Prepare HistoryProvider 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 0cbdc07688f1192e44e9b2dea53551d2d98e8de8..e9c737653f2c8f29b3ce52e955cbf130abecb964 100644
--- a/components/omnibox/autocomplete_provider_client.h
+++ b/components/omnibox/autocomplete_provider_client.h
@@ -13,7 +13,12 @@ struct AutocompleteMatch;
 class AutocompleteSchemeClassifier;
 class GURL;
 
+namespace bookmarks {
+class BookmarkModel;
+}
+
 namespace history {
+class HistoryService;
 class URLDatabase;
 }
 
@@ -44,6 +49,12 @@ class AutocompleteProviderClient {
   // Returns the scheme classifier.
   virtual const AutocompleteSchemeClassifier& SchemeClassifier() = 0;
 
+  // Returns the HistoryService.
+  virtual history::HistoryService* HistoryService() = 0;
+
+  // Returns the bookmarks:BookmarkModel.
+  virtual bookmarks::BookmarkModel* BookmarkModel() = 0;
+
   // Given some string |text| that the user wants to use for navigation,
   // determines how it should be interpreted.
   virtual void Classify(