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

Unified Diff: chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc

Issue 398753004: [cros] Move User class to user_manager component. (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
Index: chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
index b76c90bf52a8c9054c7448a12231f0b17ad6316c..b8bd601bbc8e4e47d26f5ccace825f02d7e7632a 100644
--- a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
@@ -50,7 +50,7 @@ class UserAddingScreenTest : public LoginManagerTest,
virtual void OnUserAddingStarted() OVERRIDE { ++user_adding_started_; }
- void SetUserCanLock(User* user, bool can_lock) {
+ void SetUserCanLock(user_manager::User* user, bool can_lock) {
user->set_can_lock(can_lock);
}
@@ -192,7 +192,7 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
MultiProfileUserController::kBehaviorUnrestricted);
prefs3->SetString(prefs::kMultiProfileUserBehavior,
MultiProfileUserController::kBehaviorUnrestricted);
- chromeos::UserList unlock_users = user_manager->GetUnlockUsers();
+ user_manager::UserList unlock_users = user_manager->GetUnlockUsers();
ASSERT_EQ(1UL, unlock_users.size());
EXPECT_EQ(kTestUsers[0], unlock_users[0]->email());
« no previous file with comments | « chrome/browser/chromeos/login/ui/mock_login_display.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698