Prepare HistoryProvider for componentization

chrome/browser/autocomplete/autocomplete_controller.h

Index: chrome/browser/autocomplete/autocomplete_controller.h
diff --git a/chrome/browser/autocomplete/autocomplete_controller.h b/chrome/browser/autocomplete/autocomplete_controller.h
index 6ca35cbfea76809c7bc28254be0008a379a100bb..0f5417b27dac1a2067c2a359bf0745858f81ac8b 100644
--- a/chrome/browser/autocomplete/autocomplete_controller.h
+++ b/chrome/browser/autocomplete/autocomplete_controller.h
@@ -12,6 +12,7 @@
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_provider.h"
 #include "components/omnibox/autocomplete_provider_listener.h"
@@ -216,6 +217,9 @@ class AutocompleteController : public AutocompleteProviderListener {
 
   ZeroSuggestProvider* zero_suggest_provider_;
 
+  // The client passed to the providers.
+  scoped_ptr<ChromeAutocompleteProviderClient> provider_client_;

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

Nit: I'd place this above |providers_| since it outlives them and is used when
creating them.

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

Done.

+
   // Input passed to Start.
   AutocompleteInput input_;