User Gesture plumbed from Renderer to Browser's FullscreenController::RequestToLockMouse.

chrome/browser/ui/browser_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 <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #if defined(OS_MACOSX)
@@ skipping 229 matching lines @@
     ASSERT_EQ(browser()->window()->IsFullscreen(), !enter_fullscreen);
     FullscreenNotificationObserver fullscreen_observer;
 
     browser()->ToggleFullscreenMode();
 
     fullscreen_observer.Wait();
     ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen);
     ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen);
   }
 
-  void RequestToLockMouse(content::WebContents* tab) {
-    browser()->RequestToLockMouse(tab);
+  void RequestToLockMouse(content::WebContents* tab, bool user_gesture) {
+    browser()->RequestToLockMouse(tab, user_gesture);
   }
 
   void LostMouseLock() {
     browser()->LostMouseLock();
   }
 
   bool IsFullscreenForBrowser() {
     return browser()->fullscreen_controller_->IsFullscreenForBrowser();
   }
 
@@ skipping 759 matching lines @@
   AddTabAtIndex(0, GURL(chrome::kAboutBlankURL),
                 content::PAGE_TRANSITION_TYPED);
   AddTabAtIndex(1, GURL(chrome::kAboutBlankURL),
                 content::PAGE_TRANSITION_TYPED);
 
   WebContents* fullscreen_tab = browser()->GetSelectedWebContents();
 
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(fullscreen_tab, true));
 
   // Request mouse lock and verify the bubble is waiting for user confirmation.
-  RequestToLockMouse(fullscreen_tab);
+  RequestToLockMouse(fullscreen_tab, true);
   ASSERT_TRUE(IsMouseLockPermissionRequested());
 
   // Accept mouse lock and verify bubble no longer shows confirmation buttons.
   AcceptCurrentFullscreenOrMouseLockRequest();
   ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons());
 }
 
 // Tests mouse lock fails before fullscreen is entered.
 IN_PROC_BROWSER_TEST_F(BrowserTest, MouseLockThenFullscreen) {
   WebContents* tab = browser()->GetSelectedWebContents();
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 
-  RequestToLockMouse(tab);
+  RequestToLockMouse(tab, true);
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(tab, true));
   ASSERT_TRUE(IsFullscreenPermissionRequested());
   ASSERT_FALSE(IsMouseLockPermissionRequested());
 }
 
 // Helper method to be called by multiple tests.
 // Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK.
 void BrowserTest::TestFullscreenMouseLockContentSettings() {
@@ skipping 20 matching lines @@
   // Now, fullscreen should not prompt for permission.
   ASSERT_FALSE(IsFullscreenPermissionRequested());
   ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(tab, true));
   ASSERT_FALSE(IsFullscreenPermissionRequested());
 
   // Leaving tab in fullscreen, now test mouse lock ALLOW:
 
   // Validate that mouse lock defaults to asking permision.
   ASSERT_FALSE(IsMouseLockPermissionRequested());
   ASSERT_FALSE(IsMouseLockedOrPending());
-  RequestToLockMouse(tab);
+  RequestToLockMouse(tab, true);
   ASSERT_TRUE(IsMouseLockPermissionRequested());
   ASSERT_TRUE(IsMouseLockedOrPending());
   LostMouseLock();
 
   // Add content setting to ALLOW mouse lock.
   settings_map->SetContentSetting(
       pattern, ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(),
       CONTENT_SETTING_ALLOW);
 
   // Now, mouse lock should not prompt for permission.
   ASSERT_FALSE(IsMouseLockedOrPending());
   ASSERT_FALSE(IsMouseLockPermissionRequested());
-  RequestToLockMouse(tab);
+  RequestToLockMouse(tab, true);
   ASSERT_TRUE(IsMouseLockedOrPending());
   ASSERT_FALSE(IsMouseLockPermissionRequested());
   LostMouseLock();
 
   // Leaving tab in fullscreen, now test mouse lock BLOCK:
 
   // Add content setting to BLOCK mouse lock.
   settings_map->SetContentSetting(
       pattern, ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string(),
       CONTENT_SETTING_BLOCK);
 
   // Now, mouse lock should not be pending.
   ASSERT_FALSE(IsMouseLockedOrPending());
   ASSERT_FALSE(IsMouseLockPermissionRequested());
-  RequestToLockMouse(tab);
+  RequestToLockMouse(tab, true);
   ASSERT_FALSE(IsMouseLockedOrPending());
   ASSERT_FALSE(IsMouseLockPermissionRequested());
 }
 
 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK.
 IN_PROC_BROWSER_TEST_F(BrowserTest, FullscreenMouseLockContentSettings) {
   TestFullscreenMouseLockContentSettings();
 }
 
 // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK,
@@ skipping 617 matching lines @@
 
   // The normal browser should now have four.
   EXPECT_EQ(4, browser()->tab_count());
 
   // Close the additional browsers.
   popup_browser->CloseAllTabs();
   app_browser->CloseAllTabs();
   app_popup_browser->CloseAllTabs();
 }
 #endif