Prepare HistoryProvider for componentization

components/omnibox/search_provider.h

 // 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all autocomplete entries that start with "Search <engine>
 // for ...", including searching for the current input string, search
 // history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
@@ skipping 36 matching lines @@
 // matches (either synchronously or asynchronously).
 //
 // Initially the provider creates a match that searches for the current input
 // text.  It also starts a task to query the Suggest servers.  When that data
 // comes back, the provider creates and returns matches for the best
 // suggestions.
 class SearchProvider : public BaseSearchProvider,
                        public TemplateURLServiceObserver,
                        public net::URLFetcherDelegate {
  public:
-  SearchProvider(AutocompleteProviderListener* listener,
-                 TemplateURLService* template_url_service,
-                 scoped_ptr<AutocompleteProviderClient> client);
+  SearchProvider(AutocompleteProviderClient* client,
+                 AutocompleteProviderListener* listener,
+                 TemplateURLService* template_url_service);
 
   // Extracts the suggest response metadata which SearchProvider previously
   // stored for |match|.
   static std::string GetSuggestMetadata(const AutocompleteMatch& match);
 
   // Answers prefetch handling - register displayed answers. Takes the top
   // match for Autocomplete and registers the contained answer data, if any.
   void RegisterDisplayedAnswers(const AutocompleteResult& result);
 
   // AutocompleteProvider:
@@ skipping 343 matching lines @@
   base::TimeTicks token_expiration_time_;
 
   // Answers prefetch management.
   AnswersCache answers_cache_;  // Cache for last answers seen.
   AnswersQueryData prefetch_data_;  // Data to use for query prefetching.
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_