Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/project/test/projectsummary_test.py b/project/test/projectsummary_test.py
index 32b2fde..6f6373b 100644
--- a/project/test/projectsummary_test.py
+++ b/project/test/projectsummary_test.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """Unittests for Project Summary servlet."""
 from __future__ import print_function
@@ -12,8 +11,8 @@
 
 from framework import permissions
 from project import projectsummary
-from proto import project_pb2
-from proto import user_pb2
+from mrproto import project_pb2
+from mrproto import user_pb2
 from services import service_manager
 from testing import fake
 from testing import testing_helpers
@@ -30,8 +29,7 @@
     self.project = services.project.TestAddProject(
         'proj', project_id=123, summary='sum',
         description='desc')
-    self.servlet = projectsummary.ProjectSummary(
-        'req', 'res', services=services)
+    self.servlet = projectsummary.ProjectSummary(services=services)
 
   def testGatherPageData(self):
     mr = testing_helpers.MakeMonorailRequest(project=self.project)