Merge Crashpad to the 42.0.2311 branch

chrome/chrome_browser.gypi

 # Copyright 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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 264 matching lines @@
       'browser/component_updater/recovery_component_installer.cc',
       'browser/component_updater/recovery_component_installer.h',
       'browser/component_updater/supervised_user_whitelist_installer.cc',
       'browser/component_updater/supervised_user_whitelist_installer.h',
       'browser/component_updater/sw_reporter_installer_win.cc',
       'browser/component_updater/sw_reporter_installer_win.h',
       'browser/component_updater/swiftshader_component_installer.cc',
       'browser/component_updater/swiftshader_component_installer.h',
       'browser/crash_upload_list.cc',
       'browser/crash_upload_list.h',
+      'browser/crash_upload_list_mac.cc',
+      'browser/crash_upload_list_mac.h',
       'browser/crash_upload_list_win.cc',
       'browser/crash_upload_list_win.h',
       'browser/custom_handlers/protocol_handler_registry.cc',
       'browser/custom_handlers/protocol_handler_registry.h',
       'browser/custom_handlers/protocol_handler_registry_factory.cc',
       'browser/custom_handlers/protocol_handler_registry_factory.h',
       'browser/custom_handlers/register_protocol_handler_infobar_delegate.cc',
       'browser/custom_handlers/register_protocol_handler_infobar_delegate.h',
       'browser/custom_handlers/register_protocol_handler_permission_request.cc',
       'browser/custom_handlers/register_protocol_handler_permission_request.h',
@@ skipping 3419 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }