Remove dependency of HistoryServiceFactory on ChromeBookmarkClientFactory

components/history/core/browser/history_client.h

Index: components/history/core/browser/history_client.h
diff --git a/components/history/core/browser/history_client.h b/components/history/core/browser/history_client.h
index ae9c19562e2fc0bde101137654331c79a8b88edc..ef11815b17ca0d5df5570263a442e99b69dde8a0 100644
--- a/components/history/core/browser/history_client.h
+++ b/components/history/core/browser/history_client.h
@@ -5,6 +5,9 @@
 #ifndef COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_CLIENT_H_
 #define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_CLIENT_H_
 
+#include <set>

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

Seems like you shouldn't need either of these new includes.

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

Good catch. Removed.

+
+#include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "sql/init_status.h"
@@ -20,6 +23,7 @@ namespace history {
 class HistoryBackend;
 class HistoryBackendClient;
 class HistoryDatabase;
+class HistoryService;
 class ThumbnailDatabase;
 
 // This class abstracts operations that depend on the embedder's environment,
@@ -29,6 +33,9 @@ class HistoryClient {
   HistoryClient() {}
   virtual ~HistoryClient() {}
 
+  // Called upon HistoryService creation.
+  virtual void Init(HistoryService* history_service) = 0;

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

This name seems misleading. It isn't that HistoryClient needs to necessarily
init, rather than the HistoryService has been created. Maybe
OnHistoryServiceCreated()?

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

Done.

+
   // Called before HistoryService is shutdown.
   virtual void Shutdown() = 0;