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

content/public/android/javatests/src/org/chromium/content/browser/MediaSessionTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/MediaSessionTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/MediaSessionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/MediaSessionTest.java
index 89db721ca0783c28eec4fd06407927e59419ee28..a67cb50e2cd7cd4830a20442fd085ad70ef694d0 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/MediaSessionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/MediaSessionTest.java
@@ -19,10 +19,10 @@
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
+import org.chromium.content.common.ContentSwitches;
 import org.chromium.content_public.browser.MediaSession;
 import org.chromium.content_public.browser.MediaSessionObserver;
 import org.chromium.content_shell_apk.ContentShellTestBase;
-import org.chromium.media.MediaSwitches;
 
 import java.util.ArrayList;
 import java.util.concurrent.Callable;
@@ -31,7 +31,7 @@
  * Tests for MediaSession.
  */
 @RetryOnFailure
-@CommandLineFlags.Add(MediaSwitches.IGNORE_AUTOPLAY_RESTRICTIONS_FOR_TESTS)
+@CommandLineFlags.Add(ContentSwitches.DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK)
 public class MediaSessionTest extends ContentShellTestBase {
     private static final String MEDIA_SESSION_TEST_URL =
             "content/test/data/media/session/media-session.html";