[Android][Telemetry] Enable ATrace tracing for BattOr Tests.

tools/perf/benchmarks/battor.py

 # Copyright 2016 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.
 
 from core import perf_benchmark
 from telemetry.web_perf import timeline_based_measurement
 import page_sets
 from telemetry import benchmark
 
 
 # TODO(rnephew): Remove BattOr naming from all benchmarks once the BattOr tests
 # are the primary means of benchmarking power.
 class _BattOrBenchmark(perf_benchmark.PerfBenchmark):
 
   def CreateTimelineBasedMeasurementOptions(self):
     options = timeline_based_measurement.Options()
     options.config.enable_battor_trace = True
     options.config.enable_chrome_trace = True
+    options.config.enable_atrace_trace = True
     options.config.chrome_trace_config.SetDefaultOverheadFilter()
     options.SetTimelineBasedMetrics(['powerMetric', 'clockSyncLatencyMetric'])
     return options
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # Only run if BattOr is detected.
     if not possible_browser.platform.HasBattOrConnected():
       return True
 
@@ skipping 66 matching lines @@
     return 'battor.power_cases'
 
 
 class BattOrPowerCasesNoChromeTrace(_BattOrBenchmark):
   page_set = page_sets.power_cases.PowerCasesPageSet
 
   def CreateTimelineBasedMeasurementOptions(self):
     options = timeline_based_measurement.Options()
     options.config.enable_battor_trace = True
     options.config.enable_chrome_trace = False
+    options.config.enable_atrace_trace = False
     options.config.chrome_trace_config.SetDefaultOverheadFilter()
     options.SetTimelineBasedMetrics(['powerMetric', 'clockSyncLatencyMetric'])
     return options
 
   @classmethod
   def Name(cls):
     return 'battor.power_cases_no_chrome_trace'