Port part of media.tough_video_cases to TBMv2

tools/perf/benchmarks/media.py

Index: tools/perf/benchmarks/media.py
diff --git a/tools/perf/benchmarks/media.py b/tools/perf/benchmarks/media.py
index c5c6ba613934b033b5f76770000c5d16809565bf..27463b102b81b86b728e4ea7ea1f9d67014f04dc 100644
--- a/tools/perf/benchmarks/media.py
+++ b/tools/perf/benchmarks/media.py
@@ -6,8 +6,10 @@ from core import perf_benchmark
 
 from telemetry import benchmark
 from telemetry.page import legacy_page_test
+from telemetry.timeline import chrome_trace_category_filter
 from telemetry.value import list_of_scalar_values
 from telemetry.value import scalar
+from telemetry.web_perf import timeline_based_measurement
 
 from measurements import media
 import page_sets
@@ -40,7 +42,7 @@ class _MSEMeasurement(legacy_page_test.LegacyPageTest):
 # android: See media.android.tough_video_cases below
 # crbug.com/565180: Only include cases that report time_to_play
 @benchmark.Disabled('android')
-class Media(perf_benchmark.PerfBenchmark):
+class MediaToughVideoCases(perf_benchmark.PerfBenchmark):
   """Obtains media metrics for key user scenarios."""
   test = media.Media
   page_set = page_sets.ToughVideoCasesPageSet
@@ -50,6 +52,33 @@ class Media(perf_benchmark.PerfBenchmark):
     return 'media.tough_video_cases'
 
 
+@benchmark.Disabled('android')

[nednguyen, 2017/03/14 19:18:41]

Can you add @benchmark.Owner(...) before landing this?

+class MediaToughVideoCasesTBMv2(perf_benchmark.PerfBenchmark):
+  """Obtains media metrics using TBMv2. Will eventually replace Media class."""

[charliea (OOO until 10-5), 2017/03/14 19:04:21]

I think "Media" class should now be "MediaToughVideoCases" class

+  page_set = page_sets.ToughVideoCasesPageSet
+
+  def CreateTimelineBasedMeasurementOptions(self):
+    category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter()
+
+    # 'toplevel' category provides CPU time slices used by # cpuTimeMetric.
+    category_filter.AddIncludedCategory('toplevel')
+
+    # 'rail' category is used by powerMetric to attribute different period of
+    # time to different activities, such as video_animation, etc.
+    category_filter.AddIncludedCategory('rail')
+
+    options = timeline_based_measurement.Options(category_filter)
+    options.config.enable_atrace_trace = True
+    options.config.atrace_config.categories = ['sched']
+    options.config.enable_battor_trace = True
+    options.SetTimelineBasedMetrics(['powerMetric', 'cpuTimeMetric'])
+    return options
+
+  @classmethod
+  def Name(cls):
+    return 'media.tough_video_cases_tbmv2'
+
+
 # crbug.com/565180: Only include cases that don't report time_to_play
 @benchmark.Disabled('android')
 class MediaExtra(perf_benchmark.PerfBenchmark):