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

tools/perf/measurements/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.
 
 from telemetry.page import legacy_page_test
 
 from metrics import cpu
 from metrics import media
 from metrics import power
 from metrics import system_memory
@@ skipping 13 matching lines @@
     self._add_browser_metrics = False
     self._cpu_metric = None
     self._memory_metric = None
     self._power_metric = None
 
   def WillStartBrowser(self, platform):
     self._power_metric = power.PowerMetric(platform)
 
   def CustomizeBrowserOptions(self, options):
     # Needed to run media actions in JS on touch-based devices as on Android.
-    options.AppendExtraBrowserArgs('--ignore-autoplay-restrictions')
+    options.AppendExtraBrowserArgs(
+        '--disable-gesture-requirement-for-media-playback')
     power.PowerMetric.CustomizeBrowserOptions(options)
 
   def DidNavigateToPage(self, page, tab):
     """Override to do operations right after the page is navigated."""
     self._media_metric = media.MediaMetric(tab)
     self._media_metric.Start(page, tab)
 
     # Reset to false for every page.
     self._add_browser_metrics = (
         page.add_browser_metrics
@@ skipping 19 matching lines @@
       exclude_metrics = ['WorkingSetSizePeak', 'SystemCommitCharge', 'VMPeak',
                          'VM']
       self._memory_metric.AddResults(tab, results,
                                      trace_name=trace_name,
                                      exclude_metrics=exclude_metrics)
       self._power_metric.AddResults(tab, results)
 
   def DidRunPage(self, platform):
     del platform  # unused
     self._power_metric.Close()