Instant: Use only one hidden WebContents per profile.

chrome/browser/autocomplete/search_provider_unittest.cc

Index: chrome/browser/autocomplete/search_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index 44af16b695552f8645d9518a3b2106f7bc98bb71..c8203a0f512f15db435d86f06ea33a3288ad4ac4 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -24,7 +24,7 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/ui/browser_instant_controller.h"
+#include "chrome/browser/ui/search/search.h"
 #include "chrome/common/metrics/entropy_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ -274,8 +274,7 @@ void SearchProviderTest::QueryForInputAndSetWYTMatch(
   QueryForInput(text, string16(), false);
   profile_.BlockUntilHistoryProcessesPendingRequests();
   ASSERT_NO_FATAL_FAILURE(FinishDefaultSuggestQuery());
-  EXPECT_NE(chrome::BrowserInstantController::IsInstantEnabled(&profile_),
-            provider_->done());
+  EXPECT_NE(chrome::search::IsInstantEnabled(&profile_), provider_->done());
   if (!wyt_match)
     return;
   ASSERT_GE(provider_->matches().size(), 1u);
@@ -506,11 +505,11 @@ TEST_F(SearchProviderTest, FinalizeInstantQuery) {
   ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("foo"),
                                                       NULL));
 
-  // Tell the provider instant is done.
+  // Tell the provider Instant is done.
   provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"),
                                   InstantSuggestion(ASCIIToUTF16("bar"),
                                                     INSTANT_COMPLETE_NOW,
-                                                    INSTANT_SUGGESTION_SEARCH));
+                                                    false));
 
   // The provider should now be done.
   EXPECT_TRUE(provider_->done());
@@ -534,7 +533,7 @@ TEST_F(SearchProviderTest, FinalizeInstantQuery) {
           &wyt_match));
   EXPECT_TRUE(wyt_match.description.empty());
 
-  // The instant search should be more relevant.
+  // The Instant search should be more relevant.
   EXPECT_GT(instant_match.relevance, wyt_match.relevance);
 }
 
@@ -546,12 +545,12 @@ TEST_F(SearchProviderTest, FinalizeInstantURL) {
   ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("ex"),
                                                       NULL));
 
-  // Tell the provider instant is done.
+  // Tell the provider Instant is done.
   provider_->FinalizeInstantQuery(ASCIIToUTF16("ex"),
                                   InstantSuggestion(
                                       ASCIIToUTF16("http://example.com/"),
                                       INSTANT_COMPLETE_NOW,
-                                      INSTANT_SUGGESTION_URL));
+                                      true));
 
   // The provider should now be done.
   EXPECT_TRUE(provider_->done());
@@ -563,7 +562,7 @@ TEST_F(SearchProviderTest, FinalizeInstantURL) {
   AutocompleteMatch instant_match;
   EXPECT_TRUE(FindMatchWithDestination(instant_url, &instant_match));
 
-  // The instant match should not have a description, it'll be set later.
+  // The Instant match should not have a description, it'll be set later.
   EXPECT_TRUE(instant_match.description.empty());
 
   // Make sure the what you typed match has no description.
@@ -574,7 +573,7 @@ TEST_F(SearchProviderTest, FinalizeInstantURL) {
           &wyt_match));
   EXPECT_TRUE(wyt_match.description.empty());
 
-  // The instant URL should be more relevant.
+  // The Instant URL should be more relevant.
   EXPECT_GT(instant_match.relevance, wyt_match.relevance);
 }
 
@@ -589,12 +588,12 @@ TEST_F(SearchProviderTest, FinalizeInstantURLWithURLText) {
   ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(
       ASCIIToUTF16("example.co"), NULL));
 
-  // Tell the provider instant is done.
+  // Tell the provider Instant is done.
   provider_->FinalizeInstantQuery(ASCIIToUTF16("example.co"),
                                   InstantSuggestion(
                                       ASCIIToUTF16("http://example.com/"),
                                       INSTANT_COMPLETE_NOW,
-                                      INSTANT_SUGGESTION_URL));
+                                      true));
 
   // The provider should now be done.
   EXPECT_TRUE(provider_->done());
@@ -606,10 +605,10 @@ TEST_F(SearchProviderTest, FinalizeInstantURLWithURLText) {
   AutocompleteMatch instant_match;
   EXPECT_TRUE(FindMatchWithDestination(instant_url, &instant_match));
 
-  // The instant match should not have a description, it'll be set later.
+  // The Instant match should not have a description, it'll be set later.
   EXPECT_TRUE(instant_match.description.empty());
 
-  // The instant URL should be more relevant than a URL_WHAT_YOU_TYPED match.
+  // The Instant URL should be more relevant than a URL_WHAT_YOU_TYPED match.
   EXPECT_GT(instant_match.relevance,
             HistoryURLProvider::kScoreForWhatYouTypedResult);
 }
@@ -622,11 +621,11 @@ TEST_F(SearchProviderTest, RememberInstantQuery) {
 
   QueryForInput(ASCIIToUTF16("foo"), string16(), false);
 
-  // Finalize the instant query immediately.
+  // Finalize the Instant query immediately.
   provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"),
                                   InstantSuggestion(ASCIIToUTF16("bar"),
                                                     INSTANT_COMPLETE_NOW,
-                                                    INSTANT_SUGGESTION_SEARCH));
+                                                    false));
 
   // There should be two matches, one for what you typed, the other for
   // 'foobar'.
@@ -661,11 +660,11 @@ TEST_F(SearchProviderTest, DifferingText) {
   ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("foo"),
                                                       NULL));
 
-  // Finalize the instant query immediately.
+  // Finalize the Instant query immediately.
   provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"),
                                   InstantSuggestion(ASCIIToUTF16("bar"),
                                                     INSTANT_COMPLETE_NOW,
-                                                    INSTANT_SUGGESTION_SEARCH));
+                                                    false));
 
   // Query with the same input text, but trailing whitespace.
   AutocompleteMatch instant_match;
@@ -961,7 +960,7 @@ TEST_F(SearchProviderTest, KeywordVerbatim) {
   RunTest(cases, arraysize(cases), true);
 }
 
-// Verifies Navsuggest results don't set a TemplateURL, which instant relies on.
+// Verifies Navsuggest results don't set a TemplateURL, which Instant relies on.
 // Also verifies that just the *first* navigational result is listed as a match
 // if suggested relevance scores were not sent.
 TEST_F(SearchProviderTest, NavSuggestNoSuggestedRelevanceScores) {