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

Unified Diff: chrome/browser/chromeos/preferences_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
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences_browsertest.cc
diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_browsertest.cc
index 7b606627a51602c8bf3cd4425d626d8505bcf848..996832c1bdc5a89a4637331a50c21dfc553b2faf 100644
--- a/chrome/browser/chromeos/preferences_browsertest.cc
+++ b/chrome/browser/chromeos/preferences_browsertest.cc
@@ -144,7 +144,7 @@ IN_PROC_BROWSER_TEST_F(PreferencesTest, MultiProfiles) {
// Add first user and init its preferences. Check that corresponding
// settings has been changed.
LoginUser(kTestUsers[0]);
- const User* user1 = user_manager->FindUser(kTestUsers[0]);
+ const user_manager::User* user1 = user_manager->FindUser(kTestUsers[0]);
PrefService* prefs1 =
ProfileHelper::Get()->GetProfileByUser(user1)->GetPrefs();
SetPrefs(prefs1, false);
@@ -157,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(PreferencesTest, MultiProfiles) {
DisableAnimations();
AddUser(kTestUsers[1]);
content::RunAllPendingInMessageLoop();
- const User* user2 = user_manager->FindUser(kTestUsers[1]);
+ const user_manager::User* user2 = user_manager->FindUser(kTestUsers[1]);
EXPECT_TRUE(user2->is_active());
PrefService* prefs2 =
ProfileHelper::Get()->GetProfileByUser(user2)->GetPrefs();
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698