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

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a61c2c69cd703215ec9be2c77643c4d5df0347cf..e72af4221b79c90382f0da7118cb256295b8faa3 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -456,8 +456,6 @@
       'browser/history/android/android_cache_database.h',
       'browser/history/android/android_history_provider_service.cc',
       'browser/history/android/android_history_provider_service.h',
-      'browser/history/android/android_history_types.cc',
-      'browser/history/android/android_history_types.h',
       'browser/history/android/android_provider_backend.cc',
       'browser/history/android/android_provider_backend.h',
       'browser/history/android/android_time.h',
@@ -504,8 +502,6 @@
       'browser/history/history_service_factory.h',
       'browser/history/history_tab_helper.cc',
       'browser/history/history_tab_helper.h',
-      'browser/history/history_types.cc',
-      'browser/history/history_types.h',
       'browser/history/in_memory_history_backend.cc',
       'browser/history/in_memory_history_backend.h',
       'browser/history/in_memory_url_index.cc',
@@ -3260,6 +3256,7 @@
           'dependencies': [
             '../components/components.gyp:cdm_browser',
             '../components/components.gyp:enhanced_bookmarks',
+            '../components/components.gyp:history_core_android',
             '../components/components.gyp:web_contents_delegate_android',
             '../third_party/android_opengl/etc1/etc1.gyp:etc1',
             'chrome_browser_jni_headers',