Prepare HistoryProvider for componentization

components/omnibox/base_search_provider.h

Index: components/omnibox/base_search_provider.h
diff --git a/components/omnibox/base_search_provider.h b/components/omnibox/base_search_provider.h
index a709e8c42d09d8f42087227e9cd241832f879ddd..25d0fe64237008db2cf0256e6cb52c9fc9f2e21c 100644
--- a/components/omnibox/base_search_provider.h
+++ b/components/omnibox/base_search_provider.h
@@ -49,9 +49,9 @@ class BaseSearchProvider : public AutocompleteProvider {
   // ID used in creating URLFetcher for deleting suggestion results.
   static const int kDeletionURLFetcherID;
 
-  BaseSearchProvider(TemplateURLService* template_url_service,
-                     scoped_ptr<AutocompleteProviderClient> client,
-                     AutocompleteProvider::Type type);
+  BaseSearchProvider(AutocompleteProvider::Type type,
+                     AutocompleteProviderClient* client,
+                     TemplateURLService* template_url_service);
 
   // Returns whether |match| is flagged as a query that should be prefetched.
   static bool ShouldPrefetch(const AutocompleteMatch& match);
@@ -220,8 +220,8 @@ class BaseSearchProvider : public AutocompleteProvider {
   // Records in UMA whether the deletion request resulted in success.
   virtual void RecordDeletionResult(bool success) = 0;
 
+  AutocompleteProviderClient* client_;
   TemplateURLService* template_url_service_;
-  scoped_ptr<AutocompleteProviderClient> client_;
 
   // Whether a field trial, if any, has triggered in the most recent
   // autocomplete query. This field is set to true only if the suggestion