Split to SafeBrowsingDatabaseManager into Local* and Remote*.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 7125fa747fdc6694c07d695ea2d98eff645d207a..46353419953b051716a2cf207de5851dfbf42069 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -794,6 +794,8 @@
       'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
       'browser/safe_browsing/safe_browsing_service_browsertest.cc',
       'browser/safe_browsing/safe_browsing_test.cc',
+      'browser/safe_browsing/test_database_manager.cc',
+      'browser/safe_browsing/test_database_manager.h',
       'renderer/safe_browsing/malware_dom_details_browsertest.cc',
       'renderer/safe_browsing/phishing_classifier_browsertest.cc',
       'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc',
@@ -2947,8 +2949,6 @@
             '../components/components.gyp:precache_javatests',
             '../content/content_shell_and_tests.gyp:content_java_test_support',
             '../sync/sync.gyp:sync_javatests',
-            '../testing/android/on_device_instrumentation.gyp:broker_java',
-            '../testing/android/on_device_instrumentation.gyp:require_driver_apk',

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

was this intentional?

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

Nope. Looks like a rebase issue.  I must have picked it up when moving patches
back and forth between two git trees I have for testing (one is for mobile, one
for desktop). I haven't found a reliable way to use just one directory tree for
both since clank generally lags behind TOT and has a difference in directory
structure.  But it is a pain.

Fixed, and I looked through all the other files for similar changes (were none).

             '../ui/android/ui_android.gyp:ui_javatests',
           ],
           'variables': {