Chromium Code Reviews| Index: tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py |
| diff --git a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py |
| index 696c9bf8433af8d648746592d06b5dc660996f3a..97c9071bdfa45638b90c7813134eedf08fcfe403 100644 |
| --- a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py |
| +++ b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py |
| @@ -24,7 +24,7 @@ from telemetry.core.backends.chrome import extension_backend |
| from telemetry.core.backends.chrome import system_info_backend |
| from telemetry.core.backends.chrome import tab_list_backend |
| from telemetry.core.backends.chrome import tracing_backend |
| -from telemetry.timeline import tracing_timeline_data |
| +from telemetry.value import trace as trace_value_module |
| from telemetry.unittest import options_for_unittests |
| @@ -266,9 +266,7 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend): |
| return None |
| return self._tracing_backend.is_tracing_running |
| - def StopTracing(self): |
| - """ Stops tracing and returns the result as TimelineData object. """ |
| - tab_ids_list = [] |
| + def StopTracing(self, trace_value_builder): |
| for (i, _) in enumerate(self._browser.tabs): |
| tab = self.tab_list_backend.Get(i, None) |
| if tab: |
| @@ -278,11 +276,10 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend): |
| "console.time.toString().indexOf('[native code]') != -1;") |
| if not success: |
| raise Exception('Page stomped on console.time') |
| - tab_ids_list.append(tab.id) |
| - trace_events = self._tracing_backend.StopTracing() |
| - # Augment tab_ids data to trace events. |
| - event_data = {'traceEvents' : trace_events, 'tabIds': tab_ids_list} |
| - return tracing_timeline_data.TracingTimelineData(event_data) |
| + trace_value_builder.AddEventsFor( |
| + trace_value_module.TAB_ID_PART, [tab.id]) |
| + |
| + self._tracing_backend.StopTracing(builder) |
|
slamm
2014/08/12 23:11:58
builder -> trace_value_builder ?
|
| def GetProcessName(self, cmd_line): |
| """Returns a user-friendly name for the process of the given |cmd_line|.""" |