Refactor safe-browsing build-config definitions.

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 334 matching lines @@
         ['configuration_policy==1', {
           'dependencies': [
             '../components/components.gyp:policy_component_test_support',
             '../components/components.gyp:policy_test_support',
           ],
           'export_dependent_settings': [
             '../components/components.gyp:policy_component_test_support',
             '../components/components.gyp:policy_test_support',
           ],
         }],
-        ['safe_browsing!=1', {
+        ['safe_browsing==0 or safe_browsing==2', {
           'sources/': [
             ['exclude', '^browser/extensions/blacklist_unittest.cc'],
             ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.cc'],
             ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.h'],
+            ['exclude', '^browser/extensions/test_blacklist.cc'],
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['enable_printing==1', {
           'dependencies': [
             'service',
@@ skipping 1905 matching lines @@
         ['enable_web_speech==0', {
           'sources/': [
             ['exclude', '^browser/speech/'],
           ],
         }],
         ['notifications==0', {
           'sources/': [
             ['exclude', '^browser/notifications/'],
           ],
         }],
-        ['safe_browsing==1', {
-          'defines': [
-            'FULL_SAFE_BROWSING',
-          ],
-        }],
         # TODO(sgurun): enable tests for safe_browsing==2.
-        ['safe_browsing!=1', {
+        ['safe_browsing==0 or safe_browsing==2', {
           'sources/': [
             ['exclude', '^browser/safe_browsing/'],
             ['exclude', '^renderer/safe_browsing/'],
           ],
         }],
         ['enable_autofill_dialog!=1 or OS=="android"', {
           'sources!': [
             'browser/ui/autofill/account_chooser_model_unittest.cc',
             'browser/ui/autofill/autofill_credit_card_bubble_controller_unittest.cc',
             'browser/ui/autofill/autofill_dialog_controller_unittest.cc',
@@ skipping 621 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }