Revert of Multiprofile: switch to newly added user to the session

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2013 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 <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 406 matching lines @@
     DCHECK(!IsUserLoggedIn());
 
   User* user = FindUserInListAndModify(user_id);
   if (active_user_ && user) {
     user->set_is_logged_in(true);
     user->set_username_hash(username_hash);
     logged_in_users_.push_back(user);
     lru_logged_in_users_.push_back(user);
     // Reset the new user flag if the user already exists.
     is_current_user_new_ = false;
+    // Set active user wallpaper back.
+    WallpaperManager::Get()->SetUserWallpaperNow(active_user_->email());
     NotifyUserAddedToSession(user);
-    // Remember that we need to switch to this user as soon as profile ready.
-    pending_user_switch_ = user_id;
     return;
   }
 
   policy::DeviceLocalAccount::Type device_local_account_type;
   if (user_id == UserManager::kGuestUserName) {
     GuestUserLoggedIn();
   } else if (user_id == UserManager::kRetailModeUserName) {
     RetailModeUserLoggedIn();
   } else if (policy::IsDeviceLocalAccountUser(user_id,
                                               &device_local_account_type) &&
@@ skipping 524 matching lines @@
         GetNSSCertDatabaseForProfile(profile,
                                      base::Bind(&OnGetNSSCertDatabaseForUser));
       }
       break;
     }
     case chrome::NOTIFICATION_PROFILE_CREATED: {
       Profile* profile = content::Source<Profile>(source).ptr();
       User* user = GetUserByProfile(profile);
       if (user != NULL)
         user->set_profile_is_created();
-      // If there is pending user switch, do it now.
-      if (!pending_user_switch_.empty()) {
-        // Call SwitchActiveUser async because otherwise it may cause
-        // ProfileManager::GetProfile before the profile gets registered
-        // in ProfileManager. It happens in case of sync profile load when
-        // NOTIFICATION_PROFILE_CREATED is called synchronously.
-        base::MessageLoop::current()->PostTask(FROM_HERE,
-          base::Bind(&UserManagerImpl::SwitchActiveUser,
-                     base::Unretained(this),
-                     pending_user_switch_));
-        pending_user_switch_.clear();
-      }
+
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 void UserManagerImpl::OnExternalDataSet(const std::string& policy,
                                         const std::string& user_id) {
   if (policy == policy::key::kUserAvatarImage)
@@ skipping 1095 matching lines @@
 }
 
 void UserManagerImpl::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
 }  // namespace chromeos