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

content/test/gpu/gpu_tests/context_lost.py

 # Copyright (c) 2013 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.
 import os
 import time
 
 import context_lost_expectations
 
 from telemetry import benchmark as benchmark_module
 from telemetry.core import exceptions
@@ skipping 47 matching lines @@
       needs_browser_restart_after_each_page=True)
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs(
         '--disable-domain-blocking-for-3d-apis')
     options.AppendExtraBrowserArgs(
         '--disable-gpu-process-crash-limit')
     # 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
       # the browser every time.
       for x in range(page.number_of_gpu_process_kills):
         if not tab.browser.supports_tab_control:
           raise page_test.Failure('Browser must support tab control')
 
         expected_kills = x + 1
 
@@ skipping 217 matching lines @@
     ps = page_set.PageSet(
       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))
     return ps