| Index: chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
|
| diff --git a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
|
| index 608fd6f008c1e22ff983efb4e2843a8e276535f7..c2b0dc09cd52a72ddb1833ca2171a0d22214f048 100644
|
| --- a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
|
| +++ b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
|
| @@ -514,6 +514,7 @@ class WebViewInteractiveTest : public WebViewInteractiveTestBase,
|
| };
|
|
|
| class WebViewNewWindowInteractiveTest : public WebViewInteractiveTest {};
|
| +class WebViewPointerLockInteractiveTest : public WebViewInteractiveTest {};
|
|
|
| // The tests below aren't needed in --use-cross-process-frames-for-guests.
|
| class WebViewContextMenuInteractiveTest : public WebViewInteractiveTestBase {};
|
| @@ -523,7 +524,6 @@ class WebViewContextMenuInteractiveTest : public WebViewInteractiveTestBase {};
|
| // with WebViewInteractiveTest (see crbug.com/582562).
|
| class WebViewFocusInteractiveTest : public WebViewInteractiveTestBase {};
|
| class WebViewPopupInteractiveTest : public WebViewInteractiveTestBase {};
|
| -class WebViewPointerLockInteractiveTest : public WebViewInteractiveTestBase {};
|
| class WebViewDragDropInteractiveTest : public WebViewInteractiveTestBase {};
|
|
|
| INSTANTIATE_TEST_CASE_P(WebViewInteractiveTests,
|
| @@ -534,6 +534,10 @@ INSTANTIATE_TEST_CASE_P(WebViewInteractiveTests,
|
| WebViewNewWindowInteractiveTest,
|
| testing::Bool());
|
|
|
| +INSTANTIATE_TEST_CASE_P(WebViewInteractiveTests,
|
| + WebViewPointerLockInteractiveTest,
|
| + testing::Bool());
|
| +
|
| // ui_test_utils::SendMouseMoveSync doesn't seem to work on OS_MACOSX, and
|
| // likely won't work on many other platforms as well, so for now this test
|
| // is for Windows and Linux only. As of Sept 17th, 2013 this test is disabled
|
| @@ -544,7 +548,7 @@ INSTANTIATE_TEST_CASE_P(WebViewInteractiveTests,
|
|
|
| #if defined(OS_LINUX)
|
| // flaky http://crbug.com/412086
|
| -IN_PROC_BROWSER_TEST_F(WebViewPointerLockInteractiveTest,
|
| +IN_PROC_BROWSER_TEST_P(WebViewPointerLockInteractiveTest,
|
| DISABLED_PointerLock) {
|
| SetupTest("web_view/pointer_lock",
|
| "/extensions/platform_apps/web_view/pointer_lock/guest.html");
|
| @@ -618,7 +622,7 @@ IN_PROC_BROWSER_TEST_F(WebViewPointerLockInteractiveTest,
|
| }
|
|
|
| // flaky http://crbug.com/412086
|
| -IN_PROC_BROWSER_TEST_F(WebViewPointerLockInteractiveTest,
|
| +IN_PROC_BROWSER_TEST_P(WebViewPointerLockInteractiveTest,
|
| DISABLED_PointerLockFocus) {
|
| SetupTest("web_view/pointer_lock_focus",
|
| "/extensions/platform_apps/web_view/pointer_lock_focus/guest.html");
|
| @@ -1106,7 +1110,7 @@ IN_PROC_BROWSER_TEST_P(WebViewInteractiveTest, Navigation_BackForwardKeys) {
|
| ASSERT_TRUE(done_listener.WaitUntilSatisfied());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebViewPointerLockInteractiveTest,
|
| +IN_PROC_BROWSER_TEST_P(WebViewPointerLockInteractiveTest,
|
| PointerLock_PointerLockLostWithFocus) {
|
| TestHelper("testPointerLockLostWithFocus",
|
| "web_view/pointerlock",
|
|
|