Remove Instant hooks from SearchProvider.

chrome/browser/autocomplete/search_provider_unittest.cc

 // Copyright 2012 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 "chrome/browser/autocomplete/search_provider.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/search/search.h"
 #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/common/instant_types.h"
 #include "chrome/common/metrics/entropy_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
@@ skipping 240 matching lines @@
   // URLFetchers runs.
   message_loop_.RunUntilIdle();
 }
 
 void SearchProviderTest::QueryForInputAndSetWYTMatch(
     const string16& text,
     AutocompleteMatch* wyt_match) {
   QueryForInput(text, false, false);
   profile_.BlockUntilHistoryProcessesPendingRequests();
   ASSERT_NO_FATAL_FAILURE(FinishDefaultSuggestQuery());
-  EXPECT_NE(chrome::IsInstantExtendedAPIEnabled(), provider_->done());
   if (!wyt_match)
     return;
   ASSERT_GE(provider_->matches().size(), 1u);
   EXPECT_TRUE(FindMatchWithDestination(GURL(
       default_t_url_->url_ref().ReplaceSearchTerms(
           TemplateURLRef::SearchTermsArgs(text))),
       wyt_match));
 }
 
 void SearchProviderTest::TearDown() {
@@ skipping 203 matching lines @@
   for (size_t i = 0; i < arraysize(inputs); ++i) {
     QueryForInput(ASCIIToUTF16(inputs[i]), false, false);
     // Make sure the default providers suggest service was not queried.
     ASSERT_TRUE(test_factory_.GetFetcherByID(
         SearchProvider::kDefaultProviderURLFetcherID) == NULL);
     // Run till the history results complete.
     RunTillProviderDone();
   }
 }
 
-// Make sure FinalizeInstantQuery works.
-TEST_F(SearchProviderTest, FinalizeInstantQuery) {
-  chrome::EnableInstantExtendedAPIForTesting();
-
-  ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("foo"),
-                                                      NULL));
-
-  // Tell the provider Instant is done.
-  provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"),
-                                  InstantSuggestion(ASCIIToUTF16("bar"),
-                                                    INSTANT_COMPLETE_NOW,
-                                                    INSTANT_SUGGESTION_SEARCH,
-                                                    string16(),
-                                                    kNoMatchIndex));
-
-  // The provider should now be done.
-  EXPECT_TRUE(provider_->done());
-
-  // There should be two matches, one for what you typed, the other for
-  // 'foobar'.
-  EXPECT_EQ(2u, provider_->matches().size());
-  GURL instant_url(default_t_url_->url_ref().ReplaceSearchTerms(
-      TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("foobar"))));
-  AutocompleteMatch instant_match;
-  EXPECT_TRUE(FindMatchWithDestination(instant_url, &instant_match));
-
-  // And the 'foobar' 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.
-  AutocompleteMatch wyt_match;
-  EXPECT_TRUE(FindMatchWithDestination(
-      GURL(default_t_url_->url_ref().ReplaceSearchTerms(
-          TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("foo")))),
-          &wyt_match));
-  EXPECT_TRUE(wyt_match.description.empty());
-
-  // Instant search suggestions should be ranked above verbatim matches.
-  EXPECT_GT(instant_match.relevance, wyt_match.relevance);
-}
-
-// Make sure FinalizeInstantQuery works with URL suggestions.
-TEST_F(SearchProviderTest, FinalizeInstantURL) {
-  chrome::EnableInstantExtendedAPIForTesting();
-
-  ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("ex"),
-                                                      NULL));
-
-  // Tell the provider Instant is done.
-  provider_->FinalizeInstantQuery(ASCIIToUTF16("ex"),
-                                  InstantSuggestion(
-                                      ASCIIToUTF16("http://example.com/"),
-                                      INSTANT_COMPLETE_NOW,
-                                      INSTANT_SUGGESTION_URL,
-                                      string16(),
-                                      kNoMatchIndex));
-
-  // The provider should now be done.
-  EXPECT_TRUE(provider_->done());
-
-  // There should be two matches, one for what you typed, the other for
-  // "http://example.com/".
-  EXPECT_EQ(2u, provider_->matches().size());
-  GURL instant_url("http://example.com");
-  AutocompleteMatch instant_match;
-  EXPECT_TRUE(FindMatchWithDestination(instant_url, &instant_match));
-
-  // 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.
-  AutocompleteMatch wyt_match;
-  EXPECT_TRUE(FindMatchWithDestination(
-      GURL(default_t_url_->url_ref().ReplaceSearchTerms(
-          TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("ex")))),
-          &wyt_match));
-  EXPECT_TRUE(wyt_match.description.empty());
-
-  // The Instant URL should be more relevant.
-  EXPECT_GT(instant_match.relevance, wyt_match.relevance);
-}
-
-// An Instant URL suggestion should behave the same way whether the input text
-// is classified as UNKNOWN or as an URL. Otherwise if the user types
-// "example.co" url-what-you-typed will displace the Instant suggestion for
-// "example.com".
-TEST_F(SearchProviderTest, FinalizeInstantURLWithURLText) {
-  chrome::EnableInstantExtendedAPIForTesting();
-
-  ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(
-      ASCIIToUTF16("example.co"), NULL));
-
-  // Tell the provider Instant is done.
-  provider_->FinalizeInstantQuery(ASCIIToUTF16("example.co"),
-                                  InstantSuggestion(
-                                      ASCIIToUTF16("http://example.com/"),
-                                      INSTANT_COMPLETE_NOW,
-                                      INSTANT_SUGGESTION_URL,
-                                      string16(),
-                                      kNoMatchIndex));
-
-  // The provider should now be done.
-  EXPECT_TRUE(provider_->done());
-
-  // There should be two matches, one for what you typed, the other for
-  // "http://example.com/".
-  EXPECT_EQ(2u, provider_->matches().size());
-  GURL instant_url("http://example.com");
-  AutocompleteMatch instant_match;
-  EXPECT_TRUE(FindMatchWithDestination(instant_url, &instant_match));
-
-  // 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.
-  EXPECT_GT(instant_match.relevance,
-            HistoryURLProvider::kScoreForWhatYouTypedResult);
-}
-
-// Make sure that if FinalizeInstantQuery is invoked before suggest results
-// return, the suggest text from FinalizeInstantQuery is remembered.
-TEST_F(SearchProviderTest, RememberInstantQuery) {
-  chrome::EnableInstantExtendedAPIForTesting();
-
-  QueryForInput(ASCIIToUTF16("foo"), false, false);
-
-  // Finalize the Instant query immediately.
-  provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"),
-                                  InstantSuggestion(ASCIIToUTF16("bar"),
-                                                    INSTANT_COMPLETE_NOW,
-                                                    INSTANT_SUGGESTION_SEARCH,
-                                                    string16(),
-                                                    kNoMatchIndex));
-
-  // There should be two matches, one for what you typed, the other for
-  // 'foobar'.
-  EXPECT_EQ(2u, provider_->matches().size());
-  GURL instant_url(default_t_url_->url_ref().ReplaceSearchTerms(
-      TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("foobar"))));
-  AutocompleteMatch instant_match;
-  EXPECT_TRUE(FindMatchWithDestination(instant_url, &instant_match));
-
-  // Wait until history and the suggest query complete.
-  profile_.BlockUntilHistoryProcessesPendingRequests();
-  ASSERT_NO_FATAL_FAILURE(FinishDefaultSuggestQuery());
-
-  // Provider should be done.
-  EXPECT_TRUE(provider_->done());
-
-  // There should be two matches, one for what you typed, the other for
-  // 'foobar'.
-  EXPECT_EQ(2u, provider_->matches().size());
-  EXPECT_TRUE(FindMatchWithDestination(instant_url, &instant_match));
-
-  // And the 'foobar' match should not have a description, it'll be set later.
-  EXPECT_TRUE(instant_match.description.empty());
-}
-
-// Make sure that if trailing whitespace is added to the text supplied to
-// AutocompleteInput the default suggest text is cleared.
-TEST_F(SearchProviderTest, DifferingText) {
-  chrome::EnableInstantExtendedAPIForTesting();
-
-  ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("foo"),
-                                                      NULL));
-
-  // Finalize the Instant query immediately.
-  provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"),
-                                  InstantSuggestion(ASCIIToUTF16("bar"),
-                                                    INSTANT_COMPLETE_NOW,
-                                                    INSTANT_SUGGESTION_SEARCH,
-                                                    string16(),
-                                                    kNoMatchIndex));
-
-  // Query with the same input text, but trailing whitespace.
-  AutocompleteMatch instant_match;
-  ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("foo "),
-                                                      &instant_match));
-
-  // There should only one match, for what you typed.
-  EXPECT_EQ(1u, provider_->matches().size());
-  EXPECT_FALSE(instant_match.destination_url.is_empty());
-}
-
 TEST_F(SearchProviderTest, DontAutocompleteURLLikeTerms) {
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       &profile_, &AutocompleteClassifierFactory::BuildInstanceFor);
   GURL url = AddSearchToHistory(default_t_url_,
                                 ASCIIToUTF16("docs.google.com"), 1);
 
   // Add the term as a url.
   HistoryServiceFactory::GetForProfile(&profile_, Profile::EXPLICIT_ACCESS)->
       AddPageWithDetails(GURL("http://docs.google.com"), string16(), 1, 1,
                          base::Time::Now(), false, history::SOURCE_BROWSED);
@@ skipping 944 matching lines @@
     }
     // Ensure that no expected matches are missing.
     for (; j < ARRAYSIZE_UNSAFE(cases[i].matches); ++j)
       EXPECT_EQ(kNotApplicable, cases[i].matches[j].contents) <<
           "Case # " << i << " " << description;
   }
 }
 
 TEST_F(SearchProviderTest, LocalAndRemoteRelevances) {
   // Enable Instant Extended in order to allow an increased number of
-  // suggestions.  Unfortunately this requires us to call FinalizeInstantQuery()
-  // every time.
+  // suggestions.
   chrome::EnableInstantExtendedAPIForTesting();
 
   // We hardcode the string "term1" below, so ensure that the search term that
   // got added to history already is that string.
   ASSERT_EQ(ASCIIToUTF16("term1"), term1_);
   string16 term = term1_.substr(0, term1_.length() - 1);
 
   AddSearchToHistory(default_t_url_, term + ASCIIToUTF16("2"), 2);
   profile_.BlockUntilHistoryProcessesPendingRequests();
 
@@ skipping 57 matching lines @@
        "{\"google:suggesttype\":[\"QUERY\", \"QUERY\", \"NAVIGATION\","
                                 "\"NAVIGATION\"],"
         // A verbatim query for URL-like input scores 850, so the navigation
         // scores here should bracket it.
         "\"google:suggestrelevance\":[9999, 9998, 900, 800]}]",
       { "a.com/1", "a.com", "a.com/2", "a1", kNotApplicable, kNotApplicable } },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
     QueryForInput(cases[i].input, false, false);
-    provider_->FinalizeInstantQuery(string16(), InstantSuggestion());
     net::TestURLFetcher* fetcher = WaitUntilURLFetcherIsReady(
         SearchProvider::kDefaultProviderURLFetcherID);
     ASSERT_TRUE(fetcher);
     fetcher->set_response_code(200);
     fetcher->SetResponseString(cases[i].json);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
     RunTillProviderDone();
 
     const std::string description = "for input with json=" + cases[i].json;
     const ACMatches& matches = provider_->matches();
@@ skipping 520 matching lines @@
       } else {
         ASSERT_NE(sug_end, sug_it) << "Failed to find " << suggestion;
         EXPECT_EQ(ASCIIToUTF16(suggestion), sug_it->suggestion());
         ++sug_it;
       }
     }
     EXPECT_EQ(sug_end, sug_it);
     EXPECT_EQ(nav_end, nav_it);
   }
 }