Split HistoryClient in two objects

chrome/browser/history/android/android_provider_backend.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_ANDROID_ANDROID_PROVIDER_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_ANDROID_ANDROID_PROVIDER_BACKEND_H_
 
 #include <list>
 #include <set>
 
 #include "base/containers/hash_tables.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/supports_user_data.h"
 #include "components/history/core/browser/android/android_cache_database.h"
 #include "components/history/core/browser/android/android_history_types.h"
 #include "components/history/core/browser/android/sql_handler.h"
 
 namespace history {
 
 class AndroidProviderBackend;
 class AndroidURLsSQLHandler;
 class HistoryBackend;
+class HistoryBackendClient;
 class HistoryBackendNotifier;
-class HistoryClient;
 class HistoryDatabase;
 class ThumbnailDatabase;
 
 // This class provides the query/insert/update/remove methods to implement
 // android.provider.Browser.BookmarkColumns and
 // android.provider.Browser.SearchColumns API.
 //
 // When used it:
 // a. The android_urls table is created in history database if it doesn't
 //    exists.
 // b. The android_cache database is created.
 // c. The bookmark_cache table is created.
 //
 // Android_urls and android_cache database is only updated before the related
 // methods are accessed. A data change will not triger the update.
 //
 // The android_cache database is deleted when shutdown.
 class AndroidProviderBackend : public base::SupportsUserData::Data {
  public:
   AndroidProviderBackend(const base::FilePath& cache_db_name,
                          HistoryDatabase* history_db,
                          ThumbnailDatabase* thumbnail_db,
-                         HistoryClient* history_client,
+                         HistoryBackendClient* backend_client,
                          HistoryBackendNotifier* notifier);
 
   ~AndroidProviderBackend() override;
 
   static const void* GetUserDataKey();
 
   static AndroidProviderBackend* FromHistoryBackend(
       HistoryBackend* history_backend);
 
   // Bookmarks ----------------------------------------------------------------
@@ skipping 270 matching lines @@
   // Android cache database filename.
   const base::FilePath android_cache_db_filename_;
 
   // The history db's connection.
   sql::Connection* db_;
 
   HistoryDatabase* history_db_;
 
   ThumbnailDatabase* thumbnail_db_;
 
-  HistoryClient* history_client_;
+  HistoryBackendClient* backend_client_;
 
   // Whether AndroidProviderBackend has been initialized.
   bool initialized_;
 
   HistoryBackendNotifier* notifier_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_ANDROID_ANDROID_PROVIDER_BACKEND_H_