Prepare AutocompleteController for componentization

chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

Index: chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
index 8500baad10156a45ca668292208e7d89b5af5eef..c366c035483cf7e91877ce6b3b96a1109faec79b 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -7,6 +7,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
+#include "chrome/browser/autocomplete/in_memory_url_index_factory.h"
 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h"
@@ -22,6 +23,10 @@
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/notification_service.h"
 
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/autocomplete/keyword_extensions_delegate_impl.h"
+#endif
+
 ChromeAutocompleteProviderClient::ChromeAutocompleteProviderClient(
     Profile* profile)
     : profile_(profile),
@@ -73,6 +78,10 @@ history::URLDatabase* ChromeAutocompleteProviderClient::GetInMemoryDatabase() {
   return history_service ? history_service->InMemoryDatabase() : NULL;
 }
 
+InMemoryURLIndex* ChromeAutocompleteProviderClient::GetInMemoryURLIndex() {
+  return InMemoryURLIndexFactory::GetForProfile(profile_);
+}
+
 TemplateURLService* ChromeAutocompleteProviderClient::GetTemplateURLService() {
   return TemplateURLServiceFactory::GetForProfile(profile_);
 }
@@ -151,3 +160,12 @@ void ChromeAutocompleteProviderClient::OnAutocompleteControllerResultReady(
       content::Source<AutocompleteController>(controller),
       content::NotificationService::NoDetails());
 }
+
+void ChromeAutocompleteProviderClient::ConfigureKeywordProvider(

[Peter Kasting, 2015/06/19 19:19:21]

Nit: Why not instead have something like

scoped_ptr<KeywordExtensionsDelegate>
GetKeywordExtensionsDelegate(KeywordProvider* provider);

... and when ENABLE_EXTENSIONS is off, this can return null; then have the
keyword provider call this itself?  That will eliminate the need of the
set_extensions_delegate() public method on that provider and make the API of
this class a bit easier to use and more parallel to other getters.

[blundell, 2015/06/22 09:01:36]

Done.

+    KeywordProvider* keyword_provider) {
+#if defined(ENABLE_EXTENSIONS)
+  keyword_provider->set_extensions_delegate(
+      scoped_ptr<KeywordExtensionsDelegate>(

[Peter Kasting, 2015/06/19 19:19:21]

Nit: make_scoped_ptr?

[blundell, 2015/06/22 09:01:36]

Done.

+          new KeywordExtensionsDelegateImpl(profile_, keyword_provider)));
+#endif
+}