Chromium Code Reviews| Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc |
| diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc |
| index 17826259c81f170f9c3645b0c796be56ddd20f28..f984f6b8a87b90bd3d070416de707437c55d5e19 100644 |
| --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc |
| +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc |
| @@ -566,7 +566,11 @@ class OmniboxViewTest : public InProcessBrowserTest, |
| ASSERT_TRUE(popup_model->IsOpen()); |
| // ctrl-Enter triggers desired_tld feature, thus www.bar.com shall be |
| // opened. |
| - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, ui::EF_CONTROL_DOWN)); |
| + ASSERT_TRUE(SendKeyAndWait( |
| + browser(), ui::VKEY_RETURN, ui::EF_CONTROL_DOWN, |
|
Peter Kasting
2012/02/06 19:25:17
Nit: You could also put these args at the end of t
Charlie Reis
2012/02/06 19:32:47
Fixed, thanks.
|
| + content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| + content::Source<content::NavigationController>( |
| + &browser()->GetSelectedWebContents()->GetController()))); |
| GURL url = browser()->GetSelectedWebContents()->GetURL(); |
| EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str()); |
| @@ -599,7 +603,11 @@ class OmniboxViewTest : public InProcessBrowserTest, |
| popup_model->result().default_match()->type); |
| // Open the default match. |
| - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, 0)); |
| + ASSERT_TRUE(SendKeyAndWait( |
| + browser(), ui::VKEY_RETURN, 0, |
| + content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| + content::Source<content::NavigationController>( |
| + &browser()->GetSelectedWebContents()->GetController()))); |
| GURL url = browser()->GetSelectedWebContents()->GetURL(); |
| EXPECT_STREQ(kSearchTextURL, url.spec().c_str()); |
| @@ -616,7 +624,11 @@ class OmniboxViewTest : public InProcessBrowserTest, |
| popup_model->result().default_match()->type); |
| // Open the default match. |
| - ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, 0)); |
| + ASSERT_TRUE(SendKeyAndWait( |
| + browser(), ui::VKEY_RETURN, 0, |
| + content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| + content::Source<content::NavigationController>( |
| + &browser()->GetSelectedWebContents()->GetController()))); |
| url = browser()->GetSelectedWebContents()->GetURL(); |
| EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str()); |
| } |
| @@ -1157,12 +1169,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, AltEnter) { |
| AltEnterTest(); |
| } |
| -// DISABLED http://crbug.com/80118 |
| -#if defined(OS_LINUX) |
| -IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EnterToSearch) { |
| -#else |
| IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EnterToSearch) { |
| -#endif // OS_LINUX |
| EnterToSearchTest(); |
| } |