Delete unused code for exclusive access permission prompting.

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 "base/command_line.h"
 #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"
@@ skipping 46 matching lines @@
                 browser()
                     ->tab_strip_model()
                     ->GetActiveWebContents()
                     ->GetRenderViewHost()
                     ->GetWidget()
                     ->GetView()
                     ->IsMouseLocked());
     return browser()->IsMouseLocked();
   }
 
-  void TestFullscreenMouseLockContentSettings();
-
  private:
    void ToggleTabFullscreen_Internal(bool enter_fullscreen,
                                      bool retry_until_success);
 };
 
 // Allow the test harness to pick the non-simplified fullscreen UI, which
 // prompts with an interactive dialog rather than just notifying the user how to
 // exit fullscreen. TODO(tapted): Remove this when "simplified" is the only way.
 enum TestType {
   TEST_TYPE_START,
@@ skipping 51 matching lines @@
   ASSERT_EQ(browser()->window()->IsFullscreen(), !enter_fullscreen);
   FullscreenNotificationObserver fullscreen_observer;
 
   chrome::ToggleFullscreenMode(browser());
 
   fullscreen_observer.Wait();
   ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen);
   ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen);
 }
 
-// Helper method to be called by multiple tests.
-// Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK.
-void
-FullscreenControllerInteractiveTest::TestFullscreenMouseLockContentSettings() {
-  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(ToggleTabFullscreen(true));
-  ASSERT_TRUE(IsFullscreenPermissionRequested());
-  ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false));
-
-  // Add content setting to ALLOW fullscreen.
-  HostContentSettingsMap* settings_map =
-      HostContentSettingsMapFactory::GetForProfile(browser()->profile());
-  settings_map->SetContentSettingDefaultScope(
-      url, url, CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string(),
-      CONTENT_SETTING_ALLOW);
-
-  // Now, fullscreen should not prompt for permission.
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
-  ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true));
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
-
-  // Leaving tab in fullscreen, now test mouse lock ALLOW:
-
-  // Validate that mouse lock defaults to asking permision.
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
-  RequestToLockMouse(true, false);
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-  LostMouseLock();
-
-  // Add content setting to ALLOW mouse lock.
-  settings_map->SetContentSettingDefaultScope(
-      url, GURL(), CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(),
-      CONTENT_SETTING_ALLOW);
-
-  // Now, mouse lock should not prompt for permission.
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
-  RequestToLockMouse(true, false);
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
-  LostMouseLock();
-
-  // Leaving tab in fullscreen, now test mouse lock BLOCK:
-
-  // Add content setting to BLOCK mouse lock.
-  settings_map->SetContentSettingDefaultScope(
-      url, GURL(), CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(),
-      CONTENT_SETTING_BLOCK);
-
-  // Now, mouse lock should not be pending.
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
-  RequestToLockMouse(true, false);
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
-}
-
 void FullscreenControllerInteractiveTest::ToggleTabFullscreen_Internal(
     bool enter_fullscreen, bool retry_until_success) {
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
   do {
     FullscreenNotificationObserver fullscreen_observer;
     if (enter_fullscreen)
       browser()->EnterFullscreenModeForTab(tab, GURL());
     else
       browser()->ExitFullscreenModeForTab(tab);
     fullscreen_observer.Wait();
@@ skipping 33 matching lines @@
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_TestTabExitsItselfFromFullscreen) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
 
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true));
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false));
 }
 
-// Tests entering fullscreen and then requesting mouse lock results in
-// buttons for the user, and that after confirming the buttons are dismissed.
-// Test is flaky: http://crbug.com/146006
-IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
-                       DISABLED_TestFullscreenBubbleMouseLockState) {
-  ASSERT_TRUE(embedded_test_server()->Start());
-
-  AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
-  AddTabAtIndex(1, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
-
-  ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true));
-
-  // Request mouse lock and verify the bubble is waiting for user confirmation.
-  RequestToLockMouse(true, false);
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-
-  // Accept mouse lock and verify bubble no longer shows confirmation buttons.
-  AcceptCurrentFullscreenOrMouseLockRequest();
-  ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons());
-}
-
-// Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK.
-// http://crbug.com/146006
-IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
-                       DISABLED_FullscreenMouseLockContentSettings) {
-  TestFullscreenMouseLockContentSettings();
-}
-
-// Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK,
-// but with the browser initiated in fullscreen mode first.
-// Test is flaky: http://crbug.com/103912, http://crbug.com/146006
-IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
-                       DISABLED_BrowserFullscreenMouseLockContentSettings) {
-  // Enter browser fullscreen first.
-  ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true));
-  TestFullscreenMouseLockContentSettings();
-  ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(false));
-}
-
 // Tests Fullscreen entered in Browser, then Tab mode, then exited via Browser.
 // Test is flaky: http://crbug.com/146006
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_BrowserFullscreenExit) {
   // Enter browser fullscreen.
   ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true));
 
   // Enter tab fullscreen.
   AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true));
@@ skipping 22 matching lines @@
 // Tests fullscreen entered without permision prompt for file:// urls.
 // Test is flaky: http://crbug.com/146006
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_FullscreenFileURL) {
   ui_test_utils::NavigateToURL(
       browser(), ui_test_utils::GetTestUrl(
                      base::FilePath(base::FilePath::kCurrentDirectory),
                      base::FilePath(kSimpleFile)));
 
   // Validate that going fullscreen for a file does not ask permision.
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true));
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false));
 }
 
 // Tests fullscreen is exited on page navigation.
 // Test is flaky: http://crbug.com/146006
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_TestTabExitsFullscreenOnNavigation) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
@@ skipping 105 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());
-
-  // 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());
-
-    // 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_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());
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
 }
 
 // Tests mouse lock and fullscreen modes can be escaped with ESC key.
 // Test is flaky: http://crbug.com/146006
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_EscapingMouseLockAndFullscreen) {
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
 
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 
   // Request to lock the mouse and enter fullscreen.
   {
     FullscreenNotificationObserver fullscreen_observer;
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         browser(), ui::VKEY_B, false, true, false, false,
         chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
         content::NotificationService::AllSources()));
     fullscreen_observer.Wait();
   }
-  ASSERT_TRUE(IsFullscreenPermissionRequested());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
 
   // Escape, no prompts should remain.
   {
     FullscreenNotificationObserver fullscreen_observer;
     SendEscapeToFullscreenController();
     fullscreen_observer.Wait();
   }
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
-
-  // Request to lock the mouse and enter fullscreen.
-  {
-    FullscreenNotificationObserver fullscreen_observer;
-    ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
-        browser(), ui::VKEY_B, false, true, false, false,
-        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
-        content::NotificationService::AllSources()));
-    fullscreen_observer.Wait();
-  }
-  ASSERT_TRUE(IsFullscreenPermissionRequested());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-
-  // Accept both, confirm mouse lock and fullscreen and no prompts.
-  AcceptCurrentFullscreenOrMouseLockRequest();
-  ASSERT_TRUE(IsMouseLocked());
-  ASSERT_TRUE(IsWindowFullscreenForTabOrPending());
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
-
-  // Escape, confirm we are out of mouse lock and fullscreen with no prompts.
-  {
-    FullscreenNotificationObserver fullscreen_observer;
-    SendEscapeToFullscreenController();
-    fullscreen_observer.Wait();
-  }
   ASSERT_FALSE(IsMouseLocked());
   ASSERT_FALSE(IsWindowFullscreenForTabOrPending());
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
 }
 
 // Tests mouse lock then fullscreen.
 // Test is flaky: http://crbug.com/146006
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_MouseLockThenFullscreen) {

[scheib, 2016/06/07 16:14:56]

This diff section is a touch confusing. It seems you truncated
DISABLED_EscapingMouseLockAndFullscreen, but the end of it sends ESC to exit
both modes and that part might as well remain?

Except for the meta point: all these tests have been disabled for so long. ;(
The flakiness of actually causing our windows to transition was frustrating, and
why the fullscreen state tests were made. We've significantly changed how the
bots run tests now though. I suppose we could try re-enabling these, or we can
just call it futile and remove them all.

[Matt Giuca, 2016/06/08 01:45:43]

I guess you're talking about the previous test (not sure why this comment is
here).

Well the test used to be:
1. Request lock.
2. Escape.
3. Request lock again.
4. Accept lock.
5. Escape.

I'm chopping out steps 3--5 (or equivalently, steps 2--4). The last thing this
test does press escape and test that it's not locked. There's no need to do the
second pass because now we've removed acceptance, the second pass would be the
same as the first pass.
Yes :'(

I want to have a go at enabling this after deleting all the code that can be
deleted. Then there's a better chance of it being non-flaky.

I enabled it briefly yesterday to test but a lot was broken. But I made sure I'm
not introducing new breakage here (which is why I feel justified updating these
disabled tests despite that they aren't being run).

[scheib, 2016/06/08 01:49:22]

Thanks, easier to understand with that summary.

   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
 
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 
   // Lock the mouse without a user gesture, expect no response.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       browser(), ui::VKEY_D, false, false, false, false,
       chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
       content::NotificationService::AllSources()));
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
   ASSERT_FALSE(IsMouseLocked());
 
   // 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_FALSE(IsFullscreenPermissionRequested());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-  ASSERT_FALSE(IsMouseLocked());
+  ASSERT_TRUE(IsMouseLocked());
 
-  // Accept mouse lock.
-  AcceptCurrentFullscreenOrMouseLockRequest();
-  ASSERT_TRUE(IsMouseLocked());
-  ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons());
-
-  // Enter fullscreen mode, mouse lock should be dropped to present buttons.
+  // Enter fullscreen mode, mouse should remain locked.
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true));
-  ASSERT_TRUE(IsFullscreenPermissionRequested());
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
-  ASSERT_FALSE(IsMouseLocked());
-
-  // Request mouse lock also, expect fullscreen and mouse lock buttons.
-  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
-      browser(), ui::VKEY_1, false, false, false, false,
-      chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
-      content::NotificationService::AllSources()));
-  ASSERT_TRUE(IsFullscreenPermissionRequested());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-  ASSERT_FALSE(IsMouseLocked());
-
-  // Accept fullscreen and mouse lock.
-  AcceptCurrentFullscreenOrMouseLockRequest();
   ASSERT_TRUE(IsMouseLocked());
   ASSERT_TRUE(IsWindowFullscreenForTabOrPending());
-  ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons());
 }
 
 // Times out sometimes on Linux. http://crbug.com/135115
 // Mac: http://crbug.com/103912
 // Windows: Failing flakily on try jobs also.
 // Tests mouse lock then fullscreen in same request.
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_MouseLockAndFullscreen) {
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
 
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 
   // Request to lock the mouse and enter fullscreen.
   {
     FullscreenNotificationObserver fullscreen_observer;
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         browser(), ui::VKEY_B, false, true, false, false,
         chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
         content::NotificationService::AllSources()));
     fullscreen_observer.Wait();
   }
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
-  ASSERT_TRUE(IsFullscreenPermissionRequested());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-  ASSERT_FALSE(IsMouseLocked());
-  ASSERT_TRUE(IsWindowFullscreenForTabOrPending());
-
-  // Deny both first, to make sure we can.
-  {
-    FullscreenNotificationObserver fullscreen_observer;
-    DenyCurrentFullscreenOrMouseLockRequest();
-    fullscreen_observer.Wait();
-  }
-  ASSERT_FALSE(IsMouseLocked());
-  ASSERT_FALSE(IsWindowFullscreenForTabOrPending());
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
-
-  // Request to lock the mouse and enter fullscreen.
-  {
-    FullscreenNotificationObserver fullscreen_observer;
-    ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
-        browser(), ui::VKEY_B, false, true, false, false,
-        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
-        content::NotificationService::AllSources()));
-    fullscreen_observer.Wait();
-  }
-  ASSERT_TRUE(IsFullscreenBubbleDisplayed());
-  ASSERT_TRUE(IsFullscreenPermissionRequested());
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-  ASSERT_FALSE(IsMouseLocked());
-  ASSERT_TRUE(IsWindowFullscreenForTabOrPending());
-
-  // Accept both, confirm they are enabled and there is no prompt.
-  AcceptCurrentFullscreenOrMouseLockRequest();
   ASSERT_TRUE(IsMouseLocked());
   ASSERT_TRUE(IsWindowFullscreenForTabOrPending());
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
 }
 
 // Tests mouse lock and fullscreen for the privileged fullscreen case (e.g.,
 // embedded flash fullscreen, since the Flash plugin handles user permissions
 // requests itself).
 // Test is flaky: http://crbug.com/146006
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_PrivilegedMouseLockAndFullscreen) {
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
 
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 
   SetPrivilegedFullscreen(true);
 
   // Request to lock the mouse and enter fullscreen.
   FullscreenNotificationObserver fullscreen_observer;
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       browser(), ui::VKEY_B, false, true, false, false,
       chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
       content::NotificationService::AllSources()));
   fullscreen_observer.Wait();
 
   // Confirm they are enabled and there is no prompt.
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
-  ASSERT_FALSE(IsFullscreenPermissionRequested());
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
   ASSERT_TRUE(IsMouseLocked());
   ASSERT_TRUE(IsWindowFullscreenForTabOrPending());
 }
 
 // Flaky on Windows, Linux, CrOS: http://crbug.com/159000
 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
 #define MAYBE_MouseLockSilentAfterTargetUnlock \
   DISABLED_MouseLockSilentAfterTargetUnlock
 #else
 #define MAYBE_MouseLockSilentAfterTargetUnlock MouseLockSilentAfterTargetUnlock
@@ skipping 89 matching lines @@
   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());
 
-  // 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());
 
-  // 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 \
@@ skipping 15 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());
 
-  // 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
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_ReloadExitsMouseLockAndFullscreen) {
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
 
-  ASSERT_FALSE(IsMouseLockPermissionRequested());
-
   // Request mouse lock.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       browser(), ui::VKEY_1, false, false, false, false,
       chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
       content::NotificationService::AllSources()));
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
+
+  ASSERT_TRUE(IsMouseLocked());
+  ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Reload. Mouse lock request should be cleared.
   {
     MouseLockNotificationObserver mouselock_observer;
     Reload();
     mouselock_observer.Wait();
-    ASSERT_FALSE(IsMouseLockPermissionRequested());
-  }
-
-  // Request mouse lock.
-  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
-      browser(), ui::VKEY_1, false, false, false, false,
-      chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
-      content::NotificationService::AllSources()));
-  ASSERT_TRUE(IsMouseLockPermissionRequested());
-
-  // Accept mouse lock.
-  AcceptCurrentFullscreenOrMouseLockRequest();
-  ASSERT_TRUE(IsMouseLocked());
-  ASSERT_TRUE(IsFullscreenBubbleDisplayed());
-
-  // Reload. Mouse should be unlocked.
-  {
-    MouseLockNotificationObserver mouselock_observer;
-    Reload();
-    mouselock_observer.Wait();
-    ASSERT_FALSE(IsMouseLocked());
   }
 
   // Request to lock the mouse and enter fullscreen.
   {
     FullscreenNotificationObserver fullscreen_observer;
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         browser(), ui::VKEY_B, false, true, false, false,
         chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
         content::NotificationService::AllSources()));
     fullscreen_observer.Wait();
@@ skipping 13 matching lines @@
 }
 
 // Tests ToggleFullscreenModeForTab always causes window to change.
 // Test is flaky: http://crbug.com/146006
 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
                        DISABLED_ToggleFullscreenModeForTab) {
   // Most fullscreen tests run sharded in fullscreen_controller_browsertest.cc
   // but flakiness required a while loop in
   // FullscreenControllerTest::ToggleTabFullscreen. This test verifies that
   // when running serially there is no flakiness.
-  // This test reproduces the same flow as
-  // TestFullscreenMouseLockContentSettings.
-  // http://crbug.com/133831
 
   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_TRUE(IsWindowFullscreenForTabOrPending());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false));
+  ASSERT_FALSE(IsWindowFullscreenForTabOrPending());
 }
 
 INSTANTIATE_TEST_CASE_P(
     ParamaterizedFullscreenControllerInteractiveTestInstance,
     ParamaterizedFullscreenControllerInteractiveTest,
     ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));