Rename ValidatePage/MeasurePage -> ValidateAndMeasurePage for all files...

Rename ValidatePage/MeasurePage -> ValidateAndMeasurePage for all files outside tools/telemetry and tools/perf.

BUG=383635

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

Cr-Commit-Position: refs/heads/master@{#288459}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288459 0039d316-1c4b-4281-b951-d872f2087c98

content/test/gpu/gpu_tests/context_lost.py

@@ -65,7 +65,7 @@ class _ContextLostValidator(page_test.PageTest):
     # Required for about:gpucrash handling from Telemetry.
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
 
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     if page.kill_gpu_process:
       # Doing the GPU process kill operation cooperatively -- in the
       # same page's context -- is much more stressful than restarting

content/test/gpu/gpu_tests/gpu_process.py

@@ -27,7 +27,7 @@ class _GpuProcessValidator(page_test.PageTest):
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
 
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     has_gpu_process_js = 'chrome.gpuBenchmarking.hasGpuProcess()'
     has_gpu_process = tab.EvaluateJavaScript(has_gpu_process_js)
     if not has_gpu_process:

content/test/gpu/gpu_tests/gpu_rasterization.py

@@ -34,7 +34,7 @@ class _GpuRasterizationValidator(cloud_storage_test_base.ValidatorBase):
                                     '--force-gpu-rasterization',
                                     '--enable-gpu-benchmarking'])
 
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     if not _DidTestSucceed(tab):
       raise page_test.Failure('Page indicated a failure')
 

content/test/gpu/gpu_tests/hardware_accelerated_feature.py

@@ -26,7 +26,7 @@ test_harness_script = r"""
 """;
 
 class _HardwareAcceleratedFeatureValidator(page_test.PageTest):
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     feature = page.feature
     if not tab.EvaluateJavaScript('VerifyHardwareAccelerated("%s")' % feature):
       print 'Test failed. Printing page contents:'

content/test/gpu/gpu_tests/maps.py

@@ -24,7 +24,7 @@ class _MapsValidator(cloud_storage_test_base.ValidatorBase):
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
 
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     # TODO: This should not be necessary, but it's not clear if the test is
     # failing on the bots in it's absence. Remove once we can verify that it's
     # safe to do so.

content/test/gpu/gpu_tests/memory.py

@@ -63,7 +63,7 @@ test_harness_script = r"""
 """ % MEMORY_LIMIT_MB
 
 class _MemoryValidator(page_test.PageTest):
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     timeline_data = tab.browser.StopTracing()
     timeline_model = model.TimelineModel(timeline_data)
     for process in timeline_model.GetAllProcesses():

content/test/gpu/gpu_tests/pixel.py

@@ -53,7 +53,7 @@ class _PixelValidator(cloud_storage_test_base.ValidatorBase):
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
 
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     if not _DidTestSucceed(tab):
       raise page_test.Failure('Page indicated a failure')
 

content/test/gpu/gpu_tests/screenshot_sync.py

@@ -19,7 +19,7 @@ class _ScreenshotSyncValidator(page_test.PageTest):
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
 
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     test_success = tab.EvaluateJavaScript('window.__testSuccess')
     if not test_success:
       message = tab.EvaluateJavaScript('window.__testMessage')

content/test/gpu/gpu_tests/webgl_conformance.py

@@ -71,7 +71,7 @@ class WebglConformanceValidator(page_test.PageTest):
   def __init__(self):
     super(WebglConformanceValidator, self).__init__(attempts=1, max_failures=10)
 
-  def ValidatePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     if not _DidWebGLTestSucceed(tab):
       raise page_test.Failure(_WebGLTestMessages(tab))
 

tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py

@@ -21,7 +21,7 @@ class ChromeProxyLatency(page_test.PageTest):
   def WillNavigateToPage(self, page, tab):
     tab.ClearCache(force=True)
 
-  def MeasurePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     # Wait for the load event.
     tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300)
     loading.LoadingMetric().AddResults(tab, results)
@@ -37,7 +37,7 @@ class ChromeProxyDataSaving(page_test.PageTest):
     tab.ClearCache(force=True)
     self._metrics.Start(page, tab)
 
-  def MeasurePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     # Wait for the load event.
     tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300)
     self._metrics.Stop(page, tab)
@@ -64,7 +64,7 @@ class ChromeProxyValidation(page_test.PageTest):
     assert self._metrics
     self._metrics.Start(page, tab)
 
-  def MeasurePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     self._page = page
     # Wait for the load event.
     tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300)