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

Unified Diff: chrome/browser/chromeos/login/supervised/supervised_user_test_base.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/supervised/supervised_user_test_base.cc
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc
index b61de972d914ec0720c28a1a1efde63b3b8ffd58..1b6645f31a340cc3ba4aa972493d8bdef51e0371 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc
@@ -304,8 +304,8 @@ void SupervisedUserTestBase::StartFlowLoginAsManager() {
login_observer.Wait();
// OAuth token is valid.
- UserManager::Get()->SaveUserOAuthStatus(kTestManager,
- User::OAUTH2_TOKEN_STATUS_VALID);
+ UserManager::Get()->SaveUserOAuthStatus(
+ kTestManager, user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
base::RunLoop().RunUntilIdle();
// Check the page have changed.
@@ -364,7 +364,8 @@ void SupervisedUserTestBase::SigninAsSupervisedUser(
ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size());
// Created supervised user have to be first in a list.
- const User* user = UserManager::Get()->GetUsers().at(user_index);
+ const user_manager::User* user =
+ UserManager::Get()->GetUsers().at(user_index);
ASSERT_EQ(base::UTF8ToUTF16(expected_display_name), user->display_name());
LoginUser(user->email());
if (check_homedir_calls)
@@ -383,7 +384,8 @@ void SupervisedUserTestBase::SigninAsManager(int user_index) {
ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size());
// Created supervised user have to be first in a list.
- const User* user = UserManager::Get()->GetUsers().at(user_index);
+ const user_manager::User* user =
+ UserManager::Get()->GetUsers().at(user_index);
LoginUser(user->email());
Profile* profile = ProfileHelper::Get()->GetProfileByUser(user);
shared_settings_adapter_.reset(
@@ -399,7 +401,8 @@ void SupervisedUserTestBase::RemoveSupervisedUser(
ASSERT_EQ(original_user_count, UserManager::Get()->GetUsers().size());
// Created supervised user have to be first in a list.
- const User* user = UserManager::Get()->GetUsers().at(user_index);
+ const user_manager::User* user =
+ UserManager::Get()->GetUsers().at(user_index);
ASSERT_EQ(base::UTF8ToUTF16(expected_display_name), user->display_name());
// Open pod menu.

Powered by Google App Engine
This is Rietveld 408576698