Revert of Rename kDisableGestureRequirementForMediaPlayback and make it a test-only flag.

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.timeline import chrome_trace_category_filter
 from telemetry.value import list_of_scalar_values
@@ skipping 132 matching lines @@
     return cls.IsSvelte(possible_browser)
 
   @classmethod
   def Name(cls):
     return 'media.android.tough_video_cases_tbmv2'
 
   def SetExtraBrowserOptions(self, options):
     # By default, Chrome on Android does not allow autoplay
     # of media: it requires a user gesture event to start a video.
     # The following option works around that.
-    options.AppendExtraBrowserArgs(['--ignore-autoplay-restrictions'])
+    options.AppendExtraBrowserArgs(
+        ['--disable-gesture-requirement-for-media-playback'])
 
 
 @benchmark.Enabled('chromeos')
 class MediaChromeOS4kOnly(perf_benchmark.PerfBenchmark):
   """Benchmark for media performance on ChromeOS using only is_4k test content.
   """
   test = media.Media
   tag = 'chromeOS4kOnly'
   page_set = page_sets.ToughVideoCasesPageSet
   options = {
@@ skipping 33 matching lines @@
   page_set = page_sets.MseCasesPageSet
 
   @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',
-         '--ignore-autoplay-restrictions'])
+         '--disable-gesture-requirement-for-media-playback'])