| 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 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1122 | 1122 |
| 1123 ASSERT_TRUE(ready_back_key_listener.WaitUntilSatisfied()); | 1123 ASSERT_TRUE(ready_back_key_listener.WaitUntilSatisfied()); |
| 1124 SendBackShortcutToPlatformApp(); | 1124 SendBackShortcutToPlatformApp(); |
| 1125 | 1125 |
| 1126 ASSERT_TRUE(ready_forward_key_listener.WaitUntilSatisfied()); | 1126 ASSERT_TRUE(ready_forward_key_listener.WaitUntilSatisfied()); |
| 1127 SendForwardShortcutToPlatformApp(); | 1127 SendForwardShortcutToPlatformApp(); |
| 1128 | 1128 |
| 1129 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 1129 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
| 1130 } | 1130 } |
| 1131 | 1131 |
| 1132 // Flaky on Linux: crbug.com/678267 | |
| 1133 #if defined(OS_LINUX) | |
| 1134 #define MAYBE_PointerLock_PointerLockLostWithFocus \ | |
| 1135 DISABLED_PointerLock_PointerLockLostWithFocus | |
| 1136 #else | |
| 1137 #define MAYBE_PointerLock_PointerLockLostWithFocus \ | |
| 1138 PointerLock_PointerLockLostWithFocus | |
| 1139 #endif | |
| 1140 IN_PROC_BROWSER_TEST_P(WebViewPointerLockInteractiveTest, | 1132 IN_PROC_BROWSER_TEST_P(WebViewPointerLockInteractiveTest, |
| 1141 MAYBE_PointerLock_PointerLockLostWithFocus) { | 1133 PointerLock_PointerLockLostWithFocus) { |
| 1142 TestHelper("testPointerLockLostWithFocus", | 1134 TestHelper("testPointerLockLostWithFocus", |
| 1143 "web_view/pointerlock", | 1135 "web_view/pointerlock", |
| 1144 NO_TEST_SERVER); | 1136 NO_TEST_SERVER); |
| 1145 } | 1137 } |
| 1146 | 1138 |
| 1147 // Disable this on mac, throws an assertion failure on teardown which | 1139 // Disable this on mac, throws an assertion failure on teardown which |
| 1148 // will result in flakiness: | 1140 // will result in flakiness: |
| 1149 // | 1141 // |
| 1150 // "not is fullscreen state" | 1142 // "not is fullscreen state" |
| 1151 // "*** Assertion failure in -[_NSWindowFullScreenTransition | 1143 // "*** Assertion failure in -[_NSWindowFullScreenTransition |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1508 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( | 1500 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( |
| 1509 GetPlatformAppWindow(), ui::VKEY_Z, false, false, false, false)); | 1501 GetPlatformAppWindow(), ui::VKEY_Z, false, false, false, false)); |
| 1510 | 1502 |
| 1511 next_step_listener.Reset(); | 1503 next_step_listener.Reset(); |
| 1512 EXPECT_TRUE(content::ExecuteScript( | 1504 EXPECT_TRUE(content::ExecuteScript( |
| 1513 embedder_web_contents(), | 1505 embedder_web_contents(), |
| 1514 "window.runCommand('testKeyboardFocusRunNextStep', 'aBcxYz');")); | 1506 "window.runCommand('testKeyboardFocusRunNextStep', 'aBcxYz');")); |
| 1515 | 1507 |
| 1516 ASSERT_TRUE(next_step_listener.WaitUntilSatisfied()); | 1508 ASSERT_TRUE(next_step_listener.WaitUntilSatisfied()); |
| 1517 } | 1509 } |
| OLD | NEW |