[Systrace] Fix systrace clock syncing issue with BattOr.

systrace/profile_chrome/perf_tracing_agent.py

 # Copyright 2014 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 logging
 import optparse
 import os
 import py_utils
 import signal
 import subprocess
 import sys
 import tempfile
 
 from devil.android import device_temp_file
 from devil.android.perf import perf_control
 
 from profile_chrome import ui
 from systrace import trace_result
 from systrace import tracing_agents
+from telemetry.timeline import trace_data as trace_data_module
 
 _CATAPULT_DIR = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), '..', '..')
 sys.path.append(os.path.join(_CATAPULT_DIR, 'telemetry'))
 try:
   # pylint: disable=F0401
   from telemetry.internal.platform.profiler import android_profiling_helper
   from telemetry.internal.util import binary_manager
 except ImportError:
   android_profiling_helper = None
@@ skipping 105 matching lines @@
       return
     self._perf_instance.SignalAndWait()
     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('perf', trace_data)
 
+  def CollectAgentTraceData(self, trace_data_builder):
+    with open(self._PullTrace(), 'r') as f:
+      data = f.read()
+    trace_data_builder.AddTraceFor(trace_data_module.PROFILER_TRACE_PART, data)
+
   @staticmethod
   def _GetInteractivePerfCommand(perfhost_path, perf_profile, symfs_dir,
                                  required_libs, kallsyms):
     cmd = '%s report -n -i %s --symfs %s --kallsyms %s' % (
         os.path.relpath(perfhost_path, '.'), perf_profile, symfs_dir, kallsyms)
     for lib in required_libs:
       lib = os.path.join(symfs_dir, lib[1:])
       if not os.path.exists(lib):
         continue
       objdump_path = android_profiling_helper.GetToolchainBinaryPath(
@@ skipping 88 matching lines @@
 
 def get_config(options):
   return PerfConfig(options.perf_categories, options.device)
 
 def _ComputePerfCategories(config):
   if not PerfProfilerAgent.IsSupported():
     return []
   if not config.perf_categories:
     return []
   return config.perf_categories.split(',')