Componentize HistoryDatabase

chrome/browser/history/android/android_cache_database_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 "components/history/core/android/android_cache_database.h"
+#include "components/history/core/browser/android/android_cache_database.h"
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/history/history_database.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/history/core/android/android_time.h"
+#include "components/history/core/browser/android/android_time.h"
+#include "components/history/core/browser/history_database.h"
+#include "components/history/core/test/test_history_database.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace history {
 
 class AndroidCacheDatabaseTest : public testing::Test {
  public:
-  AndroidCacheDatabaseTest() {
-  }
+  AndroidCacheDatabaseTest() {}
   virtual ~AndroidCacheDatabaseTest() {}
 
  protected:
   virtual void SetUp() {
     // Get a temporary directory for the test DB files.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath history_db_name_ =
         temp_dir_.path().AppendASCII("history.db");
     android_cache_db_name_ = temp_dir_.path().AppendASCII(
         "TestAndroidCache.db");
     ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
     ASSERT_EQ(sql::INIT_OK,
               history_db_.InitAndroidCacheDatabase(android_cache_db_name_));
   }
 
   base::ScopedTempDir temp_dir_;
   base::FilePath android_cache_db_name_;
-  HistoryDatabase history_db_;
+  TestHistoryDatabase history_db_;
 };
 
 TEST(AndroidCacheDatabaseAttachTest, AttachDatabaseInTransactionNesting) {
   base::ScopedTempDir temp_dir;
   base::FilePath android_cache_db_name;
-  HistoryDatabase history_db;
+  TestHistoryDatabase history_db;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath history_db_name = temp_dir.path().AppendASCII("history.db");
   android_cache_db_name = temp_dir.path().AppendASCII(
         "TestAndroidCache.db");
   ASSERT_EQ(sql::INIT_OK, history_db.Init(history_db_name));
   // Create nested transactions.
   history_db.BeginTransaction();
   history_db.BeginTransaction();
   history_db.BeginTransaction();
   int transaction_nesting = history_db.transaction_nesting();
@@ skipping 48 matching lines @@
   EXPECT_FALSE(history_db_.GetSearchTerm(update_row1.term, NULL));
   // The search_term2 should still in the table.
   ASSERT_EQ(id2, history_db_.GetSearchTerm(search_term2, &row1));
   EXPECT_EQ(id2, row1.id);
   EXPECT_EQ(ToDatabaseTime(search_time2),
             ToDatabaseTime(row1.last_visit_time));
   EXPECT_EQ(search_term2, row1.term);
 }
 
 }  // namespace history