Prepare HistoryProvider for componentization

components/omnibox/search_provider.cc

 // Copyright 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 "components/omnibox/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/base64.h"
@@ skipping 100 matching lines @@
   bool operator()(const SearchSuggestionParser::Result& a,
                   const SearchSuggestionParser::Result& b) {
     // Sort in descending relevance order.
     return a.relevance() > b.relevance();
   }
 };
 
 
 // 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) {
   // |template_url_service_| can be null in tests.
   if (template_url_service_)
     template_url_service_->AddObserver(this);
 }
 
 // static
 std::string SearchProvider::GetSuggestMetadata(const AutocompleteMatch& match) {
@@ skipping 706 matching lines @@
   }
   GURL suggest_url(template_url->suggestions_url_ref().ReplaceSearchTerms(
       search_term_args,
       providers_.template_url_service()->search_terms_data()));
   if (!suggest_url.is_valid())
     return NULL;
   // Send the current page URL if user setting and URL requirements are met and
   // 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.
     suggest_url = GURL(template_url->suggestions_url_ref().ReplaceSearchTerms(
         search_term_args,
         providers_.template_url_service()->search_terms_data()));
   }
 
   LogOmniboxSuggestRequest(REQUEST_SENT);
 
@@ skipping 648 matching lines @@
   for (MatchMap::const_iterator i(map.begin()); i != map.end(); ++i)
     matches.push_back(i->second);
   std::sort(matches.begin(), matches.end(), &AutocompleteMatch::MoreRelevant);
 
   // If there is a top scoring entry, find the corresponding answer.
   if (!matches.empty())
     return answers_cache_.GetTopAnswerEntry(matches[0].contents);
 
   return AnswersQueryData();
 }