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..b370a6dd18e84d65ffe9e5cc46f2b9ad759e5878 100644
--- a/chrome/browser/autocomplete/history_provider.h
+++ b/chrome/browser/autocomplete/history_provider.h
@@ -6,7 +6,9 @@
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_H_
 
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.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 +27,8 @@ class HistoryProvider : public AutocompleteProvider {
   static bool PreventInlineAutocomplete(const AutocompleteInput& input);
 
  protected:
-  HistoryProvider(Profile* profile, AutocompleteProvider::Type type);
+  HistoryProvider(scoped_ptr<AutocompleteProviderClient> client,
+                  AutocompleteProvider::Type type);
   ~HistoryProvider() override;
 
   // Finds and removes the match from the current collection of matches and
@@ -38,7 +41,7 @@ class HistoryProvider : public AutocompleteProvider {
                                                    size_t text_length,
                                                    bool is_url);
 
-  Profile* profile_;
+  scoped_ptr<AutocompleteProviderClient> client_;

[Peter Kasting, 2015/06/12 16:20:23]

This was a pre-existing bug, but: the Google style guide bans protected data
members.  Make this private, and give subclasses access via one or more
accessors as appropriate.

[blundell, 2015/06/15 08:51:33]

Done.

 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_H_