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
new file mode 100644
index 0000000000000000000000000000000000000000..dd88bcff21f8d14877f80f85c98f4b8b8fd702a1
--- /dev/null
+++ b/chrome/browser/history/chrome_history_client.h
@@ -0,0 +1,45 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_HISTORY_CHROME_HISTORY_CLIENT_H_
+#define CHROME_BROWSER_HISTORY_CHROME_HISTORY_CLIENT_H_
+
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "components/history/core/browser/history_client.h"
+#include "components/keyed_service/core/keyed_service.h"
+
+class Profile;
+class BookmarkModel;
+class HistoryService;
+
+namespace history {
+
+class ChromeHistoryClient : public HistoryClient,
+                            public KeyedService {
+ public:
+  explicit ChromeHistoryClient(Profile* profile);
+
+  HistoryService* history_service() const {
+    return history_service_.get();
+  }
+
+  // HistoryClient:
+  virtual void BlockTillBookmarksLoaded() OVERRIDE;
+  virtual bool IsBookmarked(const GURL& url) OVERRIDE;
+  virtual void GetBookmarks(std::vector<URLAndTitle>* bookmarks) OVERRIDE;
+
+  // KeyedService:
+  virtual void Shutdown() OVERRIDE;
+
+ private:
+  scoped_ptr<HistoryService> history_service_;
+  BookmarkModel* bookmark_model_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeHistoryClient);
+};
+
+}  // namespace history
+
+#endif  // CHROME_BROWSER_HISTORY_CHROME_HISTORY_CLIENT_H_