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

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 438 matching lines @@
       'browser/gpu/gpu_feature_checker.cc',
       'browser/gpu/gpu_feature_checker.h',
       'browser/gpu/gpu_mode_manager.cc',
       'browser/gpu/gpu_mode_manager.h',
       'browser/gpu/three_d_api_observer.cc',
       'browser/gpu/three_d_api_observer.h',
       'browser/history/android/android_cache_database.cc',
       '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',
       'browser/history/android/android_urls_database.cc',
       'browser/history/android/android_urls_database.h',
       'browser/history/android/android_urls_sql_handler.cc',
       'browser/history/android/android_urls_sql_handler.h',
       'browser/history/android/bookmark_model_sql_handler.cc',
       'browser/history/android/bookmark_model_sql_handler.h',
       'browser/history/android/favicon_sql_handler.cc',
@@ skipping 26 matching lines @@
       'browser/history/history_db_task.h',
       'browser/history/history_details.h',
       'browser/history/history_notifications.cc',
       'browser/history/history_notifications.h',
       'browser/history/history_service.cc',
       'browser/history/history_service.h',
       'browser/history/history_service_factory.cc',
       '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',
       'browser/history/in_memory_url_index.h',
       'browser/history/in_memory_url_index_types.cc',
       'browser/history/in_memory_url_index_types.h',
       'browser/history/scored_history_match.cc',
       'browser/history/scored_history_match.h',
       'browser/history/shortcuts_database.cc',
       'browser/history/shortcuts_database.h',
@@ skipping 2734 matching lines @@
           'sources': [ '<@(chrome_browser_non_mobile_sources)' ],
           'dependencies': [
             '../device/core/core.gyp:device_core',
             '../device/usb/usb.gyp:device_usb',
           ]
         }],
         ['OS=="android"', {
           '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',
           ],
           'dependencies!': [
             '../components/components.gyp:feedback_component',
             '../components/components.gyp:storage_monitor',
             '../components/components.gyp:web_modal',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
@@ skipping 321 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }