Split HistoryClient in two objects

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/history/android/bookmark_model_sql_handler.h"
 #include "components/history/core/browser/android/android_time.h"
 #include "components/history/core/browser/android/android_urls_sql_handler.h"
 #include "components/history/core/browser/android/favicon_sql_handler.h"
 #include "components/history/core/browser/android/urls_sql_handler.h"
 #include "components/history/core/browser/android/visit_sql_handler.h"
 #include "components/history/core/browser/history_backend.h"
+#include "components/history/core/browser/history_backend_client.h"
 #include "components/history/core/browser/history_backend_notifier.h"
-#include "components/history/core/browser/history_client.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/keyword_search_term.h"
 #include "components/history/core/browser/thumbnail_database.h"
 
 
 namespace history {
 
 
 // Helpers --------------------------------------------------------------------
 
@@ skipping 166 matching lines @@
   committed_ = true;
 }
 
 
 // AndroidProviderBackend -----------------------------------------------------
 
 AndroidProviderBackend::AndroidProviderBackend(
     const base::FilePath& db_name,
     HistoryDatabase* history_db,
     ThumbnailDatabase* thumbnail_db,
-    HistoryClient* history_client,
+    HistoryBackendClient* backend_client,
     HistoryBackendNotifier* notifier)
     : android_cache_db_filename_(db_name),
       db_(&history_db->GetDB()),
       history_db_(history_db),
       thumbnail_db_(thumbnail_db),
-      history_client_(history_client),
+      backend_client_(backend_client),
       initialized_(false),
       notifier_(notifier) {
   DCHECK(notifier_);
 }
 
 AndroidProviderBackend::~AndroidProviderBackend() {
 }
 
 // static
 const void* AndroidProviderBackend::GetUserDataKey() {
@@ skipping 576 matching lines @@
       return false;
   }
   return true;
 }
 
 bool AndroidProviderBackend::UpdateRemovedURLs() {
   return history_db_->DeleteUnusedAndroidURLs();
 }
 
 bool AndroidProviderBackend::UpdateBookmarks() {
-  if (history_client_ == NULL) {
+  if (backend_client_ == NULL) {
     LOG(ERROR) << "HistoryClient is not available";
     return false;
   }
 
   std::vector<URLAndTitle> bookmarks;
-  history_client_->GetBookmarks(&bookmarks);
+  backend_client_->GetBookmarks(&bookmarks);
 
   if (bookmarks.empty())
     return true;
 
   std::vector<URLID> url_ids;
   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);
@@ skipping 428 matching lines @@
       return false;
 
     if (!history_db_->SetKeywordSearchTermsForURL(bookmark_row.url_id(),
                           values.keyword_id(), values.search_term()))
       return false;
   }
   return true;
 }
 
 }  // namespace history