Fix FullscreenController tests with simplified-fullscreen-ui flag.

chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 402 matching lines @@
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 
   // Request to lock the mouse.
   {
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         browser(), ui::VKEY_1, false, false, false, false,
         chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
         content::NotificationService::AllSources()));
   }
   ASSERT_FALSE(IsFullscreenPermissionRequested());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
 
-  // Escape, no prompts should remain.
-  SendEscapeToFullscreenController();
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
+  // In simplified mode, the mouse will automatically lock, so we can skip
+  // testing the permission requested and manually accepting.
+  if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
+    ASSERT_TRUE(IsMouseLockPermissionRequested());
 
-  // Request to lock the mouse.
-  {
-    ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
-        browser(), ui::VKEY_1, false, false, false, false,
-        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
-        content::NotificationService::AllSources()));
+    // Escape, no prompts should remain.
+    SendEscapeToFullscreenController();
+    ASSERT_FALSE(IsFullscreenPermissionRequested());
+    ASSERT_FALSE(IsMouseLockPermissionRequested());
+
+    // Request to lock the mouse.
+    {
+      ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+          browser(), ui::VKEY_1, false, false, false, false,
+          chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+          content::NotificationService::AllSources()));
+    }
+    ASSERT_FALSE(IsFullscreenPermissionRequested());
+    ASSERT_TRUE(IsMouseLockPermissionRequested());
+
+    // Accept mouse lock, confirm it and that there is no prompt.
+    AcceptCurrentFullscreenOrMouseLockRequest();
   }
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
 
-  // Accept mouse lock, confirm it and that there is no prompt.
-  AcceptCurrentFullscreenOrMouseLockRequest();
   ASSERT_TRUE(IsMouseLocked());
   ASSERT_FALSE(IsWindowFullscreenForTabOrPending());
   ASSERT_FALSE(IsFullscreenPermissionRequested());
   ASSERT_FALSE(IsMouseLockPermissionRequested());
 
   // Escape, confirm we are out of mouse lock with no prompts.
   SendEscapeToFullscreenController();
   ASSERT_FALSE(IsMouseLocked());
   ASSERT_FALSE(IsWindowFullscreenForTabOrPending());
   ASSERT_FALSE(IsFullscreenPermissionRequested());
@@ skipping 308 matching lines @@
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
 
   // Lock the mouse with a user gesture.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       browser(), ui::VKEY_1, false, false, false, false,
       chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
       content::NotificationService::AllSources()));
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-  ASSERT_FALSE(IsMouseLocked());
 
-  // Accept mouse lock.
-  AcceptCurrentFullscreenOrMouseLockRequest();
+  // In simplified mode, the mouse will automatically lock, so we can skip
+  // testing the permission requested and manually accepting.
+  if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
+    ASSERT_TRUE(IsMouseLockPermissionRequested());
+    ASSERT_FALSE(IsMouseLocked());
+
+    // Accept mouse lock.
+    AcceptCurrentFullscreenOrMouseLockRequest();
+  }
+
   ASSERT_TRUE(IsMouseLocked());
 
   ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
 
   ASSERT_FALSE(IsMouseLocked());
 }
 
 // Tests mouse lock is exited when navigating back.
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        MAYBE_TestTabExitsMouseLockOnGoBack) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   // Navigate twice to provide a place to go back to.
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
 
   // Lock the mouse with a user gesture.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       browser(), ui::VKEY_1, false, false, false, false,
       chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
       content::NotificationService::AllSources()));
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-  ASSERT_FALSE(IsMouseLocked());
 
-  // Accept mouse lock.
-  AcceptCurrentFullscreenOrMouseLockRequest();
+  // In simplified mode, the mouse will automatically lock, so we can skip
+  // testing the permission requested and manually accepting.
+  if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
+    ASSERT_TRUE(IsMouseLockPermissionRequested());
+    ASSERT_FALSE(IsMouseLocked());
+
+    // Accept mouse lock.
+    AcceptCurrentFullscreenOrMouseLockRequest();
+  }
+
   ASSERT_TRUE(IsMouseLocked());
 
   GoBack();
 
   ASSERT_FALSE(IsMouseLocked());
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
 // TODO(erg): linux_aura bringup: http://crbug.com/163931
 #define MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation DISABLED_TestTabDoesntExitMouseLockOnSubFrameNavigation
@@ skipping 12 matching lines @@
 
   // Navigate to test page.
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Lock the mouse with a user gesture.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       browser(), ui::VKEY_1, false, false, false, false,
       chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
       content::NotificationService::AllSources()));
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-  ASSERT_FALSE(IsMouseLocked());
 
-  // Accept mouse lock.
-  AcceptCurrentFullscreenOrMouseLockRequest();
+  // In simplified mode, the mouse will automatically lock, so we can skip
+  // testing the permission requested and manually accepting.
+  if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) {
+    ASSERT_TRUE(IsMouseLockPermissionRequested());
+    ASSERT_FALSE(IsMouseLocked());
+
+    // Accept mouse lock.
+    AcceptCurrentFullscreenOrMouseLockRequest();
+  }
+
   ASSERT_TRUE(IsMouseLocked());
 
   // Navigate to url with fragment. Mouse lock should persist.
   ui_test_utils::NavigateToURL(browser(), url_with_fragment);
   ASSERT_TRUE(IsMouseLocked());
 }
 
 // Tests Mouse Lock and Fullscreen are exited upon reload.
 // http://crbug.com/137486
 // mac: http://crbug.com/103912
@@ skipping 77 matching lines @@
 
   GURL url = embedded_test_server()->GetURL("/simple.html");
   AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED);
 
   // Validate that going fullscreen for a URL defaults to asking permision.
   ASSERT_FALSE(IsFullscreenPermissionRequested());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true));
   ASSERT_TRUE(IsFullscreenPermissionRequested());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false));
 }