Breakpad: Compile Breakpad into Chromium by default on Mac

chrome/chrome_dll.gypi

Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 2f7d34036aa1cb591c4c51e4b8176d20a0e98e0a..fd59c70c68ccf972643b5e910ff79935b06e6aee 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -358,7 +358,8 @@
                   # but this seems like a really good place to store them.
                   'postbuild_name': 'Tweak Info.plist',
                   'action': ['<(tweak_info_plist_path)',
-                             '-b<(mac_breakpad)',
+                             '--breakpad=<(mac_breakpad_compiled_in)',
+                             '--breakpad_uploads=<(mac_breakpad_uploads)',
                              '-k0',
                              '-s1',
                              '<(branding)',
@@ -452,6 +453,8 @@
                     # A real .dSYM is needed for dump_syms to operate on.
                     'mac_real_dsym': 1,
                   },
+                }],
+                ['mac_breakpad_compiled_in==1', {
                   'sources': [
                     'app/breakpad_mac.mm',
                     'app/breakpad_mac.h',
@@ -469,13 +472,13 @@
                       ],
                     },
                   ],
-                }, {  # else: mac_breakpad!=1
+                }, {  # else: mac_breakpad_compiled_in!=1
                   # No Breakpad, put in the stubs.
                   'sources': [
                     'app/breakpad_mac_stubs.mm',
                     'app/breakpad_mac.h',
                   ],
-                }],  # mac_breakpad
+                }],  # mac_breakpad_compiled_in
                 ['mac_keystone==1', {
                   'mac_bundle_resources': [
                     'browser/mac/keystone_promote_preflight.sh',