Prepare HistoryProvider for componentization

components/omnibox/search_provider.cc

Index: components/omnibox/search_provider.cc
diff --git a/components/omnibox/search_provider.cc b/components/omnibox/search_provider.cc
index e97e7f09302160f4873e7784974334e0ab634d8f..974825e2b630652754a4d0770bea05089393631a 100644
--- a/components/omnibox/search_provider.cc
+++ b/components/omnibox/search_provider.cc
@@ -118,12 +118,12 @@ class SearchProvider::CompareScoredResults {
 
 // SearchProvider -------------------------------------------------------------
 
-SearchProvider::SearchProvider(
-    AutocompleteProviderListener* listener,
-    TemplateURLService* template_url_service,
-    scoped_ptr<AutocompleteProviderClient> client)
-    : BaseSearchProvider(template_url_service, client.Pass(),
-                         AutocompleteProvider::TYPE_SEARCH),
+SearchProvider::SearchProvider(AutocompleteProviderClient* client,
+                               AutocompleteProviderListener* listener,
+                               TemplateURLService* template_url_service)
+    : BaseSearchProvider(AutocompleteProvider::TYPE_SEARCH,
+                         client,
+                         template_url_service),
       listener_(listener),
       providers_(template_url_service),
       answers_cache_(10) {
@@ -850,7 +850,7 @@ scoped_ptr<net::URLFetcher> SearchProvider::CreateSuggestFetcher(
   // the user is in the field trial.
   if (CanSendURL(current_page_url_, suggest_url, template_url,
                  input.current_page_classification(),
-                 template_url_service_->search_terms_data(), client_.get()) &&
+                 template_url_service_->search_terms_data(), client_) &&
       OmniboxFieldTrial::InZeroSuggestAfterTypingFieldTrial()) {
     search_term_args.current_page_url = current_page_url_.spec();
     // Create the suggest URL again with the current page URL.