Revert of Multiprofile: switch to newly added user to the session

chrome/browser/chromeos/preferences_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sys/types.h>
 
 #include "ash/shell.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/prefs/pref_service.h"
@@ skipping 135 matching lines @@
   LoginUser(kTestUsers[0]);
   const User* user1 = user_manager->FindUser(kTestUsers[0]);
   PrefService* prefs1 = user_manager->GetProfileByUser(user1)->GetPrefs();
   SetPrefs(prefs1, false);
   content::RunAllPendingInMessageLoop();
   CheckSettingsCorrespondToPrefs(prefs1);
 
   // Add second user and init its prefs with different values.
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
-  DisableAnimations();
   AddUser(kTestUsers[1]);
-  content::RunAllPendingInMessageLoop();
+  EXPECT_TRUE(user1->is_active());
   const User* user2 = user_manager->FindUser(kTestUsers[1]);
-  EXPECT_TRUE(user2->is_active());
   PrefService* prefs2 = user_manager->GetProfileByUser(user2)->GetPrefs();
   SetPrefs(prefs2, true);
 
-  // Check that settings were changed accordingly.
+  // 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]);
   EXPECT_TRUE(user2->is_active());
   CheckSettingsCorrespondToPrefs(prefs2);
 
   // Check that changing prefs of the active user doesn't affect prefs of the
   // inactive user.
   scoped_ptr<base::DictionaryValue> prefs_backup =
       prefs1->GetPreferenceValues();
   SetPrefs(prefs2, false);
   CheckSettingsCorrespondToPrefs(prefs2);
   EXPECT_TRUE(prefs_backup->Equals(prefs1->GetPreferenceValues().get()));
@@ skipping 22 matching lines @@
                      !prefs1->GetBoolean(prefs::kTapToClickEnabled));
   CheckLocalStateCorrespondsToPrefs(prefs1);
 
   // Switch user back.
   user_manager->SwitchActiveUser(kTestUsers[0]);
   CheckSettingsCorrespondToPrefs(prefs1);
   CheckLocalStateCorrespondsToPrefs(prefs1);
 }
 
 }  // namespace chromeos