[ash-md] Remove the number of animators used for the Shelf animations.

ui/gfx/animation/slide_animation_unittest.cc

 // Copyright (c) 2012 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 "ui/gfx/animation/slide_animation.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/time/time.h"
@@ skipping 23 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // SlideAnimationTest
 class SlideAnimationTest: public testing::Test {
  private:
   base::MessageLoopForUI message_loop_;
 };
 
 // Tests animation construction.
 TEST_F(SlideAnimationTest, InitialState) {
-  SlideAnimation animation(NULL);
+  SlideAnimation animation(nullptr);
   // By default, slide animations are 60 Hz, so the timer interval should be
   // 1/60th of a second.
   EXPECT_EQ(1000 / 60, animation.timer_interval().InMilliseconds());
   // Duration defaults to 120 ms.
   EXPECT_EQ(120, animation.GetSlideDuration());
   // Slide is neither showing nor closing.
   EXPECT_FALSE(animation.IsShowing());
   EXPECT_FALSE(animation.IsClosing());
   // Starts at 0.
   EXPECT_EQ(0.0, animation.GetCurrentValue());
 }
 
 TEST_F(SlideAnimationTest, Basics) {
-  SlideAnimation animation(NULL);
+  SlideAnimation animation(nullptr);
   SlideAnimation::TestApi test_api(&animation);
 
   // Use linear tweening to make the math easier below.
   animation.SetTweenType(Tween::LINEAR);
 
   // Duration can be set after construction.
   animation.SetSlideDuration(100);
   EXPECT_EQ(100, animation.GetSlideDuration());
 
   // Show toggles the appropriate state.
@@ skipping 11 matching lines @@
   EXPECT_FALSE(animation.IsShowing());
   EXPECT_TRUE(animation.IsClosing());
 
   // Reset stops the animation.
   animation.Reset();
   EXPECT_EQ(0.0, animation.GetCurrentValue());
   EXPECT_FALSE(animation.IsShowing());
   EXPECT_FALSE(animation.IsClosing());
 }
 
+TEST_F(SlideAnimationTest, ShowAndHideImmediately) {
+  SlideAnimation animation(nullptr);
+  SlideAnimation::TestApi test_api(&animation);
+
+  EXPECT_NE(1.0, animation.GetCurrentValue());
+
+  animation.ShowImmediately();
+  EXPECT_FALSE(animation.is_animating());
+  EXPECT_TRUE(animation.IsShowing());
+  EXPECT_EQ(1.0, animation.GetCurrentValue());
+
+  animation.HideImmediately();
+  EXPECT_FALSE(animation.is_animating());
+  EXPECT_EQ(0.0, animation.GetCurrentValue());
+}
+
 // Tests that delegate is not notified when animation is running and is deleted.
 // (Such a scenario would cause problems for BoundsAnimator).
 TEST_F(SlideAnimationTest, DontNotifyOnDelete) {
   TestAnimationDelegate delegate;
   std::unique_ptr<SlideAnimation> animation(new SlideAnimation(&delegate));
 
   // Start the animation.
   animation->Show();
 
   // Delete the animation.
   animation.reset();
 
   // Make sure the delegate wasn't notified.
   EXPECT_FALSE(delegate.finished());
   EXPECT_FALSE(delegate.canceled());
 }
 
 }  // namespace gfx