Reenable CPU tracing agent for BattOr benchmarks

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.timeline import chrome_trace_category_filter
 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):
     category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter(
         filter_string='toplevel')
     options = timeline_based_measurement.Options(category_filter)
     options.config.chrome_trace_config.category_filter.AddFilterString('rail')
-    # TODO(charliea): Reenable the CPU tracing agent once it no longer causes
-    # indefinite hangs on Windows.
-    # https://crbug.com/647443
+    options.config.enable_atrace_trace = True
+    options.config.atrace_config.categories = ['sched']
     options.config.enable_battor_trace = True
     options.config.enable_chrome_trace = True
-    options.config.enable_atrace_trace = True
-    options.config.atrace_config.categories = ['sched']
+    options.config.enable_cpu_trace = True
     options.SetTimelineBasedMetrics(
         ['powerMetric', 'clockSyncLatencyMetric', 'cpuTimeMetric'])
     return options
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # Only run if BattOr is detected.
     if not possible_browser.platform.HasBattOrConnected():
       return True
 
@@ skipping 60 matching lines @@
 @benchmark.Enabled('mac')
 class BattOrSteadyStatePages(_BattOrBenchmark):
 
   def CreateStorySet(self, options):
     # We want it to wait for 30 seconds to be comparable to legacy power tests.
     return page_sets.IdleAfterLoadingStories(wait_in_seconds=30)
 
   @classmethod
   def Name(cls):
     return 'battor.steady_state'