Reenable CPU tracing agent for BattOr benchmarks

tools/perf/benchmarks/battor.py

Index: tools/perf/benchmarks/battor.py
diff --git a/tools/perf/benchmarks/battor.py b/tools/perf/benchmarks/battor.py
index aeb863c83d6344f5636e604d32d5ed0319b2d1c5..39586d7c9e9d8c1076bac0f038c6d7000ec5998d 100644
--- a/tools/perf/benchmarks/battor.py
+++ b/tools/perf/benchmarks/battor.py
@@ -18,13 +18,11 @@ class _BattOrBenchmark(perf_benchmark.PerfBenchmark):
         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_battor_trace = True
-    options.config.enable_chrome_trace = True
     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_cpu_trace = True
     options.SetTimelineBasedMetrics(
         ['powerMetric', 'clockSyncLatencyMetric', 'cpuTimeMetric'])
     return options