Remove page_set argument from benchmark.CreateExpectations to limit the access...

Remove page_set argument from benchmark.CreateExpectations to limit the access to page_set (user_story)

BUG=418278

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

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

content/test/gpu/gpu_tests/context_lost.py

@@ -317,7 +317,7 @@ class ContextLost(benchmark_module.Benchmark):
   enabled = True
   test = _ContextLostValidator
 
-  def CreateExpectations(self, page_set):
+  def CreateExpectations(self):
     return context_lost_expectations.ContextLostExpectations()
 
   # For the record, this would have been another way to get the pages

content/test/gpu/gpu_tests/gpu_process.py

@@ -37,7 +37,7 @@ class GpuProcess(benchmark.Benchmark):
   """Tests that accelerated content triggers the creation of a GPU process"""
   test = _GpuProcessValidator
 
-  def CreateExpectations(self, page_set):
+  def CreateExpectations(self):
     return expectations.GpuProcessExpectations()
 
   def CreatePageSet(self, options):

content/test/gpu/gpu_tests/hardware_accelerated_feature.py

@@ -49,7 +49,7 @@ class HardwareAcceleratedFeature(benchmark.Benchmark):
   """Tests GPU acceleration is reported as active for various features"""
   test = _HardwareAcceleratedFeatureValidator
 
-  def CreateExpectations(self, page_set):
+  def CreateExpectations(self):
     return expectations.HardwareAcceleratedFeatureExpectations()
 
   def CreatePageSet(self, options):

content/test/gpu/gpu_tests/maps.py

@@ -90,7 +90,7 @@ class Maps(cloud_storage_test_base.TestBase):
   """Google Maps pixel tests."""
   test = _MapsValidator
 
-  def CreateExpectations(self, page_set):
+  def CreateExpectations(self):
     return maps_expectations.MapsExpectations()
 
   def CreatePageSet(self, options):

content/test/gpu/gpu_tests/memory_test.py

@@ -103,7 +103,7 @@ class MemoryTest(benchmark.Benchmark):
   """Tests GPU memory limits"""
   test = _MemoryValidator
 
-  def CreateExpectations(self, page_set):
+  def CreateExpectations(self):
     return memory_test_expectations.MemoryTestExpectations()
 
   def CreatePageSet(self, options):

content/test/gpu/gpu_tests/pixel.py

@@ -163,5 +163,5 @@ class Pixel(cloud_storage_test_base.TestBase):
       page.script_to_evaluate_on_commit = test_harness_script
     return page_set
 
-  def CreateExpectations(self, page_set):
+  def CreateExpectations(self):
     return pixel_expectations.PixelExpectations()

content/test/gpu/gpu_tests/screenshot_sync.py

@@ -48,7 +48,7 @@ class ScreenshotSyncProcess(benchmark.Benchmark):
   they were requested"""
   test = _ScreenshotSyncValidator
 
-  def CreateExpectations(self, page_set):
+  def CreateExpectations(self):
     return expectations.ScreenshotSyncExpectations()
 
   def CreatePageSet(self, options):

content/test/gpu/gpu_tests/webgl_conformance.py

@@ -119,7 +119,7 @@ class WebglConformance(benchmark_module.Benchmark):
 
     return ps
 
-  def CreateExpectations(self, page_set):
+  def CreateExpectations(self):
     return webgl_conformance_expectations.WebGLConformanceExpectations()
 
   @staticmethod

tools/telemetry/telemetry/benchmark.py

@@ -85,7 +85,7 @@ class Benchmark(command_line.Command):
       pt._enabled_strings = self._enabled_strings
 
     ps = self.CreatePageSet(finder_options)
-    expectations = self.CreateExpectations(ps)
+    expectations = self.CreateExpectations()
 
     self._DownloadGeneratedProfileArchive(finder_options)
 
@@ -196,7 +196,7 @@ class Benchmark(command_line.Command):
     return cls.PageSetClass()()
 
   @classmethod
-  def CreateExpectations(cls, ps):  # pylint: disable=W0613
+  def CreateExpectations(cls):  # pylint: disable=W0613
     """Get the expectations this test will run with.
 
     By default, it will create an empty expectations set. Override to generate