Allow blink.console or webkit.console in telemetry

tools/perf/measurements/image_decoding.py

 # Copyright 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 metrics import power
 from telemetry.page import page_measurement
 from telemetry.timeline import model
 
 
 class ImageDecoding(page_measurement.PageMeasurement):
   def __init__(self):
     super(ImageDecoding, self).__init__()
     self._power_metric = power.PowerMetric()
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
     power.PowerMetric.CustomizeBrowserOptions(options)
 
   def WillNavigateToPage(self, page, tab):
     tab.ExecuteJavaScript("""
         if (window.chrome &&
             chrome.gpuBenchmarking &&
             chrome.gpuBenchmarking.clearImageCache) {
           chrome.gpuBenchmarking.clearImageCache();
         }
     """)
     self._power_metric.Start(page, tab)
     # FIXME: bare 'devtools' is for compatibility with older reference versions
     # only and may eventually be removed.
     tab.browser.StartTracing(

[ernstm, 2014/06/19 22:01:24]

Please add a TODO comment to remove the webkit.console category once the
reference builds were updated to a revision that uses blink.console. Also file a
ticket for that.

[dsinclair, 2014/06/19 23:02:51]

Done.

-        'disabled-by-default-devtools.timeline*,devtools,webkit.console')
+        'disabled-by-default-devtools.timeline*,' +
+            'devtools,webkit.console,blink.console')
 
   def StopBrowserAfterPage(self, browser, page):
     return not browser.tabs[0].ExecuteJavaScript("""
         window.chrome &&
             chrome.gpuBenchmarking &&
             chrome.gpuBenchmarking.clearImageCache;
     """)
 
   def MeasurePage(self, page, tab, results):
     timeline_data = tab.browser.StopTracing()
@@ skipping 19 matching lines @@
     assert durations, 'Failed to find "Decode Image" trace events.'
 
     image_decoding_avg = sum(durations) / len(durations)
     results.Add('ImageDecoding_avg', 'ms', image_decoding_avg)
     results.Add('ImageLoading_avg', 'ms',
                 tab.EvaluateJavaScript('averageLoadingTimeMs()'))
 
   def CleanUpAfterPage(self, page, tab):
     if tab.browser.is_tracing_running:
       tab.browser.StopTracing()