Remove dependency of HistoryServiceFactory on ChromeBookmarkClientFactory

components/history/core/browser/history_service.cc

Index: components/history/core/browser/history_service.cc
diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc
index da0ed64137e740b8f4b79894060d797b5ffa0d98..0665bffc21043ecdc3ec306b212ebf8cb14dcd65 100644
--- a/components/history/core/browser/history_service.cc
+++ b/components/history/core/browser/history_service.cc
@@ -18,6 +18,7 @@
 
 #include "components/history/core/browser/history_service.h"
 
+#include "base/bind.h"

[sky, 2015/06/23 17:38:50]

Is this necessary?

[sdefresne, 2015/06/23 21:46:33]

I don't think it is necessary (it is probably transitively #include-d by another
file). Removed.

 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ -889,6 +890,9 @@ bool HistoryService::Init(
   if (visit_delegate_ && !visit_delegate_->Init(this))
     return false;
 
+  if (history_client_)
+    history_client_->Init(this);
+
   return true;
 }