Split to SafeBrowsingDatabaseManager into Local* and Remote*.

chrome/chrome_tests.gypi

 # Copyright 2013 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': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 776 matching lines @@
       'browser/ui/webui/policy_ui_browsertest.cc',
     ],
     'chrome_browser_tests_speech_sources': [
       'browser/speech/extension_api/tts_extension_apitest.cc',
     ],
     'chrome_browser_tests_full_safe_browsing_sources': [
       'browser/safe_browsing/local_safebrowsing_test_server.cc',
       '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',
       'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc',
     ],
     'chrome_browser_tests_remoting_sources': [
       'test/remoting/auth_browsertest.cc',
       'test/remoting/fullscreen_browsertest.cc',
       'test/remoting/it2me_browsertest.cc',
       'test/remoting/key_code_conv.cc',
@@ skipping 2133 matching lines @@
           'dependencies': [
             'chrome_java',
             'chrome_shell_apk_java',
             'chrome_java_test_support',
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             '../components/components.gyp:invalidation_javatests',
             '../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': {
             'apk_name': 'ChromeShellTest',
             'java_in_dir': 'android/shell/javatests',
             'additional_src_dirs': ['android/javatests/src'],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
@@ skipping 289 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }