views: Move more two directories into ui/views/.

ui/views/animation/bounds_animator_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/test_animation_delegate.h"
-#include "views/animation/bounds_animator.h"
+#include "ui/views/animation/bounds_animator.h"
 #include "views/view.h"
 
 using views::BoundsAnimator;
 using ui::Animation;
 using ui::SlideAnimation;
 using ui::TestAnimationDelegate;
 
 namespace {
 
 class TestBoundsAnimator : public BoundsAnimator {
@@ skipping 153 matching lines @@
 
   animator()->StopAnimatingView(child());
 
   // Shouldn't be animating now.
   EXPECT_FALSE(animator()->IsAnimating());
 
   // Stopping should both cancel the delegate and delete it.
   EXPECT_TRUE(OwnedDelegate::get_and_clear_deleted());
   EXPECT_TRUE(OwnedDelegate::get_and_clear_canceled());
 }