ui/base/animation -> ui/gfx/animation

ui/views/animation/bounds_animator_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/views/animation/bounds_animator.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/animation/slide_animation.h"
-#include "ui/base/animation/test_animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
+#include "ui/gfx/animation/test_animation_delegate.h"
 #include "ui/views/view.h"
 
-using ui::Animation;
-using ui::SlideAnimation;
-using ui::TestAnimationDelegate;
+using gfx::Animation;
+using gfx::SlideAnimation;
+using gfx::TestAnimationDelegate;
 
 namespace views {
 namespace {
 
 class TestBoundsAnimator : public BoundsAnimator {
  public:
   explicit TestBoundsAnimator(View* view) : BoundsAnimator(view) {
   }
 
  protected:
@@ skipping 20 matching lines @@
     deleted_ = false;
     return value;
   }
 
   static bool GetAndClearCanceled() {
     bool value = canceled_;
     canceled_ = false;
     return value;
   }
 
-  // Overridden from ui::AnimationDelegate:
+  // Overridden from gfx::AnimationDelegate:
   virtual void AnimationCanceled(const Animation* animation) OVERRIDE {
     canceled_ = true;
   }
 
  private:
   static bool deleted_;
   static bool canceled_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnedDelegate);
 };
@@ skipping 106 matching lines @@
 
   // Shouldn't be animating now.
   EXPECT_FALSE(animator()->IsAnimating());
 
   // Stopping should both cancel the delegate and delete it.
   EXPECT_TRUE(OwnedDelegate::GetAndClearDeleted());
   EXPECT_TRUE(OwnedDelegate::GetAndClearCanceled());
 }
 
 }  // namespace views