Remove deprecated methods related to tracing in browser.py.

content/test/gpu/gpu_tests/memory.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.
 import memory_expectations
 import page_sets
 
 from telemetry import benchmark
 from telemetry.page import page_test
+from telemetry.core.platform import tracing_category_filter
+from telemetry.core.platform import tracing_options
 from telemetry.timeline import counter
 from telemetry.timeline import model
 
 MEMORY_LIMIT_MB = 192
 SINGLE_TAB_LIMIT_MB = 192
 WIGGLE_ROOM_MB = 12
 
 test_harness_script = r"""
   var domAutomationController = {};
   domAutomationController._finished = false;
@@ skipping 38 matching lines @@
 
   window.domAutomationController = domAutomationController;
 
   window.addEventListener("load", function() {
     useGpuMemory(%d);
   }, false);
 """ % MEMORY_LIMIT_MB
 
 class _MemoryValidator(page_test.PageTest):
   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)
     for process in timeline_model.GetAllProcesses():
       if 'gpu.GpuMemoryUsage' in process.counters:
         counter = process.GetCounter('gpu', 'GpuMemoryUsage')
         mb_used = counter.samples[-1] / 1048576
 
     if mb_used + WIGGLE_ROOM_MB < SINGLE_TAB_LIMIT_MB:
       raise page_test.Failure(self._FormatException('low', mb_used))
 
     if mb_used - WIGGLE_ROOM_MB > MEMORY_LIMIT_MB:
       raise page_test.Failure(self._FormatException('high', mb_used))
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-logging')
     options.AppendExtraBrowserArgs(
         '--force-gpu-mem-available-mb=%s' % MEMORY_LIMIT_MB)
 
   def WillNavigateToPage(self, page, tab):
     # FIXME: Remove webkit.console when blink.console lands in chromium and the
     # ref builds are updated. crbug.com/386847
     custom_categories = ['webkit.console', 'blink.console', 'gpu']
-    tab.browser.StartTracing(','.join(custom_categories), 60)
+    category_filter = tracing_category_filter.TracingCategoryFilter()
+    for c in custom_categories:
+        category_filter.AddIncludedCategory(c)
+    options = tracing_options.TracingOptions()
+    options.enable_chrome_trace = True
+    tab.browser.platform.tracing_controller.Start(options, category_filter, 60)
 
   def _FormatException(self, low_or_high, mb_used):
     return 'Memory allocation too %s (was %d MB, should be %d MB +/- %d MB)' % (
       low_or_high, mb_used, SINGLE_TAB_LIMIT_MB, WIGGLE_ROOM_MB)
 
 class Memory(benchmark.Benchmark):
   """Tests GPU memory limits"""
   test = _MemoryValidator
   page_set = page_sets.MemoryTestsPageSet
 
   def CreateExpectations(self, page_set):
     return memory_expectations.MemoryExpectations()
 
   def CreatePageSet(self, options):
     page_set = super(Memory, self).CreatePageSet(options)
     for page in page_set.pages:
       page.script_to_evaluate_on_commit = test_harness_script
     return page_set