[Systrace] Fix systrace clock syncing issue with BattOr.

systrace/profile_chrome/chrome_startup_tracing_agent.py

 # Copyright 2015 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 optparse
 import os
 import py_utils
 import re
 
 from devil.android import flag_changer
 from devil.android.perf import cache_control
 from devil.android.sdk import intent
-
 from systrace import trace_result
 from systrace import tracing_agents
+from telemetry.timeline import trace_data as trace_data_module

[rnephew (Reviews Here), 2017/02/24 17:21:26]

I eventually would like to move this out of telemetry into either its own part
of the repo so that it doesn't rely on telemetry.

 
 
 class ChromeStartupTracingAgent(tracing_agents.TracingAgent):
   def __init__(self, device, package_info, cold, url):
     tracing_agents.TracingAgent.__init__(self)
     self._device = device
     self._package_info = package_info
     self._cold = cold
     self._logcat_monitor = self._device.GetLogcatMonitor()
     self._url = url
@@ skipping 44 matching lines @@
     finally:
       self._TearDownTracing()
     return True
 
   @py_utils.Timeout(tracing_agents.GET_RESULTS_TIMEOUT)
   def GetResults(self, timeout=None):
     with open(self._PullTrace(), 'r') as f:
       trace_data = f.read()
     return trace_result.TraceResult('traceEvents', trace_data)
 
+  def CollectAgentTraceData(self, trace_data_builder):

[rnephew (Reviews Here), 2017/02/24 17:21:26]

Made changes to make it operate more like the tracing in telemetry.

+    with open(self._PullTrace(), 'r') as f:
+      data = f.read()
+    trace_data_builder.AddTraceFor(trace_data_module.CHROME_TRACE_PART, data)
+
   def _PullTrace(self):
     trace_file = self._trace_file.replace('/storage/emulated/0/', '/sdcard/')
     host_file = os.path.join(os.path.curdir, os.path.basename(trace_file))
     self._device.PullFile(trace_file, host_file)
     return host_file
 
   def SupportsExplicitClockSync(self):
     return False
 
   def RecordClockSyncMarker(self, sync_id, did_record_sync_marker_callback):
@@ skipping 24 matching lines @@
                      default='https://www.google.com', metavar='URL')
   options.add_option('--cold', help='Flush the OS page cache before starting '
                      'the browser. Note that this require a device with root '
                      'access.', default=False, action='store_true')
   return options
 
 def get_config(options):
   return ChromeStartupConfig(options.device, options.package_info,
                              options.cold, options.url,
                              options.chrome_categories)