Finish the job that r48732 started. Move the remainder of the

installer-related files from chrome/tools/build/mac to chrome/installer/mac.

BUG=45017
TEST=none
Review URL: http://codereview.chromium.org/2755007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49551 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 16 deletions

diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 73048ab..c7f079e 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -809,7 +809,7 @@
               'destination': '<(mac_packaging_dir)',
               'files': [
                 # Pull over the known version of pkg-dmg to use.
-                'tools/build/mac/pkg-dmg',
+                'installer/mac/pkg-dmg',
               ],
               'conditions': [
                 ['mac_keystone==1', {
diff --git a/chrome/tools/build/mac/README.chromium b/chrome/installer/mac/README.chromium
index cce113d..cce113d 100644
--- a/chrome/tools/build/mac/README.chromium
+++ b/chrome/installer/mac/README.chromium
diff --git a/chrome/tools/build/mac/keystone_install_test.sh b/chrome/installer/mac/keystone_install_test.sh
index 32930bf..bc49c32 100755
--- a/chrome/tools/build/mac/keystone_install_test.sh
+++ b/chrome/installer/mac/keystone_install_test.sh
@@ -94,10 +94,8 @@ EOF
 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
+  defaults write "${DEST}/Contents/Info" KSVersion 0
   cat >"${TEMPDIR}"/ksadmin <<EOF
 #!/bin/sh
 if [ "\${1}" = "--ksadmin-version" ] ; then
@@ -122,9 +120,9 @@ function make_src() {
   mkdir -p "${RSRCDIR}"
   defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" \
       CFBundleShortVersionString "1"
-  defaults write "${RSRCDIR}/Info" \
+  defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" \
       KSProductID "com.google.Chrome"
-  defaults write "${RSRCDIR}/Info" \
+  defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" \
       KSVersion "2"
 }
 
@@ -146,24 +144,18 @@ make_basic_src_and_dest
 fail_installer "Was no KSUpdateURL in dest after copy"
 
 make_basic_src_and_dest
-defaults write \
-    "${TEMPDIR}/${APPNAME}/Contents/Versions/1/${FWKNAME}/Resources/Info" \
-    KSUpdateURL "http://foo.bar"
+defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" KSUpdateURL "http://foobar"
 export FAKE_SYSTEM_TICKET=1
 fail_installer "User and system ticket both present"
 export -n FAKE_SYSTEM_TICKET
 
 make_src
 make_old_dest
-defaults write \
-    "${TEMPDIR}/${APPNAME}/Contents/Versions/1/${FWKNAME}/Resources/Info" \
-    KSUpdateURL "http://foo.bar"
+defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" KSUpdateURL "http://foobar"
 pass_installer "Old-style update"
 
 make_basic_src_and_dest
-defaults write \
-    "${TEMPDIR}/${APPNAME}/Contents/Versions/1/${FWKNAME}/Resources/Info" \
-    KSUpdateURL "http://foo.bar"
+defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" KSUpdateURL "http://foobar"
 pass_installer "ALL"
 
 cleanup_tempdir
diff --git a/chrome/tools/build/mac/pkg-dmg b/chrome/installer/mac/pkg-dmg
index 3458aab..3458aab 100755
--- a/chrome/tools/build/mac/pkg-dmg
+++ b/chrome/installer/mac/pkg-dmg
diff --git a/chrome/tools/build/mac/build_app_dmg b/chrome/tools/build/mac/build_app_dmg
index 9799b07..d88cc0b 100755
--- a/chrome/tools/build/mac/build_app_dmg
+++ b/chrome/tools/build/mac/build_app_dmg
@@ -19,7 +19,7 @@ fi
 set -e
 
 TOP="${SRCROOT}/.."
-PKG_DMG="${SRCROOT}/tools/build/mac/pkg-dmg"
+PKG_DMG="${SRCROOT}/installer/mac/pkg-dmg"
 BRAND_SCRIPT="${TOP}/build/branding_value.sh"
 
 BUILD_BRANDING=$1