Fixing too long running unit tests on valgrind (produced by user switch animation)

chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "ash/ash_switches.h"
 #include "ash/multi_profile_uma.h"
@@ skipping 30 matching lines @@
 #include "ui/wm/core/transient_window_manager.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/core/window_util.h"
 
 namespace {
 
 // The animation time in milliseconds for a single window which is fading
 // in / out.
 const int kAnimationTimeMS = 100;
 
+// The animation time in milliseconds for the fade in and / or out when
+// switching users.
+const int kUserFadeTimeMS = 110;
+
 // The animation time in ms for a window which get teleported to another screen.
 const int kTeleportAnimationTimeMS = 300;
 
 // Checks if a given event is a user event.
 bool IsUserEvent(const ui::Event* e) {
   if (e) {
     ui::EventType type = e->type();
     if (type != ui::ET_CANCEL_MODE &&
         type != ui::ET_UMA_DATA &&
         type != ui::ET_UNKNOWN)
@@ skipping 140 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AppObserver);
 };
 
 MultiUserWindowManagerChromeOS::MultiUserWindowManagerChromeOS(
     const std::string& current_user_id)
     : current_user_id_(current_user_id),
       notification_blocker_(new MultiUserNotificationBlockerChromeOS(
           message_center::MessageCenter::Get(), this, current_user_id)),
       suppress_visibility_changes_(false),
-      animations_disabled_(false) {
+      animation_speed_(ANIMATION_SPEED_NORMAL) {
   // Add a session state observer to be able to monitor session changes.
   if (ash::Shell::HasInstance())
     ash::Shell::GetInstance()->session_state_delegate()->
         AddSessionStateObserver(this);
 
   // The BrowserListObserver would have been better to use then the old
   // notification system, but that observer fires before the window got created.
   registrar_.Add(this, NOTIFICATION_BROWSER_WINDOW_READY,
                  content::NotificationService::AllSources());
 
@@ skipping 164 matching lines @@
   observers_.RemoveObserver(observer);
 }
 
 void MultiUserWindowManagerChromeOS::ActiveUserChanged(
     const std::string& user_id) {
   DCHECK(user_id != current_user_id_);
   // This needs to be set before the animation starts.
   current_user_id_ = user_id;
 
   animation_.reset(
-      new UserSwichAnimatorChromeOS(this, user_id, animations_disabled_));
+      new UserSwichAnimatorChromeOS(this, user_id,
+          animation_speed_ == ANIMATION_SPEED_NORMAL ? kUserFadeTimeMS :
+              (animation_speed_ == ANIMATION_SPEED_FAST ? 10 : 0)));
 }
 
 void MultiUserWindowManagerChromeOS::OnWindowDestroyed(aura::Window* window) {
   if (GetWindowOwner(window).empty()) {
     // This must be a window in the transient chain - remove it and its
     // children from the owner.
     RemoveTransientOwnerRecursive(window);
     return;
   }
   wm::TransientWindowManager::Get(window)->RemoveObserver(this);
@@ skipping 71 matching lines @@
 }
 
 void MultiUserWindowManagerChromeOS::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == NOTIFICATION_BROWSER_WINDOW_READY)
     AddBrowserWindow(content::Source<Browser>(source).ptr());
 }
 
-void MultiUserWindowManagerChromeOS::SetAnimationsForTest(bool disable) {
-  animations_disabled_ = disable;
+void MultiUserWindowManagerChromeOS::SetAnimationSpeedForTest(
+    MultiUserWindowManagerChromeOS::AnimationSpeed speed) {
+  animation_speed_ = speed;
 }
 
 bool MultiUserWindowManagerChromeOS::IsAnimationRunningForTest() {
   return animation_.get() != NULL && !animation_->IsAnimationFinished();
 }
 
 const std::string& MultiUserWindowManagerChromeOS::GetCurrentUserForTest() {
   return current_user_id_;
 }
 
@@ skipping 175 matching lines @@
     window->Show();
   }
 }
 
 void MultiUserWindowManagerChromeOS::SetWindowVisible(
     aura::Window* window,
     bool visible,
     int animation_time_in_ms) {
   AnimationSetter animation_setter(
       window,
-      animations_disabled_ ? 0 : animation_time_in_ms);
+      animation_speed_ == ANIMATION_SPEED_NORMAL ? animation_time_in_ms :
+          (animation_speed_ == ANIMATION_SPEED_FAST ? 10 : 0));

[Dmitry Polukhin, 2014/04/10 00:11:48]

I would extract it to separate method that gets normal speed and return 10 or 0
depending on animation_speed_. It will also slightly improve readability and
compiler will inline this function.

[Mr4D (OOO till 08-26), 2014/04/10 17:10:17]

Done.

 
   if (visible)
     window->Show();
   else
     window->Hide();
 
   // Make sure that animations have no influence on the window state after the
   // call.
   DCHECK_EQ(visible, window->IsVisible());
 }
 
 }  // namespace chrome