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

Unified Diff: ui/aura/window_unittest.cc

Issue 496313004: Remove implicit conversions from scoped_refptr to T* in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/compositor/compositor.cc » ('j') | ui/compositor/test/in_process_context_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 2ac87ebe8cd57d29dcf6c44ed6edba9fc116a135..b287aea9e13183cb23ba496b8be173248edf894a 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -3394,7 +3394,7 @@ TEST_F(WindowTest, WindowDestroyCompletesAnimations) {
// Make sure destroying a Window completes the animation.
{
scoped_ptr<Window> window(CreateTestWindowWithId(1, root_window()));
- window->layer()->SetAnimator(animator);
+ window->layer()->SetAnimator(animator.get());
gfx::Transform transform;
transform.Scale(0.5f, 0.5f);
@@ -3403,7 +3403,7 @@ TEST_F(WindowTest, WindowDestroyCompletesAnimations) {
EXPECT_TRUE(animator->is_animating());
EXPECT_FALSE(observer.animation_completed());
}
- EXPECT_TRUE(animator);
+ EXPECT_TRUE(animator.get());
EXPECT_FALSE(animator->is_animating());
EXPECT_TRUE(observer.animation_completed());
EXPECT_FALSE(observer.animation_aborted());
@@ -3413,7 +3413,7 @@ TEST_F(WindowTest, WindowDestroyCompletesAnimations) {
animator = ui::LayerAnimator::CreateImplicitAnimator();
animator->AddObserver(&observer);
ui::Layer layer;
- layer.SetAnimator(animator);
+ layer.SetAnimator(animator.get());
{
scoped_ptr<Window> window(CreateTestWindowWithId(1, root_window()));
window->layer()->Add(&layer);
@@ -3426,7 +3426,7 @@ TEST_F(WindowTest, WindowDestroyCompletesAnimations) {
EXPECT_FALSE(observer.animation_completed());
}
- EXPECT_TRUE(animator);
+ EXPECT_TRUE(animator.get());
EXPECT_FALSE(animator->is_animating());
EXPECT_TRUE(observer.animation_completed());
EXPECT_FALSE(observer.animation_aborted());
« no previous file with comments | « no previous file | ui/compositor/compositor.cc » ('j') | ui/compositor/test/in_process_context_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698