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

chrome/browser/infobars/infobar.cc

Index: chrome/browser/infobars/infobar.cc
diff --git a/chrome/browser/infobars/infobar.cc b/chrome/browser/infobars/infobar.cc
index 1f2cdb9387a704f0f76a114a5dff609ac4abfa58..85b7d511193cbca9c4fb062be0b607d4f975e382 100644
--- a/chrome/browser/infobars/infobar.cc
+++ b/chrome/browser/infobars/infobar.cc
@@ -10,7 +10,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/infobars/infobar_container.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/slide_animation.h"
 
 SkColor GetInfoBarTopColor(InfoBarDelegate::Type infobar_type) {
   static const SkColor kWarningBackgroundColorTop =
@@ -42,7 +42,7 @@ InfoBar::InfoBar(InfoBarService* owner, InfoBarDelegate* delegate)
       bar_target_height_(kDefaultBarTargetHeight) {
   DCHECK(owner_ != NULL);
   DCHECK(delegate_ != NULL);
-  animation_.SetTweenType(ui::Tween::LINEAR);
+  animation_.SetTweenType(gfx::Tween::LINEAR);
 }
 
 InfoBar::~InfoBar() {
@@ -88,7 +88,7 @@ void InfoBar::CloseSoon() {
   MaybeDelete();
 }
 
-void InfoBar::AnimationProgressed(const ui::Animation* animation) {
+void InfoBar::AnimationProgressed(const gfx::Animation* animation) {
   RecalculateHeights(false);
 }
 
@@ -118,7 +118,7 @@ int InfoBar::OffsetY(const gfx::Size& prefsize) const {
       (bar_target_height_ - bar_height_);
 }
 
-void InfoBar::AnimationEnded(const ui::Animation* animation) {
+void InfoBar::AnimationEnded(const gfx::Animation* animation) {
   // When the animation ends, we must ensure the container is notified even if
   // the heights haven't changed, lest it never get an "animation finished"
   // notification.  (If the browser doesn't get this notification, it will not