Componentize HistoryDatabase

components/history.gypi

Index: components/history.gypi
diff --git a/components/history.gypi b/components/history.gypi
index cde78051ab035de00520a782b7467296d7f1fa29..e1b251647193e8553d04fe6a9ba3b8a3fcaa6c9c 100644
--- a/components/history.gypi
+++ b/components/history.gypi
@@ -40,6 +40,10 @@
         'history/core/browser/history_constants.cc',
         'history/core/browser/history_constants.h',
         'history/core/browser/history_context.h',
+        'history/core/browser/history_database.cc',
+        'history/core/browser/history_database.h',
+        'history/core/browser/history_database_params.cc',
+        'history/core/browser/history_database_params.h',
         'history/core/browser/history_db_task.h',
         'history/core/browser/history_match.cc',
         'history/core/browser/history_match.h',
@@ -75,6 +79,29 @@
         'history/core/browser/visitsegment_database.cc',
         'history/core/browser/visitsegment_database.h',
       ],
+      'conditions': [
+        ['OS=="android"', {
+          'sources': [
+            'history/core/browser/android/android_cache_database.cc',
+            'history/core/browser/android/android_cache_database.h',
+            'history/core/browser/android/android_history_types.cc',
+            'history/core/browser/android/android_history_types.h',
+            'history/core/browser/android/android_time.h',
+            'history/core/browser/android/android_urls_database.cc',
+            'history/core/browser/android/android_urls_database.h',
+            'history/core/browser/android/android_urls_sql_handler.cc',
+            'history/core/browser/android/android_urls_sql_handler.h',
+            'history/core/browser/android/favicon_sql_handler.cc',
+            'history/core/browser/android/favicon_sql_handler.h',
+            'history/core/browser/android/sql_handler.cc',
+            'history/core/browser/android/sql_handler.h',
+            'history/core/browser/android/urls_sql_handler.cc',
+            'history/core/browser/android/urls_sql_handler.h',
+            'history/core/browser/android/visit_sql_handler.cc',
+            'history/core/browser/android/visit_sql_handler.h',
+          ],
+        }],
+      ],
     },
     {
       # GN version: //components/history/core/browser:proto
@@ -127,6 +154,8 @@
         'history/core/test/history_client_fake_bookmarks.h',
         'history/core/test/history_unittest_base.cc',
         'history/core/test/history_unittest_base.h',
+        'history/core/test/test_history_database.cc',
+        'history/core/test/test_history_database.h',
       ],
     },
   ],
@@ -150,45 +179,11 @@
             'history/content/browser/download_constants_utils.h',
             'history/content/browser/history_context_helper.cc',
             'history/content/browser/history_context_helper.h',
+            'history/content/browser/history_database_helper.cc',
+            'history/content/browser/history_database_helper.h',
           ],
         }
       ],
     }],
-    ['OS=="android"', {
-      'targets': [
-        {
-          # GN version: //components/history/code/android
-          'target_name': 'history_core_android',
-          'type': 'static_library',
-          'include_dirs': [
-            '..',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../sql/sql.gyp:sql',
-            'history_core_browser',
-          ],
-          'sources': [
-            'history/core/android/android_cache_database.cc',
-            'history/core/android/android_cache_database.h',
-            'history/core/android/android_history_types.cc',
-            'history/core/android/android_history_types.h',
-            'history/core/android/android_time.h',
-            'history/core/android/android_urls_database.cc',
-            'history/core/android/android_urls_database.h',
-            'history/core/android/android_urls_sql_handler.cc',
-            'history/core/android/android_urls_sql_handler.h',
-            'history/core/android/favicon_sql_handler.cc',
-            'history/core/android/favicon_sql_handler.h',
-            'history/core/android/sql_handler.cc',
-            'history/core/android/sql_handler.h',
-            'history/core/android/urls_sql_handler.cc',
-            'history/core/android/urls_sql_handler.h',
-            'history/core/android/visit_sql_handler.cc',
-            'history/core/android/visit_sql_handler.h',
-          ],
-        },
-      ],
-    }],
   ],
 }