Componentize history_types.{cc,h} and android_history_types.{cc,h}

components/history/core/android/android_history_types.h

Index: components/history/core/android/android_history_types.h
diff --git a/chrome/browser/history/android/android_history_types.h b/components/history/core/android/android_history_types.h
similarity index 96%
rename from chrome/browser/history/android/android_history_types.h
rename to components/history/core/android/android_history_types.h
index a27b99e7cbc7fcd7de2fef23d82a15d4cfc2669c..3c642f380dd63d1ae54ec3416ca7bfe03a045f60 100644
--- a/chrome/browser/history/android/android_history_types.h
+++ b/components/history/core/android/android_history_types.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 CHROME_BROWSER_HISTORY_ANDROID_ANDROID_HISTORY_TYPES_H_
-#define CHROME_BROWSER_HISTORY_ANDROID_ANDROID_HISTORY_TYPES_H_
+#ifndef COMPONENTS_HISTORY_CORE_ANDROID_ANDROID_HISTORY_TYPES_H_
+#define COMPONENTS_HISTORY_CORE_ANDROID_ANDROID_HISTORY_TYPES_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/history/history_types.h"
+#include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/keyword_id.h"
 #include "sql/statement.h"
 
@@ -329,4 +329,4 @@ class AndroidStatement {
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_HISTORY_ANDROID_ANDROID_HISTORY_TYPES_H_
+#endif  // COMPONENTS_HISTORY_CORE_ANDROID_ANDROID_HISTORY_TYPES_H_