Componentize HistoryDatabase

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

Index: components/history/core/browser/android/android_urls_database.h
diff --git a/components/history/core/android/android_urls_database.h b/components/history/core/browser/android/android_urls_database.h
similarity index 87%
rename from components/history/core/android/android_urls_database.h
rename to components/history/core/browser/android/android_urls_database.h
index d57ea680c730ac5149c059623ffb4516bbf514e1..2fb929bccd1611f52fbd45ca249f94d1f93a7319 100644
--- a/components/history/core/android/android_urls_database.h
+++ b/components/history/core/browser/android/android_urls_database.h
@@ -2,10 +2,10 @@
 // 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_URLS_DATABASE_H_
-#define COMPONENTS_HISTORY_CORE_ANDROID_ANDROID_URLS_DATABASE_H_
+#ifndef COMPONENTS_HISTORY_CORE_BROWSER_ANDROID_ANDROID_URLS_DATABASE_H_
+#define COMPONENTS_HISTORY_CORE_BROWSER_ANDROID_ANDROID_URLS_DATABASE_H_
 
-#include "components/history/core/android/android_history_types.h"
+#include "components/history/core/browser/android/android_history_types.h"
 
 namespace history {
 
@@ -49,7 +49,7 @@ class AndroidURLsDatabase {
   // Updates the row of |id| with the given |raw_url| and |url_id|. Returns true
   // on success.
   bool UpdateAndroidURLRow(AndroidURLID id,
-                           const std::string&raw_url,
+                           const std::string& raw_url,
                            URLID url_id);
 
   // Clears all the rows in android_urls table, returns true on success, false
@@ -70,4 +70,4 @@ class AndroidURLsDatabase {
 
 }  // namespace history
 
-#endif  // COMPONENTS_HISTORY_CORE_ANDROID_ANDROID_URLS_DATABASE_H_
+#endif  // COMPONENTS_HISTORY_CORE_BROWSER_ANDROID_ANDROID_URLS_DATABASE_H_