Abstract history dependencies on bookmarks through HistoryClient

chrome/browser/history/chrome_history_client.h

Index: chrome/browser/history/chrome_history_client.h
diff --git a/chrome/browser/history/chrome_history_client.h b/chrome/browser/history/chrome_history_client.h
index f6f8d35f1ee3881ae7923044b7537f6a906db91a..364dcd6016ea49c426b4dd2f185b44c992401249 100644
--- a/chrome/browser/history/chrome_history_client.h
+++ b/chrome/browser/history/chrome_history_client.h
@@ -8,11 +8,27 @@
 #include "base/macros.h"
 #include "components/history/core/browser/history_client.h"
 
+class BookmarkModel;
+
+// This class implements history::HistoryClient to abstract operations that
+// depends on Chrome environment.

[blundell, 2014/06/02 09:39:30]

s/depends/depend

[sdefresne, 2014/06/02 12:59:12]

Done.

 class ChromeHistoryClient : public history::HistoryClient {
  public:
-  ChromeHistoryClient();
+  explicit ChromeHistoryClient(BookmarkModel* bookmark_model);
+
+  // history::HistoryClient:
+  virtual void BlockUntilBookmarksLoaded() OVERRIDE;
+  virtual bool IsBookmarked(const GURL& url) OVERRIDE;
+  virtual void GetBookmarks(
+      std::vector<history::URLAndTitle>* bookmarks) OVERRIDE;
+
+  // KeyedService:
+  virtual void Shutdown() OVERRIDE;
+
+ private:
+  // The BookmarkModel, this should outlive ChromeHistoryClient.
+  BookmarkModel* bookmark_model_;
 
- protected:
   DISALLOW_COPY_AND_ASSIGN(ChromeHistoryClient);
 };