Port part of media.tough_video_cases to TBMv2

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
 
@@ skipping 18 matching lines @@
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return not possible_browser.platform.HasBattOrConnected()
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True
 
 
-# android: See battor.android.tough_video_cases below
-# win8: crbug.com/531618
-# crbug.com/565180: Only include cases that report time_to_play
-# Taken directly from media benchmark.
-@benchmark.Disabled('android', 'win8')
-class BattOrToughVideoCases(_BattOrBenchmark):
-  """Obtains media metrics for key user scenarios."""
-  page_set = page_sets.ToughVideoCasesPageSet
-
-  @classmethod
-  def Name(cls):
-    return 'battor.tough_video_cases'
-
-
 @benchmark.Enabled('mac')
 class BattOrTrivialPages(_BattOrBenchmark):
 
   def CreateStorySet(self, options):
     # We want it to wait for 30 seconds to be comparable to legacy power tests.
     return page_sets.TrivialSitesStorySet(wait_in_seconds=30)
 
   @classmethod
   def Name(cls):
     return 'battor.trivial_pages'
 
 @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'