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

content/test/gpu/gpu_tests/hardware_accelerated_feature.py

 # Copyright 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 hardware_accelerated_feature_expectations as expectations
 
 from telemetry import benchmark
 from telemetry.page import page as page_module
 from telemetry.page import page_set
 from telemetry.page import page_test
 
 test_harness_script = r"""
   function VerifyHardwareAccelerated(feature) {
     feature += ': '
     var list = document.querySelector('.feature-status-list');
     for (var i=0; i < list.childElementCount; i++) {
       var span_list = list.children[i].getElementsByTagName('span');
       var feature_str = span_list[0].textContent;
       var value_str = span_list[1].textContent;
       if ((feature_str == feature) &&
           (value_str == 'Hardware accelerated')) {
         return true;
       }
     }
     return false;
   };
 """;
 
 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:'
       print tab.EvaluateJavaScript('document.body.innerHTML')
       raise page_test.Failure('%s not hardware accelerated' % feature)
 
 def safe_feature_name(feature):
   return feature.lower().replace(' ', '_')
 
 class ChromeGpuPage(page_module.Page):
@@ skipping 13 matching lines @@
     return expectations.HardwareAcceleratedFeatureExpectations()
 
   def CreatePageSet(self, options):
     features = ['WebGL', 'Canvas']
 
     ps = page_set.PageSet(user_agent_type='desktop', file_path='')
 
     for feature in features:
       ps.AddPage(ChromeGpuPage(page_set=ps, feature=feature))
     return ps