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..8d1d187eb57f782175aa59ff664b8f568898dfb1 100644
--- a/components/omnibox/base_search_provider.h
+++ b/components/omnibox/base_search_provider.h
@@ -50,7 +50,7 @@ class BaseSearchProvider : public AutocompleteProvider {
   static const int kDeletionURLFetcherID;
 
   BaseSearchProvider(TemplateURLService* template_url_service,
-                     scoped_ptr<AutocompleteProviderClient> client,
+                     AutocompleteProviderClient* client,
                      AutocompleteProvider::Type type);

[Peter Kasting, 2015/06/16 00:03:43]

Nit: For consistency with HistoryProvider, I'd order these (type, client,
template_url_service).

[blundell, 2015/06/16 07:21:25]

Done.

 
   // Returns whether |match| is flagged as a query that should be prefetched.
@@ -221,7 +221,7 @@ class BaseSearchProvider : public AutocompleteProvider {
   virtual void RecordDeletionResult(bool success) = 0;
 
   TemplateURLService* template_url_service_;
-  scoped_ptr<AutocompleteProviderClient> client_;
+  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