Prepare AutocompleteController for componentization

chrome/browser/autocomplete/chrome_autocomplete_provider_client.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 "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 
 #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"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/pref_names.h"
 #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),
       scheme_classifier_(profile),
       search_terms_data_(profile_) {
 }
 
 ChromeAutocompleteProviderClient::~ChromeAutocompleteProviderClient() {
 }
 
@@ skipping 31 matching lines @@
 }
 
 history::URLDatabase* ChromeAutocompleteProviderClient::GetInMemoryDatabase() {
   history::HistoryService* history_service = GetHistoryService();
 
   // This method is called in unit test contexts where the HistoryService isn't
   // loaded.
   return history_service ? history_service->InMemoryDatabase() : NULL;
 }
 
+InMemoryURLIndex* ChromeAutocompleteProviderClient::GetInMemoryURLIndex() {
+  return InMemoryURLIndexFactory::GetForProfile(profile_);
+}
+
 TemplateURLService* ChromeAutocompleteProviderClient::GetTemplateURLService() {
   return TemplateURLServiceFactory::GetForProfile(profile_);
 }
 
 const SearchTermsData& ChromeAutocompleteProviderClient::GetSearchTermsData() {
   return search_terms_data_;
 }
 
 scoped_refptr<ShortcutsBackend>
 ChromeAutocompleteProviderClient::GetShortcutsBackend() {
@@ skipping 58 matching lines @@
   image_service->Prefetch(url);
 }
 
 void ChromeAutocompleteProviderClient::OnAutocompleteControllerResultReady(
     AutocompleteController* controller) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
       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
+}