Re-enable media.android.tough_video_cases.

tools/perf/benchmarks/media.py

 # Copyright 2014 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 import benchmark
 from telemetry.page import legacy_page_test
 from telemetry.value import list_of_scalar_values
 from telemetry.value import scalar
@@ skipping 56 matching lines @@
 class MediaNetworkSimulation(perf_benchmark.PerfBenchmark):
   """Obtains media metrics under different network simulations."""
   test = media.Media
   page_set = page_sets.MediaCnsCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'media.media_cns_cases'
 
 
-@benchmark.Disabled('android')  # crbug.com/671628, WebView: crbug.com/419689.
+@benchmark.Disabled('l', 'android-webview')  # WebView: crbug.com/419689.
 class MediaAndroid(perf_benchmark.PerfBenchmark):
   """Obtains media metrics for key user scenarios on Android."""
   test = media.Media
   tag = 'android'
   page_set = page_sets.ToughVideoCasesPageSet
   # Exclude is_4k and 50 fps media files (garden* & crowd*).
   options = {'story_tag_filter_exclude': 'is_4k,is_50fps'}
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
-    # crbug.com/672059
-    if possible_browser.platform.GetOSName() != "android":

[johnchen, 2017/02/10 01:46:36]

Offline comment

-      return True
-    # crbug.com/448092
-    if cls.IsSvelte(possible_browser):
-        return True
-
-    # crbug.com/647372
-    if possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X':
-      return True
-
-    return False
+    return cls.IsSvelte(possible_browser)
 
   @classmethod
   def Name(cls):
     return 'media.android.tough_video_cases'
 
 
 @benchmark.Enabled('chromeos')
 class MediaChromeOS4kOnly(perf_benchmark.PerfBenchmark):
   """Benchmark for media performance on ChromeOS using only is_4k test content.
   """
@@ skipping 37 matching lines @@
 
   @classmethod
   def Name(cls):
     return 'media.mse_cases'
 
   def SetExtraBrowserOptions(self, options):
     # Needed to allow XHR requests to return stream objects.
     options.AppendExtraBrowserArgs(
         ['--enable-experimental-web-platform-features',
          '--disable-gesture-requirement-for-media-playback'])