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

chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.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 "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
 
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_state.h"
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace chrome {
 
 namespace {
 
-// The animation time in milliseconds for the fade in and / or out when
-// switching users.
-const int kUserFadeTimeMS = 110;
-
 // The minimal possible animation time for animations which should happen
 // "instantly".
 const int kMinimalAnimationTimeMS = 1;
 
 // logic while the user gets switched.
 class UserChangeActionDisabler {
  public:
   UserChangeActionDisabler() {
     ash::WindowPositioner::DisableAutoPositioning(true);
     ash::Shell::GetInstance()->mru_window_tracker()->SetIgnoreActivations(true);
   }
 
   ~UserChangeActionDisabler() {
     ash::WindowPositioner::DisableAutoPositioning(false);
     ash::Shell::GetInstance()->mru_window_tracker()->SetIgnoreActivations(
         false);
   }
  private:
 
   DISALLOW_COPY_AND_ASSIGN(UserChangeActionDisabler);
 };
 
 }  // namespace
 
 UserSwichAnimatorChromeOS::UserSwichAnimatorChromeOS(
     MultiUserWindowManagerChromeOS* owner,
     const std::string& new_user_id,
-    bool animation_disabled)
+    int animation_speed_ms)
     : owner_(owner),
       new_user_id_(new_user_id),
-      animation_disabled_(animation_disabled),
+      animation_speed_ms_(animation_speed_ms),
       animation_step_(ANIMATION_STEP_HIDE_OLD_USER),
       screen_cover_(GetScreenCover()) {
   AdvanceUserTransitionAnimation();
 
-  if (animation_disabled_) {
+  if (!animation_speed_ms_) {
     FinalizeAnimation();
   } else {
     user_changed_animation_timer_.reset(new base::Timer(
         FROM_HERE,
-        base::TimeDelta::FromMilliseconds(kUserFadeTimeMS),
+        base::TimeDelta::FromMilliseconds(animation_speed_ms_),
         base::Bind(
             &UserSwichAnimatorChromeOS::AdvanceUserTransitionAnimation,
             base::Unretained(this)),
         true));
     user_changed_animation_timer_->Reset();
   }
 }
 
 UserSwichAnimatorChromeOS::~UserSwichAnimatorChromeOS() {
   FinalizeAnimation();
@@ skipping 49 matching lines @@
 }
 
 void UserSwichAnimatorChromeOS::TransitionWallpaper(
     AnimationStep animation_step) {
   // Handle the wallpaper switch.
   ash::UserWallpaperDelegate* wallpaper_delegate =
       ash::Shell::GetInstance()->user_wallpaper_delegate();
   if (animation_step == ANIMATION_STEP_HIDE_OLD_USER) {
     // Set the wallpaper cross dissolve animation duration to our complete
     // animation cycle for a fade in and fade out.
+    int duration =
+        NO_USER_COVERS_SCREEN == screen_cover_ ? (2 * animation_speed_ms_) : 0;
     wallpaper_delegate->SetAnimationDurationOverride(
-        NO_USER_COVERS_SCREEN == screen_cover_ ? (2 * kUserFadeTimeMS) :
-                                                 kMinimalAnimationTimeMS);
+        std::max(duration, kMinimalAnimationTimeMS));
     if (screen_cover_ != NEW_USER_COVERS_SCREEN) {
       chromeos::WallpaperManager::Get()->SetUserWallpaperNow(new_user_id_);
       wallpaper_user_id_ =
           (NO_USER_COVERS_SCREEN == screen_cover_ ? "->" : "") +
           new_user_id_;
     }
   } else if (animation_step == ANIMATION_STEP_FINALIZE) {
     // Revert the wallpaper cross dissolve animation duration back to the
     // default.
     if (screen_cover_ == NEW_USER_COVERS_SCREEN)
       chromeos::WallpaperManager::Get()->SetUserWallpaperNow(new_user_id_);
 
     // Coming here the wallpaper user id is the final result. No matter how we
     // got here.
     wallpaper_user_id_ = new_user_id_;
     wallpaper_delegate->SetAnimationDurationOverride(0);
   }
 }
 
 void UserSwichAnimatorChromeOS::TransitionUserShelf(
     AnimationStep animation_step) {
   // The shelf animation duration override.
-  int duration_override = kUserFadeTimeMS;
+  int duration_override = animation_speed_ms_;
   // Handle the shelf order of items. This is done once the old user is hidden.
   if (animation_step == ANIMATION_STEP_SHOW_NEW_USER) {
     // Some unit tests have no ChromeLauncherController.
     if (ChromeLauncherController::instance())
       ChromeLauncherController::instance()->ActiveUserChanged(new_user_id_);
     // We kicked off the shelf animation in the command above. As such we can
     // disable the override now again.
     duration_override = 0;
   }
 
-  if (animation_disabled_ || animation_step == ANIMATION_STEP_FINALIZE)
+  if (!animation_speed_ms_ || animation_step == ANIMATION_STEP_FINALIZE)
     return;
 
   ash::Shell::RootWindowControllerList controller =
       ash::Shell::GetInstance()->GetAllRootWindowControllers();
   for (ash::Shell::RootWindowControllerList::iterator iter = controller.begin();
        iter != controller.end(); ++iter) {
     (*iter)->GetShelfLayoutManager()->SetAnimationDurationOverride(
         duration_override);
   }
 
@@ skipping 61 matching lines @@
           ash::wm::WindowState* window_state = ash::wm::GetWindowState(window);
           if (it_map->second->owner() == new_user_id_ &&
               it_map->second->show_for_user() != new_user_id_ &&
               window_state->IsMinimized()) {
             // Pull back minimized visiting windows to the owners desktop.
             owner_->ShowWindowForUserIntern(window, new_user_id_);
             window_state->Unminimize();
           } else if (should_be_visible != is_visible) {
             bool animate = true;
             int duration = animation_step == ANIMATION_STEP_FINALIZE ?
-                kMinimalAnimationTimeMS : (2 * kUserFadeTimeMS);
+                               0 : (2 * animation_speed_ms_);
+            duration = std::max(kMinimalAnimationTimeMS, duration);
             if (animation_step != ANIMATION_STEP_FINALIZE &&
                 screen_cover_ == BOTH_USERS_COVER_SCREEN &&
                 CoversScreen(window)) {
               if (!foreground_window_found) {
                 foreground_window_found = true;
                 foreground_becomes_visible = should_be_visible;
               } else if (should_be_visible != foreground_becomes_visible) {
                 // Covering windows behind the foreground window which are
                 // inverting their visibility should immediately become visible
                 // or stay visible until the animation is finished.
@@ skipping 52 matching lines @@
       if (cover == OLD_USER_COVERS_SCREEN)
         return BOTH_USERS_COVER_SCREEN;
       else
         cover = NEW_USER_COVERS_SCREEN;
     }
   }
   return cover;
 }
 
 }  // namespace chrome