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

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 8367dc6f2d61c74c4821e15b3ca3e37964ddd358..bbcdef5aba2486d9c0a61dccf11e8accaed75e6b 100644
--- a/tools/perf/benchmarks/media.py
+++ b/tools/perf/benchmarks/media.py
@@ -2,8 +2,6 @@
 # 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
 
@@ -37,21 +35,12 @@ 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
@@ -62,16 +51,8 @@ class MediaChromeOS(test.Test):
       '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'