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

content/test/gpu/gpu_tests/pixel.py

 # Copyright (c) 2012 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.
 from datetime import datetime
 import glob
 import optparse
 import os
 import re
 
 import cloud_storage_test_base
@@ skipping 35 matching lines @@
 class PixelTestFailure(Exception):
   pass
 
 def _DidTestSucceed(tab):
   return tab.EvaluateJavaScript('domAutomationController._succeeded')
 
 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')
 
     if not tab.screenshot_supported:
       raise page_test.Failure('Browser does not support screenshot capture')
 
     screenshot = tab.Screenshot(5)
 
     if not screenshot:
       raise page_test.Failure('Could not capture screenshot')
@@ skipping 92 matching lines @@
         default=default_reference_image_dir)
 
   def CreatePageSet(self, options):
     page_set = super(Pixel, self).CreatePageSet(options)
     for page in page_set.pages:
       page.script_to_evaluate_on_commit = test_harness_script
     return page_set
 
   def CreateExpectations(self, page_set):
     return pixel_expectations.PixelExpectations()