Merge Crashpad to the 42.0.2311 branch

chrome/chrome_dll_bundle.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.
 
 # This file contains resources for the main Mac chromium bundle.
 {
   # The main browser executable's name is <(mac_product_name).
   # Certain things will get confused if two modules in the
   # executable share the same name, so append " Framework" to the
   # product_name used for the framework.  This will result in
@@ skipping 62 matching lines @@
   ],
   'dependencies': [
     'app_mode_app',
     # Bring in pdfsqueeze and run it on all pdfs
     '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze',
     '../crypto/crypto.gyp:crypto',
     # On Mac, Flash gets put into the framework, so we need this
     # dependency here. flash_player.gyp will copy the Flash bundle
     # into PRODUCT_DIR.
     '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
+    '../third_party/crashpad/crashpad/handler/handler.gyp:crashpad_handler',
     '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
     'chrome_resources.gyp:packed_extra_resources',
     'chrome_resources.gyp:packed_resources',
   ],
   'rules': [
     {
       'rule_name': 'pdfsqueeze',
       'extension': 'pdf',
       'inputs': [
         '<(PRODUCT_DIR)/pdfsqueeze',
@@ skipping 45 matching lines @@
   ],
   'copies': [
     {
       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
       'files': [
         '<(PRODUCT_DIR)/exif.so',
         '<(PRODUCT_DIR)/ffmpegsumo.so',
       ],
     },
     {
+      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Helpers',
+      'files': [
+        '<(PRODUCT_DIR)/crashpad_handler',
+      ],
+    },
+    {
       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins',
       'files': [],
       'conditions': [
         ['disable_nacl!=1', {
           'conditions': [
             ['target_arch=="x64"', {
               'files': [
                 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
               ],
             }, {
@@ skipping 64 matching lines @@
           'files': ['<@(default_apps_list)'],
         },
       ],
     }],
     ['mac_breakpad==1', {
       'variables': {
         # A real .dSYM is needed for dump_syms to operate on.
         'mac_real_dsym': 1,
       },
     }],
-    ['mac_breakpad_compiled_in==1', {
-      'dependencies': [
-        '../breakpad/breakpad.gyp:breakpad',
-        '../components/components.gyp:policy',
-      ],
-      'copies': [
-        {
-          'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
-          'files': [
-            '<(PRODUCT_DIR)/crash_inspector',
-            '<(PRODUCT_DIR)/crash_report_sender.app'
-          ],
-        },
-      ],
-    }],  # mac_breakpad_compiled_in
     ['mac_keystone==1', {
       'mac_bundle_resources': [
         'browser/mac/keystone_promote_preflight.sh',
         'browser/mac/keystone_promote_postflight.sh',
       ],
       'postbuilds': [
         {
           'postbuild_name': 'Copy KeystoneRegistration.framework',
           'action': [
             '../build/mac/copy_framework_unversioned.sh',
@@ skipping 43 matching lines @@
       ],
     }],
     ['v8_use_external_startup_data==1', {
       'mac_bundle_resources': [
         '<(PRODUCT_DIR)/natives_blob.bin',
         '<(PRODUCT_DIR)/snapshot_blob.bin',
       ],
     }],
   ],  # conditions
 }