Split HistoryClient in two objects

chrome/browser/history/android/android_provider_backend_unittest.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 <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/chrome_history_client.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/history/core/browser/android/android_time.h"
 #include "components/history/core/browser/history_backend.h"
+#include "components/history/core/browser/history_backend_client.h"
 #include "components/history/core/browser/history_constants.h"
 #include "components/history/core/browser/history_database_params.h"
 #include "components/history/core/browser/keyword_search_term.h"
 #include "components/history/core/test/test_history_database.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ skipping 138 matching lines @@
     // Setup the testing profile, so the bookmark_model_sql_handler could
     // get the bookmark model from it.
     ASSERT_TRUE(profile_manager_.SetUp());
     // It seems that the name has to be chrome::kInitialProfile, so it
     // could be found by ProfileManager::GetLastUsedProfile().
     TestingProfile* testing_profile = profile_manager_.CreateTestingProfile(
         chrome::kInitialProfile);
     testing_profile->CreateBookmarkModel(true);
     bookmark_model_ = BookmarkModelFactory::GetForProfile(testing_profile);
     history_client_.reset(new ChromeHistoryClient(bookmark_model_));
+    history_backend_client_ = history_client_->CreateBackendClient();
     bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model_);
     ASSERT_TRUE(bookmark_model_);
 
     // Get the BookmarkModel from LastUsedProfile, this is the same way that
     // how the BookmarkModelSQLHandler gets the BookmarkModel.
     Profile* profile = ProfileManager::GetLastUsedProfile();
     ASSERT_TRUE(profile);
 
     // Setup the database directory and files.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ skipping 51 matching lines @@
   base::FilePath android_cache_db_name_;
   base::FilePath history_db_name_;
   base::FilePath thumbnail_db_name_;
 
   TestingProfileManager profile_manager_;
   BookmarkModel* bookmark_model_;
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   scoped_ptr<history::HistoryClient> history_client_;
+  scoped_ptr<history::HistoryBackendClient> history_backend_client_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackendTest);
 };
 
 TEST_F(AndroidProviderBackendTest, UpdateTables) {
   GURL url1("http://www.cnn.com");
   URLID url_id1 = 0;
   std::vector<VisitInfo> visits1;
   Time last_visited1 = Time::Now() - TimeDelta::FromDays(1);
   Time created1 = last_visited1 - TimeDelta::FromDays(20);
@@ skipping 14 matching lines @@
 
   // Add a bookmark which is not in the history.
   GURL url3("http://www.bookmark.com");
   base::string16 title3(UTF8ToUTF16("bookmark"));
   ASSERT_TRUE(bookmark_model_->AddURL(bookmark_model_->bookmark_bar_node(), 0,
                                       title3, url3));
   // Only use the HistoryBackend to generate the test data.
   // HistoryBackend will shutdown after that.
   {
   scoped_refptr<HistoryBackend> history_backend;
-  history_backend =
-      new HistoryBackend(new AndroidProviderBackendDelegate(),
-                         history_client_.get(), message_loop_.task_runner());
+  history_backend = new HistoryBackend(new AndroidProviderBackendDelegate(),
+                                       history_client_->CreateBackendClient(),
+                                       message_loop_.task_runner());
   history_backend->Init(std::string(), false,
                         TestHistoryDatabaseParamsForPath(temp_dir_.path()));
   history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
   history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
   URLRow url_row;
 
   ASSERT_TRUE(history_backend->GetURL(url1, &url_row));
   url_id1 = url_row.id();
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
@@ skipping 10 matching lines @@
   ASSERT_TRUE(base::PathExists(thumbnail_db_name_));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   // Set url1 as bookmark.
   AddBookmark(url1);
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   ASSERT_TRUE(backend->EnsureInitializedAndUpdated());
 
   // First verify that the bookmark which was not in the history has been added
   // to history database.
   URLRow url_row;
   ASSERT_TRUE(history_db_.GetRowForURL(url3, &url_row));
   URLID url_id3 = url_row.id();
   ASSERT_EQ(url3, url_row.url());
@@ skipping 85 matching lines @@
   Time created2 = last_visited2 - TimeDelta::FromDays(10);
   visits2.push_back(VisitInfo(created2, ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2 - TimeDelta::FromDays(5),
                               ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2, ui::PAGE_TRANSITION_LINK));
 
   // Only use the HistoryBackend to generate the test data.
   // HistoryBackend will shutdown after that.
   {
   scoped_refptr<HistoryBackend> history_backend;
-  history_backend =
-      new HistoryBackend(new AndroidProviderBackendDelegate(),
-                         history_client_.get(), message_loop_.task_runner());
+  history_backend = new HistoryBackend(new AndroidProviderBackendDelegate(),
+                                       history_client_->CreateBackendClient(),
+                                       message_loop_.task_runner());
   history_backend->Init(std::string(), false,
                         TestHistoryDatabaseParamsForPath(temp_dir_.path()));
   history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
   history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
 
   history::URLRows url_rows(2u);
   ASSERT_TRUE(history_backend->GetURL(url1, &url_rows[0]));
   ASSERT_TRUE(history_backend->GetURL(url2, &url_rows[1]));
   url_rows[0].set_title(title1);
   url_rows[1].set_title(title2);
@@ skipping 12 matching lines @@
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   // Set url1 as bookmark.
   AddBookmark(url1);
 
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
 
   projections.push_back(HistoryAndBookmarkRow::ID);
   projections.push_back(HistoryAndBookmarkRow::URL);
   projections.push_back(HistoryAndBookmarkRow::TITLE);
   projections.push_back(HistoryAndBookmarkRow::CREATED);
   projections.push_back(HistoryAndBookmarkRow::LAST_VISIT_TIME);
   projections.push_back(HistoryAndBookmarkRow::VISIT_COUNT);
@@ skipping 68 matching lines @@
   std::vector<unsigned char> data;
   data.push_back('1');
   row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   EXPECT_FALSE(notifier_.deleted_details());
   ASSERT_TRUE(notifier_.modified_details());
   ASSERT_EQ(1u, notifier_.modified_details()->size());
   EXPECT_EQ(row1.url(), (*notifier_.modified_details())[0].url());
   EXPECT_EQ(row1.last_visit_time(),
             (*notifier_.modified_details())[0].last_visit());
   EXPECT_EQ(row1.visit_count(),
@@ skipping 91 matching lines @@
   data.push_back('1');
   row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
 
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2));
   // Verify the row1 has been added in bookmark model.
   content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
   EXPECT_EQ(row1.title(), child->GetTitle());
@@ skipping 78 matching lines @@
   ASSERT_FALSE(statement1->statement()->Step());
 }
 
 TEST_F(AndroidProviderBackendTest, IsValidHistoryAndBookmarkRow) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   // The created time and last visit time are too close to have required visit
   // count.
   HistoryAndBookmarkRow row1;
   row1.set_raw_url("cnn.com");
   row1.set_url(GURL("http://cnn.com"));
   row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
   row1.set_created(Time::FromInternalValue(
       row1.last_visit_time().ToInternalValue() - 1));
@@ skipping 72 matching lines @@
   std::vector<unsigned char> data;
   data.push_back('1');
   row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
   AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
   ASSERT_TRUE(id2);
 
   // Verify the row1 has been added in bookmark model.
   content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
@@ skipping 161 matching lines @@
   std::vector<unsigned char> data;
   data.push_back('1');
   row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
   AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
   ASSERT_TRUE(id2);
 
   int update_count;
   std::vector<base::string16> update_args;
   // Update the visit_count to a value less than current one.
@@ skipping 62 matching lines @@
   std::vector<unsigned char> data;
   data.push_back('1');
   row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
   AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
   ASSERT_TRUE(id2);
 
   int update_count;
   std::vector<base::string16> update_args;
   // Update the last visit time to a value greater than current one.
@@ skipping 43 matching lines @@
   row1.set_visit_count(10);
   row1.set_is_bookmark(true);
   row1.set_title(UTF8ToUTF16("cnn"));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
 
   int update_count;
   std::vector<base::string16> update_args;
   // Update the last visit time to a value greater than current one.
   HistoryAndBookmarkRow update_row1;
 
@@ skipping 47 matching lines @@
       row1.url(), favicon_base::FAVICON, NULL));
 }
 
 TEST_F(AndroidProviderBackendTest, UpdateSearchTermTable) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
   // Insert a keyword search item to verify if the update succeeds.
   HistoryAndBookmarkRow row1;
   row1.set_raw_url("cnn.com");
   row1.set_url(GURL("http://cnn.com"));
   row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
   row1.set_title(UTF8ToUTF16("cnn"));
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   base::string16 term = UTF8ToUTF16("Search term 1");
   URLID url_id = history_db_.GetRowForURL(row1.url(), NULL);
@@ skipping 60 matching lines @@
   EXPECT_EQ(id2, history_db_.GetSearchTerm(term2, NULL));
 }
 
 TEST_F(AndroidProviderBackendTest, QuerySearchTerms) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
   // Insert a keyword search item to verify if we can find it.
   HistoryAndBookmarkRow row1;
   row1.set_raw_url("cnn.com");
   row1.set_url(GURL("http://cnn.com"));
   row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
   row1.set_title(UTF8ToUTF16("cnn"));
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   base::string16 term = UTF8ToUTF16("Search term 1");
   URLID url_id = history_db_.GetRowForURL(row1.url(), NULL);
@@ skipping 16 matching lines @@
   EXPECT_FALSE(statement->statement()->Step());
 }
 
 TEST_F(AndroidProviderBackendTest, UpdateSearchTerms) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
   // Insert a keyword.
   HistoryAndBookmarkRow row1;
   row1.set_raw_url("cnn.com");
   row1.set_url(GURL("http://cnn.com"));
   row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
   row1.set_title(UTF8ToUTF16("cnn"));
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   base::string16 term = UTF8ToUTF16("Search term 1");
   URLID url_id = history_db_.GetRowForURL(row1.url(), NULL);
@@ skipping 86 matching lines @@
   EXPECT_FALSE(statement->statement()->Step());
 }
 
 TEST_F(AndroidProviderBackendTest, DeleteSearchTerms) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
   // Insert a keyword.
   HistoryAndBookmarkRow row1;
   row1.set_raw_url("cnn.com");
   row1.set_url(GURL("http://cnn.com"));
   row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
   row1.set_title(UTF8ToUTF16("cnn"));
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   base::string16 term = UTF8ToUTF16("Search term 1");
   URLID url_id = history_db_.GetRowForURL(row1.url(), NULL);
@@ skipping 88 matching lines @@
   EXPECT_FALSE(statement->statement()->Step());
 }
 
 TEST_F(AndroidProviderBackendTest, InsertSearchTerm) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
   SearchRow search_row;
   search_row.set_search_term(UTF8ToUTF16("google"));
   search_row.set_url(GURL("http://google.com"));
   search_row.set_keyword_id(1);
   search_row.set_search_time(Time::Now() - TimeDelta::FromHours(1));
 
   SearchTermID id = backend->InsertSearchTerm(search_row);
   ASSERT_TRUE(id);
 
@@ skipping 36 matching lines @@
   std::vector<unsigned char> data;
   data.push_back('1');
   row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
   AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
   ASSERT_TRUE(id2);
 
   // Verify the row1 has been added in bookmark model.
   content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
@@ skipping 35 matching lines @@
   EXPECT_EQ(1u, notifier_.favicon_changed()->size());
 }
 
 TEST_F(AndroidProviderBackendTest, TestMultipleNestingTransaction) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   // Create the nested transactions.
   history_db_.BeginTransaction();
   history_db_.BeginTransaction();
   history_db_.BeginTransaction();
   thumbnail_db_.BeginTransaction();
   thumbnail_db_.BeginTransaction();
   int history_transaction = history_db_.transaction_nesting();
   int thumbnail_transaction = thumbnail_db_.transaction_nesting();
@@ skipping 32 matching lines @@
 
 TEST_F(AndroidProviderBackendTest, TestAndroidCTSComplianceForZeroVisitCount) {
   // This is to verify the last visit time and created time are same when visit
   // count is 0.
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
   URLRow url_row(GURL("http://www.google.com"));
   url_row.set_last_visit(Time::Now());
   url_row.set_visit_count(0);
   history_db_.AddURL(url_row);
 
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
 
   projections.push_back(HistoryAndBookmarkRow::ID);
   projections.push_back(HistoryAndBookmarkRow::URL);
@@ skipping 19 matching lines @@
 TEST_F(AndroidProviderBackendTest, AndroidCTSComplianceFolderColumnExists) {
   // This is test is used to verify the 'folder' column exists, all bookmarks
   // returned when folder is 0 and the non bookmark rows returned when folder
   // is 1.
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
   HistoryAndBookmarkRow row1;
   row1.set_raw_url("cnn.com");
   row1.set_url(GURL("http://cnn.com"));
   row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
   row1.set_created(Time::Now() - TimeDelta::FromDays(20));
   row1.set_visit_count(10);
   row1.set_is_bookmark(true);
   row1.set_title(UTF8ToUTF16("cnn"));
 
@@ skipping 52 matching lines @@
   Time created2 = last_visited2 - TimeDelta::FromDays(10);
   visits2.push_back(VisitInfo(created2, ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2 - TimeDelta::FromDays(5),
                               ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2, ui::PAGE_TRANSITION_LINK));
 
   // Only use the HistoryBackend to generate the test data.
   // HistoryBackend will shutdown after that.
   {
   scoped_refptr<HistoryBackend> history_backend;
-  history_backend =
-      new HistoryBackend(new AndroidProviderBackendDelegate(),
-                         history_client_.get(), message_loop_.task_runner());
+  history_backend = new HistoryBackend(new AndroidProviderBackendDelegate(),
+                                       history_client_->CreateBackendClient(),
+                                       message_loop_.task_runner());
   history_backend->Init(std::string(), false,
                         TestHistoryDatabaseParamsForPath(temp_dir_.path()));
   history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
   history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
   URLRow url_row;
 
   history::URLRows url_rows(2u);
   ASSERT_TRUE(history_backend->GetURL(url1, &url_rows[0]));
   ASSERT_TRUE(history_backend->GetURL(url2, &url_rows[1]));
   url_rows[0].set_title(title1);
@@ skipping 14 matching lines @@
   // Only creates the history database
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
 
   // Set url1 as bookmark.
   AddBookmark(url1);
 
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  NULL,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
 
   projections.push_back(HistoryAndBookmarkRow::ID);
   projections.push_back(HistoryAndBookmarkRow::URL);
   projections.push_back(HistoryAndBookmarkRow::TITLE);
   projections.push_back(HistoryAndBookmarkRow::CREATED);
   projections.push_back(HistoryAndBookmarkRow::LAST_VISIT_TIME);
   projections.push_back(HistoryAndBookmarkRow::VISIT_COUNT);
@@ skipping 52 matching lines @@
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
   row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  NULL,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   EXPECT_FALSE(notifier_.deleted_details());
   ASSERT_TRUE(notifier_.modified_details());
   ASSERT_EQ(1u, notifier_.modified_details()->size());
   EXPECT_EQ(row1.url(), (*notifier_.modified_details())[0].url());
   EXPECT_EQ(row1.last_visit_time(),
             (*notifier_.modified_details())[0].last_visit());
   EXPECT_EQ(row1.visit_count(),
@@ skipping 46 matching lines @@
   {
     TestHistoryDatabase history_db;
     ThumbnailDatabase thumbnail_db(NULL);
     ASSERT_EQ(sql::INIT_OK, history_db.Init(history_db_name_));
     ASSERT_EQ(sql::INIT_OK, thumbnail_db.Init(thumbnail_db_name_));
 
     scoped_ptr<AndroidProviderBackend> backend(
         new AndroidProviderBackend(android_cache_db_name_,
                                    &history_db,
                                    &thumbnail_db,
-                                   history_client_.get(),
+                                   history_backend_client_.get(),
                                    &notifier_));
 
     ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
     ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2));
     // Verify the row1 has been added in bookmark model.
     content::RunAllPendingInMessageLoop();
     ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
     const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
     ASSERT_TRUE(child);
     EXPECT_EQ(row1.title(), child->GetTitle());
     EXPECT_EQ(row1.url(), child->url());
   }
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  NULL,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   // Delete all rows.
   std::vector<base::string16> args;
   int deleted_count = 0;
   notifier_.ResetDetails();
   ASSERT_TRUE(backend->DeleteHistoryAndBookmarks("Favicon IS NULL", args,
                                                  &deleted_count));
   // All rows were deleted.
   EXPECT_EQ(2, deleted_count);
@@ skipping 37 matching lines @@
 
   {
     TestHistoryDatabase history_db;
     ThumbnailDatabase thumbnail_db(NULL);
     ASSERT_EQ(sql::INIT_OK, history_db.Init(history_db_name_));
     ASSERT_EQ(sql::INIT_OK, thumbnail_db.Init(thumbnail_db_name_));
     scoped_ptr<AndroidProviderBackend> backend(
         new AndroidProviderBackend(android_cache_db_name_,
                                    &history_db,
                                    &thumbnail_db,
-                                   history_client_.get(),
+                                   history_backend_client_.get(),
                                    &notifier_));
 
     AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
     ASSERT_TRUE(id1);
   }
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  NULL,
-                                 history_client_.get(),
+                                 history_backend_client_.get(),
                                  &notifier_));
 
   int update_count;
   std::vector<base::string16> update_args;
   // Update the last visit time to a value greater than current one.
   HistoryAndBookmarkRow update_row1;
 
   // Set visit count.
   update_row1.set_visit_count(5);
   // Set favicon.
   std::vector<unsigned char> data;
   data.push_back('1');
   update_row1.set_favicon(base::RefCountedBytes::TakeVector(&data));
   update_args.push_back(UTF8ToUTF16(row1.raw_url()));
   notifier_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row1, "url = ?",
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(notifier_.deleted_details());
   ASSERT_TRUE(notifier_.modified_details());
   ASSERT_EQ(1u, notifier_.modified_details()->size());
   // No favicon will be updated as thumbnail database is missing.
   EXPECT_FALSE(notifier_.favicon_changed());
 }
 
 }  // namespace history