Componentize HistoryDatabase

chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc

Index: chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
diff --git a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
index 482aea99fa7b1f22232767bc4c521a37262764d9..5f7f1be3324a6fb0cd2f72fe75741ae220c9213c 100644
--- a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
+++ b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/history/history_database.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ -16,6 +15,8 @@
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.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 "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
@@ -29,12 +30,10 @@ namespace history {
 class BookmarkModelSQLHandlerTest : public testing::Test {
  public:
   BookmarkModelSQLHandlerTest()
-      : profile_manager_(
-          TestingBrowserProcess::GetGlobal()),
+      : profile_manager_(TestingBrowserProcess::GetGlobal()),
         bookmark_model_(NULL),
         ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_) {
-  }
+        file_thread_(BrowserThread::FILE, &message_loop_) {}
   virtual ~BookmarkModelSQLHandlerTest() {}
 
  protected:
@@ -75,7 +74,7 @@ class BookmarkModelSQLHandlerTest : public testing::Test {
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   base::ScopedTempDir temp_dir_;
-  HistoryDatabase history_db_;
+  TestHistoryDatabase history_db_;
 };
 
 TEST_F(BookmarkModelSQLHandlerTest, InsertIntoMobileFolder) {