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

content/browser/media/media_browsertest.cc

 // Copyright (c) 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.
 
 #include "content/browser/media/media_browsertest.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 17 matching lines @@
 const char MediaBrowserTest::kFailed[] = "FAILED";
 
 // Upper case event name set by Utils.installTitleEventHandler().
 const char MediaBrowserTest::kEnded[] = "ENDED";
 const char MediaBrowserTest::kErrorEvent[] = "ERROR";
 
 // Lower case event name as set by Utils.failTest().
 const char MediaBrowserTest::kError[] = "error";
 
 void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
-  command_line->AppendSwitch(switches::kIgnoreAutoplayRestrictionsForTests);
+  command_line->AppendSwitch(
+      switches::kDisableGestureRequirementForMediaPlayback);
   command_line->AppendSwitch(switches::kEnableVp9InMp4);
 }
 
 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page,
                                         const base::StringPairs& query_params,
                                         const std::string& expected_title,
                                         bool http) {
   GURL gurl;
   std::string query = media::GetURLQueryString(query_params);
   std::unique_ptr<net::EmbeddedTestServer> http_test_server;
@@ skipping 250 matching lines @@
 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
   PlayVideo("bear.webm", false);
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
   EXPECT_FALSE(shell()->web_contents()->IsCrashed());
 }
 
 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
 
 }  // namespace content