Revert "Revert "Add default proxy stub as well as login to session_manager_setup""

session_manager_setup.sh

 #!/bin/sh
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 XAUTH=/usr/bin/xauth
 XAUTH_FILE="/var/run/chromelogin.auth"
 SERVER_READY=
 
@@ skipping 25 matching lines @@
 
 if [ -n "$ENABLE_CHROME_LOGGING" ] ; then
   CHROME_LOG=${DATA_DIR}/chrome_log
   CHROME_OLD_LOGS=${DATA_DIR}/chrome_old_logs
   # Forces Chrome to put its log into the home directory.
   # Release versions do this already, but not Debug ones.
   export CHROME_LOG_FILE=${CHROME_LOG}
   CHROME_LOG_FLAG="--enable-logging"
   mkdir -p $CHROME_OLD_LOGS
   chown $USER $CHROME_OLD_LOGS
-  if [ -e ${CHROME_LOG} ] ; then 
+  if [ -e ${CHROME_LOG} ] ; then
     LS_ARGS="-lht --time-style=+chrome.%Y%m%d-%H%M%S"
     OLD_LOG=${CHROME_OLD_LOGS}/`ls $LS_ARGS $CHROME_LOG | awk '{ print $6 }'`
     mv $CHROME_LOG $OLD_LOG
   fi
 else
   CHROME_LOG_FLAG="--disable-logging"
 fi
 
 # Forces Chrome mini dumps that are sent to the crash server to also be written
 # locally.  Chrome by default will create these mini dump files in
@@ skipping 23 matching lines @@
   umount -f ${LOGIN_PROFILE_DIR}
 fi
 rm -rf ${LOGIN_PROFILE_DIR}
 mkdir -p ${LOGIN_PROFILE_DIR}
 mount -n -t tmpfs -onodev,noexec,nosuid loginprofile ${LOGIN_PROFILE_DIR}
 chown ${USER}:${USER} ${LOGIN_PROFILE_DIR}
 
 # temporary hack to tell cryptohome that we're doing chrome-login
 touch /tmp/doing-chrome-login
 
+# Read default_proxy file from etc.  Ok if not set.
+PROXY_ARGS=--proxy-pac-url="$(cat /etc/default_proxy)"
+
 CHROME_DIR="/opt/google/chrome"
 CHROME="$CHROME_DIR/chrome"
 SEND_METRICS="/etc/send_metrics"
 CONSENT_FILE="$DATA_DIR/Consent To Send Stats"
 
 # xdg-open is used to open downloaded files.
 # It runs sensible-browser, which uses $BROWSER.
 export BROWSER=${CHROME}
 
 USER_ID=$(/usr/bin/id -u ${USER})
@@ skipping 45 matching lines @@
             --enable-sync \
             --enable-chat-manager \
             --log-level=0 \
             "$CHROME_LOG_FLAG" \
             --main-menu-url="http://welcome-cros.appspot.com/menu" \
             --no-first-run \
             --user-data-dir=/home/$USER \
             --login-profile=user \
             --in-chrome-auth \
             --enable-login-images \
-            "${SKIP_OOBE}"
+            "${SKIP_OOBE}" \
+            "${PROXY_ARGS}"