UserManager refactoring: move active user session restoration to UserSessionManager.

chrome/browser/chromeos/login/crash_restore_browsertest.cc

 // Copyright 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 <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
+#include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 40 matching lines @@
   UserManager* user_manager = UserManager::Get();
   User* user = user_manager->GetActiveUser();
   ASSERT_TRUE(user);
   EXPECT_EQ(kUserId1, user->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1),
             user->username_hash());
   EXPECT_EQ(1UL, user_manager->GetLoggedInUsers().size());
 }
 
 // Observer that keeps track of user sessions restore event.
-class UserSessionRestoreObserver :
-    public UserManager::UserSessionStateObserver {
+class UserSessionRestoreObserver : public UserSessionStateObserver {
  public:
   UserSessionRestoreObserver()
       : running_loop_(false),
-        user_sessions_restored_(UserManager::Get()->UserSessionsRestored()) {
+        user_sessions_restored_(
+            UserSessionManager::GetInstance()->UserSessionsRestored()) {
     if (!user_sessions_restored_)
-      UserManager::Get()->AddSessionStateObserver(this);
+      UserSessionManager::GetInstance()->AddSessionStateObserver(this);
   }
   virtual ~UserSessionRestoreObserver() {}
 
   virtual void PendingUserSessionsRestoreFinished() OVERRIDE {
     user_sessions_restored_ = true;
-    UserManager::Get()->RemoveSessionStateObserver(this);
+    UserSessionManager::GetInstance()->RemoveSessionStateObserver(this);
     if (!running_loop_)
       return;
 
     message_loop_runner_->Quit();
     running_loop_ = false;
   }
 
   // Wait until the user sessions are restored. If that happened between the
   // construction of this object and this call or even before it was created
   // then it returns immediately.
@@ skipping 25 matching lines @@
     session_manager_client_->StartSession(kUserId3);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(CrashRestoreComplexTest, RestoreSessionForThreeUsers) {
   {
     UserSessionRestoreObserver restore_observer;
     restore_observer.Wait();
   }
 
-  UserManager* user_manager = UserManager::Get();
-  DCHECK(user_manager->UserSessionsRestored());
+  DCHECK(UserSessionManager::GetInstance()->UserSessionsRestored());
 
   // User that is last in the user sessions map becomes active. This behavior
   // will become better defined once each user gets a separate user desktop.
+  UserManager* user_manager = UserManager::Get();
   User* user = user_manager->GetActiveUser();
   ASSERT_TRUE(user);
   EXPECT_EQ(kUserId3, user->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3),
             user->username_hash());
   const UserList& users = user_manager->GetLoggedInUsers();
   ASSERT_EQ(3UL, users.size());
 
   // User that becomes active moves to the beginning of the list.
   EXPECT_EQ(kUserId3, users[0]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3),
             users[0]->username_hash());
   EXPECT_EQ(kUserId2, users[1]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2),
             users[1]->username_hash());
   EXPECT_EQ(kUserId1, users[2]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1),
             users[2]->username_hash());
 }
 
 }  // namespace chromeos