Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc

Issue 2715213009: Re-enable FocusBeforeNavigation test. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 // Wait for page to receive (successful) mouse unlock response. 651 // Wait for page to receive (successful) mouse unlock response.
652 ASSERT_TRUE(unlocked_listener.WaitUntilSatisfied()); 652 ASSERT_TRUE(unlocked_listener.WaitUntilSatisfied());
653 } 653 }
654 654
655 #endif // defined(OS_LINUX) 655 #endif // defined(OS_LINUX)
656 656
657 // Tests that if a <webview> is focused before navigation then the guest starts 657 // Tests that if a <webview> is focused before navigation then the guest starts
658 // off focused. 658 // off focused.
659 IN_PROC_BROWSER_TEST_P(WebViewFocusInteractiveTest, 659 IN_PROC_BROWSER_TEST_P(WebViewFocusInteractiveTest,
660 Focus_FocusBeforeNavigation) { 660 Focus_FocusBeforeNavigation) {
661 // TODO(avallee): Determine if test is relevant with OOPIF or fix the bug.
662 // http://crbug.com/672947
663 if (GetParam())
664 return;
665 TestHelper("testFocusBeforeNavigation", "web_view/focus", NO_TEST_SERVER); 661 TestHelper("testFocusBeforeNavigation", "web_view/focus", NO_TEST_SERVER);
666 } 662 }
667 663
668 // Tests that setting focus on the <webview> sets focus on the guest. 664 // Tests that setting focus on the <webview> sets focus on the guest.
669 IN_PROC_BROWSER_TEST_P(WebViewFocusInteractiveTest, Focus_FocusEvent) { 665 IN_PROC_BROWSER_TEST_P(WebViewFocusInteractiveTest, Focus_FocusEvent) {
670 TestHelper("testFocusEvent", "web_view/focus", NO_TEST_SERVER); 666 TestHelper("testFocusEvent", "web_view/focus", NO_TEST_SERVER);
671 } 667 }
672 668
673 IN_PROC_BROWSER_TEST_P(WebViewFocusInteractiveTest, Focus_FocusTracksEmbedder) { 669 IN_PROC_BROWSER_TEST_P(WebViewFocusInteractiveTest, Focus_FocusTracksEmbedder) {
674 content::WebContents* embedder_web_contents = NULL; 670 content::WebContents* embedder_web_contents = NULL;
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( 1504 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
1509 GetPlatformAppWindow(), ui::VKEY_Z, false, false, false, false)); 1505 GetPlatformAppWindow(), ui::VKEY_Z, false, false, false, false));
1510 1506
1511 next_step_listener.Reset(); 1507 next_step_listener.Reset();
1512 EXPECT_TRUE(content::ExecuteScript( 1508 EXPECT_TRUE(content::ExecuteScript(
1513 embedder_web_contents(), 1509 embedder_web_contents(),
1514 "window.runCommand('testKeyboardFocusRunNextStep', 'aBcxYz');")); 1510 "window.runCommand('testKeyboardFocusRunNextStep', 'aBcxYz');"));
1515 1511
1516 ASSERT_TRUE(next_step_listener.WaitUntilSatisfied()); 1512 ASSERT_TRUE(next_step_listener.WaitUntilSatisfied());
1517 } 1513 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698