Merge Crashpad to the 42.0.2311 branch

chrome/installer/mac/sign_versioned_dir.sh.in

Index: chrome/installer/mac/sign_versioned_dir.sh.in
diff --git a/chrome/installer/mac/sign_versioned_dir.sh.in b/chrome/installer/mac/sign_versioned_dir.sh.in
index 82a11c696b354d1828b56ede9b5828a3f72a362f..2a09ac6bf704cd4a6914d091f93a198ed8b25e78 100644
--- a/chrome/installer/mac/sign_versioned_dir.sh.in
+++ b/chrome/installer/mac/sign_versioned_dir.sh.in
@@ -41,6 +41,7 @@ versioned_dir="${app_path}/Contents/Versions/@VERSION@"
 # signed directly. See copy_framework_unversioned.sh.
 
 framework="${versioned_dir}/@MAC_PRODUCT_NAME@ Framework.framework"
+crashpad_handler="${framework}/Helpers/crashpad_handler"
 helper_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper.app"
 helper_eh_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper EH.app"
 helper_np_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper NP.app"
@@ -50,6 +51,10 @@ and certificate leaf = H\"85cee8254216185620ddc8851c7a9fc4dfe120ef\"\
 "
 
 codesign --sign "${codesign_id}" --keychain "${codesign_keychain}" \
+    "${crashpad_handler}" \
+    -r="designated => identifier \"crashpad_handler\" \
+${requirement_suffix}"
+codesign --sign "${codesign_id}" --keychain "${codesign_keychain}" \
     "${framework}" \
     -r="designated => identifier \"com.google.Chrome.framework\" \
 ${requirement_suffix}"
@@ -68,6 +73,7 @@ ${requirement_suffix}"
 
 # Verify everything. Don't use --deep on the framework because Keystone's
 # signature is in a transitional state (radar 18474911).
+codesign --verify --deep "${crashpad_handler}"
 codesign --verify "${framework}"
 codesign --verify --deep "${helper_app}"
 codesign --verify --deep "${helper_eh_app}"