| 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 "apps/shell_window.h" | 5 #include "apps/shell_window.h" |
| 6 #include "apps/shell_window_registry.h" | 6 #include "apps/shell_window_registry.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 414 content::WebContents* embedder_web_contents_; | 414 content::WebContents* embedder_web_contents_; |
| 415 gfx::Point corner_; | 415 gfx::Point corner_; |
| 416 bool mouse_click_result_; | 416 bool mouse_click_result_; |
| 417 bool first_click_; | 417 bool first_click_; |
| 418 // Only used in drag/drop test. | 418 // Only used in drag/drop test. |
| 419 base::Closure quit_closure_; | 419 base::Closure quit_closure_; |
| 420 }; | 420 }; |
| 421 | 421 |
| 422 // ui_test_utils::SendMouseMoveSync doesn't seem to work on OS_MACOSX, and | 422 // ui_test_utils::SendMouseMoveSync doesn't seem to work on OS_MACOSX, and |
| 423 // likely won't work on many other platforms as well, so for now this test | 423 // likely won't work on many other platforms as well, so for now this test |
| 424 // is for Windows and Linux only. | 424 // is for Windows and Linux only. As of Sept 17th, 2013 this test is disabled |
| 425 #if (defined(OS_WIN) || defined(OS_LINUX)) | 425 // on Windows due to flakines, see http://crbug.com/293445. |
| 426 |
| 427 #if defined(OS_LINUX) |
| 426 | 428 |
| 427 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, PointerLock) { | 429 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, PointerLock) { |
| 428 SetupTest("web_view/pointer_lock", | 430 SetupTest("web_view/pointer_lock", |
| 429 "/extensions/platform_apps/web_view/pointer_lock/guest.html"); | 431 "/extensions/platform_apps/web_view/pointer_lock/guest.html"); |
| 430 | 432 |
| 431 // Move the mouse over the Lock Pointer button. | 433 // Move the mouse over the Lock Pointer button. |
| 432 ASSERT_TRUE(ui_test_utils::SendMouseMoveSync( | 434 ASSERT_TRUE(ui_test_utils::SendMouseMoveSync( |
| 433 gfx::Point(corner().x() + 75, corner().y() + 25))); | 435 gfx::Point(corner().x() + 75, corner().y() + 25))); |
| 434 | 436 |
| 435 // Click the Lock Pointer button. The first two times the button is clicked | 437 // Click the Lock Pointer button. The first two times the button is clicked |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 704 | 706 |
| 705 ASSERT_TRUE(ready_back_key_listener.WaitUntilSatisfied()); | 707 ASSERT_TRUE(ready_back_key_listener.WaitUntilSatisfied()); |
| 706 SendBackShortcutToPlatformApp(); | 708 SendBackShortcutToPlatformApp(); |
| 707 | 709 |
| 708 ASSERT_TRUE(ready_forward_key_listener.WaitUntilSatisfied()); | 710 ASSERT_TRUE(ready_forward_key_listener.WaitUntilSatisfied()); |
| 709 SendForwardShortcutToPlatformApp(); | 711 SendForwardShortcutToPlatformApp(); |
| 710 | 712 |
| 711 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 713 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
| 712 } | 714 } |
| 713 | 715 |
| 716 // Fail at least once a day on Windows. See http://crbug.com/293445. |
| 717 #if defined(OS_WIN) |
| 718 #define MAYBE_PointerLock_PointerLockLostWithFocus \ |
| 719 DISABLED_PointerLock_PointerLockLostWithFocus |
| 720 #else |
| 721 #define MAYBE_PointerLock_PointerLockLostWithFocus \ |
| 722 PointerLock_PointerLockLostWithFocus |
| 723 #endif |
| 724 |
| 714 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, | 725 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
| 715 PointerLock_PointerLockLostWithFocus) { | 726 MAYBE_PointerLock_PointerLockLostWithFocus) { |
| 716 TestHelper("testPointerLockLostWithFocus", "web_view/pointerlock"); | 727 TestHelper("testPointerLockLostWithFocus", "web_view/pointerlock"); |
| 717 } | 728 } |
| OLD | NEW |