Componentize HistoryDatabase

chrome/browser/history/android/android_urls_database_unittest.cc

Index: chrome/browser/history/android/android_urls_database_unittest.cc
diff --git a/chrome/browser/history/android/android_urls_database_unittest.cc b/chrome/browser/history/android/android_urls_database_unittest.cc
index 75cae51a10aaef67bd022a81540431daa659dde8..cbc27559b31d2639cd9ecbf31d500bddc5fabea7 100644
--- a/chrome/browser/history/android/android_urls_database_unittest.cc
+++ b/chrome/browser/history/android/android_urls_database_unittest.cc
@@ -2,24 +2,24 @@
 // 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_urls_database.h"
+#include "components/history/core/browser/android/android_urls_database.h"
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
-#include "chrome/browser/history/history_database.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/history/core/browser/history_constants.h"
+#include "components/history/core/browser/history_database.h"
 #include "components/history/core/test/history_unittest_base.h"
+#include "components/history/core/test/test_history_database.h"
 
 namespace history {
 
 class AndroidURLsMigrationTest : public HistoryUnitTestBase {
  public:
-  AndroidURLsMigrationTest() {
-  }
+  AndroidURLsMigrationTest() {}
   virtual ~AndroidURLsMigrationTest() {}
 
  protected:
@@ -45,7 +45,7 @@ class AndroidURLsMigrationTest : public HistoryUnitTestBase {
 // Disabled as this does not correctly set up all the tables so that migration
 // fails. See http://crbug.com/175460 .
 TEST_F(AndroidURLsMigrationTest, DISABLED_MigrateToVersion22) {
-  HistoryDatabase db;
+  TestHistoryDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(history_db_name_));
   // Migration has done.
   // The column of previous table shouldn't exist.