Prepare AutocompleteController for componentization

components/omnibox/keyword_provider.cc

Index: components/omnibox/keyword_provider.cc
diff --git a/components/omnibox/keyword_provider.cc b/components/omnibox/keyword_provider.cc
index 273a6e00d5a291c20e4bc918483572406ec87d01..c7d8a81c3185d1c24573836f468d1e7f9109be2a 100644
--- a/components/omnibox/keyword_provider.cc
+++ b/components/omnibox/keyword_provider.cc
@@ -12,6 +12,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/autocomplete_match.h"
+#include "components/omnibox/autocomplete_provider_client.h"
 #include "components/omnibox/autocomplete_provider_listener.h"
 #include "components/omnibox/keyword_extensions_delegate.h"
 #include "components/search_engines/template_url.h"
@@ -69,12 +70,12 @@ void ScopedEndExtensionKeywordMode::StayInKeywordMode() {
 
 }  // namespace
 
-KeywordProvider::KeywordProvider(
-    AutocompleteProviderListener* listener,
-    TemplateURLService* model)
+KeywordProvider::KeywordProvider(AutocompleteProviderClient* client,
+                                 AutocompleteProviderListener* listener)
     : AutocompleteProvider(AutocompleteProvider::TYPE_KEYWORD),
       listener_(listener),
-      model_(model) {
+      model_(client->GetTemplateURLService()),
+      extensions_delegate_(client->GetKeywordExtensionsDelegate(this)) {
 }
 
 // static