Refactor safe-browsing build-config definitions

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 2183 matching lines @@
             'test/data/webui/certificate_viewer_dialog_test.js',
             'test/data/webui/certificate_viewer_ui_test-inl.h',
           ],
         }],
         ['configuration_policy==1', {
           'sources': [ '<@(chrome_browser_tests_policy_sources)' ],
         }],
         ['enable_web_speech==1', {
           'sources': [ '<@(chrome_browser_tests_speech_sources)' ],
         }],
+        # TODO(nparker) enable tests for safe_browsing==2.
         ['safe_browsing==1', {
           'sources': [ '<@(chrome_browser_tests_full_safe_browsing_sources)' ],
-          'defines': [
-            'FULL_SAFE_BROWSING',
-          ],
         }],
         ['enable_captive_portal_detection==1', {
           'sources': [ 'browser/captive_portal/captive_portal_browsertest.cc' ],
         }],
         ['enable_webrtc==0', {
           'sources!': [
             'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc',
             'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc',
             'browser/media/chrome_webrtc_browsertest.cc',
             'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc',
@@ skipping 1011 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }