Prepare AutocompleteController for componentization

components/omnibox/keyword_provider.cc

 // Copyright 2014 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.
 
 #include "components/omnibox/keyword_provider.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #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"
 #include "components/search_engines/template_url_service.h"
 #include "grit/components_strings.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ skipping 37 matching lines @@
   if (delegate_)
     delegate_->MaybeEndExtensionKeywordMode();
 }
 
 void ScopedEndExtensionKeywordMode::StayInKeywordMode() {
   delegate_ = NULL;
 }
 
 }  // 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
 base::string16 KeywordProvider::SplitKeywordFromInput(
     const base::string16& input,
     bool trim_leading_whitespace,
     base::string16* remaining_input) {
   // Find end of first token.  The AutocompleteController has trimmed leading
   // whitespace, so we need not skip over that.
   const size_t first_white(input.find_first_of(base::kWhitespaceUTF16));
@@ skipping 381 matching lines @@
         ACMatchClassification::NONE, &match->contents_class);
   }
 }
 
 TemplateURLService* KeywordProvider::GetTemplateURLService() const {
   // Make sure the model is loaded. This is cheap and quickly bails out if
   // the model is already loaded.
   model_->Load();
   return model_;
 }