Index: tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py |
diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py |
index 7784884da06859480af6c152bc518237d75223df..3187cc170c97b5f75304fd9bae177633484b4209 100644 |
--- a/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py |
+++ b/tools/telemetry/telemetry/core/platform/profiler/android_systrace_profiler.py |
@@ -10,6 +10,7 @@ import zipfile |
from telemetry.core import util |
from telemetry.core.backends.chrome import android_browser_finder |
from telemetry.core.platform import profiler |
+from telemetry.value import trace as trace_value_module |
_SYSTRACE_CATEGORIES = [ |
'gfx', |
@@ -52,7 +53,10 @@ class AndroidSystraceProfiler(profiler.Profiler): |
def CollectProfile(self): |
self._profiler.communicate(input='\n') |
- trace_result = self._browser_backend.StopTracing() |
+ |
+ trace_result_builder = trace_value_module.TraceValueBuilder() |
+ self._browser_backend.StopTracing(builder) |
slamm
2014/08/12 23:11:59
builder -> trace_result_builder ?
|
+ trace_result = trace_result_builder.AsValue() |
trace_file = StringIO.StringIO() |
trace_result.Serialize(trace_file) |