Remove deprecated methods related to tracing in browser.py.

tools/perf/measurements/smoothness_unittest.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 sys
 
 from measurements import smoothness
 from metrics import power
 from telemetry.core import exceptions
 from telemetry.core import wpr_modes
 from telemetry.page import page
 from telemetry.page import page_test
 from telemetry.unittest import options_for_unittests
 from telemetry.unittest import page_test_test_case
 from telemetry.unittest import test
 
+class FakeTracingController(object):
+  def __init__(self):
+    self.category_filter = None
+  def Start(self, _options, category_filter, _timeout):
+    self.category_filter = category_filter
+
+
 class FakePlatform(object):
+  def __init__(self):
+    self.tracing_controller = FakeTracingController()
   def IsRawDisplayFrameRateSupported(self):
     return False
   def CanMonitorPower(self):
     return False
 
 
 class FakeBrowser(object):
   def __init__(self):
     self.platform = FakePlatform()
-    self.category_filter = None
-
-  def StartTracing(self, category_filter, _):
-    self.category_filter = category_filter
 
 
 class AnimatedPage(page.Page):
   def __init__(self, page_set):
     super(AnimatedPage, self).__init__(
       url='file://animated_page.html',
       page_set=page_set, base_dir=page_set.base_dir)
 
   def RunSmoothness(self, action_runner):
     action_runner.Wait(.2)
@@ skipping 20 matching lines @@
         'cc.DrawAndSwap': { 'target_duration': 0.012, 'mode': 'alternating' },
         'gpu.PresentingFrame': { 'target_duration': 0.012 }
     }
 
     tab = FakeTab()
     measurement = smoothness.Smoothness()
     measurement.WillStartBrowser(tab.browser)
     measurement.WillNavigateToPage(test_page, tab)
     measurement.WillRunActions(test_page, tab)
 
-    expected_category_filter = [
+    expected_category_filter = set([
         'DELAY(cc.BeginMainFrame;0.012000;static)',
         'DELAY(cc.DrawAndSwap;0.012000;alternating)',
         'DELAY(gpu.PresentingFrame;0.012000;static)',
         'benchmark'
-    ]
-    actual_category_filter = tab.browser.category_filter.split(',')
-    actual_category_filter.sort()
+    ])
+    tracing_controller = tab.browser.platform.tracing_controller
+    actual_category_filter = (
+      tracing_controller.category_filter.included_categories)
 
     # FIXME: Put blink.console into the expected above and remove these two
     # remove entries when the blink.console change has rolled into chromium.
     actual_category_filter.remove('webkit.console')
     actual_category_filter.remove('blink.console')
 
     if expected_category_filter != actual_category_filter:
       sys.stderr.write("Expected category filter: %s\n" %
                        repr(expected_category_filter))
       sys.stderr.write("Actual category filter filter: %s\n" %
@@ skipping 76 matching lines @@
         self.fake_power = self._power_metric = FakePowerMetric(browser)
 
     measurement = BuggyMeasurement()
     try:
       self.RunMeasurement(measurement, ps)
     except page_test.TestNotSupportedOnPlatformFailure:
       pass
 
     self.assertTrue(measurement.fake_power.start_called)
     self.assertTrue(measurement.fake_power.stop_called)