Enable media android tests and make --disable-gesture-requirement-for-media-playback default for me…

tools/perf/benchmarks/media.py

 # Copyright 2013 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.
 
-import sys
-
 from telemetry import test
 from telemetry.page import page_measurement
 
 from measurements import media
 
 
 class MSEMeasurement(page_measurement.PageMeasurement):
   def MeasurePage(self, page, tab, results):
     media_metric = tab.EvaluateJavaScript('window.__testMetrics')
     trace = media_metric['id'] if 'id' in media_metric else None
@@ skipping 13 matching lines @@
 
 class MediaNetworkSimulation(test.Test):
   """Obtains media metrics under different network simulations."""
   test = media.Media
   page_set = 'page_sets/media_cns_cases.json'
 
 class MediaAndroid(test.Test):
   """Obtains media metrics for key user scenarios on Android."""
   test = media.Media
   tag = 'android'
-  # Disable media-tests on Android: crbug/329691
-  # Before re-enabling on Android, make sure the new 4K content,
-  # garden2_10s*, passes.
-  enabled = not sys.platform.startswith('linux')
   page_set = 'page_sets/tough_video_cases.json'
-  # Exclude crowd* media files (50fps 2160p).
+  # Exclude 4k and 50 fps media files (garden* & crowd*).
   options = {
-      'page_filter_exclude': '.*crowd.*'
+      'page_filter_exclude': '.*(crowd|garden).*'
   }
 
-  def CustomizeBrowserOptions(self, options):
-    # Needed to run media actions in JS in Android.
-    options.AppendExtraBrowserArgs(
-        '--disable-gesture-requirement-for-media-playback')
-
 class MediaChromeOS(test.Test):
   """Obtains media metrics for key user scenarios on ChromeOS."""
   test = media.Media
   tag = 'chromeOS'
   page_set = 'page_sets/tough_video_cases.json'
   # Exclude crowd* media files (50fps 2160p): crbug/331816
   options = {
       'page_filter_exclude': '.*crowd.*'
   }
 
-  def CustomizeBrowserOptions(self, options):
-    # Needed to run media actions in JS in Android.
-    options.AppendExtraBrowserArgs(
-        '--disable-gesture-requirement-for-media-playback')
-
 class MediaSourceExtensions(test.Test):
   """Obtains media metrics for key media source extensions functions."""
-  test = media.Media
-  # Disable MSE media-tests on Android and linux: crbug/329691
-  # Disable MSE tests on windows 8 crbug.com/330910
   test = MSEMeasurement
   page_set = 'page_sets/mse_cases.json'
 
   def CustomizeBrowserOptions(self, options):
     # Needed to allow XHR requests to return stream objects.
     options.AppendExtraBrowserArgs(
         ['--enable-experimental-web-platform-features',
          '--disable-gesture-requirement-for-media-playback'])