Componentize HistoryDatabase

chrome/browser/history/android/sqlite_cursor_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/sqlite_cursor.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/android/android_history_provider_service.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.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/test/bookmark_test_helpers.h"
-#include "components/history/core/android/android_history_types.h"
-#include "components/history/core/android/android_time.h"
+#include "components/history/core/browser/android/android_history_types.h"
+#include "components/history/core/browser/android/android_time.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"
 
 namespace {
 
 using base::Bind;
 using base::Time;
 using content::BrowserThread;
@@ skipping 179 matching lines @@
       cursor->GetBlob(env, NULL, 3);
   std::vector<uint8> out;
   base::android::JavaByteArrayToByteVector(env, data.obj(), &out);
   EXPECT_EQ(data_bytes->data().size(), out.size());
   EXPECT_EQ(data_bytes->data()[0], out[0]);
   cursor->Destroy(env, NULL);
   // Cursor::Destroy posts the task in UI thread, run Message loop to release
   // the statement, delete SQLiteCursor itself etc.
   content::RunAllPendingInMessageLoop();
 }