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 "chrome/browser/ui/ash/session_state_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" | 10 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 } | 39 } |
40 | 40 |
41 // Add and log in a user to the session. | 41 // Add and log in a user to the session. |
42 void UserAddedToSession(std::string user) { | 42 void UserAddedToSession(std::string user) { |
43 user_manager()->AddUser(user); | 43 user_manager()->AddUser(user); |
44 user_manager()->LoginUser(user); | 44 user_manager()->LoginUser(user); |
45 } | 45 } |
46 | 46 |
47 // Get the active user. | 47 // Get the active user. |
48 const std::string& GetActiveUser() { | 48 const std::string& GetActiveUser() { |
49 return chromeos::UserManager::Get()->GetActiveUser()->email(); | 49 return chromeos::GetUserManager()->GetActiveUser()->email(); |
50 } | 50 } |
51 | 51 |
52 chromeos::FakeUserManager* user_manager() { return user_manager_; } | 52 chromeos::FakeUserManager* user_manager() { return user_manager_; } |
53 SessionStateDelegateChromeos* session_state_delegate() { | 53 SessionStateDelegateChromeos* session_state_delegate() { |
54 return session_state_delegate_.get(); | 54 return session_state_delegate_.get(); |
55 } | 55 } |
56 | 56 |
57 private: | 57 private: |
58 scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; | 58 scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; |
59 scoped_ptr<SessionStateDelegateChromeos> session_state_delegate_; | 59 scoped_ptr<SessionStateDelegateChromeos> session_state_delegate_; |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 // Cycle backwards. | 97 // Cycle backwards. |
98 const ash::SessionStateDelegate::CycleUser backward = | 98 const ash::SessionStateDelegate::CycleUser backward = |
99 ash::SessionStateDelegate::CYCLE_TO_PREVIOUS_USER; | 99 ash::SessionStateDelegate::CYCLE_TO_PREVIOUS_USER; |
100 session_state_delegate()->CycleActiveUser(backward); | 100 session_state_delegate()->CycleActiveUser(backward); |
101 EXPECT_EQ("thirduser@test.com", GetActiveUser()); | 101 EXPECT_EQ("thirduser@test.com", GetActiveUser()); |
102 session_state_delegate()->CycleActiveUser(backward); | 102 session_state_delegate()->CycleActiveUser(backward); |
103 EXPECT_EQ("seconduser@test.com", GetActiveUser()); | 103 EXPECT_EQ("seconduser@test.com", GetActiveUser()); |
104 session_state_delegate()->CycleActiveUser(backward); | 104 session_state_delegate()->CycleActiveUser(backward); |
105 EXPECT_EQ("firstuser@test.com", GetActiveUser()); | 105 EXPECT_EQ("firstuser@test.com", GetActiveUser()); |
106 } | 106 } |
OLD | NEW |