| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "app/animation_container.h" | 5 #include "app/animation_container.h" |
| 6 #include "app/linear_animation.h" | 6 #include "app/linear_animation.h" |
| 7 #include "app/test_animation_delegate.h" | 7 #include "app/test_animation_delegate.h" |
| 8 #include "base/scoped_ptr.h" |
| 8 #include "testing/gmock/include/gmock/gmock.h" | 9 #include "testing/gmock/include/gmock/gmock.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 11 |
| 11 using testing::AtLeast; | 12 using testing::AtLeast; |
| 12 | 13 |
| 13 namespace { | 14 namespace { |
| 14 | 15 |
| 15 class MockObserver : public AnimationContainer::Observer { | 16 class MockObserver : public AnimationContainer::Observer { |
| 16 public: | 17 public: |
| 17 MockObserver() {} | 18 MockObserver() {} |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 MessageLoop::current()->Run(); | 112 MessageLoop::current()->Run(); |
| 112 | 113 |
| 113 // The timer should have finished. | 114 // The timer should have finished. |
| 114 EXPECT_TRUE(delegate1.finished()); | 115 EXPECT_TRUE(delegate1.finished()); |
| 115 | 116 |
| 116 // And the container should no longer be runnings. | 117 // And the container should no longer be runnings. |
| 117 EXPECT_FALSE(container->is_running()); | 118 EXPECT_FALSE(container->is_running()); |
| 118 | 119 |
| 119 container->set_observer(NULL); | 120 container->set_observer(NULL); |
| 120 } | 121 } |
| OLD | NEW |
|---|
Chromium Code Reviews
