diff options
Diffstat (limited to 'ash/test')
-rw-r--r-- | ash/test/test_session_state_delegate.cc | 11 | ||||
-rw-r--r-- | ash/test/test_session_state_delegate.h | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc index 8831b58..4c76143 100644 --- a/ash/test/test_session_state_delegate.cc +++ b/ash/test/test_session_state_delegate.cc @@ -7,12 +7,12 @@ #include <algorithm> #include <string> -#include "ash/session/user_info.h" #include "ash/shell.h" #include "ash/system/user/login_status.h" #include "base/stl_util.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "components/user_manager/user_info.h" #include "testing/gtest/include/gtest/gtest.h" namespace ash { @@ -29,7 +29,7 @@ std::string GetUserIDFromEmail(const std::string& email) { } // namespace -class MockUserInfo : public UserInfo { +class MockUserInfo : public user_manager::UserInfo { public: explicit MockUserInfo(const std::string& id) : email_(id) {} virtual ~MockUserInfo() {} @@ -89,7 +89,8 @@ void TestSessionStateDelegate::AddUser(const std::string user_id) { user_list_.push_back(new MockUserInfo(user_id)); } -const UserInfo* TestSessionStateDelegate::GetActiveUserInfo() const { +const user_manager::UserInfo* TestSessionStateDelegate::GetActiveUserInfo() + const { return user_list_[active_user_index_]; } @@ -192,13 +193,13 @@ void TestSessionStateDelegate::SetUserImage( user_list_[active_user_index_]->SetUserImage(user_image); } -const UserInfo* TestSessionStateDelegate::GetUserInfo( +const user_manager::UserInfo* TestSessionStateDelegate::GetUserInfo( MultiProfileIndex index) const { int max = static_cast<int>(user_list_.size()); return user_list_[index < max ? index : max - 1]; } -const UserInfo* TestSessionStateDelegate::GetUserInfo( +const user_manager::UserInfo* TestSessionStateDelegate::GetUserInfo( content::BrowserContext* context) const { return user_list_[active_user_index_]; } diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h index 5616eec..478c340 100644 --- a/ash/test/test_session_state_delegate.h +++ b/ash/test/test_session_state_delegate.h @@ -24,7 +24,7 @@ class TestSessionStateDelegate : public SessionStateDelegate { void set_logged_in_users(int users) { logged_in_users_ = users; } void AddUser(const std::string user_id); - const UserInfo* GetActiveUserInfo() const; + const user_manager::UserInfo* GetActiveUserInfo() const; // SessionStateDelegate: virtual content::BrowserContext* GetBrowserContextByIndex( @@ -41,9 +41,9 @@ class TestSessionStateDelegate : public SessionStateDelegate { virtual void UnlockScreen() OVERRIDE; virtual bool IsUserSessionBlocked() const OVERRIDE; virtual SessionState GetSessionState() const OVERRIDE; - virtual const UserInfo* GetUserInfo( + virtual const user_manager::UserInfo* GetUserInfo( ash::MultiProfileIndex index) const OVERRIDE; - virtual const UserInfo* GetUserInfo( + virtual const user_manager::UserInfo* GetUserInfo( content::BrowserContext* context) const OVERRIDE; virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE; virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE; |