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

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

 // Copyright 2015 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.content.browser;
 
 import android.content.Context;
 import android.media.AudioManager;
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.RetryOnFailure;
 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;
 
 /**
  * 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";
     private static final String VERY_SHORT_AUDIO = "very-short-audio";
     private static final String SHORT_AUDIO = "short-audio";
     private static final String LONG_AUDIO = "long-audio";
     private static final String VERY_SHORT_VIDEO = "very-short-video";
     private static final String SHORT_VIDEO = "short-video";
     private static final String LONG_VIDEO = "long-video";
     private static final String LONG_VIDEO_SILENT = "long-video-silent";
@@ skipping 436 matching lines @@
 
         mAudioFocusChangeListener.requestAudioFocus(AudioManager.AUDIOFOCUS_GAIN);
         assertEquals(AudioManager.AUDIOFOCUS_GAIN, mAudioFocusChangeListener.getAudioFocusState());
 
         // Wait for 1 second before observing MediaSession state change.
         Thread.sleep(AUDIO_FOCUS_CHANGE_TIMEOUT);
 
         assertEquals(expectedStates, mStateRecords);
     }
 }