Refactor safe-browsing build-config definitions.

build/common.gypi

 # Copyright (c) 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 5535 matching lines @@
     #  make generator doesn't support CC_wrapper without CC
     #  in make_global_settings yet.
     ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
       'make_global_settings': [
        ['CC_wrapper', '<(gomadir)/gomacc'],
        ['CXX_wrapper', '<(gomadir)/gomacc'],
        ['CC.host_wrapper', '<(gomadir)/gomacc'],
        ['CXX.host_wrapper', '<(gomadir)/gomacc'],
       ],
     }],
+
+    # SAFE_BROWSING_SERVICE - browser manages a safe-browsing service.

[Ryan Sleevi, 2014/07/15 23:46:10]

You like want to move this to 2456/2853 for consistency. Note those blocks are
already in target_defaults

[Scott Hess - ex-Googler, 2014/07/17 23:51:46]

Makes sense.  Done.

+    # SAFE_BROWSING_DATABASE - service manages a local database.
+    # SAFE_BROWSING_CSD - enable client-side phishing detection.
+    ['safe_browsing==1', {
+      'target_defaults': {
+        'defines': [
+          'FULL_SAFE_BROWSING',
+          'SAFE_BROWSING_CSD',
+          'SAFE_BROWSING_DATABASE',
+          'SAFE_BROWSING_SERVICE',
+        ],
+      },
+    }],
+    # TODO(shess): This is no longer in use.
+    ['safe_browsing==2', {
+      'target_defaults': {
+        'defines': [
+          'SAFE_BROWSING_SERVICE',
+        ],
+      },
+    }],
   ],
+
   'xcode_settings': {
     # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
     # This block adds *project-wide* configuration settings to each project
     # file.  It's almost always wrong to put things here.  Specify your
     # custom xcode_settings in target_defaults to add them to targets instead.
 
     'conditions': [
       # In an Xcode Project Info window, the "Base SDK for All Configurations"
       # setting sets the SDK on a project-wide basis. In order to get the
       # configured SDK to show properly in the Xcode UI, SDKROOT must be set
@@ skipping 49 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }