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

Unified Diff: chrome/browser/ui/webui/options/chromeos/shared_options_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/ui/webui/options/chromeos/shared_options_browsertest.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
index 4cd5c94ea125e96d022d751c2cd5fedb85880c31..dc2c9ffdd13776b4875d8a116a37875710cbebb2 100644
--- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
@@ -110,7 +110,9 @@ class SharedOptionsTest : public LoginManagerTest {
}
protected:
- void CheckOptionsUI(const User* user, bool is_owner, bool is_primary) {
+ void CheckOptionsUI(const user_manager::User* user,
+ bool is_owner,
+ bool is_primary) {
Browser* browser = CreateBrowserForUser(user);
content::WebContents* contents =
browser->tab_strip_model()->GetActiveWebContents();
@@ -128,7 +130,7 @@ class SharedOptionsTest : public LoginManagerTest {
}
// Creates a browser and navigates to the Settings page.
- Browser* CreateBrowserForUser(const User* user) {
+ Browser* CreateBrowserForUser(const user_manager::User* user) {
Profile* profile = ProfileHelper::Get()->GetProfileByUser(user);
profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
user->email());
@@ -303,8 +305,8 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferencePrimary) {
AddUser(kTestNonOwner);
UserManager* manager = UserManager::Get();
- const User* user1 = manager->FindUser(kTestOwner);
- const User* user2 = manager->FindUser(kTestNonOwner);
+ const user_manager::User* user1 = manager->FindUser(kTestOwner);
+ const user_manager::User* user2 = manager->FindUser(kTestNonOwner);
PrefService* prefs1 =
ProfileHelper::Get()->GetProfileByUser(user1)->GetPrefs();
@@ -374,8 +376,8 @@ IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferenceSecondary) {
AddUser(kTestNonOwner);
UserManager* manager = UserManager::Get();
- const User* user1 = manager->FindUser(kTestOwner);
- const User* user2 = manager->FindUser(kTestNonOwner);
+ const user_manager::User* user1 = manager->FindUser(kTestOwner);
+ const user_manager::User* user2 = manager->FindUser(kTestNonOwner);
PrefService* prefs1 =
ProfileHelper::Get()->GetProfileByUser(user1)->GetPrefs();

Powered by Google App Engine
This is Rietveld 408576698