Split HistoryClient in two objects

chrome/browser/history/chrome_history_backend_client.cc

Index: chrome/browser/history/chrome_history_backend_client.cc
diff --git a/chrome/browser/history/chrome_history_backend_client.cc b/chrome/browser/history/chrome_history_backend_client.cc
new file mode 100644
index 0000000000000000000000000000000000000000..20448a04799c3c78af25c4302e8094c3185de1bc
--- /dev/null
+++ b/chrome/browser/history/chrome_history_backend_client.cc
@@ -0,0 +1,93 @@
+// Copyright 2015 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.
+
+#include "chrome/browser/history/chrome_history_backend_client.h"
+
+#include "chrome/common/chrome_version_info.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "url/gurl.h"
+
+#if defined(OS_ANDROID)
+#include "base/files/file_path.h"
+#include "base/logging.h"
+#include "chrome/browser/history/android/android_provider_backend.h"
+#include "components/history/core/browser/history_backend.h"
+#endif
+
+#if defined(OS_ANDROID)
+namespace {
+const base::FilePath::CharType kAndroidCacheFilename[] =
+    FILE_PATH_LITERAL("AndroidCache");
+}
+#endif  // defined(OS_IOS)
+
+ChromeHistoryBackendClient::ChromeHistoryBackendClient(
+    bookmarks::BookmarkModel* bookmark_model)
+    : bookmark_model_(bookmark_model) {
+}
+
+ChromeHistoryBackendClient::~ChromeHistoryBackendClient() {
+}
+
+bool ChromeHistoryBackendClient::IsBookmarked(const GURL& url) {
+  if (!bookmark_model_)
+    return false;
+
+  // HistoryBackendClient is used to determine if an URL is bookmarked. The data
+  // is loaded on a separate thread and may not be done when this method is
+  // called, therefore blocks until the bookmarks have finished loading.
+  bookmark_model_->BlockTillLoaded();
+  return bookmark_model_->IsBookmarked(url);
+}
+
+void ChromeHistoryBackendClient::GetBookmarks(
+    std::vector<history::URLAndTitle>* bookmarks) {
+  if (!bookmark_model_)
+    return;
+
+  // HistoryBackendClient is used to determine the set of bookmarked URLs. The
+  // data is loaded on a separate thread and may not be done when this method is
+  // called, therefore blocks until the bookmarks have finished loading.
+  std::vector<bookmarks::BookmarkModel::URLAndTitle> url_and_titles;
+  bookmark_model_->BlockTillLoaded();
+  bookmark_model_->GetBookmarks(&url_and_titles);
+
+  bookmarks->reserve(bookmarks->size() + url_and_titles.size());
+  for (const auto& url_and_title : url_and_titles) {
+    history::URLAndTitle value = { url_and_title.url, url_and_title.title };
+    bookmarks->push_back(value);
+  }
+}
+
+bool ChromeHistoryBackendClient::ShouldReportDatabaseError() {
+  // TODO(shess): For now, don't report on beta or stable so as not to
+  // overwhelm the crash server.  Once the big fish are fried,
+  // consider reporting at a reduced rate on the bigger channels.
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  return channel != chrome::VersionInfo::CHANNEL_STABLE &&
+         channel != chrome::VersionInfo::CHANNEL_BETA;
+}
+
+#if defined(OS_ANDROID)
+void ChromeHistoryBackendClient::OnHistoryBackendInitialized(
+    history::HistoryBackend* history_backend,
+    history::HistoryDatabase* history_database,
+    history::ThumbnailDatabase* thumbnail_database,
+    const base::FilePath& history_dir) {
+  DCHECK(history_backend);
+  if (thumbnail_database) {
+    history_backend->SetUserData(
+        history::AndroidProviderBackend::GetUserDataKey(),
+        new history::AndroidProviderBackend(
+            history_dir.Append(kAndroidCacheFilename), history_database,
+            thumbnail_database, this, history_backend));
+  }
+}
+
+void ChromeHistoryBackendClient::OnHistoryBackendDestroyed(
+    history::HistoryBackend* history_backend,
+    const base::FilePath& history_dir) {
+  sql::Connection::Delete(history_dir.Append(kAndroidCacheFilename));
+}
+#endif  // defined(OS_ANDROID)