diff options
Diffstat (limited to 'chrome/browser/chromeos/preferences_browsertest.cc')
-rw-r--r-- | chrome/browser/chromeos/preferences_browsertest.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_browsertest.cc index fe3fb00..b8a5267 100644 --- a/chrome/browser/chromeos/preferences_browsertest.cc +++ b/chrome/browser/chromeos/preferences_browsertest.cc @@ -153,19 +153,15 @@ IN_PROC_BROWSER_TEST_F(PreferencesTest, MultiProfiles) { // Add second user and init its prefs with different values. UserAddingScreen::Get()->Start(); content::RunAllPendingInMessageLoop(); + DisableAnimations(); AddUser(kTestUsers[1]); - EXPECT_TRUE(user1->is_active()); + content::RunAllPendingInMessageLoop(); const User* user2 = user_manager->FindUser(kTestUsers[1]); + EXPECT_TRUE(user2->is_active()); PrefService* prefs2 = user_manager->GetProfileByUser(user2)->GetPrefs(); SetPrefs(prefs2, true); - // First user is still active, so settings was not changed. - EXPECT_TRUE(user1->is_active()); - CheckSettingsCorrespondToPrefs(prefs1); - - // Switch user and check that settings was changed accordingly. - DisableAnimations(); - user_manager->SwitchActiveUser(kTestUsers[1]); + // Check that settings were changed accordingly. EXPECT_TRUE(user2->is_active()); CheckSettingsCorrespondToPrefs(prefs2); |