Prepare HistoryProvider for componentization

chrome/browser/autocomplete/history_quick_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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_HISTORY_QUICK_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_QUICK_PROVIDER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/autocomplete/history_provider.h"
 #include "chrome/browser/autocomplete/in_memory_url_index.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_match.h"
 
 class Profile;
 struct ScoredHistoryMatch;
 
 // This class is an autocomplete provider (a pseudo-internal component of
 // the history system) which quickly (and synchronously) provides matching
 // results from recently or frequently visited sites in the profile's
 // history.
 class HistoryQuickProvider : public HistoryProvider {
  public:
-  HistoryQuickProvider(Profile* profile, InMemoryURLIndex* in_memory_url_index);
+  HistoryQuickProvider(scoped_ptr<AutocompleteProviderClient> client,
+                       Profile* profile,
+                       InMemoryURLIndex* in_memory_url_index);
 
   // AutocompleteProvider. |minimal_changes| is ignored since there is no asynch
   // completion performed.
   void Start(const AutocompleteInput& input,
              bool minimal_changes,
              bool called_due_to_focus) override;
 
   // Disable this provider. For unit testing purposes only. This is required
   // because this provider is closely associated with the HistoryURLProvider
   // and in order to properly test the latter the HistoryQuickProvider must
   // be disabled.
   // TODO(mrossetti): Eliminate this once the HUP has been refactored.
   static void set_disabled(bool disabled) { disabled_ = disabled; }
 
  private:
   friend class HistoryQuickProviderTest;
   FRIEND_TEST_ALL_PREFIXES(HistoryQuickProviderTest, Spans);
   FRIEND_TEST_ALL_PREFIXES(HistoryQuickProviderTest, Relevance);
 
   ~HistoryQuickProvider() override;
 
   // Performs the autocomplete matching and scoring.
   void DoAutocomplete();
 
   // Creates an AutocompleteMatch from |history_match|, assigning it
   // the score |score|.
   AutocompleteMatch QuickMatchToACMatch(const ScoredHistoryMatch& history_match,
                                         int score);
 
+  Profile* profile_;
   AutocompleteInput autocomplete_input_;
   std::string languages_;
   InMemoryURLIndex* in_memory_url_index_;  // Not owned by this class.
 
   // This provider is disabled when true.
   static bool disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryQuickProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_QUICK_PROVIDER_H_