Silent mouse lock after unlock by target

chrome/browser/ui/browser_browsertest.cc

Index: chrome/browser/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index bc3c43e9c20fdd72611c50d92bc154b6a84d2ee5..bef99b29446399257f9432d99968c068baf7f64e 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -264,8 +264,12 @@ class BrowserTest : public ExtensionBrowserTest {
     ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen);
   }
 
-  void RequestToLockMouse(content::WebContents* tab, bool user_gesture) {
-    browser()->RequestToLockMouse(tab, user_gesture);
+  void RequestToLockMouse(content::WebContents* tab, bool user_gesture,

[scheib, 2012/05/30 16:41:21]

If we go with enums, we should plumb them all the way through to the call sites.

+      bool after_target_unlock_request) {
+    browser()->RequestToLockMouse(
+        tab,
+        user_gesture ? content::USER_GESTURE : content::NOT_USER_GESTURE,
+        after_target_unlock_request ? content::TARGET : content::NOT_TARGET);
   }
 
   void LostMouseLock() {
@@ -1060,7 +1064,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, TestFullscreenBubbleMouseLockState) {
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(fullscreen_tab, true));
 
   // Request mouse lock and verify the bubble is waiting for user confirmation.
-  RequestToLockMouse(fullscreen_tab, true);
+  RequestToLockMouse(fullscreen_tab, true, false);
   ASSERT_TRUE(IsMouseLockPermissionRequested());
 
   // Accept mouse lock and verify bubble no longer shows confirmation buttons.
@@ -1286,6 +1290,74 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, EscapingMouseLockAndFullscreen) {
   ASSERT_FALSE(IsMouseLockPermissionRequested());
 }
 
+IN_PROC_BROWSER_TEST_F(BrowserTest, MouseLockSilentAfterTargetUnlock) {
+  ASSERT_TRUE(test_server()->Start());
+  ui_test_utils::NavigateToURL(browser(),
+                               test_server()->GetURL(kFullscreenMouseLockHTML));
+
+  ASSERT_FALSE(IsFullscreenBubbleDisplayed());
+
+  // 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();
+  ASSERT_TRUE(IsMouseLocked());
+  ASSERT_TRUE(IsFullscreenBubbleDisplayed());
+
+  // Unlock the mouse from target, make sure it's unloacked
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+        browser(), ui::VKEY_U, false, false, false, false,
+        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+        content::NotificationService::AllSources()));
+  ASSERT_FALSE(IsMouseLocked());
+  ASSERT_FALSE(IsFullscreenBubbleDisplayed());
+
+  // Lock mouse again, make sure it works with no bubble
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+        browser(), ui::VKEY_1, false, false, false, false,
+        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+        content::NotificationService::AllSources()));
+  ASSERT_TRUE(IsMouseLocked());
+  ASSERT_FALSE(IsFullscreenBubbleDisplayed());
+
+  // Unlock the mouse again by target
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+        browser(), ui::VKEY_U, false, false, false, false,
+        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+        content::NotificationService::AllSources()));
+  ASSERT_FALSE(IsMouseLocked());
+
+  // Lock from target, not user gesture, make sure it works
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+        browser(), ui::VKEY_D, false, false, false, false,
+        chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+        content::NotificationService::AllSources()));
+  ASSERT_TRUE(IsMouseLocked());
+  ASSERT_FALSE(IsFullscreenBubbleDisplayed());
+
+  // Unlock by escape
+  ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
+          browser(), ui::VKEY_ESCAPE, false, false, false, false,
+          chrome::NOTIFICATION_MOUSE_LOCK_CHANGED,
+          content::NotificationService::AllSources()));
+  ASSERT_FALSE(IsMouseLocked());
+
+  // Lock the mouse with a user gesture, make sure we see bubble again
+  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(IsMouseLocked());
+}
+
 // Helper method to be called by multiple tests.
 // Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK.
 void BrowserTest::TestFullscreenMouseLockContentSettings() {
@@ -1319,7 +1391,7 @@ void BrowserTest::TestFullscreenMouseLockContentSettings() {
   // Validate that mouse lock defaults to asking permision.
   ASSERT_FALSE(IsMouseLockPermissionRequested());
   ASSERT_FALSE(IsMouseLocked());
-  RequestToLockMouse(tab, true);
+  RequestToLockMouse(tab, true, false);
   ASSERT_TRUE(IsMouseLockPermissionRequested());
   LostMouseLock();
 
@@ -1331,7 +1403,7 @@ void BrowserTest::TestFullscreenMouseLockContentSettings() {
 
   // Now, mouse lock should not prompt for permission.
   ASSERT_FALSE(IsMouseLockPermissionRequested());
-  RequestToLockMouse(tab, true);
+  RequestToLockMouse(tab, true, false);
   ASSERT_FALSE(IsMouseLockPermissionRequested());
   LostMouseLock();
 
@@ -1345,7 +1417,7 @@ void BrowserTest::TestFullscreenMouseLockContentSettings() {
 
   // Now, mouse lock should not be pending.
   ASSERT_FALSE(IsMouseLockPermissionRequested());
-  RequestToLockMouse(tab, true);
+  RequestToLockMouse(tab, true, false);
   ASSERT_FALSE(IsMouseLockPermissionRequested());
 }