Remove deprecated methods related to tracing in browser.py.

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.core.platform import tracing_category_filter
+from telemetry.core.platform import tracing_options
 from telemetry.page import page_test
 from telemetry.timeline import model
 from telemetry.value import scalar
 
 
 class ImageDecoding(page_test.PageTest):
   def __init__(self):
     super(ImageDecoding, self).__init__()
     self._power_metric = None
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
     power.PowerMetric.CustomizeBrowserOptions(options)
 
   def WillStartBrowser(self, browser):
     self._power_metric = power.PowerMetric(browser)
 
   def WillNavigateToPage(self, page, tab):
     tab.ExecuteJavaScript("""
         if (window.chrome &&
             chrome.gpuBenchmarking &&
             chrome.gpuBenchmarking.clearImageCache) {
           chrome.gpuBenchmarking.clearImageCache();
         }
     """)
     self._power_metric.Start(page, tab)
+
+    options = tracing_options.TracingOptions()
+    options.enable_chrome_trace = True
     # FIXME: bare 'devtools' is for compatibility with older reference versions
     # only and may eventually be removed.
+    category_filter = tracing_category_filter.TracingCategoryFilter(
+        'disabled-by-default-devtools.timeline*')
+
     # FIXME: Remove webkit.console when blink.console lands in chromium and
     # the ref builds are updated. crbug.com/386847
-    tab.browser.StartTracing(
-        'disabled-by-default-devtools.timeline*,' +
-            'devtools,webkit.console,blink.console')
+    categories = [
+        'devtools',
+        'webkit.console',
+        'blink.console'
+    ]
+    for c in categories:
+      category_filter.AddIncludedCategory(c)
+    tab.browser.platform.tracing_controller.Start(options, category_filter)
 
   def StopBrowserAfterPage(self, browser, page):
     return not browser.tabs[0].ExecuteJavaScript("""
         window.chrome &&
             chrome.gpuBenchmarking &&
             chrome.gpuBenchmarking.clearImageCache;
     """)
 
   def ValidateAndMeasurePage(self, page, tab, results):
-    timeline_data = tab.browser.StopTracing()
+    timeline_data = tab.browser.platform.tracing_controller.Stop()
     timeline_model = model.TimelineModel(timeline_data)
     self._power_metric.Stop(page, tab)
     self._power_metric.AddResults(tab, results)
 
     def _IsDone():
       return tab.EvaluateJavaScript('isDone')
 
     decode_image_events = timeline_model.GetAllEventsOfName('Decode Image')
 
     # If it is a real image page, then store only the last-minIterations
@@ skipping 12 matching lines @@
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'ImageDecoding_avg', 'ms', image_decoding_avg,
         description='Average decode time for images in 4 different '
                     'formats: gif, png, jpg, and webp. The image files are '
                     'located at chrome/test/data/image_decoding.'))
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'ImageLoading_avg', 'ms',
         tab.EvaluateJavaScript('averageLoadingTimeMs()')))
 
   def CleanUpAfterPage(self, page, tab):
-    if tab.browser.is_tracing_running:
-      tab.browser.StopTracing()
+    tracing_controller = tab.browser.platform.tracing_controller
+    if tracing_controller.is_tracing_running:
+      tracing_controller.Stop()