Introduce AutocompleteProviderDelegate

chrome/browser/autocomplete/zero_suggest_provider.cc

Index: chrome/browser/autocomplete/zero_suggest_provider.cc
diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc
index 688677023c0f752fbed0d8be82ddfe147906b7f4..9820e7166af990447b83d8742933134428d51d9c 100644
--- a/chrome/browser/autocomplete/zero_suggest_provider.cc
+++ b/chrome/browser/autocomplete/zero_suggest_provider.cc
@@ -16,6 +16,7 @@
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
+#include "chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/autocomplete/search_provider.h"
@@ -118,7 +119,7 @@ void ZeroSuggestProvider::Start(const AutocompleteInput& input,
   // No need to send the current page URL in personalized suggest field trial.
   if (CanSendURL(input.current_url(), suggest_url, default_provider,
                  current_page_classification_,
-                 template_url_service_->search_terms_data(), profile_) &&
+                 template_url_service_->search_terms_data(), delegate_.get()) &&
       !OmniboxFieldTrial::InZeroSuggestPersonalizedFieldTrial()) {
     // Update suggest_url to include the current_page_url.
     search_term_args.current_page_url = current_query_;
@@ -183,9 +184,12 @@ ZeroSuggestProvider::ZeroSuggestProvider(
   AutocompleteProviderListener* listener,
   TemplateURLService* template_url_service,
   Profile* profile)
-    : BaseSearchProvider(template_url_service, profile,
+    : BaseSearchProvider(template_url_service,
+                         scoped_ptr<AutocompleteProviderDelegate>(
+                             new ChromeAutocompleteProviderDelegate(profile)),
                          AutocompleteProvider::TYPE_ZERO_SUGGEST),
       listener_(listener),
+      profile_(profile),
       results_from_cache_(false),
       weak_ptr_factory_(this) {
 }
@@ -426,7 +430,8 @@ bool ZeroSuggestProvider::CanShowZeroSuggestWithoutSendingURL(
   if (!ZeroSuggestEnabled(suggest_url,
                           template_url_service_->GetDefaultSearchProvider(),
                           current_page_classification_,
-                          template_url_service_->search_terms_data(), profile_))
+                          template_url_service_->search_terms_data(),
+                          delegate_.get()))
     return false;
 
   // If we cannot send URLs, then only the MostVisited and Personalized