Merge Crashpad to the 42.0.2311 branch

content/content_shell.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.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 28 matching lines @@
         'content.gyp:content_resources',
         'content.gyp:content_utility',
         'content_shell_resources',
         'copy_test_netscape_plugin',
         'layouttest_support_content',
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../cc/blink/cc_blink.gyp:cc_blink',
         '../cc/cc.gyp:cc',
-        '../components/components.gyp:crash_component',
+        '../components/components.gyp:crash_component_breakpad_mac_to_be_deleted',
         '../components/components.gyp:web_cache_renderer',
         '../device/bluetooth/bluetooth.gyp:device_bluetooth',
         '../gin/gin.gyp:gin',
         '../gpu/gpu.gyp:gpu',
         '../ipc/ipc.gyp:ipc',
         '../media/blink/media_blink.gyp:media_blink',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../skia/skia.gyp:skia',
@@ skipping 1111 matching lines @@
                 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
                 '--destination_dir', '<(dest_dir)',
               ],
             },
           ],
         },
       ],
     }],  # OS=="win" and fastbuild==0 and target_arch=="ia32"
   ]
 }