Prepare HistoryProvider for componentization

chrome/browser/autocomplete/history_url_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 453 matching lines @@
       promote_type(NEITHER),
       languages(languages),
       default_search_provider(default_search_provider ?
           new TemplateURL(default_search_provider->data()) : NULL),
       search_terms_data(new SearchTermsDataSnapshot(search_terms_data)) {
 }
 
 HistoryURLProviderParams::~HistoryURLProviderParams() {
 }
 
-HistoryURLProvider::HistoryURLProvider(AutocompleteProviderListener* listener,
-                                       Profile* profile)
-    : HistoryProvider(profile, AutocompleteProvider::TYPE_HISTORY_URL),
+HistoryURLProvider::HistoryURLProvider(
+    scoped_ptr<AutocompleteProviderClient> client,
+    AutocompleteProviderListener* listener,
+    Profile* profile)
+    : HistoryProvider(client.Pass(), AutocompleteProvider::TYPE_HISTORY_URL),
+      profile_(profile),
       listener_(listener),
       params_(NULL) {
   // Initialize HUP scoring params based on the current experiment.
   OmniboxFieldTrial::GetExperimentalHUPScoringParams(&scoring_params_);
 }
 
 void HistoryURLProvider::Start(const AutocompleteInput& input,
                                bool minimal_changes,
                                bool called_due_to_focus) {
   // NOTE: We could try hard to do less work in the |minimal_changes| case
@@ skipping 692 matching lines @@
     AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0,
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   match.description_class =
       ClassifyDescription(params.input.text(), match.description);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }