Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Unified Diff: ash/test/test_session_state_delegate.cc

Issue 379803004: Move UserInfo to user_manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/test_session_state_delegate.h ('k') | chrome/browser/chromeos/login/users/user.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_session_state_delegate.cc
diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc
index 8831b58d6b1e7393df2fb6795cd7fc40828359f7..4c7614341ee324be21d8929f38753d143ea67a87 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_];
}
« no previous file with comments | « ash/test/test_session_state_delegate.h ('k') | chrome/browser/chromeos/login/users/user.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698