| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 6 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| 7 #include "chrome/browser/fullscreen.h" | 7 #include "chrome/browser/fullscreen.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| 11 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
| 12 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" | 12 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/test/base/interactive_test_utils.h" | 14 #include "chrome/test/base/interactive_test_utils.h" |
| 15 #include "chrome/test/base/ui_test_utils.h" | 15 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "components/content_settings/core/browser/host_content_settings_map.h" | 16 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 17 #include "content/public/browser/render_view_host.h" | 17 #include "content/public/browser/render_view_host.h" |
| 18 #include "content/public/browser/render_widget_host.h" | 18 #include "content/public/browser/render_widget_host.h" |
| 19 #include "content/public/browser/render_widget_host_view.h" | 19 #include "content/public/browser/render_widget_host_view.h" |
| 20 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
| 21 #include "content/public/common/url_constants.h" | 21 #include "content/public/common/url_constants.h" |
| 22 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 22 | 23 |
| 23 using url::kAboutBlankURL; | 24 using url::kAboutBlankURL; |
| 24 using content::WebContents; | 25 using content::WebContents; |
| 25 using ui::PAGE_TRANSITION_TYPED; | 26 using ui::PAGE_TRANSITION_TYPED; |
| 26 | 27 |
| 27 namespace { | 28 namespace { |
| 28 | 29 |
| 29 const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("simple.html"); | 30 const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("/simple.html"); |
| 30 | 31 |
| 31 } // namespace | 32 } // namespace |
| 32 | 33 |
| 33 class FullscreenControllerInteractiveTest | 34 class FullscreenControllerInteractiveTest |
| 34 : public FullscreenControllerTest { | 35 : public FullscreenControllerTest { |
| 35 protected: | 36 protected: |
| 36 | 37 |
| 37 // Tests that actually make the browser fullscreen have been flaky when | 38 // Tests that actually make the browser fullscreen have been flaky when |
| 38 // run sharded, and so are restricted here to interactive ui tests. | 39 // run sharded, and so are restricted here to interactive ui tests. |
| 39 void ToggleTabFullscreen(bool enter_fullscreen); | 40 void ToggleTabFullscreen(bool enter_fullscreen); |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 94 |
| 94 fullscreen_observer.Wait(); | 95 fullscreen_observer.Wait(); |
| 95 ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen); | 96 ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen); |
| 96 ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen); | 97 ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen); |
| 97 } | 98 } |
| 98 | 99 |
| 99 // Helper method to be called by multiple tests. | 100 // Helper method to be called by multiple tests. |
| 100 // Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. | 101 // Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. |
| 101 void | 102 void |
| 102 FullscreenControllerInteractiveTest::TestFullscreenMouseLockContentSettings() { | 103 FullscreenControllerInteractiveTest::TestFullscreenMouseLockContentSettings() { |
| 103 GURL url = test_server()->GetURL("simple.html"); | 104 GURL url = embedded_test_server()->GetURL("/simple.html"); |
| 104 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); | 105 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); |
| 105 | 106 |
| 106 // Validate that going fullscreen for a URL defaults to asking permision. | 107 // Validate that going fullscreen for a URL defaults to asking permision. |
| 107 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 108 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 108 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | 109 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); |
| 109 ASSERT_TRUE(IsFullscreenPermissionRequested()); | 110 ASSERT_TRUE(IsFullscreenPermissionRequested()); |
| 110 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); | 111 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); |
| 111 | 112 |
| 112 // Add content setting to ALLOW fullscreen. | 113 // Add content setting to ALLOW fullscreen. |
| 113 HostContentSettingsMap* settings_map = | 114 HostContentSettingsMap* settings_map = |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 if (!IsFullscreenForBrowser()) | 179 if (!IsFullscreenForBrowser()) |
| 179 ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen); | 180 ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen); |
| 180 } | 181 } |
| 181 | 182 |
| 182 // Tests /////////////////////////////////////////////////////////////////////// | 183 // Tests /////////////////////////////////////////////////////////////////////// |
| 183 | 184 |
| 184 // Tests that while in fullscreen creating a new tab will exit fullscreen. | 185 // Tests that while in fullscreen creating a new tab will exit fullscreen. |
| 185 // Test is flaky: http://crbug.com/146006 | 186 // Test is flaky: http://crbug.com/146006 |
| 186 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 187 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 187 DISABLED_TestNewTabExitsFullscreen) { | 188 DISABLED_TestNewTabExitsFullscreen) { |
| 188 ASSERT_TRUE(test_server()->Start()); | 189 ASSERT_TRUE(embedded_test_server()->Start()); |
| 189 | 190 |
| 190 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); | 191 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 191 | 192 |
| 192 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | 193 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); |
| 193 | 194 |
| 194 { | 195 { |
| 195 FullscreenNotificationObserver fullscreen_observer; | 196 FullscreenNotificationObserver fullscreen_observer; |
| 196 AddTabAtIndex(1, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); | 197 AddTabAtIndex(1, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 197 fullscreen_observer.Wait(); | 198 fullscreen_observer.Wait(); |
| 198 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 199 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 199 } | 200 } |
| 200 } | 201 } |
| 201 | 202 |
| 202 // Tests a tab exiting fullscreen will bring the browser out of fullscreen. | 203 // Tests a tab exiting fullscreen will bring the browser out of fullscreen. |
| 203 // Test is flaky: http://crbug.com/146006 | 204 // Test is flaky: http://crbug.com/146006 |
| 204 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 205 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 205 DISABLED_TestTabExitsItselfFromFullscreen) { | 206 DISABLED_TestTabExitsItselfFromFullscreen) { |
| 206 ASSERT_TRUE(test_server()->Start()); | 207 ASSERT_TRUE(embedded_test_server()->Start()); |
| 207 | 208 |
| 208 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); | 209 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 209 | 210 |
| 210 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | 211 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); |
| 211 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); | 212 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); |
| 212 } | 213 } |
| 213 | 214 |
| 214 // Tests entering fullscreen and then requesting mouse lock results in | 215 // Tests entering fullscreen and then requesting mouse lock results in |
| 215 // buttons for the user, and that after confirming the buttons are dismissed. | 216 // buttons for the user, and that after confirming the buttons are dismissed. |
| 216 // Test is flaky: http://crbug.com/146006 | 217 // Test is flaky: http://crbug.com/146006 |
| 217 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 218 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 218 DISABLED_TestFullscreenBubbleMouseLockState) { | 219 DISABLED_TestFullscreenBubbleMouseLockState) { |
| 219 ASSERT_TRUE(test_server()->Start()); | 220 ASSERT_TRUE(embedded_test_server()->Start()); |
| 220 | 221 |
| 221 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); | 222 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 222 AddTabAtIndex(1, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); | 223 AddTabAtIndex(1, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 223 | 224 |
| 224 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | 225 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); |
| 225 | 226 |
| 226 // Request mouse lock and verify the bubble is waiting for user confirmation. | 227 // Request mouse lock and verify the bubble is waiting for user confirmation. |
| 227 RequestToLockMouse(true, false); | 228 RequestToLockMouse(true, false); |
| 228 ASSERT_TRUE(IsMouseLockPermissionRequested()); | 229 ASSERT_TRUE(IsMouseLockPermissionRequested()); |
| 229 | 230 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 296 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 296 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | 297 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); |
| 297 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 298 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 298 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); | 299 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); |
| 299 } | 300 } |
| 300 | 301 |
| 301 // Tests fullscreen is exited on page navigation. | 302 // Tests fullscreen is exited on page navigation. |
| 302 // Test is flaky: http://crbug.com/146006 | 303 // Test is flaky: http://crbug.com/146006 |
| 303 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 304 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 304 DISABLED_TestTabExitsFullscreenOnNavigation) { | 305 DISABLED_TestTabExitsFullscreenOnNavigation) { |
| 305 ASSERT_TRUE(test_server()->Start()); | 306 ASSERT_TRUE(embedded_test_server()->Start()); |
| 306 | 307 |
| 307 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 308 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
| 308 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | 309 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); |
| 309 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); | 310 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); |
| 310 | 311 |
| 311 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 312 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 312 } | 313 } |
| 313 | 314 |
| 314 // Tests fullscreen is exited when navigating back. | 315 // Tests fullscreen is exited when navigating back. |
| 315 // Test is flaky: http://crbug.com/146006 | 316 // Test is flaky: http://crbug.com/146006 |
| 316 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 317 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 317 DISABLED_TestTabExitsFullscreenOnGoBack) { | 318 DISABLED_TestTabExitsFullscreenOnGoBack) { |
| 318 ASSERT_TRUE(test_server()->Start()); | 319 ASSERT_TRUE(embedded_test_server()->Start()); |
| 319 | 320 |
| 320 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 321 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
| 321 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); | 322 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); |
| 322 | 323 |
| 323 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | 324 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); |
| 324 | 325 |
| 325 GoBack(); | 326 GoBack(); |
| 326 | 327 |
| 327 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 328 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 328 } | 329 } |
| 329 | 330 |
| 330 // Tests fullscreen is not exited on sub frame navigation. | 331 // Tests fullscreen is not exited on sub frame navigation. |
| 331 // Test is flaky: http://crbug.com/146006 | 332 // Test is flaky: http://crbug.com/146006 |
| 332 IN_PROC_BROWSER_TEST_F( | 333 IN_PROC_BROWSER_TEST_F( |
| 333 FullscreenControllerInteractiveTest, | 334 FullscreenControllerInteractiveTest, |
| 334 DISABLED_TestTabDoesntExitFullscreenOnSubFrameNavigation) { | 335 DISABLED_TestTabDoesntExitFullscreenOnSubFrameNavigation) { |
| 335 ASSERT_TRUE(test_server()->Start()); | 336 ASSERT_TRUE(embedded_test_server()->Start()); |
| 336 | 337 |
| 337 GURL url(ui_test_utils::GetTestUrl(base::FilePath( | 338 GURL url(ui_test_utils::GetTestUrl(base::FilePath( |
| 338 base::FilePath::kCurrentDirectory), base::FilePath(kSimpleFile))); | 339 base::FilePath::kCurrentDirectory), base::FilePath(kSimpleFile))); |
| 339 GURL url_with_fragment(url.spec() + "#fragment"); | 340 GURL url_with_fragment(url.spec() + "#fragment"); |
| 340 | 341 |
| 341 ui_test_utils::NavigateToURL(browser(), url); | 342 ui_test_utils::NavigateToURL(browser(), url); |
| 342 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | 343 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); |
| 343 ui_test_utils::NavigateToURL(browser(), url_with_fragment); | 344 ui_test_utils::NavigateToURL(browser(), url_with_fragment); |
| 344 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); | 345 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); |
| 345 } | 346 } |
| 346 | 347 |
| 347 // Tests tab fullscreen exits, but browser fullscreen remains, on navigation. | 348 // Tests tab fullscreen exits, but browser fullscreen remains, on navigation. |
| 348 // Test is flaky: http://crbug.com/146006 | 349 // Test is flaky: http://crbug.com/146006 |
| 349 IN_PROC_BROWSER_TEST_F( | 350 IN_PROC_BROWSER_TEST_F( |
| 350 FullscreenControllerInteractiveTest, | 351 FullscreenControllerInteractiveTest, |
| 351 DISABLED_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks) { | 352 DISABLED_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks) { |
| 352 ASSERT_TRUE(test_server()->Start()); | 353 ASSERT_TRUE(embedded_test_server()->Start()); |
| 353 | 354 |
| 354 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 355 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
| 355 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); | 356 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); |
| 356 | 357 |
| 357 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); | 358 ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); |
| 358 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); | 359 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); |
| 359 | 360 |
| 360 GoBack(); | 361 GoBack(); |
| 361 | 362 |
| 362 ASSERT_TRUE(IsFullscreenForBrowser()); | 363 ASSERT_TRUE(IsFullscreenForBrowser()); |
| 363 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); | 364 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); |
| 364 } | 365 } |
| 365 | 366 |
| 366 #if defined(OS_MACOSX) | 367 #if defined(OS_MACOSX) |
| 367 // http://crbug.com/100467 | 368 // http://crbug.com/100467 |
| 368 IN_PROC_BROWSER_TEST_F( | 369 IN_PROC_BROWSER_TEST_F( |
| 369 FullscreenControllerTest, DISABLED_TabEntersPresentationModeFromWindowed) { | 370 FullscreenControllerTest, DISABLED_TabEntersPresentationModeFromWindowed) { |
| 370 ASSERT_TRUE(test_server()->Start()); | 371 ASSERT_TRUE(embedded_test_server()->Start()); |
| 371 | 372 |
| 372 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); | 373 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 373 | 374 |
| 374 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); | 375 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
| 375 | 376 |
| 376 { | 377 { |
| 377 FullscreenNotificationObserver fullscreen_observer; | 378 FullscreenNotificationObserver fullscreen_observer; |
| 378 EXPECT_FALSE(browser()->window()->IsFullscreen()); | 379 EXPECT_FALSE(browser()->window()->IsFullscreen()); |
| 379 EXPECT_FALSE(browser()->window()->IsFullscreenWithToolbar()); | 380 EXPECT_FALSE(browser()->window()->IsFullscreenWithToolbar()); |
| 380 browser()->EnterFullscreenModeForTab(tab, GURL()); | 381 browser()->EnterFullscreenModeForTab(tab, GURL()); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 398 chrome::ToggleFullscreenMode(browser()); | 399 chrome::ToggleFullscreenMode(browser()); |
| 399 fullscreen_observer.Wait(); | 400 fullscreen_observer.Wait(); |
| 400 EXPECT_TRUE(browser()->window()->IsFullscreen()); | 401 EXPECT_TRUE(browser()->window()->IsFullscreen()); |
| 401 EXPECT_TRUE(browser()->window()->IsFullscreenWithToolbar()); | 402 EXPECT_TRUE(browser()->window()->IsFullscreenWithToolbar()); |
| 402 } | 403 } |
| 403 } | 404 } |
| 404 #endif | 405 #endif |
| 405 | 406 |
| 406 // Tests mouse lock can be escaped with ESC key. | 407 // Tests mouse lock can be escaped with ESC key. |
| 407 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, EscapingMouseLock) { | 408 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, EscapingMouseLock) { |
| 408 ASSERT_TRUE(test_server()->Start()); | 409 ASSERT_TRUE(embedded_test_server()->Start()); |
| 409 ui_test_utils::NavigateToURL(browser(), | 410 ui_test_utils::NavigateToURL( |
| 410 test_server()->GetURL(kFullscreenMouseLockHTML)); | 411 browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 411 | 412 |
| 412 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 413 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 413 | 414 |
| 414 // Request to lock the mouse. | 415 // Request to lock the mouse. |
| 415 { | 416 { |
| 416 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 417 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 417 browser(), ui::VKEY_1, false, false, false, false, | 418 browser(), ui::VKEY_1, false, false, false, false, |
| 418 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 419 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| 419 content::NotificationService::AllSources())); | 420 content::NotificationService::AllSources())); |
| 420 } | 421 } |
| (...skipping 27 matching lines...) Expand all Loading... |
| 448 ASSERT_FALSE(IsMouseLocked()); | 449 ASSERT_FALSE(IsMouseLocked()); |
| 449 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); | 450 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); |
| 450 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 451 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 451 ASSERT_FALSE(IsMouseLockPermissionRequested()); | 452 ASSERT_FALSE(IsMouseLockPermissionRequested()); |
| 452 } | 453 } |
| 453 | 454 |
| 454 // Tests mouse lock and fullscreen modes can be escaped with ESC key. | 455 // Tests mouse lock and fullscreen modes can be escaped with ESC key. |
| 455 // Test is flaky: http://crbug.com/146006 | 456 // Test is flaky: http://crbug.com/146006 |
| 456 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 457 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 457 DISABLED_EscapingMouseLockAndFullscreen) { | 458 DISABLED_EscapingMouseLockAndFullscreen) { |
| 458 ASSERT_TRUE(test_server()->Start()); | 459 ASSERT_TRUE(embedded_test_server()->Start()); |
| 459 ui_test_utils::NavigateToURL(browser(), | 460 ui_test_utils::NavigateToURL( |
| 460 test_server()->GetURL(kFullscreenMouseLockHTML)); | 461 browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 461 | 462 |
| 462 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 463 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 463 | 464 |
| 464 // Request to lock the mouse and enter fullscreen. | 465 // Request to lock the mouse and enter fullscreen. |
| 465 { | 466 { |
| 466 FullscreenNotificationObserver fullscreen_observer; | 467 FullscreenNotificationObserver fullscreen_observer; |
| 467 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 468 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 468 browser(), ui::VKEY_B, false, true, false, false, | 469 browser(), ui::VKEY_B, false, true, false, false, |
| 469 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 470 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| 470 content::NotificationService::AllSources())); | 471 content::NotificationService::AllSources())); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 ASSERT_FALSE(IsMouseLocked()); | 511 ASSERT_FALSE(IsMouseLocked()); |
| 511 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); | 512 ASSERT_FALSE(IsWindowFullscreenForTabOrPending()); |
| 512 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 513 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 513 ASSERT_FALSE(IsMouseLockPermissionRequested()); | 514 ASSERT_FALSE(IsMouseLockPermissionRequested()); |
| 514 } | 515 } |
| 515 | 516 |
| 516 // Tests mouse lock then fullscreen. | 517 // Tests mouse lock then fullscreen. |
| 517 // Test is flaky: http://crbug.com/146006 | 518 // Test is flaky: http://crbug.com/146006 |
| 518 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 519 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 519 DISABLED_MouseLockThenFullscreen) { | 520 DISABLED_MouseLockThenFullscreen) { |
| 520 ASSERT_TRUE(test_server()->Start()); | 521 ASSERT_TRUE(embedded_test_server()->Start()); |
| 521 ui_test_utils::NavigateToURL(browser(), | 522 ui_test_utils::NavigateToURL( |
| 522 test_server()->GetURL(kFullscreenMouseLockHTML)); | 523 browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 523 | 524 |
| 524 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 525 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 525 | 526 |
| 526 // Lock the mouse without a user gesture, expect no response. | 527 // Lock the mouse without a user gesture, expect no response. |
| 527 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 528 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 528 browser(), ui::VKEY_D, false, false, false, false, | 529 browser(), ui::VKEY_D, false, false, false, false, |
| 529 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 530 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| 530 content::NotificationService::AllSources())); | 531 content::NotificationService::AllSources())); |
| 531 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 532 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 532 ASSERT_FALSE(IsMouseLocked()); | 533 ASSERT_FALSE(IsMouseLocked()); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); | 568 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); |
| 568 ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons()); | 569 ASSERT_FALSE(IsFullscreenBubbleDisplayingButtons()); |
| 569 } | 570 } |
| 570 | 571 |
| 571 // Times out sometimes on Linux. http://crbug.com/135115 | 572 // Times out sometimes on Linux. http://crbug.com/135115 |
| 572 // Mac: http://crbug.com/103912 | 573 // Mac: http://crbug.com/103912 |
| 573 // Windows: Failing flakily on try jobs also. | 574 // Windows: Failing flakily on try jobs also. |
| 574 // Tests mouse lock then fullscreen in same request. | 575 // Tests mouse lock then fullscreen in same request. |
| 575 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 576 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 576 DISABLED_MouseLockAndFullscreen) { | 577 DISABLED_MouseLockAndFullscreen) { |
| 577 ASSERT_TRUE(test_server()->Start()); | 578 ASSERT_TRUE(embedded_test_server()->Start()); |
| 578 ui_test_utils::NavigateToURL(browser(), | 579 ui_test_utils::NavigateToURL( |
| 579 test_server()->GetURL(kFullscreenMouseLockHTML)); | 580 browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 580 | 581 |
| 581 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 582 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 582 | 583 |
| 583 // Request to lock the mouse and enter fullscreen. | 584 // Request to lock the mouse and enter fullscreen. |
| 584 { | 585 { |
| 585 FullscreenNotificationObserver fullscreen_observer; | 586 FullscreenNotificationObserver fullscreen_observer; |
| 586 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 587 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 587 browser(), ui::VKEY_B, false, true, false, false, | 588 browser(), ui::VKEY_B, false, true, false, false, |
| 588 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 589 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| 589 content::NotificationService::AllSources())); | 590 content::NotificationService::AllSources())); |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); | 627 ASSERT_TRUE(IsWindowFullscreenForTabOrPending()); |
| 627 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 628 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 628 } | 629 } |
| 629 | 630 |
| 630 // Tests mouse lock and fullscreen for the privileged fullscreen case (e.g., | 631 // Tests mouse lock and fullscreen for the privileged fullscreen case (e.g., |
| 631 // embedded flash fullscreen, since the Flash plugin handles user permissions | 632 // embedded flash fullscreen, since the Flash plugin handles user permissions |
| 632 // requests itself). | 633 // requests itself). |
| 633 // Test is flaky: http://crbug.com/146006 | 634 // Test is flaky: http://crbug.com/146006 |
| 634 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 635 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 635 DISABLED_PrivilegedMouseLockAndFullscreen) { | 636 DISABLED_PrivilegedMouseLockAndFullscreen) { |
| 636 ASSERT_TRUE(test_server()->Start()); | 637 ASSERT_TRUE(embedded_test_server()->Start()); |
| 637 ui_test_utils::NavigateToURL(browser(), | 638 ui_test_utils::NavigateToURL( |
| 638 test_server()->GetURL(kFullscreenMouseLockHTML)); | 639 browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 639 | 640 |
| 640 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 641 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 641 | 642 |
| 642 SetPrivilegedFullscreen(true); | 643 SetPrivilegedFullscreen(true); |
| 643 | 644 |
| 644 // Request to lock the mouse and enter fullscreen. | 645 // Request to lock the mouse and enter fullscreen. |
| 645 FullscreenNotificationObserver fullscreen_observer; | 646 FullscreenNotificationObserver fullscreen_observer; |
| 646 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 647 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 647 browser(), ui::VKEY_B, false, true, false, false, | 648 browser(), ui::VKEY_B, false, true, false, false, |
| 648 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 649 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 662 #define MAYBE_MouseLockSilentAfterTargetUnlock \ | 663 #define MAYBE_MouseLockSilentAfterTargetUnlock \ |
| 663 DISABLED_MouseLockSilentAfterTargetUnlock | 664 DISABLED_MouseLockSilentAfterTargetUnlock |
| 664 #else | 665 #else |
| 665 #define MAYBE_MouseLockSilentAfterTargetUnlock MouseLockSilentAfterTargetUnlock | 666 #define MAYBE_MouseLockSilentAfterTargetUnlock MouseLockSilentAfterTargetUnlock |
| 666 #endif | 667 #endif |
| 667 | 668 |
| 668 // Tests mouse lock can be exited and re-entered by an application silently | 669 // Tests mouse lock can be exited and re-entered by an application silently |
| 669 // with no UI distraction for users. | 670 // with no UI distraction for users. |
| 670 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 671 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 671 MAYBE_MouseLockSilentAfterTargetUnlock) { | 672 MAYBE_MouseLockSilentAfterTargetUnlock) { |
| 672 ASSERT_TRUE(test_server()->Start()); | 673 ASSERT_TRUE(embedded_test_server()->Start()); |
| 673 ui_test_utils::NavigateToURL(browser(), | 674 ui_test_utils::NavigateToURL( |
| 674 test_server()->GetURL(kFullscreenMouseLockHTML)); | 675 browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 675 | 676 |
| 676 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 677 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 677 | 678 |
| 678 // Lock the mouse with a user gesture. | 679 // Lock the mouse with a user gesture. |
| 679 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 680 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 680 browser(), ui::VKEY_1, false, false, false, false, | 681 browser(), ui::VKEY_1, false, false, false, false, |
| 681 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 682 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| 682 content::NotificationService::AllSources())); | 683 content::NotificationService::AllSources())); |
| 683 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 684 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 684 ASSERT_TRUE(IsMouseLockPermissionRequested()); | 685 ASSERT_TRUE(IsMouseLockPermissionRequested()); |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 749 #else | 750 #else |
| 750 #define MAYBE_TestTabExitsMouseLockOnNavigation \ | 751 #define MAYBE_TestTabExitsMouseLockOnNavigation \ |
| 751 TestTabExitsMouseLockOnNavigation | 752 TestTabExitsMouseLockOnNavigation |
| 752 #define MAYBE_TestTabExitsMouseLockOnGoBack \ | 753 #define MAYBE_TestTabExitsMouseLockOnGoBack \ |
| 753 TestTabExitsMouseLockOnGoBack | 754 TestTabExitsMouseLockOnGoBack |
| 754 #endif | 755 #endif |
| 755 | 756 |
| 756 // Tests mouse lock is exited on page navigation. | 757 // Tests mouse lock is exited on page navigation. |
| 757 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 758 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 758 MAYBE_TestTabExitsMouseLockOnNavigation) { | 759 MAYBE_TestTabExitsMouseLockOnNavigation) { |
| 759 ASSERT_TRUE(test_server()->Start()); | 760 ASSERT_TRUE(embedded_test_server()->Start()); |
| 760 ui_test_utils::NavigateToURL(browser(), | 761 ui_test_utils::NavigateToURL( |
| 761 test_server()->GetURL(kFullscreenMouseLockHTML)); | 762 browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 762 | 763 |
| 763 // Lock the mouse with a user gesture. | 764 // Lock the mouse with a user gesture. |
| 764 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 765 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 765 browser(), ui::VKEY_1, false, false, false, false, | 766 browser(), ui::VKEY_1, false, false, false, false, |
| 766 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 767 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| 767 content::NotificationService::AllSources())); | 768 content::NotificationService::AllSources())); |
| 768 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 769 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 769 ASSERT_TRUE(IsMouseLockPermissionRequested()); | 770 ASSERT_TRUE(IsMouseLockPermissionRequested()); |
| 770 ASSERT_FALSE(IsMouseLocked()); | 771 ASSERT_FALSE(IsMouseLocked()); |
| 771 | 772 |
| 772 // Accept mouse lock. | 773 // Accept mouse lock. |
| 773 AcceptCurrentFullscreenOrMouseLockRequest(); | 774 AcceptCurrentFullscreenOrMouseLockRequest(); |
| 774 ASSERT_TRUE(IsMouseLocked()); | 775 ASSERT_TRUE(IsMouseLocked()); |
| 775 | 776 |
| 776 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); | 777 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); |
| 777 | 778 |
| 778 ASSERT_FALSE(IsMouseLocked()); | 779 ASSERT_FALSE(IsMouseLocked()); |
| 779 } | 780 } |
| 780 | 781 |
| 781 // Tests mouse lock is exited when navigating back. | 782 // Tests mouse lock is exited when navigating back. |
| 782 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 783 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 783 MAYBE_TestTabExitsMouseLockOnGoBack) { | 784 MAYBE_TestTabExitsMouseLockOnGoBack) { |
| 784 ASSERT_TRUE(test_server()->Start()); | 785 ASSERT_TRUE(embedded_test_server()->Start()); |
| 785 | 786 |
| 786 // Navigate twice to provide a place to go back to. | 787 // Navigate twice to provide a place to go back to. |
| 787 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 788 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
| 788 ui_test_utils::NavigateToURL(browser(), | 789 ui_test_utils::NavigateToURL( |
| 789 test_server()->GetURL(kFullscreenMouseLockHTML)); | 790 browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 790 | 791 |
| 791 // Lock the mouse with a user gesture. | 792 // Lock the mouse with a user gesture. |
| 792 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 793 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 793 browser(), ui::VKEY_1, false, false, false, false, | 794 browser(), ui::VKEY_1, false, false, false, false, |
| 794 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 795 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| 795 content::NotificationService::AllSources())); | 796 content::NotificationService::AllSources())); |
| 796 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 797 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 797 ASSERT_TRUE(IsMouseLockPermissionRequested()); | 798 ASSERT_TRUE(IsMouseLockPermissionRequested()); |
| 798 ASSERT_FALSE(IsMouseLocked()); | 799 ASSERT_FALSE(IsMouseLocked()); |
| 799 | 800 |
| 800 // Accept mouse lock. | 801 // Accept mouse lock. |
| 801 AcceptCurrentFullscreenOrMouseLockRequest(); | 802 AcceptCurrentFullscreenOrMouseLockRequest(); |
| 802 ASSERT_TRUE(IsMouseLocked()); | 803 ASSERT_TRUE(IsMouseLocked()); |
| 803 | 804 |
| 804 GoBack(); | 805 GoBack(); |
| 805 | 806 |
| 806 ASSERT_FALSE(IsMouseLocked()); | 807 ASSERT_FALSE(IsMouseLocked()); |
| 807 } | 808 } |
| 808 | 809 |
| 809 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) | 810 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
| 810 // TODO(erg): linux_aura bringup: http://crbug.com/163931 | 811 // TODO(erg): linux_aura bringup: http://crbug.com/163931 |
| 811 #define MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation DISABLED_TestTabDoe
sntExitMouseLockOnSubFrameNavigation | 812 #define MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation DISABLED_TestTabDoe
sntExitMouseLockOnSubFrameNavigation |
| 812 #else | 813 #else |
| 813 #define MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation TestTabDoesntExitMo
useLockOnSubFrameNavigation | 814 #define MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation TestTabDoesntExitMo
useLockOnSubFrameNavigation |
| 814 #endif | 815 #endif |
| 815 | 816 |
| 816 // Tests mouse lock is not exited on sub frame navigation. | 817 // Tests mouse lock is not exited on sub frame navigation. |
| 817 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 818 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 818 MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation) { | 819 MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation) { |
| 819 ASSERT_TRUE(test_server()->Start()); | 820 ASSERT_TRUE(embedded_test_server()->Start()); |
| 820 | 821 |
| 821 // Create URLs for test page and test page with #fragment. | 822 // Create URLs for test page and test page with #fragment. |
| 822 GURL url(test_server()->GetURL(kFullscreenMouseLockHTML)); | 823 GURL url(embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 823 GURL url_with_fragment(url.spec() + "#fragment"); | 824 GURL url_with_fragment(url.spec() + "#fragment"); |
| 824 | 825 |
| 825 // Navigate to test page. | 826 // Navigate to test page. |
| 826 ui_test_utils::NavigateToURL(browser(), url); | 827 ui_test_utils::NavigateToURL(browser(), url); |
| 827 | 828 |
| 828 // Lock the mouse with a user gesture. | 829 // Lock the mouse with a user gesture. |
| 829 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 830 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 830 browser(), ui::VKEY_1, false, false, false, false, | 831 browser(), ui::VKEY_1, false, false, false, false, |
| 831 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 832 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| 832 content::NotificationService::AllSources())); | 833 content::NotificationService::AllSources())); |
| 833 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 834 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 834 ASSERT_TRUE(IsMouseLockPermissionRequested()); | 835 ASSERT_TRUE(IsMouseLockPermissionRequested()); |
| 835 ASSERT_FALSE(IsMouseLocked()); | 836 ASSERT_FALSE(IsMouseLocked()); |
| 836 | 837 |
| 837 // Accept mouse lock. | 838 // Accept mouse lock. |
| 838 AcceptCurrentFullscreenOrMouseLockRequest(); | 839 AcceptCurrentFullscreenOrMouseLockRequest(); |
| 839 ASSERT_TRUE(IsMouseLocked()); | 840 ASSERT_TRUE(IsMouseLocked()); |
| 840 | 841 |
| 841 // Navigate to url with fragment. Mouse lock should persist. | 842 // Navigate to url with fragment. Mouse lock should persist. |
| 842 ui_test_utils::NavigateToURL(browser(), url_with_fragment); | 843 ui_test_utils::NavigateToURL(browser(), url_with_fragment); |
| 843 ASSERT_TRUE(IsMouseLocked()); | 844 ASSERT_TRUE(IsMouseLocked()); |
| 844 } | 845 } |
| 845 | 846 |
| 846 // Tests Mouse Lock and Fullscreen are exited upon reload. | 847 // Tests Mouse Lock and Fullscreen are exited upon reload. |
| 847 // http://crbug.com/137486 | 848 // http://crbug.com/137486 |
| 848 // mac: http://crbug.com/103912 | 849 // mac: http://crbug.com/103912 |
| 849 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 850 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 850 DISABLED_ReloadExitsMouseLockAndFullscreen) { | 851 DISABLED_ReloadExitsMouseLockAndFullscreen) { |
| 851 ASSERT_TRUE(test_server()->Start()); | 852 ASSERT_TRUE(embedded_test_server()->Start()); |
| 852 ui_test_utils::NavigateToURL(browser(), | 853 ui_test_utils::NavigateToURL( |
| 853 test_server()->GetURL(kFullscreenMouseLockHTML)); | 854 browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); |
| 854 | 855 |
| 855 ASSERT_FALSE(IsMouseLockPermissionRequested()); | 856 ASSERT_FALSE(IsMouseLockPermissionRequested()); |
| 856 | 857 |
| 857 // Request mouse lock. | 858 // Request mouse lock. |
| 858 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( | 859 ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( |
| 859 browser(), ui::VKEY_1, false, false, false, false, | 860 browser(), ui::VKEY_1, false, false, false, false, |
| 860 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, | 861 chrome::NOTIFICATION_MOUSE_LOCK_CHANGED, |
| 861 content::NotificationService::AllSources())); | 862 content::NotificationService::AllSources())); |
| 862 ASSERT_TRUE(IsMouseLockPermissionRequested()); | 863 ASSERT_TRUE(IsMouseLockPermissionRequested()); |
| 863 | 864 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 917 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, | 918 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, |
| 918 DISABLED_ToggleFullscreenModeForTab) { | 919 DISABLED_ToggleFullscreenModeForTab) { |
| 919 // Most fullscreen tests run sharded in fullscreen_controller_browsertest.cc | 920 // Most fullscreen tests run sharded in fullscreen_controller_browsertest.cc |
| 920 // but flakiness required a while loop in | 921 // but flakiness required a while loop in |
| 921 // FullscreenControllerTest::ToggleTabFullscreen. This test verifies that | 922 // FullscreenControllerTest::ToggleTabFullscreen. This test verifies that |
| 922 // when running serially there is no flakiness. | 923 // when running serially there is no flakiness. |
| 923 // This test reproduces the same flow as | 924 // This test reproduces the same flow as |
| 924 // TestFullscreenMouseLockContentSettings. | 925 // TestFullscreenMouseLockContentSettings. |
| 925 // http://crbug.com/133831 | 926 // http://crbug.com/133831 |
| 926 | 927 |
| 927 GURL url = test_server()->GetURL("simple.html"); | 928 GURL url = embedded_test_server()->GetURL("/simple.html"); |
| 928 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); | 929 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); |
| 929 | 930 |
| 930 // Validate that going fullscreen for a URL defaults to asking permision. | 931 // Validate that going fullscreen for a URL defaults to asking permision. |
| 931 ASSERT_FALSE(IsFullscreenPermissionRequested()); | 932 ASSERT_FALSE(IsFullscreenPermissionRequested()); |
| 932 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); | 933 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); |
| 933 ASSERT_TRUE(IsFullscreenPermissionRequested()); | 934 ASSERT_TRUE(IsFullscreenPermissionRequested()); |
| 934 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); | 935 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); |
| 935 } | 936 } |
| OLD | NEW |