Media: do not lock the screen orientation when a video goes fullscreen on a tablet.

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

 // Copyright 2016 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.graphics.Rect;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 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.browser.test.util.UiUtils;
 import org.chromium.content.common.ContentSwitches;
 import org.chromium.content_shell_apk.ContentShellTestBase;
+import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeoutException;
 
 /**
  * Integration tests for the feature that auto lock the orientation when a video goes fullscreen.
  */
 @CommandLineFlags.Add({ "enable-features=VideoFullscreenOrientationLock",
                         ContentSwitches.DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK })
 public class VideoFullscreenOrientationLockTest extends ContentShellTestBase {
@@ skipping 68 matching lines @@
     @Override
     public void setUp() throws Exception {
         super.setUp();
 
         startActivityWithTestUrl(TEST_URL);
     }
 
     @MediumTest
     @Feature({"VideoFullscreenOrientationLock"})
     public void testEnterExitFullscreenWithControlsButton() throws Exception {
+        if (DeviceFormFactor.isTablet(getInstrumentation().getContext())) return;
+
         // Start playback to guarantee it's properly loaded.
         assertTrue(DOMUtils.isMediaPaused(getWebContents(), VIDEO_ID));
         DOMUtils.playMedia(getWebContents(), VIDEO_ID);
         DOMUtils.waitForMediaPlay(getWebContents(), VIDEO_ID);
 
         // Simulate click on fullscreen button.
         assertTrue(clickFullscreenButton());
         waitForContentsFullscreenState(true);
 
         // Should be landscape now, `waitForLandscapeOrientation` will throw otherwise.
         waitForLandscapeOrientation();
 
         // Because of the fullscreen animation, the click on the exit fullscreen button will fail
         // roughly 10% of the time. Settling down the UI reduces the flake to 0%.
         UiUtils.settleDownUI(getInstrumentation());
 
         // Leave fullscreen by clicking back on the button.
         assertTrue(clickFullscreenButton());
         waitForContentsFullscreenState(false);
     }
 
     @MediumTest
     @Feature({"VideoFullscreenOrientationLock"})
     public void testEnterExitFullscreenWithAPI() throws Exception {
+        if (DeviceFormFactor.isTablet(getInstrumentation().getContext())) return;
+
         // Start playback to guarantee it's properly loaded.
         assertTrue(DOMUtils.isMediaPaused(getWebContents(), VIDEO_ID));
         DOMUtils.playMedia(getWebContents(), VIDEO_ID);
         DOMUtils.waitForMediaPlay(getWebContents(), VIDEO_ID);
 
         // Trigger requestFullscreen() via a click on a button.
         assertTrue(DOMUtils.clickNode(this, getContentViewCore(), "fullscreen"));
         waitForContentsFullscreenState(true);
 
         // Should be landscape now, `waitForLandscapeOrientation` will throw otherwise.
         waitForLandscapeOrientation();
 
         // Leave fullscreen from API.
         DOMUtils.exitFullscreen(getWebContents());
         waitForContentsFullscreenState(false);
     }
 }