Move remote_db_manager into the safe_browsing_db component.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e7c7155482ad1ec6f35c5877b5cbb49efec69903..27c7634419543e0ce59808c3570bf73dd7e7d6de 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2519,12 +2519,6 @@
     'chrome_browser_safe_browsing_mobile_sources': [
       'browser/renderer_host/safe_browsing_resource_throttle.cc',
       'browser/renderer_host/safe_browsing_resource_throttle.h',
-      'browser/safe_browsing/remote_database_manager.cc',
-      'browser/safe_browsing/remote_database_manager.h',
-      'browser/safe_browsing/safe_browsing_api_handler.cc',
-      'browser/safe_browsing/safe_browsing_api_handler.h',
-      'browser/safe_browsing/safe_browsing_api_handler_util.cc',
-      'browser/safe_browsing/safe_browsing_api_handler_util.h',
     ],
     # "Safe Browsing Full" files in addition to the "basic" ones to use for
     # full safe browsing. This has some in common with "mobile."
@@ -3548,9 +3542,9 @@
           'sources': [ '<@(chrome_browser_safe_browsing_basic_sources)' ],
           'dependencies': [
             'safe_browsing_chunk_proto',
-            'safe_browsing_metadata_proto',
             'safe_browsing_proto',
             '../components/components.gyp:safe_browsing_db',
+            '../components/components.gyp:safe_browsing_metadata_proto',
           ],
           'conditions': [
             ['safe_browsing == 1', {
@@ -3570,6 +3564,7 @@
               'sources': [ '<@(chrome_browser_safe_browsing_mobile_sources)' ],
               'dependencies': [
                 'safe_browsing_proto',
+                '../components/components.gyp:safe_browsing_db_mobile',
               ],
             }],
           ],
@@ -3984,19 +3979,6 @@
       'includes': [ '../build/protoc.gypi' ]
     },
     {
-      # Protobuf compiler / generator for the safebrowsing full hash metadata
-      # protocol buffer.
-      # GN version: //chrome/browser/safe_browsing:metadata_proto
-      'target_name': 'safe_browsing_metadata_proto',
-      'type': 'static_library',
-      'sources': [ 'browser/safe_browsing/metadata.proto' ],
-      'variables': {
-        'proto_in_dir': 'browser/safe_browsing',
-        'proto_out_dir': 'chrome/browser/safe_browsing',
-      },
-      'includes': [ '../build/protoc.gypi' ]
-    },
-    {
       # Protobuf compiler / generator for the safebrowsing incident reporting
       # service state store data protocol buffer.
       # GN version: //chrome/browser/safe_browsing/incident_reporting:state_store_data_proto