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

chrome/android/javatests/src/org/chromium/chrome/browser/VideoFullscreenOrientationLockChromeTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/VideoFullscreenOrientationLockChromeTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/VideoFullscreenOrientationLockChromeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/VideoFullscreenOrientationLockChromeTest.java
index 7d8413b9d2ccc43d91ff917ff73529698efb7891..6150bfc70319651b3ab39a7bbe05edd0eb319ff3 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/VideoFullscreenOrientationLockChromeTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/VideoFullscreenOrientationLockChromeTest.java
@@ -19,8 +19,8 @@
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
+import org.chromium.content.common.ContentSwitches;
 import org.chromium.content_public.browser.WebContents;
-import org.chromium.media.MediaSwitches;
 import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.concurrent.Callable;
@@ -31,7 +31,7 @@
  * See also content layer org.chromium.content.browser.VideoFullscreenOrientationLockTest
  */
 @CommandLineFlags.Add({"enable-features=VideoFullscreenOrientationLock",
-        MediaSwitches.IGNORE_AUTOPLAY_RESTRICTIONS_FOR_TESTS})
+        ContentSwitches.DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK})
 public class VideoFullscreenOrientationLockChromeTest extends ChromeTabbedActivityTestBase {
     private static final String TEST_URL = "content/test/data/media/video-player.html";
     private static final String VIDEO_URL = "content/test/data/media/bear.webm";