Add cpuTimeMetric to BattOr benchmark.

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 53ef3e4f2dae6583e9efc804cf2144e73b6363d9..cd0edab96a71453bf949b11f24e5cd453f40b084 100644
--- a/tools/perf/benchmarks/battor.py
+++ b/tools/perf/benchmarks/battor.py
@@ -14,15 +14,17 @@ from telemetry import benchmark
 class _BattOrBenchmark(perf_benchmark.PerfBenchmark):
 
   def CreateTimelineBasedMeasurementOptions(self):
-    options = timeline_based_measurement.Options(
-        chrome_trace_category_filter.ChromeTraceCategoryFilter())
+    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')
     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'])
+    options.SetTimelineBasedMetrics(
+        ['powerMetric', 'clockSyncLatencyMetric', 'cpuTimeMetric'])
     return options
 
   @classmethod
@@ -135,7 +137,8 @@ class BattOrTrivialPages(_BattOrBenchmark):
 class BattOrSteadyStatePages(_BattOrBenchmark):
 
   def CreateStorySet(self, options):
-    # We want it to wait for 30 seconds to be comparable to legacy power tests.
+    # We want it to wait for 30 seconds to be comparable to legacy power tests,
+    # but that produces too much tracing data. Instead wait for 15 seconds.

[charliea (OOO until 10-5), 2016/09/19 17:09:50]

nit: please eliminate the second line now that we just got rid of ABC news

[erikchen, 2016/09/19 17:19:38]

Done.

     return page_sets.IdleAfterLoadingStories(wait_in_seconds=30)
 
   @classmethod