Merge trunk r145370 to the 21.0.1180 branch.

chrome/installer/mac/sign_versioned_dir.sh.in

 #!/bin/bash -p
 
 # 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.
 
 # Using codesign, sign the contents of the versioned directory. Namely, this
 # includes the framework and helper app. After signing, the signatures are
 # verified.
 
@@ skipping 27 matching lines @@
 # framework bundle requires that each version within be signed individually.
 # http://developer.apple.com/mac/library/technotes/tn2007/tn2206.html#TNTAG13
 # In Chrome's case, the framework bundle is unversioned, so it too can be
 # signed directly. See copy_framework_unversioned.sh.
 
 framework="${versioned_dir}/@MAC_PRODUCT_NAME@ Framework.framework"
 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"
 
-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}"
 codesign -v "${helper_app}"
 codesign -v "${helper_eh_app}"
 codesign -v "${helper_np_app}"