| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 dbus_thread_manager->SetSessionManagerClient( | 51 dbus_thread_manager->SetSessionManagerClient( |
| 52 scoped_ptr<SessionManagerClient>(session_manager_client_)); | 52 scoped_ptr<SessionManagerClient>(session_manager_client_)); |
| 53 DBusThreadManager::SetInstanceForTesting(dbus_thread_manager); | 53 DBusThreadManager::SetInstanceForTesting(dbus_thread_manager); |
| 54 session_manager_client_->StartSession(kUserId1); | 54 session_manager_client_->StartSession(kUserId1); |
| 55 } | 55 } |
| 56 | 56 |
| 57 FakeSessionManagerClient* session_manager_client_; | 57 FakeSessionManagerClient* session_manager_client_; |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 IN_PROC_BROWSER_TEST_F(CrashRestoreSimpleTest, RestoreSessionForOneUser) { | 60 IN_PROC_BROWSER_TEST_F(CrashRestoreSimpleTest, RestoreSessionForOneUser) { |
| 61 UserManager* user_manager = UserManager::Get(); | 61 UserManager* user_manager = GetUserManager(); |
| 62 User* user = user_manager->GetActiveUser(); | 62 User* user = user_manager->GetActiveUser(); |
| 63 ASSERT_TRUE(user); | 63 ASSERT_TRUE(user); |
| 64 EXPECT_EQ(kUserId1, user->email()); | 64 EXPECT_EQ(kUserId1, user->email()); |
| 65 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1), | 65 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1), |
| 66 user->username_hash()); | 66 user->username_hash()); |
| 67 EXPECT_EQ(1UL, user_manager->GetLoggedInUsers().size()); | 67 EXPECT_EQ(1UL, user_manager->GetLoggedInUsers().size()); |
| 68 } | 68 } |
| 69 | 69 |
| 70 // Observer that keeps track of user sessions restore event. | 70 // Observer that keeps track of user sessions restore event. |
| 71 class UserSessionRestoreObserver : | 71 class UserSessionRestoreObserver : |
| 72 public UserManager::UserSessionStateObserver { | 72 public UserManager::UserSessionStateObserver { |
| 73 public: | 73 public: |
| 74 UserSessionRestoreObserver() | 74 UserSessionRestoreObserver() |
| 75 : running_loop_(false), | 75 : running_loop_(false), |
| 76 user_sessions_restored_(UserManager::Get()->UserSessionsRestored()) { | 76 user_sessions_restored_(GetUserManager()->UserSessionsRestored()) { |
| 77 if (!user_sessions_restored_) | 77 if (!user_sessions_restored_) |
| 78 UserManager::Get()->AddSessionStateObserver(this); | 78 GetUserManager()->AddSessionStateObserver(this); |
| 79 } | 79 } |
| 80 virtual ~UserSessionRestoreObserver() {} | 80 virtual ~UserSessionRestoreObserver() {} |
| 81 | 81 |
| 82 virtual void PendingUserSessionsRestoreFinished() OVERRIDE { | 82 virtual void PendingUserSessionsRestoreFinished() OVERRIDE { |
| 83 user_sessions_restored_ = true; | 83 user_sessions_restored_ = true; |
| 84 UserManager::Get()->RemoveSessionStateObserver(this); | 84 GetUserManager()->RemoveSessionStateObserver(this); |
| 85 if (!running_loop_) | 85 if (!running_loop_) |
| 86 return; | 86 return; |
| 87 | 87 |
| 88 message_loop_runner_->Quit(); | 88 message_loop_runner_->Quit(); |
| 89 running_loop_ = false; | 89 running_loop_ = false; |
| 90 } | 90 } |
| 91 | 91 |
| 92 // Wait until the user sessions are restored. If that happened between the | 92 // Wait until the user sessions are restored. If that happened between the |
| 93 // construction of this object and this call or even before it was created | 93 // construction of this object and this call or even before it was created |
| 94 // then it returns immediately. | 94 // then it returns immediately. |
| (...skipping 25 matching lines...) Expand all Loading... |
| 120 session_manager_client_->StartSession(kUserId3); | 120 session_manager_client_->StartSession(kUserId3); |
| 121 } | 121 } |
| 122 }; | 122 }; |
| 123 | 123 |
| 124 IN_PROC_BROWSER_TEST_F(CrashRestoreComplexTest, RestoreSessionForThreeUsers) { | 124 IN_PROC_BROWSER_TEST_F(CrashRestoreComplexTest, RestoreSessionForThreeUsers) { |
| 125 { | 125 { |
| 126 UserSessionRestoreObserver restore_observer; | 126 UserSessionRestoreObserver restore_observer; |
| 127 restore_observer.Wait(); | 127 restore_observer.Wait(); |
| 128 } | 128 } |
| 129 | 129 |
| 130 UserManager* user_manager = UserManager::Get(); | 130 UserManager* user_manager = GetUserManager(); |
| 131 DCHECK(user_manager->UserSessionsRestored()); | 131 DCHECK(user_manager->UserSessionsRestored()); |
| 132 | 132 |
| 133 // User that is last in the user sessions map becomes active. This behavior | 133 // User that is last in the user sessions map becomes active. This behavior |
| 134 // will become better defined once each user gets a separate user desktop. | 134 // will become better defined once each user gets a separate user desktop. |
| 135 User* user = user_manager->GetActiveUser(); | 135 User* user = user_manager->GetActiveUser(); |
| 136 ASSERT_TRUE(user); | 136 ASSERT_TRUE(user); |
| 137 EXPECT_EQ(kUserId3, user->email()); | 137 EXPECT_EQ(kUserId3, user->email()); |
| 138 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3), | 138 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3), |
| 139 user->username_hash()); | 139 user->username_hash()); |
| 140 const UserList& users = user_manager->GetLoggedInUsers(); | 140 const UserList& users = user_manager->GetLoggedInUsers(); |
| 141 ASSERT_EQ(3UL, users.size()); | 141 ASSERT_EQ(3UL, users.size()); |
| 142 | 142 |
| 143 // User that becomes active moves to the beginning of the list. | 143 // User that becomes active moves to the beginning of the list. |
| 144 EXPECT_EQ(kUserId3, users[0]->email()); | 144 EXPECT_EQ(kUserId3, users[0]->email()); |
| 145 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3), | 145 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3), |
| 146 users[0]->username_hash()); | 146 users[0]->username_hash()); |
| 147 EXPECT_EQ(kUserId2, users[1]->email()); | 147 EXPECT_EQ(kUserId2, users[1]->email()); |
| 148 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2), | 148 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2), |
| 149 users[1]->username_hash()); | 149 users[1]->username_hash()); |
| 150 EXPECT_EQ(kUserId1, users[2]->email()); | 150 EXPECT_EQ(kUserId1, users[2]->email()); |
| 151 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1), | 151 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1), |
| 152 users[2]->username_hash()); | 152 users[2]->username_hash()); |
| 153 } | 153 } |
| 154 | 154 |
| 155 } // namespace chromeos | 155 } // namespace chromeos |
| OLD | NEW |