[Telemetry] Add trivial pages page set to 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):
@@ skipping 93 matching lines @@
     options = timeline_based_measurement.Options()
     options.config.enable_battor_trace = True
     options.config.enable_chrome_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'
+
+
+@benchmark.Enabled('mac')
+class BattOrTrivialPages(_BattOrBenchmark):
+
+  def CreateTimelineBasedMeasurementOptions(self):
+    options = timeline_based_measurement.Options(
+        chrome_trace_category_filter.ChromeTraceCategoryFilter())
+    options.config.chrome_trace_config.category_filter.AddFilterString('rail')
+    options.config.enable_battor_trace = True
+    options.config.enable_chrome_trace = True
+    options.SetTimelineBasedMetrics(['powerMetric', 'clockSyncLatencyMetric'])
+    return options
+
+  def CreateStorySet(self, options):
+    return page_sets.MacGpuTrivialPagesStorySet(wait=30)

[nednguyen, 2016/08/22 12:58:37]

Can you add  some comment about we want to wait for 30s to make it comparable
with the legacy power measurement?

[rnephew (Reviews Here), 2016/08/22 17:06:47]

Done.

+
+  @classmethod
+  def Name(cls):
+    return 'battor.trivial_pages'