Set valid profile image when logging in as demo user

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 303 matching lines @@
   const_cast<UserManagerImpl*>(this)->EnsureUsersLoaded();
   return users_;
 }
 
 void UserManagerImpl::UserLoggedIn(const std::string& email) {
   DCHECK(!is_user_logged_in_);
 
   is_user_logged_in_ = true;
 
   if (email == kGuestUser) {
-    is_current_user_ephemeral_ = true;
     GuestUserLoggedIn();
     return;
   }
 
   if (email == kDemoUser) {
-    is_current_user_ephemeral_ = true;
     DemoUserLoggedIn();
     return;
   }
 
   if (IsEphemeralUser(email)) {
+    EphemeralUserLoggedIn(email);
+    return;
+  }
+
+  EnsureUsersLoaded();
+
+  // Clear the prefs view of the users.
+  PrefService* prefs = g_browser_process->local_state();
+  ListPrefUpdate prefs_users_update(prefs, UserManager::kLoggedInUsers);
+  prefs_users_update->Clear();
+
+  // Make sure this user is first.
+  prefs_users_update->Append(Value::CreateStringValue(email));
+  UserList::iterator logged_in_user = users_.end();
+  for (UserList::iterator it = users_.begin(); it != users_.end(); ++it) {
+    std::string user_email = (*it)->email();
+    // Skip the most recent user.
+    if (email != user_email)
+      prefs_users_update->Append(Value::CreateStringValue(user_email));
+    else
+      logged_in_user = it;
+  }
+
+  if (logged_in_user == users_.end()) {
     is_current_user_new_ = true;
-    is_current_user_ephemeral_ = true;
     logged_in_user_ = CreateUser(email);
-    SetInitialUserImage(email);
   } else {
-    EnsureUsersLoaded();
-
-    // Clear the prefs view of the users.
-    PrefService* prefs = g_browser_process->local_state();
-    ListPrefUpdate prefs_users_update(prefs, UserManager::kLoggedInUsers);
-    prefs_users_update->Clear();
-
-    // Make sure this user is first.
-    prefs_users_update->Append(Value::CreateStringValue(email));
-    UserList::iterator logged_in_user = users_.end();
-    for (UserList::iterator it = users_.begin(); it != users_.end(); ++it) {
-      std::string user_email = (*it)->email();
-      // Skip the most recent user.
-      if (email != user_email)
-        prefs_users_update->Append(Value::CreateStringValue(user_email));
-      else
-        logged_in_user = it;
-    }
-
-    if (logged_in_user == users_.end()) {
-      is_current_user_new_ = true;
-      logged_in_user_ = CreateUser(email);
-    } else {
-      logged_in_user_ = *logged_in_user;
-      users_.erase(logged_in_user);
-    }
-    // This user must be in the front of the user list.
-    users_.insert(users_.begin(), logged_in_user_);
+    logged_in_user_ = *logged_in_user;
+    users_.erase(logged_in_user);
   }
+  // This user must be in the front of the user list.
+  users_.insert(users_.begin(), logged_in_user_);
 
   NotifyOnLogin();
 
   if (is_current_user_new_) {
     SetInitialUserImage(email);
   } else {
     // Download profile image if it's user image and see if it has changed.
     int image_index = logged_in_user_->image_index();
     if (image_index == User::kProfileImageIndex) {
       InitDownloadedProfileImage();
@@ skipping 17 matching lines @@
         histogram_index = kHistogramImageFromProfile;
         break;
     }
     UMA_HISTOGRAM_ENUMERATION("UserImage.LoggedIn",
                               histogram_index,
                               kHistogramImagesCount);
   }
 }
 
 void UserManagerImpl::DemoUserLoggedIn() {
+  is_current_user_new_ = true;
+  is_current_user_ephemeral_ = true;
   logged_in_user_ = &demo_user_;
+  SetInitialUserImage(kDemoUser);
   NotifyOnLogin();
 }
 
 void UserManagerImpl::GuestUserLoggedIn() {
+  is_current_user_ephemeral_ = true;
   logged_in_user_ = &guest_user_;
   NotifyOnLogin();
 }
 
+void UserManagerImpl::EphemeralUserLoggedIn(const std::string& email) {
+  is_current_user_new_ = true;
+  is_current_user_ephemeral_ = true;
+  logged_in_user_ = CreateUser(email);
+  SetInitialUserImage(email);
+  NotifyOnLogin();
+}
+
 void UserManagerImpl::RemoveUser(const std::string& email,
                                  RemoveUserDelegate* delegate) {
   if (!IsKnownUser(email))
     return;
 
   // Sanity check: we must not remove single user. This check may seem
   // redundant at a first sight because this single user must be an owner and
   // we perform special check later in order not to remove an owner.  However
   // due to non-instant nature of ownership assignment this later check may
   // sometimes fail. See http://crosbug.com/12723
@@ skipping 745 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos