Merge trunk r145370 to the 20.0.1132 branch.

chrome/installer/mac/sign_versioned_dir.sh.in

Index: chrome/installer/mac/sign_versioned_dir.sh.in
===================================================================
--- chrome/installer/mac/sign_versioned_dir.sh.in	(revision 146847)
+++ chrome/installer/mac/sign_versioned_dir.sh.in	(working copy)
@@ -45,12 +45,24 @@
 helper_eh_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper EH.app"
 helper_np_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper NP.app"
 
-codesign -s "${codesign_id}" --keychain "${codesign_keychain}" "${framework}"
-codesign -s "${codesign_id}" --keychain "${codesign_keychain}" "${helper_app}"
+requirement_suffix="\
+and certificate leaf = H\"85cee8254216185620ddc8851c7a9fc4dfe120ef\"\
+"
+
+codesign -s "${codesign_id}" --keychain "${codesign_keychain}" "${framework}" \
+    -r="designated => identifier \"com.google.Chrome.framework\" \
+${requirement_suffix}"
+codesign -s "${codesign_id}" --keychain "${codesign_keychain}" "${helper_app}" \
+    -r="designated => identifier \"com.google.Chrome.helper\" \
+${requirement_suffix}"
 codesign -s "${codesign_id}" --keychain "${codesign_keychain}" \
-    "${helper_eh_app}"
+    "${helper_eh_app}" \
+    -r="designated => identifier \"com.google.Chrome.helper.EH\" \
+${requirement_suffix}"
 codesign -s "${codesign_id}" --keychain "${codesign_keychain}" \
-    "${helper_np_app}"
+    "${helper_np_app}" \
+    -r="designated => identifier \"com.google.Chrome.helper.NP\" \
+${requirement_suffix}"
 
 # Verify everything.
 codesign -v "${framework}"