OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/location.h" | 7 #include "base/location.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1103 | 1103 |
1104 ASSERT_TRUE(ready_back_key_listener.WaitUntilSatisfied()); | 1104 ASSERT_TRUE(ready_back_key_listener.WaitUntilSatisfied()); |
1105 SendBackShortcutToPlatformApp(); | 1105 SendBackShortcutToPlatformApp(); |
1106 | 1106 |
1107 ASSERT_TRUE(ready_forward_key_listener.WaitUntilSatisfied()); | 1107 ASSERT_TRUE(ready_forward_key_listener.WaitUntilSatisfied()); |
1108 SendForwardShortcutToPlatformApp(); | 1108 SendForwardShortcutToPlatformApp(); |
1109 | 1109 |
1110 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 1110 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
1111 } | 1111 } |
1112 | 1112 |
| 1113 // Flaky on Linux: crbug.com/678267 |
| 1114 #if defined(OS_LINUX) |
| 1115 #define MAYBE_PointerLock_PointerLockLostWithFocus \ |
| 1116 DISABLED_PointerLock_PointerLockLostWithFocus |
| 1117 #else |
| 1118 #define MAYBE_PointerLock_PointerLockLostWithFocus \ |
| 1119 PointerLock_PointerLockLostWithFocus |
| 1120 #endif |
1113 IN_PROC_BROWSER_TEST_P(WebViewPointerLockInteractiveTest, | 1121 IN_PROC_BROWSER_TEST_P(WebViewPointerLockInteractiveTest, |
1114 PointerLock_PointerLockLostWithFocus) { | 1122 MAYBE_PointerLock_PointerLockLostWithFocus) { |
1115 TestHelper("testPointerLockLostWithFocus", | 1123 TestHelper("testPointerLockLostWithFocus", |
1116 "web_view/pointerlock", | 1124 "web_view/pointerlock", |
1117 NO_TEST_SERVER); | 1125 NO_TEST_SERVER); |
1118 } | 1126 } |
1119 | 1127 |
1120 // Disable this on mac, throws an assertion failure on teardown which | 1128 // Disable this on mac, throws an assertion failure on teardown which |
1121 // will result in flakiness: | 1129 // will result in flakiness: |
1122 // | 1130 // |
1123 // "not is fullscreen state" | 1131 // "not is fullscreen state" |
1124 // "*** Assertion failure in -[_NSWindowFullScreenTransition | 1132 // "*** Assertion failure in -[_NSWindowFullScreenTransition |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1468 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( | 1476 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( |
1469 GetPlatformAppWindow(), ui::VKEY_Z, false, false, false, false)); | 1477 GetPlatformAppWindow(), ui::VKEY_Z, false, false, false, false)); |
1470 | 1478 |
1471 next_step_listener.Reset(); | 1479 next_step_listener.Reset(); |
1472 EXPECT_TRUE(content::ExecuteScript( | 1480 EXPECT_TRUE(content::ExecuteScript( |
1473 embedder_web_contents(), | 1481 embedder_web_contents(), |
1474 "window.runCommand('testKeyboardFocusRunNextStep', 'aBcxYz');")); | 1482 "window.runCommand('testKeyboardFocusRunNextStep', 'aBcxYz');")); |
1475 | 1483 |
1476 ASSERT_TRUE(next_step_listener.WaitUntilSatisfied()); | 1484 ASSERT_TRUE(next_step_listener.WaitUntilSatisfied()); |
1477 } | 1485 } |
OLD | NEW |