Componentize HistoryDatabase

chrome/browser/history/android/visit_sql_handler_unittest.cc

Index: chrome/browser/history/android/visit_sql_handler_unittest.cc
diff --git a/chrome/browser/history/android/visit_sql_handler_unittest.cc b/chrome/browser/history/android/visit_sql_handler_unittest.cc
index 53194ff4436a29fbdc2b5493c719fad7e7f21a5c..3229d7ae8435d472d0b394ef0f9a0dac01ecd336 100644
--- a/chrome/browser/history/android/visit_sql_handler_unittest.cc
+++ b/chrome/browser/history/android/visit_sql_handler_unittest.cc
@@ -8,11 +8,12 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/history/history_database.h"
 #include "chrome/common/chrome_constants.h"
-#include "components/history/core/android/urls_sql_handler.h"
-#include "components/history/core/android/visit_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_constants.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;
@@ -39,7 +40,7 @@ class VisitSQLHandlerTest : public testing::Test {
   virtual void TearDown() {
   }
 
-  HistoryDatabase history_db_;
+  TestHistoryDatabase history_db_;
   base::ScopedTempDir temp_dir_;
   UrlsSQLHandler urls_sql_handler_;
   VisitSQLHandler visit_sql_handler_;