| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 CryptohomeClient::GetStubSanitizedUsername(kUserId1)); | 45 CryptohomeClient::GetStubSanitizedUsername(kUserId1)); |
| 46 } | 46 } |
| 47 | 47 |
| 48 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 48 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
| 49 // Redirect session_manager DBus calls to FakeSessionManagerClient. | 49 // Redirect session_manager DBus calls to FakeSessionManagerClient. |
| 50 FakeDBusThreadManager* dbus_thread_manager = new FakeDBusThreadManager; | 50 FakeDBusThreadManager* dbus_thread_manager = new FakeDBusThreadManager; |
| 51 dbus_thread_manager->SetFakeClients(); | 51 dbus_thread_manager->SetFakeClients(); |
| 52 session_manager_client_ = new FakeSessionManagerClient; | 52 session_manager_client_ = new FakeSessionManagerClient; |
| 53 dbus_thread_manager->SetSessionManagerClient( | 53 dbus_thread_manager->SetSessionManagerClient( |
| 54 scoped_ptr<SessionManagerClient>(session_manager_client_)); | 54 scoped_ptr<SessionManagerClient>(session_manager_client_)); |
| 55 DBusThreadManager::InitializeForTesting(dbus_thread_manager); | 55 DBusThreadManager::SetInstanceForTesting(dbus_thread_manager); |
| 56 session_manager_client_->StartSession(kUserId1); | 56 session_manager_client_->StartSession(kUserId1); |
| 57 } | 57 } |
| 58 | 58 |
| 59 FakeSessionManagerClient* session_manager_client_; | 59 FakeSessionManagerClient* session_manager_client_; |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 IN_PROC_BROWSER_TEST_F(CrashRestoreSimpleTest, RestoreSessionForOneUser) { | 62 IN_PROC_BROWSER_TEST_F(CrashRestoreSimpleTest, RestoreSessionForOneUser) { |
| 63 UserManager* user_manager = UserManager::Get(); | 63 UserManager* user_manager = UserManager::Get(); |
| 64 User* user = user_manager->GetActiveUser(); | 64 User* user = user_manager->GetActiveUser(); |
| 65 ASSERT_TRUE(user); | 65 ASSERT_TRUE(user); |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 users[0]->username_hash()); | 148 users[0]->username_hash()); |
| 149 EXPECT_EQ(kUserId2, users[1]->email()); | 149 EXPECT_EQ(kUserId2, users[1]->email()); |
| 150 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2), | 150 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2), |
| 151 users[1]->username_hash()); | 151 users[1]->username_hash()); |
| 152 EXPECT_EQ(kUserId1, users[2]->email()); | 152 EXPECT_EQ(kUserId1, users[2]->email()); |
| 153 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1), | 153 EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1), |
| 154 users[2]->username_hash()); | 154 users[2]->username_hash()); |
| 155 } | 155 } |
| 156 | 156 |
| 157 } // namespace chromeos | 157 } // namespace chromeos |
| OLD | NEW |