Split to SafeBrowsingDatabaseManager into Local* and Remote*.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index cf969975b0f7f5e1c007b6c43da50ff59830ca7a..1faa183e499be568c92d004a98f49a95eec190aa 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2354,15 +2354,18 @@
       'browser/rlz/rlz_mac.cc',
       'browser/rlz/rlz_win.cc',
     ],
-    # Used for safe browsing in basic mode (safe_browsing=2) as well as full
-    # mode (safe_browsing=1).
+    # "Safe Browsing Basic" files used for safe browsing in full mode
+    # (safe_browsing=1), mobile (=2), and mobile-extended (=3).
     'chrome_browser_safe_browsing_basic_sources': [
+      'browser/renderer_host/safe_browsing_resource_throttle.cc',

[mattm, 2015/05/08 02:17:26]

I thought this still shouldn't be used for mobile(=2)?

[Nathan Parker, 2015/05/12 01:04:01]

Yes there are a few extra sources here that aren't needed for mode=2 (I expect
the compiler will remove the .objs that have no use).  To get rid them here,
I'll add them them in both mobile_extended_sources and full_sources.  I was
trying to avoid that duplication since it can lead to mistakes.

(The alternative is a fourth list,
'chrome_browser_safe_browsing_database_sources' or some such. )

       'browser/renderer_host/safe_browsing_resource_throttle_factory.cc',
       'browser/renderer_host/safe_browsing_resource_throttle_factory.h',
-      'browser/safe_browsing/malware_details.cc',
-      'browser/safe_browsing/malware_details.h',
+      'browser/renderer_host/safe_browsing_resource_throttle.h',
+      'browser/safe_browsing/database_manager.h',
       'browser/safe_browsing/malware_details_cache.cc',
       'browser/safe_browsing/malware_details_cache.h',

[mattm, 2015/05/08 02:17:26]

sorting got switched around here?

[Nathan Parker, 2015/05/12 01:04:01]

Was missing "LC_COLLATE=C" on the sort. Fixed.

+      'browser/safe_browsing/malware_details.cc',
+      'browser/safe_browsing/malware_details.h',
       'browser/safe_browsing/malware_details_history.cc',
       'browser/safe_browsing/malware_details_history.h',
       'browser/safe_browsing/ping_manager.cc',
@@ -2371,6 +2374,8 @@
       'browser/safe_browsing/protocol_manager_helper.h',
       'browser/safe_browsing/safe_browsing_blocking_page.cc',
       'browser/safe_browsing/safe_browsing_blocking_page.h',
+      'browser/safe_browsing/safe_browsing_database.cc',
+      'browser/safe_browsing/safe_browsing_database.h',

[mattm, 2015/05/08 02:17:26]

not needed for 2 or 3, right?

[Nathan Parker, 2015/05/12 01:04:01]

Done.

       'browser/safe_browsing/safe_browsing_service.cc',
       'browser/safe_browsing/safe_browsing_service.h',
       'browser/safe_browsing/safe_browsing_util.cc',
@@ -2378,12 +2383,19 @@
       'browser/safe_browsing/ui_manager.cc',
       'browser/safe_browsing/ui_manager.h',
     ],
-    # Files in addition to the "basic" ones to use for full safe browsing.
+    # "Safe Browsing Extended Mobile" files in addition to the "basic" ones
+    # to use for mobile_extended mode.
+    'chrome_browser_safe_browsing_mobile_extended_sources': [
+      'browser/safe_browsing/android_safe_browsing_api_handler.cc',
+      'browser/safe_browsing/android_safe_browsing_api_handler.h',
+      'browser/safe_browsing/remote_database_manager.cc',
+      'browser/safe_browsing/remote_database_manager.h',
+    ],
+    # "Safe Browsing Full" files in addition to the "basic" ones to use for
+    # full safe browsing.
     'chrome_browser_safe_browsing_full_sources': [
       'browser/download/download_completion_blocker.cc',
       'browser/download/download_completion_blocker.h',
-      'browser/renderer_host/safe_browsing_resource_throttle.cc',
-      'browser/renderer_host/safe_browsing_resource_throttle.h',
       'browser/safe_browsing/browser_feature_extractor.cc',
       'browser/safe_browsing/browser_feature_extractor.h',
       'browser/safe_browsing/browser_features.cc',
@@ -2394,8 +2406,6 @@
       'browser/safe_browsing/client_side_detection_host.h',
       'browser/safe_browsing/client_side_detection_service.cc',
       'browser/safe_browsing/client_side_detection_service.h',
-      'browser/safe_browsing/database_manager.cc',
-      'browser/safe_browsing/database_manager.h',
       'browser/safe_browsing/download_feedback.cc',
       'browser/safe_browsing/download_feedback.h',
       'browser/safe_browsing/download_feedback_service.cc',
@@ -2450,6 +2460,8 @@
       'browser/safe_browsing/incident_reporting/variations_seed_signature_analyzer.h',
       'browser/safe_browsing/incident_reporting/variations_seed_signature_incident.cc',
       'browser/safe_browsing/incident_reporting/variations_seed_signature_incident.h',
+      'browser/safe_browsing/local_database_manager.cc',
+      'browser/safe_browsing/local_database_manager.h',
       'browser/safe_browsing/path_sanitizer.cc',
       'browser/safe_browsing/path_sanitizer.h',
       'browser/safe_browsing/prefix_set.cc',
@@ -2458,8 +2470,6 @@
       'browser/safe_browsing/protocol_manager.h',
       'browser/safe_browsing/protocol_parser.cc',
       'browser/safe_browsing/protocol_parser.h',
-      'browser/safe_browsing/safe_browsing_database.cc',
-      'browser/safe_browsing/safe_browsing_database.h',
       'browser/safe_browsing/safe_browsing_store.cc',
       'browser/safe_browsing/safe_browsing_store.h',
       'browser/safe_browsing/safe_browsing_store_file.cc',
@@ -3354,6 +3364,12 @@
                 'safe_browsing_proto',
               ],
             }],
+            ['safe_browsing == 3', {
+              'sources': [ '<@(chrome_browser_safe_browsing_mobile_extended_sources)' ],
+              'dependencies': [
+                'safe_browsing_proto',
+              ],
+            }],
           ],
         }],
         ['use_udev == 1', {