Improving the user transition to add special cases for maximized windows and make the transition "m…

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"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/chromeos/system/fake_input_device_settings.h"
 #include "chrome/browser/feedback/tracing_manager.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/ime/fake_xkeyboard.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
 
 namespace chromeos {
 
@@ skipping 77 matching lines @@
   }
 
   void CheckLocalStateCorrespondsToPrefs(PrefService* prefs) {
     PrefService* local_state = g_browser_process->local_state();
     EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerTapToClickEnabled),
               prefs->GetBoolean(prefs::kTapToClickEnabled));
     EXPECT_EQ(local_state->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight),
               prefs->GetBoolean(prefs::kPrimaryMouseButtonRight));
   }
 
+  void DisableAnimations() {
+    // Disable animations for user transitions.
+    chrome::MultiUserWindowManagerChromeOS* manager =
+        static_cast<chrome::MultiUserWindowManagerChromeOS*>(
+            chrome::MultiUserWindowManager::GetInstance());
+    manager->SetAnimationsForTest(true);
+  }
+
  private:
   system::FakeInputDeviceSettings* input_settings_;
   input_method::FakeXKeyboard* xkeyboard_;
 
   DISALLOW_COPY_AND_ASSIGN(PreferencesTest);
 };
 
 IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
@@ skipping 19 matching lines @@
   EXPECT_TRUE(user1->is_active());
   const User* user2 = user_manager->FindUser(kTestUsers[1]);
   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]);
   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);
@@ skipping 23 matching lines @@
                      !prefs1->GetBoolean(prefs::kTapToClickEnabled));
   CheckLocalStateCorrespondsToPrefs(prefs1);
 
   // Switch user back.
   user_manager->SwitchActiveUser(kTestUsers[0]);
   CheckSettingsCorrespondToPrefs(prefs1);
   CheckLocalStateCorrespondsToPrefs(prefs1);
 }
 
 }  // namespace chromeos