Kill PageSet.AddPage and its remaining usage in:

* tools/perf/(benchmarks|measurements)/
* content/test/gpu

BUG=439512

Review URL: https://codereview.chromium.org/800863003

Cr-Commit-Position: refs/heads/master@{#308424}

content/test/gpu/gpu_tests/context_lost.py

@@ -328,10 +328,11 @@ class ContextLost(benchmark_module.Benchmark):
       file_path=data_path,
       user_agent_type='desktop',
       serving_dirs=set(['']))
-    ps.AddPage(GPUProcessCrashesExactlyOnce(ps, ps.base_dir))
-    ps.AddPage(WebGLContextLostFromGPUProcessExitPage(ps, ps.base_dir))
-    ps.AddPage(WebGLContextLostFromLoseContextExtensionPage(ps, ps.base_dir))
-    ps.AddPage(WebGLContextLostFromQuantityPage(ps, ps.base_dir))
-    ps.AddPage(WebGLContextLostFromSelectElementPage(ps, ps.base_dir))
-    ps.AddPage(WebGLContextLostInHiddenTabPage(ps, ps.base_dir))
+    ps.AddUserStory(GPUProcessCrashesExactlyOnce(ps, ps.base_dir))
+    ps.AddUserStory(WebGLContextLostFromGPUProcessExitPage(ps, ps.base_dir))
+    ps.AddUserStory(
+        WebGLContextLostFromLoseContextExtensionPage(ps, ps.base_dir))
+    ps.AddUserStory(WebGLContextLostFromQuantityPage(ps, ps.base_dir))
+    ps.AddUserStory(WebGLContextLostFromSelectElementPage(ps, ps.base_dir))
+    ps.AddUserStory(WebGLContextLostInHiddenTabPage(ps, ps.base_dir))
     return ps

content/test/gpu/gpu_tests/hardware_accelerated_feature.py

@@ -58,5 +58,5 @@ class HardwareAcceleratedFeature(benchmark.Benchmark):
     ps = page_set.PageSet(user_agent_type='desktop', file_path='')
 
     for feature in features:
-      ps.AddPage(ChromeGpuPage(page_set=ps, feature=feature))
+      ps.AddUserStory(ChromeGpuPage(page_set=ps, feature=feature))
     return ps

content/test/gpu/gpu_tests/maps.py

@@ -100,5 +100,5 @@ class Maps(cloud_storage_test_base.TestBase):
                           make_javascript_deterministic=False,
                           file_path=page_set_path,
                           bucket=page_set.PUBLIC_BUCKET)
-    ps.AddPage(MapsPage(ps, ps.base_dir))
+    ps.AddUserStory(MapsPage(ps, ps.base_dir))
     return ps

content/test/gpu/gpu_tests/screenshot_sync.py

@@ -53,5 +53,5 @@ class ScreenshotSyncProcess(benchmark.Benchmark):
 
   def CreatePageSet(self, options):
     ps = page_set.PageSet(file_path=data_path, serving_dirs=[''])
-    ps.AddPage(ScreenshotSyncPage(ps, ps.base_dir))
+    ps.AddUserStory(ScreenshotSyncPage(ps, ps.base_dir))
     return ps

content/test/gpu/gpu_tests/webgl_conformance.py

@@ -115,7 +115,7 @@ class WebglConformance(benchmark_module.Benchmark):
       file_path=conformance_path)
 
     for test in tests:
-      ps.AddPage(WebglConformancePage(ps, test))
+      ps.AddUserStory(WebglConformancePage(ps, test))
 
     return ps
 

content/test/gpu/gpu_tests/webgl_robustness.py

@@ -66,5 +66,5 @@ class WebglRobustness(benchmark.Benchmark):
       file_path=conformance_path,
       user_agent_type='desktop',
       serving_dirs=[''])
-    ps.AddPage(WebglRobustnessPage(ps, ps.base_dir))
+    ps.AddUserStory(WebglRobustnessPage(ps, ps.base_dir))
     return ps

content/test/gpu/page_sets/gpu_process_tests.py

@@ -48,6 +48,6 @@ class GpuProcessTestsPageSet(page_set_module.PageSet):
     ]
 
     for url, name in urls_and_names_list:
-      self.AddPage(GpuProcessTestsPage(url, name, self))
+      self.AddUserStory(GpuProcessTestsPage(url, name, self))
 
-    self.AddPage(FunctionalVideoPage(self))
+    self.AddUserStory(FunctionalVideoPage(self))

content/test/gpu/page_sets/gpu_rasterization_tests.py

@@ -78,4 +78,4 @@ class GpuRasterizationTestsPageSet(page_set_module.PageSet):
   def __init__(self):
     super(GpuRasterizationTestsPageSet, self).__init__()
 
-    self.AddPage(GpuRasterizationTestsPage(self))
+    self.AddUserStory(GpuRasterizationTestsPage(self))

content/test/gpu/page_sets/memory_tests.py

@@ -27,4 +27,4 @@ class MemoryTestsPageSet(page_set_module.PageSet):
     super(MemoryTestsPageSet, self).__init__(
       user_agent_type='desktop')
 
-    self.AddPage(MemoryTestsPage(self))
+    self.AddUserStory(MemoryTestsPage(self))

content/test/gpu/page_sets/pixel_tests.py

@@ -26,21 +26,21 @@ class PixelTestsPageSet(page_set_module.PageSet):
   def __init__(self):
     super(PixelTestsPageSet, self).__init__(
       user_agent_type='desktop')
-    self.AddPage(PixelTestsPage(
+    self.AddUserStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_canvas2d.html',
       name='Pixel.Canvas2DRedBox',
       test_rect=[0, 0, 300, 300],
       revision=4,
       page_set=self))
 
-    self.AddPage(PixelTestsPage(
+    self.AddUserStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_css3d.html',
       name='Pixel.CSS3DBlueBox',
       test_rect=[0, 0, 300, 300],
       revision=11,
       page_set=self))
 
-    self.AddPage(PixelTestsPage(
+    self.AddUserStory(PixelTestsPage(
       url='file://../../data/gpu/pixel_webgl.html',
       name='Pixel.WebGLGreenTriangle',
       test_rect=[0, 0, 300, 300],

tools/perf/benchmarks/maps.py

@@ -52,7 +52,7 @@ class MapsBenchmark(benchmark.Benchmark):
       archive_data_file='data/maps.json',
       make_javascript_deterministic=False,
       file_path=page_set_path)
-    ps.AddPage(MapsPage(ps, ps.base_dir))
+    ps.AddUserStory(MapsPage(ps, ps.base_dir))
     return ps
 
 class MapsNoVsync(MapsBenchmark):

tools/perf/measurements/repaint_unittest.py

@@ -33,7 +33,7 @@ class RepaintUnitTest(page_test_test_case.PageTestTestCase):
 
   def testRepaint(self):
     ps = self.CreateEmptyPageSet()
-    ps.AddPage(TestRepaintPage(ps, ps.base_dir))
+    ps.AddUserStory(TestRepaintPage(ps, ps.base_dir))
     measurement = repaint.Repaint()
     results = self.RunMeasurement(measurement, ps, options=self._options)
     self.assertEquals(0, len(results.failures))

tools/perf/measurements/smooth_gesture_util_unittest.py

@@ -114,7 +114,7 @@ class ScrollingPage(page_module.Page):
 class SmoothGestureTest(page_test_test_case.PageTestTestCase):
   def testSmoothGestureAdjusted(self):
     ps = self.CreateEmptyPageSet()
-    ps.AddPage(ScrollingPage(
+    ps.AddUserStory(ScrollingPage(
       'file://scrollable_page.html', ps, base_dir=ps.base_dir))
     models = []
     tab_ids = []

tools/perf/measurements/smoothness_unittest.py

@@ -131,7 +131,7 @@ class SmoothnessUnitTest(page_test_test_case.PageTestTestCase):
   @test.Disabled('mac', 'chromeos')  # http://crbug.com/403903
   def testSmoothnessForPageWithNoGesture(self):
     ps = self.CreateEmptyPageSet()
-    ps.AddPage(AnimatedPage(ps))
+    ps.AddUserStory(AnimatedPage(ps))
 
     measurement = smoothness.Smoothness()
     results = self.RunMeasurement(measurement, ps, options=self._options)
@@ -164,7 +164,7 @@ class SmoothnessUnitTest(page_test_test_case.PageTestTestCase):
         self.stop_called = True
 
     ps = self.CreateEmptyPageSet()
-    ps.AddPage(FailPage(ps))
+    ps.AddUserStory(FailPage(ps))
 
     class BuggyMeasurement(smoothness.Smoothness):
       fake_power = None

tools/perf/measurements/task_execution_time_unittest.py

@@ -28,7 +28,7 @@ class TaskExecutionTimeUnitTest(page_test_test_case.PageTestTestCase):
 
   def testCorrectNumberOfResultsReturned(self):
     ps = self.CreateEmptyPageSet()
-    ps.AddPage(TestTaskExecutionTimePage(ps, ps.base_dir))
+    ps.AddUserStory(TestTaskExecutionTimePage(ps, ps.base_dir))
     measurement = task_execution_time.TaskExecutionTime()
 
     results = self.RunMeasurement(measurement, ps, options=self._options)
@@ -39,7 +39,7 @@ class TaskExecutionTimeUnitTest(page_test_test_case.PageTestTestCase):
 
   def testResultsAreDecreasing(self):
     ps = self.CreateEmptyPageSet()
-    ps.AddPage(TestTaskExecutionTimePage(ps, ps.base_dir))
+    ps.AddUserStory(TestTaskExecutionTimePage(ps, ps.base_dir))
     measurement = task_execution_time.TaskExecutionTime()
 
     results = self.RunMeasurement(measurement, ps, options=self._options)

tools/perf/measurements/thread_times_unittest.py

@@ -32,7 +32,7 @@ class ThreadTimesUnitTest(page_test_test_case.PageTestTestCase):
 
   def testBasicForPageWithNoGesture(self):
     ps = self.CreateEmptyPageSet()
-    ps.AddPage(smoothness_unittest.AnimatedPage(ps))
+    ps.AddUserStory(smoothness_unittest.AnimatedPage(ps))
 
     measurement = thread_times.ThreadTimes()
     timeline_options = self._options

tools/telemetry/telemetry/page/page_set.py

@@ -52,9 +52,6 @@ class PageSet(user_story_set.UserStorySet):
     assert user_story.page_set is self
     super(PageSet, self).AddUserStory(user_story)
 
-  def AddPage(self, page):
-    self.AddUserStory(page)
-
   @property
   def base_dir(self):
     if os.path.isfile(self.file_path):