Refactor safe-browsing build-config definitions.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 0b1ffd7f6f4618f1fc9131d39752cf1f09bb0e12..28568352028dbf1c363bf1f0cc2cde97d0474ea8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -5553,7 +5553,30 @@
        ['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