Prepare HistoryProvider for componentization

chrome/browser/autocomplete/zero_suggest_provider.cc

 // Copyright (c) 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/zero_suggest_provider.h"
 
 #include "base/callback.h"
 #include "base/i18n/case_conversion.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/metrics/histogram.h"
@@ skipping 58 matching lines @@
 // The maximum relevance of the top match from this provider.
 const int kDefaultVerbatimZeroSuggestRelevance = 1300;
 
 // Relevance value to use if it was not set explicitly by the server.
 const int kDefaultZeroSuggestRelevance = 100;
 
 }  // namespace
 
 // static
 ZeroSuggestProvider* ZeroSuggestProvider::Create(
+    AutocompleteProviderClient* client,
     AutocompleteProviderListener* listener,
     TemplateURLService* template_url_service,
     Profile* profile) {
-  return new ZeroSuggestProvider(listener, template_url_service, profile);
+  return new ZeroSuggestProvider(client, listener, template_url_service,
+                                 profile);
 }
 
 // static
 void ZeroSuggestProvider::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kZeroSuggestCachedResults, std::string());
 }
 
 void ZeroSuggestProvider::Start(const AutocompleteInput& input,
                                 bool minimal_changes,
@@ skipping 21 matching lines @@
   TemplateURLRef::SearchTermsArgs search_term_args(prefix);
   GURL suggest_url(default_provider->suggestions_url_ref().ReplaceSearchTerms(
       search_term_args, template_url_service_->search_terms_data()));
   if (!suggest_url.is_valid())
     return;
 
   // No need to send the current page URL in personalized suggest or
   // most visited field trials.
   if (CanSendURL(input.current_url(), suggest_url, default_provider,
                  current_page_classification_,
-                 template_url_service_->search_terms_data(), client_.get()) &&
+                 template_url_service_->search_terms_data(), client_) &&
       !OmniboxFieldTrial::InZeroSuggestPersonalizedFieldTrial() &&
       !OmniboxFieldTrial::InZeroSuggestMostVisitedFieldTrial()) {
     // Update suggest_url to include the current_page_url.
     search_term_args.current_page_url = current_query_;
     suggest_url = GURL(default_provider->suggestions_url_ref().
                        ReplaceSearchTerms(
                            search_term_args,
                            template_url_service_->search_terms_data()));
   } else if (!ShouldShowNonContextualZeroSuggest(suggest_url,
                                                  input.current_url())) {
@@ skipping 47 matching lines @@
 }
 
 void ZeroSuggestProvider::ResetSession() {
   // The user has started editing in the omnibox, so leave
   // |field_trial_triggered_in_session_| unchanged and set
   // |field_trial_triggered_| to false since zero suggest is inactive now.
   field_trial_triggered_ = false;
 }
 
 ZeroSuggestProvider::ZeroSuggestProvider(
-  AutocompleteProviderListener* listener,
-  TemplateURLService* template_url_service,
-  Profile* profile)
-    : BaseSearchProvider(template_url_service,
-                         scoped_ptr<AutocompleteProviderClient>(
-                             new ChromeAutocompleteProviderClient(profile)),
-                         AutocompleteProvider::TYPE_ZERO_SUGGEST),
+    AutocompleteProviderClient* client,
+
+    AutocompleteProviderListener* listener,
+    TemplateURLService* template_url_service,
+    Profile* profile)
+    : BaseSearchProvider(AutocompleteProvider::TYPE_ZERO_SUGGEST,
+                         client,
+                         template_url_service),
       listener_(listener),
       profile_(profile),
       results_from_cache_(false),
       waiting_for_most_visited_urls_request_(false),
       weak_ptr_factory_(this) {
 }
 
 ZeroSuggestProvider::~ZeroSuggestProvider() {
 }
 
@@ skipping 228 matching lines @@
   return results_.verbatim_relevance >= 0 ?
       results_.verbatim_relevance : kDefaultVerbatimZeroSuggestRelevance;
 }
 
 bool ZeroSuggestProvider::ShouldShowNonContextualZeroSuggest(
     const GURL& suggest_url,
     const GURL& current_page_url) const {
   if (!ZeroSuggestEnabled(suggest_url,
                           template_url_service_->GetDefaultSearchProvider(),
                           current_page_classification_,
-                          template_url_service_->search_terms_data(),
-                          client_.get()))
+                          template_url_service_->search_terms_data(), client_))
     return false;
 
   // If we cannot send URLs, then only the MostVisited and Personalized
   // variations can be shown.
   if (!OmniboxFieldTrial::InZeroSuggestMostVisitedFieldTrial() &&
       !OmniboxFieldTrial::InZeroSuggestPersonalizedFieldTrial())
     return false;
 
   // Only show zero suggest for HTTP[S] pages.
   // TODO(mariakhomenko): We may be able to expand this set to include pages
@@ skipping 21 matching lines @@
   if (!json_data.empty()) {
     scoped_ptr<base::Value> data(
         SearchSuggestionParser::DeserializeJsonData(json_data));
     if (data && ParseSuggestResults(
             *data, kDefaultZeroSuggestRelevance, false, &results_)) {
       ConvertResultsToAutocompleteMatches();
       results_from_cache_ = !matches_.empty();
     }
   }
 }