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

content/browser/webrtc/webrtc_capture_from_element_browsertest.cc

 // Copyright 2016 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.
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
 #include "content/public/common/content_switches.h"
-#include "media/base/media_switches.h"
 #include "media/base/test_data_util.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #include "base/sys_info.h"
 #endif
 
 #if defined(ENABLE_MOJO_RENDERER)
 // Remote mojo renderer does not send audio/video frames back to the renderer
 // process and hence does not support capture: https://crbug.com/641559.
@@ skipping 36 matching lines @@
   WebRtcCaptureFromElementBrowserTest() {}
   ~WebRtcCaptureFromElementBrowserTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebRtcContentBrowserTestBase::SetUpCommandLine(command_line);
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kEnableBlinkFeatures, "MediaCaptureFromVideo");
 
     // Allow <video>/<audio>.play() when not initiated by user gesture.
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kIgnoreAutoplayRestrictionsForTests);
+        switches::kDisableGestureRequirementForMediaPlayback);
     // Allow experimental canvas features.
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExperimentalCanvasFeatures);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebRtcCaptureFromElementBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
@@ skipping 61 matching lines @@
                          GetParam().has_video,
                          GetParam().has_audio,
                          GetParam().use_audio_tag),
       kVideoAudioHtmlFile);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         WebRtcCaptureFromElementBrowserTest,
                         testing::ValuesIn(kFileAndTypeParameters));
 }  // namespace content