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

chrome/browser/media/defer_background_media_browsertest.cc

Index: chrome/browser/media/defer_background_media_browsertest.cc
diff --git a/chrome/browser/media/defer_background_media_browsertest.cc b/chrome/browser/media/defer_background_media_browsertest.cc
index a5b014a6c3bdd2e0be50568b97228b89f10f557a..e6b4dd1a9ce4dc3161016f04c62033f82a3e30a5 100644
--- a/chrome/browser/media/defer_background_media_browsertest.cc
+++ b/chrome/browser/media/defer_background_media_browsertest.cc
@@ -9,15 +9,16 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
-#include "media/base/media_switches.h"
 #include "media/base/test_data_util.h"
 
 class DeferredMediaBrowserTest : public InProcessBrowserTest {
  public:
 #if defined(OS_ANDROID)
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitch(switches::kIgnoreAutoplayRestrictionsForTests);
+    command_line->AppendSwitch(
+        switches::kDisableGestureRequirementForMediaPlayback);
   }
 #endif
 };