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

Unified Diff: chrome/browser/ui/search/instant_extended_interactive_uitest.cc

Issue 13141002: Use Instant suggested match type for Instant temporary text. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: static Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/search/instant_extended_interactive_uitest.cc
diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index 811078def3e30693300ca19d2a775d805dbd6086..f24809c97f5f6a9426c0a99aa35b93d87bf9a4ba 100644
--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -1811,3 +1811,45 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OnDefaultSearchProviderChanged) {
// codereview.chromium.org/13873010.
ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
}
+
+// 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());
+}

Powered by Google App Engine
This is Rietveld 408576698