3 files changed, 2 insertions, 9 deletions
diff --git a/tools/perf/measurements/v8_gc_times.py b/tools/perf/measurements/v8_gc_times.py
index c964902..01e2d01 100644
--- a/tools/perf/measurements/v8_gc_times.py
+++ b/tools/perf/measurements/v8_gc_times.py
@@ -42,10 +42,6 @@ class V8GCTimes(page_test.PageTest):
     renderer_process = timeline_model.GetRendererProcessFromTabId(tab.id)
     self._AddV8MetricsToResults(renderer_process, results)
 
-  def CleanUpAfterPage(self, page, tab):
-    if tab.browser.platform.tracing_controller.is_tracing_running:
-      tab.browser.platform.tracing_controller.Stop()
-
   def _AddV8MetricsToResults(self, process, results):
     if process is None:
       return
diff --git a/tools/perf/measurements/v8_gc_times_unittest.py b/tools/perf/measurements/v8_gc_times_unittest.py
index 3ee121c..aaf816b 100644
--- a/tools/perf/measurements/v8_gc_times_unittest.py
+++ b/tools/perf/measurements/v8_gc_times_unittest.py
@@ -238,9 +238,6 @@ class V8GCTimesTests(page_test_test_case.PageTestTestCase):
           'Result for [' + key + '] - expected ' + str(expected[key]) +
           ' but got ' + str(actual[key]))
 
-  def testCleanUpTrace(self):
-    self.TestTracingCleanedUp(v8_gc_times.V8GCTimes, self._options)
-
 
 def _ActualValues(results):
   return dict(list(
diff --git a/tools/telemetry/telemetry/unittest_util/page_test_test_case.py b/tools/telemetry/telemetry/unittest_util/page_test_test_case.py
index c838b08..5446b51 100644
--- a/tools/telemetry/telemetry/unittest_util/page_test_test_case.py
+++ b/tools/telemetry/telemetry/unittest_util/page_test_test_case.py
@@ -87,7 +87,7 @@ class PageTestTestCase(unittest.TestCase):
           ActualStartTracing(*args, **kwargs)
           start_tracing_called[0] = True
           raise exceptions.IntentionalException
-        browser.platform.tracing_controller.Start = FakeStartTracing
+        browser.StartTracing = FakeStartTracing
 
         ActualStopTracing = browser.platform.tracing_controller.Stop
         def FakeStopTracing(*args, **kwargs):
@@ -101,7 +101,7 @@ class PageTestTestCase(unittest.TestCase):
     measurement = BuggyMeasurement()
     try:
       self.RunMeasurement(measurement, ps, options=options)
-    except page_test.MultiTabTestAppCrashError:
+    except page_test.TestNotSupportedOnPlatformError:
       pass
     if start_tracing_called[0]:
       self.assertTrue(stop_tracing_called[0])