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

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

 // Copyright 2017 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.
 
 package org.chromium.chrome.browser;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
 import android.support.test.filters.MediumTest;
 import android.view.KeyEvent;
 
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
 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.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;
 import java.util.concurrent.TimeoutException;
 
 /**
  * Integration tests for the feature that auto locks the orientation when a video goes fullscreen.
  * 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";
     private static final String VIDEO_ID = "video";
 
     private WebContents getWebContents() {
         return getActivity().getCurrentContentViewCore().getWebContents();
     }
 
     private void waitForContentsFullscreenState(boolean fullscreenValue)
@@ skipping 75 matching lines @@
                 DownloadUtils.getMediaViewerIntentForDownloadItem(fileUri, fileUri, mimeType);
         IntentHandler.startActivityForTrustedIntent(intent);
         waitUntilUnlocked();
 
         // Sometimes the web page doesn't transition out of fullscreen until we exit the download
         // activity and return to the web page.
         sendKeys(KeyEvent.KEYCODE_BACK);
         waitForContentsFullscreenState(false);
     }
 }