Prepare HistoryProvider for componentization

chrome/browser/autocomplete/autocomplete_controller.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_AUTOCOMPLETE_CONTROLLER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #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"
 #include "components/omnibox/autocomplete_result.h"
 
 class AutocompleteControllerDelegate;
 class HistoryURLProvider;
 class KeywordProvider;
 class Profile;
 class SearchProvider;
@@ skipping 184 matching lines @@
   Providers providers_;
 
   HistoryURLProvider* history_url_provider_;
 
   KeywordProvider* keyword_provider_;
 
   SearchProvider* search_provider_;
 
   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_;
 
   // Data from the autocomplete query.
   AutocompleteResult result_;
 
   // The most recent time the default match (inline match) changed.  This may
   // be earlier than the most recent keystroke if the recent keystrokes didn't
   // change the suggested match in the omnibox.  (For instance, if
   // a user typed "mail.goog" and the match https://mail.google.com/ was
@@ skipping 25 matching lines @@
   // Are we in Start()? This is used to avoid updating |result_| and sending
   // notifications until Start() has been invoked on all providers.
   bool in_start_;
 
   TemplateURLService* template_url_service_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteController);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_