Abstract history dependencies on bookmarks through HistoryClient

chrome/browser/history/android/android_provider_backend.cc

 // Copyright (c) 2012 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/android/android_provider_backend.h"
 
 #include "base/i18n/case_conversion.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_changed_details.h"
 #include "chrome/browser/history/android/android_time.h"
 #include "chrome/browser/history/android/android_urls_sql_handler.h"
 #include "chrome/browser/history/android/bookmark_model_sql_handler.h"
 #include "chrome/browser/history/android/favicon_sql_handler.h"
 #include "chrome/browser/history/android/urls_sql_handler.h"
 #include "chrome/browser/history/android/visit_sql_handler.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/thumbnail_database.h"
-#include "components/bookmarks/browser/bookmark_service.h"
+#include "components/history/core/browser/history_client.h"
 #include "content/public/common/page_transition_types.h"
 #include "sql/connection.h"
 
 
 namespace history {
 
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
@@ skipping 178 matching lines @@
   committed_ = true;
 }
 
 
 // AndroidProviderBackend -----------------------------------------------------
 
 AndroidProviderBackend::AndroidProviderBackend(
     const base::FilePath& db_name,
     HistoryDatabase* history_db,
     ThumbnailDatabase* thumbnail_db,
-    BookmarkService* bookmark_service,
+    HistoryClient* history_client,
     HistoryBackend::Delegate* delegate)
     : android_cache_db_filename_(db_name),
       db_(&history_db->GetDB()),
       history_db_(history_db),
       thumbnail_db_(thumbnail_db),
-      bookmark_service_(bookmark_service),
+      history_client_(history_client),
       initialized_(false),
       delegate_(delegate) {
   DCHECK(delegate_);
 }
 
 AndroidProviderBackend::~AndroidProviderBackend() {
 }
 
 AndroidStatement* AndroidProviderBackend::QueryHistoryAndBookmarks(
     const std::vector<HistoryAndBookmarkRow::ColumnID>& projections,
@@ skipping 551 matching lines @@
       return false;
   }
   return true;
 }
 
 bool AndroidProviderBackend::UpdateRemovedURLs() {
   return history_db_->DeleteUnusedAndroidURLs();
 }
 
 bool AndroidProviderBackend::UpdateBookmarks() {
-  if (bookmark_service_ == NULL) {
-    LOG(ERROR) << "Bookmark service is not available";
+  if (history_client_ == NULL) {
+    LOG(ERROR) << "HistoryClient is not available";
     return false;
   }
 
-  bookmark_service_->BlockTillLoaded();
-  std::vector<BookmarkService::URLAndTitle> bookmarks;
-  bookmark_service_->GetBookmarks(&bookmarks);
+  std::vector<URLAndTitle> bookmarks;
+  history_client_->GetBookmarks(&bookmarks);
 
   if (bookmarks.empty())
     return true;
 
   std::vector<URLID> url_ids;
-  for (std::vector<BookmarkService::URLAndTitle>::const_iterator i =
+  for (std::vector<URLAndTitle>::const_iterator i =
            bookmarks.begin(); i != bookmarks.end(); ++i) {
     URLID url_id = history_db_->GetRowForURL(i->url, NULL);
     if (url_id == 0) {
       URLRow url_row(i->url);
       url_row.set_title(i->title);
       // Set the visit time to the UnixEpoch since that's when the Android
       // system time starts. The Android have a CTS testcase for this.
       url_row.set_last_visit(base::Time::UnixEpoch());
       url_row.set_hidden(true);
       url_id = history_db_->AddURL(url_row);
@@ skipping 401 matching lines @@
       return false;
 
     if (!history_db_->SetKeywordSearchTermsForURL(bookmark_row.url_id(),
                           values.template_url_id(), values.search_term()))
       return false;
   }
   return true;
 }
 
 }  // namespace history