Prepare HistoryProvider for componentization

components/omnibox/base_search_provider.cc

Index: components/omnibox/base_search_provider.cc
diff --git a/components/omnibox/base_search_provider.cc b/components/omnibox/base_search_provider.cc
index dbbedd4c4cb859762828bcba80c003704c3292c6..1964eb927f2b52dd0e07e86712458e4f8c277ff1 100644
--- a/components/omnibox/base_search_provider.cc
+++ b/components/omnibox/base_search_provider.cc
@@ -81,13 +81,13 @@ const int BaseSearchProvider::kDefaultProviderURLFetcherID = 1;
 const int BaseSearchProvider::kKeywordProviderURLFetcherID = 2;
 const int BaseSearchProvider::kDeletionURLFetcherID = 3;
 
-BaseSearchProvider::BaseSearchProvider(
-    TemplateURLService* template_url_service,
-    scoped_ptr<AutocompleteProviderClient> client,
-    AutocompleteProvider::Type type)
+BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type,
+                                       AutocompleteProviderClient* client,
+
+                                       TemplateURLService* template_url_service)
     : AutocompleteProvider(type),
+      client_(client),
       template_url_service_(template_url_service),
-      client_(client.Pass()),
       field_trial_triggered_(false),
       field_trial_triggered_in_session_(false) {
 }