Prepare AutocompleteController for componentization

components/omnibox/autocomplete_provider_client.h

Index: components/omnibox/autocomplete_provider_client.h
diff --git a/components/omnibox/autocomplete_provider_client.h b/components/omnibox/autocomplete_provider_client.h
index fe84198c02ca3d525cac9cb268dfbe04e113643d..1adee89a82bac929c1d4d57539ada70451bb6951 100644
--- a/components/omnibox/autocomplete_provider_client.h
+++ b/components/omnibox/autocomplete_provider_client.h
@@ -17,6 +17,8 @@ struct AutocompleteMatch;
 class AutocompleteClassifier;
 class AutocompleteSchemeClassifier;
 class GURL;
+class InMemoryURLIndex;
+class KeywordProvider;
 class PrefService;
 class ShortcutsBackend;
 
@@ -48,6 +50,7 @@ class AutocompleteProviderClient {
   virtual scoped_refptr<history::TopSites> GetTopSites() = 0;
   virtual bookmarks::BookmarkModel* GetBookmarkModel() = 0;
   virtual history::URLDatabase* GetInMemoryDatabase() = 0;
+  virtual InMemoryURLIndex* GetInMemoryURLIndex() = 0;
   virtual TemplateURLService* GetTemplateURLService() = 0;
   virtual const SearchTermsData& GetSearchTermsData() = 0;
   virtual scoped_refptr<ShortcutsBackend> GetShortcutsBackend() = 0;
@@ -92,6 +95,10 @@ class AutocompleteProviderClient {
   // listeners add themselves to, and then kill this method.
   virtual void OnAutocompleteControllerResultReady(
       AutocompleteController* controller) {}
+
+  // Called after creation of |keyword_provider| to allow the client to
+  // configure the provider if desired.
+  virtual void ConfigureKeywordProvider(KeywordProvider* keyword_provider) {}
 };
 
 #endif  // COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_CLIENT_H_