Revert r48735 "Added user image screen for new user login (or old user logging in through"

chrome/browser/chromeos/login/login_utils.cc

Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 227eac0895cc3a7dc443a7933c2eaab8d4571b43..bef788903bfa3cd4340d220ec84523110252449a 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -88,16 +88,6 @@ class LoginUtilsImpl : public LoginUtils,
   // Authenticator and must delete it when done.
   virtual Authenticator* CreateAuthenticator(LoginStatusConsumer* consumer);
 
-  // Used to postpone browser launch via DoBrowserLaunch() if some post
-  // login screen is to be shown.
-  virtual void EnableBrowserLaunch(bool enable);
-
-  // Returns if browser launch enabled now or not.
-  virtual bool IsBrowserLaunchEnabled() const;
-
-  // Returns auth token for 'cp' Contacts service.
-  virtual const std::string& GetAuthToken() const { return auth_token_; }
-
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ -111,13 +101,6 @@ class LoginUtilsImpl : public LoginUtils,
   bool wifi_connecting_;
   base::Time wifi_connect_start_time_;
 
-  // Indicates if DoBrowserLaunch will actually launch the browser or not.
-  bool browser_launch_enabled_;
-
-  // Auth token for Contacts service. Received by GoogleAuthenticator as
-  // part of ClientLogin response.
-  std::string auth_token_;
-
   DISALLOW_COPY_AND_ASSIGN(LoginUtilsImpl);
 };
 
@@ -192,7 +175,9 @@ void LoginUtilsImpl::CompleteLogin(const std::string& username,
   // delete itself.
   CookieFetcher* cf = new CookieFetcher(profile);
   cf->AttemptFetch(credentials);
-  auth_token_ = get_auth_token(credentials);
+  std::string auth = get_auth_token(credentials);
+  if (!auth.empty())
+    new UserImageDownloader(username, auth);
 }
 
 void LoginUtilsImpl::CompleteOffTheRecordLogin() {
@@ -215,14 +200,6 @@ Authenticator* LoginUtilsImpl::CreateAuthenticator(
   return new GoogleAuthenticator(consumer);
 }
 
-void LoginUtilsImpl::EnableBrowserLaunch(bool enable) {
-  browser_launch_enabled_ = enable;
-}
-
-bool LoginUtilsImpl::IsBrowserLaunchEnabled() const {
-  return browser_launch_enabled_;
-}
-
 void LoginUtilsImpl::Observe(NotificationType type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
@@ -254,10 +231,6 @@ void LoginUtils::DoBrowserLaunch(Profile* profile) {
     return;
   }
 
-  // Browser launch was disabled due to some post login screen.
-  if (!LoginUtils::Get()->IsBrowserLaunchEnabled())
-    return;
-
   LOG(INFO) << "Launching browser...";
   BrowserInit browser_init;
   int return_code;