| Index: tools/perf/measurements/smoothness_controller.py
|
| diff --git a/tools/perf/measurements/smoothness_controller.py b/tools/perf/measurements/smoothness_controller.py
|
| index b66c6eb7110059de60b94302cac384f1a2f8b01e..8d3e07a184042f9f7676ea805e4c24327f2e0115 100644
|
| --- a/tools/perf/measurements/smoothness_controller.py
|
| +++ b/tools/perf/measurements/smoothness_controller.py
|
| @@ -4,6 +4,8 @@
|
| import sys
|
|
|
| from measurements import smooth_gesture_util
|
| +from telemetry.core.platform import tracing_category_filter
|
| +from telemetry.core.platform import tracing_options
|
| from telemetry.timeline.model import TimelineModel
|
| from telemetry.page import page_test
|
| from telemetry.page.actions import action_runner
|
| @@ -38,7 +40,12 @@ class SmoothnessController(object):
|
| # the ref builds are updated. crbug.com/386847
|
| custom_categories = ['webkit.console', 'blink.console', 'benchmark']
|
| custom_categories += page.GetSyntheticDelayCategories()
|
| - 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)
|
| if tab.browser.platform.IsRawDisplayFrameRateSupported():
|
| tab.browser.platform.StartRawDisplayFrameRateMeasurement()
|
|
|
| @@ -54,7 +61,7 @@ class SmoothnessController(object):
|
| # Stop tracing for smoothness metric.
|
| if tab.browser.platform.IsRawDisplayFrameRateSupported():
|
| tab.browser.platform.StopRawDisplayFrameRateMeasurement()
|
| - self._tracing_timeline_data = tab.browser.StopTracing()
|
| + self._tracing_timeline_data = tab.browser.platform.tracing_controller.Stop()
|
| self._timeline_model = TimelineModel(
|
| timeline_data=self._tracing_timeline_data)
|
|
|
| @@ -117,5 +124,5 @@ class SmoothnessController(object):
|
| def CleanUp(self, tab):
|
| if tab.browser.platform.IsRawDisplayFrameRateSupported():
|
| tab.browser.platform.StopRawDisplayFrameRateMeasurement()
|
| - if tab.browser.is_tracing_running:
|
| - tab.browser.StopTracing()
|
| + if tab.browser.platform.tracing_controller.is_tracing_running:
|
| + tab.browser.platform.tracing_controller.Stop()
|
|
|