Move HistoryService and ContentVisitDelegate into history namespace

HistoryService and ContentVisitDelegate are in //components/history
and thus move them to the history namespace.

BUG=453790

Review URL: https://codereview.chromium.org/967573003

Cr-Commit-Position: refs/heads/master@{#320397}

2 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc
index 1e9d1ea..863000e 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc
@@ -215,7 +215,8 @@ bool ChromeBookmarkClient::CanBeEditedByUser(const BookmarkNode* node) {
          !bookmarks::IsDescendantOf(node, supervised_node_);
 }
 
-void ChromeBookmarkClient::SetHistoryService(HistoryService* history_service) {
+void ChromeBookmarkClient::SetHistoryService(
+    history::HistoryService* history_service) {
   DCHECK(history_service);
   history_service_ = history_service;
   favicon_changed_subscription_ = history_service_->AddFaviconChangedCallback(
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.h b/chrome/browser/bookmarks/chrome_bookmark_client.h
index a7f023e..65ec621 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.h
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.h
@@ -16,7 +16,6 @@
 #include "components/policy/core/browser/managed_bookmarks_tracker.h"
 
 class GURL;
-class HistoryService;
 class HistoryServiceFactory;
 class Profile;
 
@@ -24,6 +23,10 @@ namespace bookmarks {
 class BookmarkModel;
 }
 
+namespace history {
+class HistoryService;
+}
+
 class ChromeBookmarkClient : public bookmarks::BookmarkClient,
                              public bookmarks::BaseBookmarkModelObserver {
  public:
@@ -63,7 +66,7 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient,
 
  private:
   friend class HistoryServiceFactory;
-  void SetHistoryService(HistoryService* history_service);
+  void SetHistoryService(history::HistoryService* history_service);
 
   // bookmarks::BaseBookmarkModelObserver:
   void BookmarkModelChanged() override;
@@ -94,7 +97,7 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient,
   // HistoryService associated to the Profile. Due to circular dependency, this
   // cannot be passed to the constructor, nor lazily fetched. Instead the value
   // is initialized from HistoryServiceFactory.
-  HistoryService* history_service_;
+  history::HistoryService* history_service_;
 
   scoped_ptr<base::CallbackList<void(const std::set<GURL>&)>::Subscription>
       favicon_changed_subscription_;