[Systrace] Fix systrace clock syncing issue with BattOr.

systrace/profile_chrome/ddms_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 profile_chrome import util
 from systrace import trace_result
 from systrace import tracing_agents
+from telemetry.timeline import trace_data as trace_data_module
 
 
 _DDMS_SAMPLING_FREQUENCY_US = 100
 
 
 class DdmsAgent(tracing_agents.TracingAgent):
   def __init__(self, device, package_info):
     tracing_agents.TracingAgent.__init__(self)
     self._device = device
     self._package = package_info.package
@@ skipping 24 matching lines @@
   def StopAgentTracing(self, timeout=None):
     self._device.RunShellCommand('am profile stop %s' % self._package)
     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('ddms', trace_data)
 
+  def CollectAgentTraceData(self, trace_data_builder):
+    with open(self._PullTrace(), 'r') as f:
+      trace_data = f.read()
+    trace_data_builder(trace_data_module.DDMS_TRACE_PART, trace_data)
+
   def _PullTrace(self):
     if not self._output_file:
       return None
 
     host_file = os.path.join(
         os.path.curdir, os.path.basename(self._output_file))
     self._device.PullFile(self._output_file, host_file)
     return host_file
 
   def SupportsExplicitClockSync(self):
@@ skipping 19 matching lines @@
   return None
 
 def add_options(parser):
   options = optparse.OptionGroup(parser, 'Java tracing')
   options.add_option('--ddms', help='Trace Java execution using DDMS '
                      'sampling.', action='store_true')
   return options
 
 def get_config(options):
   return DdmsConfig(options.device, options.package_info, options.ddms)