Roll Linux reference build to official build 31.0.1650.34 (trunk r224845, branch r230433)

chrome_linux/installer/common/installer.include

 # Recursively replace @@include@@ template variables with the referenced file,
 # and write the resulting text to stdout.
 process_template_includes() {
   INCSTACK+="$1->"
   # Includes are relative to the file that does the include.
   INCDIR=$(dirname $1)
   # Clear IFS so 'read' doesn't trim whitespace
   local OLDIFS="$IFS"
   IFS=''
   while read -r LINE
@@ skipping 58 matching lines @@
     -e "s#@@PROVIDES@@#${PROVIDES}#g" \
     -e "s#@@REPLACES@@#${REPLACES}#g" \
     -e "s#@@CONFLICTS@@#${CONFLICTS}#g" \
     -e "s#@@ARCHITECTURE@@#${ARCHITECTURE}#g" \
     -e "s#@@MAINTNAME@@#${MAINTNAME}#g" \
     -e "s#@@MAINTMAIL@@#${MAINTMAIL}#g" \
     -e "s#@@REPOCONFIG@@#${REPOCONFIG}#g" \
     -e "s#@@SHORTDESC@@#${SHORTDESC}#g" \
     -e "s#@@FULLDESC@@#${FULLDESC}#g" \
     -e "s#@@DEFAULT_FLAGS@@#${DEFAULT_FLAGS:-}#g" \
+    -e "s#@@SXS_USER_DATA_DIR@@#${SXS_USER_DATA_DIR:-}#g" \
+    -e "s#@@USR_BIN_SYMLINK_NAME@@#${USR_BIN_SYMLINK_NAME:-}#g" \
     > "$TMPLOUT" <<< "$TMPLINCL"
 )
 
 # Setup the installation directory hierachy in the package staging area.
 prep_staging_common() {
   install -m 755 -d "${STAGEDIR}/${INSTALLDIR}" \
     "${STAGEDIR}/usr/bin" \
     "${STAGEDIR}/usr/share/applications" \
     "${STAGEDIR}/usr/share/gnome-control-center/default-apps" \
     "${STAGEDIR}/usr/share/man/man1"
@@ skipping 22 matching lines @@
   #
   # app
   # We need to add the debug link so gdb knows to look for the symbols.
   DEBUGFILE="${BUILDDIR}/${PROGNAME}.debug"
   STRIPPEDFILE="${BUILDDIR}/${PROGNAME}.stripped"
   eu-strip -o "${STRIPPEDFILE}" -f "${DEBUGFILE}" "${BUILDDIR}/${PROGNAME}"
   install -m 755 "${STRIPPEDFILE}" "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}"
   rm "${DEBUGFILE}" "${STRIPPEDFILE}"
 
   # resources
-  install -m 644 "${BUILDDIR}/${PROGNAME}.pak" "${STAGEDIR}/${INSTALLDIR}/"
   install -m 644 "${BUILDDIR}/resources.pak" "${STAGEDIR}/${INSTALLDIR}/"
   # TODO(mmoss): This has broken a couple times on adding new .pak files. Maybe
   # we should flag all installer files in FILES.cfg and get them from there, so
   # there's only one place people need to keep track of such things (and in
   # only the public repository).
   if [ -r "${BUILDDIR}/chrome_100_percent.pak" ]; then
     install -m 644 "${BUILDDIR}/chrome_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
   else
     install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
     install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
@@ skipping 73 matching lines @@
   if [ -d "${BUILDDIR}/default_apps" ]; then
     cp -a "${BUILDDIR}/default_apps" "${STAGEDIR}/${INSTALLDIR}/"
     find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type d -exec chmod 755 '{}' \;
     find "${STAGEDIR}/${INSTALLDIR}/default_apps" -type f -exec chmod 644 '{}' \;
   fi
 
   # launcher script and symlink
   process_template "${BUILDDIR}/installer/common/wrapper" \
     "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}"
   chmod 755 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}"
-  pushd "${STAGEDIR}/usr/bin/"
-  ln -snf "${INSTALLDIR}/${PACKAGE}" "${PACKAGE}"
-  popd
+  ln -snf "${INSTALLDIR}/${PACKAGE}" \
+    "${STAGEDIR}/usr/bin/${USR_BIN_SYMLINK_NAME}"
 
   # app icons
   install -m 644 \
     "${BUILDDIR}/installer/theme/product_logo_"*.png \
     "${BUILDDIR}/installer/theme/product_logo_32.xpm" \
     "${STAGEDIR}/${INSTALLDIR}/"
 
   # desktop integration
   install -m 755 "${BUILDDIR}/xdg-mime" "${STAGEDIR}${INSTALLDIR}/"
   install -m 755 "${BUILDDIR}/xdg-settings" "${STAGEDIR}${INSTALLDIR}/"
   process_template "${BUILDDIR}/installer/common/desktop.template" \
     "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}.desktop"
   chmod 644 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}.desktop"
   process_template "${BUILDDIR}/installer/common/default-app.template" \
     "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
   chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
   process_template "${BUILDDIR}/installer/common/default-app-block.template" \
     "${STAGEDIR}${INSTALLDIR}/default-app-block"
   chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
 
   # documentation
   install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
     "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
 }