Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(703)

Side by Side Diff: app/animation_container_unittest.cc

Issue 2982009: Revert everything related to the relanding. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | app/slide_animation_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
9 #include "testing/gmock/include/gmock/gmock.h" 8 #include "testing/gmock/include/gmock/gmock.h"
10 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
11 10
12 using testing::AtLeast; 11 using testing::AtLeast;
13 12
14 namespace { 13 namespace {
15 14
16 class MockObserver : public AnimationContainer::Observer { 15 class MockObserver : public AnimationContainer::Observer {
17 public: 16 public:
18 MockObserver() {} 17 MockObserver() {}
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 MessageLoop::current()->Run(); 111 MessageLoop::current()->Run();
113 112
114 // The timer should have finished. 113 // The timer should have finished.
115 EXPECT_TRUE(delegate1.finished()); 114 EXPECT_TRUE(delegate1.finished());
116 115
117 // And the container should no longer be runnings. 116 // And the container should no longer be runnings.
118 EXPECT_FALSE(container->is_running()); 117 EXPECT_FALSE(container->is_running());
119 118
120 container->set_observer(NULL); 119 container->set_observer(NULL);
121 } 120 }
OLDNEW
« no previous file with comments | « no previous file | app/slide_animation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698