Merge trunk r35030 to the 249 branch

chrome/tools/build/mac/keystone_install_test.sh

 #!/bin/bash
 
 # Copyright (c) 2009 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.
 
 # Test of the Mac Chrome installer.
 
 
 # Where I am
 DIR=$(dirname "${0}")
 
 # My installer to test
 INSTALLER="${DIR}"/keystone_install.sh
 if [ ! -f "${INSTALLER}" ]; then
   echo "Can't find scripts." >& 2
   exit 1
 fi
 
 # What I test
 PRODNAME="Google Chrome"
 APPNAME="${PRODNAME}.app"
 FWKNAME="${PRODNAME} Framework.framework"
 
+# The version number for fake ksadmin to pretend to be
+KSADMIN_VERSION_LIE="1.0.7.1306"
+
 # Temp directory to be used as the disk image (source)
 TEMPDIR=$(mktemp -d -t $(basename ${0}))
 PATH=$PATH:"${TEMPDIR}"
 
 # Clean up the temp directory
 function cleanup_tempdir() {
   chmod u+w "${TEMPDIR}"
   rm -rf "${TEMPDIR}"
 }
 
@@ skipping 30 matching lines @@
 
 # Make an old-style destination directory, to test updating from old-style
 # versions to new-style versions.
 function make_old_dest() {
   DEST="${TEMPDIR}"/Dest.app
   rm -rf "${DEST}"
   mkdir -p "${DEST}"/Contents
   defaults write "${DEST}/Contents/Info" KSVersion 0
   cat >"${TEMPDIR}"/ksadmin <<EOF
 #!/bin/sh
+if [ "\${1}" = "--ksadmin-version" ] ; then
+  echo "${KSADMIN_VERSION_LIE}"
+  exit 0
+fi
 if [ -z "\${FAKE_SYSTEM_TICKET}" ] && [ "\${1}" = "-S" ] ; then
   echo no system tix! >& 2
   exit 1
 fi
 echo " xc=<KSPathExistenceChecker:0x45 path=${DEST}>"
 exit 0
 EOF
   chmod u+x "${TEMPDIR}"/ksadmin
 }
 
 # Make a new-style destination directory, to test updating between new-style
 # versions.
 function make_new_dest() {
   DEST="${TEMPDIR}"/Dest.app
   rm -rf "${DEST}"
   RSRCDIR="${DEST}/Contents/Versions/0/${FWKNAME}/Resources"
   mkdir -p "${RSRCDIR}"
   defaults write "${DEST}/Contents/Info" CFBundleShortVersionString 0
   defaults write "${RSRCDIR}/Info" KSVersion 0
   cat >"${TEMPDIR}"/ksadmin <<EOF
 #!/bin/sh
+if [ "\${1}" = "--ksadmin-version" ] ; then
+  echo "${KSADMIN_VERSION_LIE}"
+  exit 0
+fi
 if [ -z "\${FAKE_SYSTEM_TICKET}" ] && [ "\${1}" = "-S" ] ; then
   echo no system tix! >& 2
   exit 1
 fi
 echo " xc=<KSPathExistenceChecker:0x45 path=${DEST}>"
 exit 0
 EOF
   chmod u+x "${TEMPDIR}"/ksadmin
 }
 
@@ skipping 43 matching lines @@
     KSUpdateURL "http://foo.bar"
 pass_installer "Old-style update"
 
 make_basic_src_and_dest
 defaults write \
     "${TEMPDIR}/${APPNAME}/Contents/Versions/1/${FWKNAME}/Resources/Info" \
     KSUpdateURL "http://foo.bar"
 pass_installer "ALL"
 
 cleanup_tempdir