diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/browser/pointer_lock_browsertest.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/pointer_lock_browsertest.cc')
| -rw-r--r-- | chromium/content/browser/pointer_lock_browsertest.cc | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/chromium/content/browser/pointer_lock_browsertest.cc b/chromium/content/browser/pointer_lock_browsertest.cc index 6e4b05577a5..2bb7078708c 100644 --- a/chromium/content/browser/pointer_lock_browsertest.cc +++ b/chromium/content/browser/pointer_lock_browsertest.cc @@ -212,8 +212,7 @@ const std::string PointerLockHelper::wait_for_pointer_lock_promise_ = "()=>false);})()"; } // namespace -// crbug.com/1060129 -IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, DISABLED_PointerLockBasic) { +IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, PointerLockBasic) { GURL main_url(embedded_test_server()->GetURL( "a.com", "/cross_site_iframe_factory.html?a(b)")); EXPECT_TRUE(NavigateToURL(shell(), main_url)); @@ -241,9 +240,7 @@ IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, DISABLED_PointerLockBasic) { EXPECT_EQ(true, PointerLockHelper::IsPointerLockOnBody(child)); } -// crbug.com/1060129 -IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, - DISABLED_PointerLockAndUserActivation) { +IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, PointerLockAndUserActivation) { GURL main_url(embedded_test_server()->GetURL( "a.com", "/cross_site_iframe_factory.html?a(b(b))")); EXPECT_TRUE(NavigateToURL(shell(), main_url)); @@ -282,9 +279,7 @@ IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, grand_child, EXECUTE_SCRIPT_NO_USER_GESTURE)); } -// Flaky test crbug.com/1077306 -IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, - DISABLED_PointerLockEventRouting) { +IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, PointerLockEventRouting) { GURL main_url(embedded_test_server()->GetURL( "a.com", "/cross_site_iframe_factory.html?a(b)")); EXPECT_TRUE(NavigateToURL(shell(), main_url)); @@ -395,10 +390,8 @@ IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, } // Tests that the browser will not unlock the pointer if a RenderWidgetHostView -// that doesn't hold the pointer lock is destroyed. -// crbug.com/1060129 -IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, - DISABLED_PointerLockChildFrameDetached) { +// that doesn't hold the pointer lock is destroyed +IN_PROC_BROWSER_TEST_F(PointerLockBrowserTest, PointerLockChildFrameDetached) { GURL main_url(embedded_test_server()->GetURL( "a.com", "/cross_site_iframe_factory.html?a(b)")); EXPECT_TRUE(NavigateToURL(shell(), main_url)); @@ -755,14 +748,7 @@ IN_PROC_BROWSER_TEST_F(PointerLockBrowserTestWithOptions, } #if defined(USE_AURA) -#if defined(OS_WIN) || defined(OS_LINUX) -// https://crbug.com/1043985#c9: Flaky on Windows and Linux. -#define MAYBE_UnadjustedMovement DISABLED_UnadjustedMovement -#else -#define MAYBE_UnadjustedMovement UnadjustedMovement -#endif -IN_PROC_BROWSER_TEST_F(PointerLockBrowserTestWithOptions, - MAYBE_UnadjustedMovement) { +IN_PROC_BROWSER_TEST_F(PointerLockBrowserTestWithOptions, UnadjustedMovement) { GURL main_url(embedded_test_server()->GetURL( "a.com", "/cross_site_iframe_factory.html?a(b)")); EXPECT_TRUE(NavigateToURL(shell(), main_url)); @@ -834,7 +820,7 @@ IN_PROC_BROWSER_TEST_F(PointerLockBrowserTestWithOptions, #if defined(USE_AURA) // TODO(https://crbug.com/982379): Remove failure test when fully implemented -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_CHROMEOS) #define MAYBE_ChangeUnadjustedMovementFailure \ DISABLED_ChangeUnadjustedMovementFailure #else |