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

session_manager_setup.sh

Index: session_manager_setup.sh
diff --git a/session_manager_setup.sh b/session_manager_setup.sh
index 8c97c0fc6e2409f17981467d9a1e2657680ab17d..245011e546947c4dcbb93396f143f95e9d9c940f 100755
--- a/session_manager_setup.sh
+++ b/session_manager_setup.sh
@@ -43,7 +43,7 @@ if [ -n "$ENABLE_CHROME_LOGGING" ] ; then
   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
@@ -87,6 +87,9 @@ 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"
@@ -152,4 +155,5 @@ exec /sbin/session_manager --uid=${USER_ID} --login -- \
             --login-profile=user \
             --in-chrome-auth \
             --enable-login-images \
-            "${SKIP_OOBE}"
+            "${SKIP_OOBE}" \
+            "${PROXY_ARGS}"