Use Instant suggested match type for Instant temporary text.

chrome/browser/ui/search/instant_extended_interactive_uitest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sstream>
 
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 468 matching lines @@
   browser()->window()->GetLocationBar()->AcceptInput();
   observer.Wait();
 
   SetOmniboxText("http");
   EXPECT_EQ("http", GetOmniboxText());
 
   SendDownArrow();
   EXPECT_EQ("result 1", GetOmniboxText());
   SendDownArrow();
   EXPECT_EQ("result 2", GetOmniboxText());
+
+  // Set the next suggestion to be of type INSTANT_SUGGESTION_URL.
+  EXPECT_TRUE(content::ExecuteScript(instant()->instant_tab()->contents(),
+                                     "suggestionType = 1;"));
   SendDownArrow();
   EXPECT_EQ("http://www.google.com", GetOmniboxText());
 
   EXPECT_TRUE(HasUserInputInProgress());
 
   EXPECT_TRUE(UpdateSearchState(instant()->instant_tab()->contents()));
   // Note the commit count is initially 1 due to the AcceptInput() call above.
   EXPECT_EQ(1, submit_count_);
 
   std::string old_query_value(query_value_);
@@ skipping 1305 matching lines @@
   EXPECT_FALSE(instant_service->IsInstantProcess(
       ntp_contents->GetRenderProcessHost()->GetID()));
   // Make sure the URL remains the same.
   EXPECT_EQ(ntp_url, ntp_contents->GetURL());
 
   // TODO(kmadhusu): In order to avoid the shutdown crashes, call SetupInstant()
   // at the end of this test. Remove the folllowing code after committing
   // 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());
+}