| Index: ui/base/animation/slide_animation_unittest.cc
 | 
| diff --git a/ui/base/animation/slide_animation_unittest.cc b/ui/base/animation/slide_animation_unittest.cc
 | 
| deleted file mode 100644
 | 
| index afd32b750aab344ca59a50040d3a53508e533c01..0000000000000000000000000000000000000000
 | 
| --- a/ui/base/animation/slide_animation_unittest.cc
 | 
| +++ /dev/null
 | 
| @@ -1,104 +0,0 @@
 | 
| -// 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 "base/memory/scoped_ptr.h"
 | 
| -#include "base/time/time.h"
 | 
| -#include "testing/gtest/include/gtest/gtest.h"
 | 
| -#include "ui/base/animation/slide_animation.h"
 | 
| -#include "ui/base/animation/test_animation_delegate.h"
 | 
| -
 | 
| -namespace ui {
 | 
| -
 | 
| -// Class to provide access to SlideAnimation internals for testing.
 | 
| -class SlideAnimation::TestApi {
 | 
| - public:
 | 
| -  explicit TestApi(SlideAnimation* animation) : animation_(animation) {}
 | 
| -
 | 
| -  void SetStartTime(base::TimeTicks ticks) {
 | 
| -    animation_->SetStartTime(ticks);
 | 
| -  }
 | 
| -
 | 
| -  void Step(base::TimeTicks ticks) {
 | 
| -    animation_->Step(ticks);
 | 
| -  }
 | 
| -
 | 
| - private:
 | 
| -  SlideAnimation* animation_;
 | 
| -
 | 
| -  DISALLOW_COPY_AND_ASSIGN(TestApi);
 | 
| -};
 | 
| -
 | 
| -////////////////////////////////////////////////////////////////////////////////
 | 
| -// SlideAnimationTest
 | 
| -class SlideAnimationTest: public testing::Test {
 | 
| - private:
 | 
| -  base::MessageLoopForUI message_loop_;
 | 
| -};
 | 
| -
 | 
| -// Tests animation construction.
 | 
| -TEST_F(SlideAnimationTest, InitialState) {
 | 
| -  SlideAnimation animation(NULL);
 | 
| -  // 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::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.
 | 
| -  animation.Show();
 | 
| -  EXPECT_TRUE(animation.IsShowing());
 | 
| -  EXPECT_FALSE(animation.IsClosing());
 | 
| -
 | 
| -  // Simulate running the animation.
 | 
| -  test_api.SetStartTime(base::TimeTicks());
 | 
| -  test_api.Step(base::TimeTicks() + base::TimeDelta::FromMilliseconds(50));
 | 
| -  EXPECT_EQ(0.5, animation.GetCurrentValue());
 | 
| -
 | 
| -  // We can start hiding mid-way through the animation.
 | 
| -  animation.Hide();
 | 
| -  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());
 | 
| -}
 | 
| -
 | 
| -// 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;
 | 
| -  scoped_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 ui
 | 
| 
 |