Componentize HistoryDatabase

components/history/core/browser/android/android_cache_database.h

Index: components/history/core/browser/android/android_cache_database.h
diff --git a/components/history/core/android/android_cache_database.h b/components/history/core/browser/android/android_cache_database.h
similarity index 93%
rename from components/history/core/android/android_cache_database.h
rename to components/history/core/browser/android/android_cache_database.h
index 5aa2a1c53f12fcbcbc52792da77ce3abb905d873..b2df009c8bf97517c698ea2907553fd7227a129c 100644
--- a/components/history/core/android/android_cache_database.h
+++ b/components/history/core/browser/android/android_cache_database.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_HISTORY_CORE_ANDROID_ANDROID_CACHE_DATABASE_H_
-#define COMPONENTS_HISTORY_CORE_ANDROID_ANDROID_CACHE_DATABASE_H_
+#ifndef COMPONENTS_HISTORY_CORE_BROWSER_ANDROID_ANDROID_CACHE_DATABASE_H_
+#define COMPONENTS_HISTORY_CORE_BROWSER_ANDROID_ANDROID_CACHE_DATABASE_H_
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/time/time.h"
-#include "components/history/core/android/android_history_types.h"
+#include "components/history/core/browser/android/android_history_types.h"
 #include "sql/connection.h"
 #include "sql/init_status.h"
 
@@ -117,4 +117,4 @@ class AndroidCacheDatabase {
 
 }  // namespace history
 
-#endif  // COMPONENTS_HISTORY_CORE_ANDROID_ANDROID_CACHE_DATABASE_H_
+#endif  // COMPONENTS_HISTORY_CORE_BROWSER_ANDROID_ANDROID_CACHE_DATABASE_H_