| Index: chrome/browser/ui/search/instant_extended_browsertest.cc
|
| diff --git a/chrome/browser/ui/search/instant_extended_browsertest.cc b/chrome/browser/ui/search/instant_extended_browsertest.cc
|
| index 2921662fa6bd3cb6dd52b7bf7c6665cb473adb94..93ff33d0b0c51032451abf3a10e0d172fd9c8f4d 100644
|
| --- a/chrome/browser/ui/search/instant_extended_browsertest.cc
|
| +++ b/chrome/browser/ui/search/instant_extended_browsertest.cc
|
| @@ -1531,3 +1531,45 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedTest, HasBookmarkProvider) {
|
|
|
| EXPECT_TRUE(found_bookmark_match);
|
| }
|
| +
|
| +// Test that if Instant alters the input from URL to search, it's respected.
|
| +IN_PROC_BROWSER_TEST_F(InstantExtendedTest, InputChangedFromURLToSearch) {
|
| + ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
|
| + FocusOmniboxAndWaitForInstantExtendedSupport();
|
| +
|
| + content::WebContents* overlay = instant()->GetOverlayContents();
|
| + EXPECT_TRUE(ExecuteScript("suggestions = ['mcqueen.com'];"));
|
| +
|
| + SetOmniboxTextAndWaitForOverlayToShow("lightning");
|
| + EXPECT_EQ("lightning", GetOmniboxText());
|
| +
|
| + SendDownArrow();
|
| + EXPECT_EQ("mcqueen.com", GetOmniboxText());
|
| +
|
| + // Press Enter.
|
| + browser()->window()->GetLocationBar()->AcceptInput();
|
| +
|
| + // Confirm that the Instant overlay was committed.
|
| + EXPECT_EQ(overlay, browser()->tab_strip_model()->GetActiveWebContents());
|
| +}
|
| +
|
| +// Test that if Instant alters the input from search to URL, it's respected.
|
| +IN_PROC_BROWSER_TEST_F(InstantExtendedTest, InputChangedFromSearchToURL) {
|
| + ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
|
| + FocusOmniboxAndWaitForInstantExtendedSupport();
|
| +
|
| + content::WebContents* overlay = instant()->GetOverlayContents();
|
| + EXPECT_TRUE(ExecuteScript("suggestionType = 1;")); // INSTANT_SUGGESTION_URL
|
| +
|
| + SetOmniboxTextAndWaitForOverlayToShow("mack.com");
|
| + EXPECT_EQ("mack.com", GetOmniboxText());
|
| +
|
| + SendDownArrow();
|
| + EXPECT_EQ("result 1", GetOmniboxText());
|
| +
|
| + // Press Enter.
|
| + browser()->window()->GetLocationBar()->AcceptInput();
|
| +
|
| + // Confirm that the Instant overlay was NOT committed.
|
| + EXPECT_NE(overlay, browser()->tab_strip_model()->GetActiveWebContents());
|
| +}
|
|
|