Prepare HistoryProvider for componentization

chrome/browser/autocomplete/history_provider.h

Index: chrome/browser/autocomplete/history_provider.h
diff --git a/chrome/browser/autocomplete/history_provider.h b/chrome/browser/autocomplete/history_provider.h
index 0f06ab888f800aa19ae1e2ceddcb8dbf104c8d0f..30812475b20fca3ddd83adf484aef7fd1a48faf7 100644
--- a/chrome/browser/autocomplete/history_provider.h
+++ b/chrome/browser/autocomplete/history_provider.h
@@ -7,6 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "components/omnibox/autocomplete_provider.h"
+#include "components/omnibox/autocomplete_provider_client.h"
 #include "components/omnibox/in_memory_url_index_types.h"
 
 class AutocompleteInput;
@@ -25,7 +26,9 @@ class HistoryProvider : public AutocompleteProvider {
   static bool PreventInlineAutocomplete(const AutocompleteInput& input);
 
  protected:
-  HistoryProvider(Profile* profile, AutocompleteProvider::Type type);
+  HistoryProvider(AutocompleteProvider::Type type,
+                  AutocompleteProviderClient* client);
+
   ~HistoryProvider() override;
 
   // Finds and removes the match from the current collection of matches and
@@ -38,7 +41,10 @@ class HistoryProvider : public AutocompleteProvider {
                                                    size_t text_length,
                                                    bool is_url);
 
-  Profile* profile_;
+  AutocompleteProviderClient* client() { return client_; }
+
+ private:
+  AutocompleteProviderClient* client_;

[Peter Kasting, 2015/06/16 00:03:42]

Nit: While here: DISALLOW_COPY_AND_ASSIGN?

[blundell, 2015/06/16 07:21:25]

Done.

 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_H_