mac: Don't rely on Breakpad Info.plist keys for Crashpad initialization

build/mac/tweak_info_plist.py

Index: build/mac/tweak_info_plist.py
diff --git a/build/mac/tweak_info_plist.py b/build/mac/tweak_info_plist.py
index 23c810aaeccc1a1cb5b94070aed8d98670131d98..920c62daf99f4f4ef0207f23cc3b28bd6a168cbd 100755
--- a/build/mac/tweak_info_plist.py
+++ b/build/mac/tweak_info_plist.py
@@ -164,6 +164,8 @@ def _AddBreakpadKeys(plist, branding, platform):
   plist['BreakpadReportInterval'] = '3600'  # Deliberately a string.
   plist['BreakpadProduct'] = '%s_%s' % (branding, platform)
   plist['BreakpadProductDisplay'] = branding
+  plist['BreakpadURL'] = 'https://clients2.google.com/cr/report'

[scottmg, 2016/08/01 20:38:34]

BreakpadURL isn't used in crashpad_mac.mm any more? Do we need this at all?

[Mark Mentovai, 2016/08/01 20:39:23]

scottmg (OOO until August) wrote:
Content Shell and iOS still use Breakpad, so we need to hang on to this for them
at least. For now, anyway.

+
   # These are both deliberately strings and not boolean.
   plist['BreakpadSendAndExit'] = 'YES'
   plist['BreakpadSkipConfirm'] = 'YES'
@@ -234,9 +236,6 @@ def Main(argv):
       'the tweaked plist, rather than overwriting the input.')
   parser.add_option('--breakpad', dest='use_breakpad', action='store',
       type='int', default=False, help='Enable Breakpad [1 or 0]')
-  parser.add_option('--breakpad_uploads', dest='breakpad_uploads',
-      action='store', type='int', default=False,
-      help='Enable Breakpad\'s uploading of crash dumps [1 or 0]')
   parser.add_option('--keystone', dest='use_keystone', action='store',
       type='int', default=False, help='Enable Keystone [1 or 0]')
   parser.add_option('--scm', dest='add_scm_info', action='store', type='int',
@@ -327,16 +326,6 @@ def Main(argv):
     # the platform as known by breakpad.
     platform = {'mac': 'Mac', 'ios': 'iOS'}[options.platform]
     _AddBreakpadKeys(plist, options.branding, platform)
-    if options.breakpad_uploads:
-      plist['BreakpadURL'] = 'https://clients2.google.com/cr/report'
-    else:
-      # This allows crash dumping to a file without uploading the
-      # dump, for testing purposes.  Breakpad does not recognise
-      # "none" as a special value, but this does stop crash dump
-      # uploading from happening.  We need to specify something
-      # because if "BreakpadURL" is not present, Breakpad will not
-      # register its crash handler and no crash dumping will occur.
-      plist['BreakpadURL'] = 'none'
   else:
     _RemoveBreakpadKeys(plist)