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

chrome_linux/installer/common/installer.include

Index: chrome_linux/installer/common/installer.include
===================================================================
--- chrome_linux/installer/common/installer.include	(revision 230844)
+++ chrome_linux/installer/common/installer.include	(working copy)
@@ -76,6 +76,8 @@
     -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"
 )
 
@@ -118,7 +120,6 @@
   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
@@ -212,9 +213,8 @@
   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 \