Refactor safe-browsing build-config definitions.

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 96cd5ad20d9c546c5023cb8023a7e2ec049a2005..6efb0bc35cfd66d9eeae7f608555d49862c2da4e 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -354,11 +354,12 @@
             '../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"', {
@@ -2284,13 +2285,8 @@
             ['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/'],