Prepare AutocompleteController for componentization

chrome/browser/autocomplete/autocomplete_controller.cc

 // 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.
 
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
 #include "chrome/browser/autocomplete/builtin_provider.h"
-#include "chrome/browser/autocomplete/in_memory_url_index_factory.h"
 #include "chrome/browser/autocomplete/zero_suggest_provider.h"
 #include "components/omnibox/bookmark_provider.h"
 #include "components/omnibox/history_quick_provider.h"
 #include "components/omnibox/history_url_provider.h"
 #include "components/omnibox/keyword_provider.h"
 #include "components/omnibox/omnibox_field_trial.h"
 #include "components/omnibox/search_provider.h"
 #include "components/omnibox/shortcuts_provider.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/autocomplete/keyword_extensions_delegate_impl.h"
-#endif
-
 namespace {
 
 // Converts the given match to a type (and possibly subtype) based on the AQS
 // specification. For more details, see
 // http://goto.google.com/binary-clients-logging.
 void AutocompleteMatchToAssistedQuery(
     const AutocompleteMatch::Type& match,
     const AutocompleteProvider* provider,
     size_t* type,
     size_t* subtype) {
@@ skipping 113 matching lines @@
 
 // Whether this autocomplete match type supports custom descriptions.
 bool AutocompleteMatchHasCustomDescription(const AutocompleteMatch& match) {
   return match.type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY ||
       match.type == AutocompleteMatchType::SEARCH_SUGGEST_PROFILE;
 }
 
 }  // namespace
 
 AutocompleteController::AutocompleteController(
-    Profile* profile,
-    TemplateURLService* template_url_service,
+    scoped_ptr<AutocompleteProviderClient> provider_client,
     AutocompleteControllerDelegate* delegate,
     int provider_types)
     : delegate_(delegate),
-      provider_client_(new ChromeAutocompleteProviderClient(profile)),
+      provider_client_(provider_client.Pass()),
       history_url_provider_(NULL),
       keyword_provider_(NULL),
       search_provider_(NULL),
       zero_suggest_provider_(NULL),
       stop_timer_duration_(OmniboxFieldTrial::StopTimerFieldTrialDuration()),
       done_(true),
       in_start_(false),
-      template_url_service_(template_url_service) {
+      template_url_service_(provider_client_->GetTemplateURLService()) {
   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
   if (provider_types & AutocompleteProvider::TYPE_BOOKMARK)
     providers_.push_back(new BookmarkProvider(provider_client_.get()));
   if (provider_types & AutocompleteProvider::TYPE_BUILTIN)
     providers_.push_back(new BuiltinProvider());
-  if (provider_types & AutocompleteProvider::TYPE_HISTORY_QUICK) {
-    providers_.push_back(new HistoryQuickProvider(
-        provider_client_.get(),
-        InMemoryURLIndexFactory::GetForProfile(profile)));
-  }
+
+  if (provider_types & AutocompleteProvider::TYPE_HISTORY_QUICK)

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

Nit: Why blank lines above and below this particular block?

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

Done.

+    providers_.push_back(new HistoryQuickProvider(provider_client_.get()));
+
   if (provider_types & AutocompleteProvider::TYPE_HISTORY_URL) {
     history_url_provider_ =
         new HistoryURLProvider(provider_client_.get(), this);
     providers_.push_back(history_url_provider_);
   }
   // "Tab to search" can be used on all platforms other than Android.
 #if !defined(OS_ANDROID)
   if (provider_types & AutocompleteProvider::TYPE_KEYWORD) {
-    keyword_provider_ = new KeywordProvider(this, template_url_service);
-#if defined(ENABLE_EXTENSIONS)
-    keyword_provider_->set_extensions_delegate(
-        scoped_ptr<KeywordExtensionsDelegate>(
-            new KeywordExtensionsDelegateImpl(profile, keyword_provider_)));
-#endif
+    keyword_provider_ = new KeywordProvider(this, template_url_service_);
+    provider_client_->ConfigureKeywordProvider(keyword_provider_);
     providers_.push_back(keyword_provider_);
   }
 #endif
   if (provider_types & AutocompleteProvider::TYPE_SEARCH) {
     search_provider_ =
-        new SearchProvider(provider_client_.get(), this, template_url_service);
+        new SearchProvider(provider_client_.get(), this, template_url_service_);
     providers_.push_back(search_provider_);
   }
   if (provider_types & AutocompleteProvider::TYPE_SHORTCUTS)
     providers_.push_back(new ShortcutsProvider(provider_client_.get()));
   if (provider_types & AutocompleteProvider::TYPE_ZERO_SUGGEST) {
     zero_suggest_provider_ = ZeroSuggestProvider::Create(
-        provider_client_.get(), this, template_url_service);
+        provider_client_.get(), this, template_url_service_);
     if (zero_suggest_provider_)
       providers_.push_back(zero_suggest_provider_);
   }
 }
 
 AutocompleteController::~AutocompleteController() {
   // The providers may have tasks outstanding that hold refs to them.  We need
   // to ensure they won't call us back if they outlive us.  (Practically,
   // calling Stop() should also cancel those tasks and make it so that we hold
   // the only refs.)  We also don't want to bother notifying anyone of our
@@ skipping 423 matching lines @@
   expire_timer_.Stop();
   stop_timer_.Stop();
   done_ = true;
   if (clear_result && !result_.empty()) {
     result_.Reset();
     // NOTE: We pass in false since we're trying to only clear the popup, not
     // touch the edit... this is all a mess and should be cleaned up :(
     NotifyChanged(false);
   }
 }