From 968153f336dfc187cdea3267c68caf07e8be6e6f Mon Sep 17 00:00:00 2001 From: danakj Date: Wed, 15 Oct 2014 15:52:16 -0700 Subject: cc: Change scoped_ptr() to nullptr. R=enne Review URL: https://codereview.chromium.org/657103003 Cr-Commit-Position: refs/heads/master@{#299782} --- cc/trees/damage_tracker_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cc/trees/damage_tracker_unittest.cc') diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc index dffe90a..90b5b8a 100644 --- a/cc/trees/damage_tracker_unittest.cc +++ b/cc/trees/damage_tracker_unittest.cc @@ -1105,7 +1105,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForReplica) { // CASE 3: removing the reflection should cause the entire region including // reflection to damage the target surface. ClearDamageForAllSurfaces(root.get()); - grand_child1->SetReplicaLayer(scoped_ptr()); + grand_child1->SetReplicaLayer(nullptr); EmulateDrawingOneFrame(root.get()); ASSERT_EQ(old_content_rect.width(), child1->render_surface()->content_rect().width()); @@ -1202,7 +1202,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForMask) { // Then test mask removal. ClearDamageForAllSurfaces(root.get()); - child->SetMaskLayer(scoped_ptr()); + child->SetMaskLayer(nullptr); ASSERT_TRUE(child->LayerPropertyChanged()); EmulateDrawingOneFrame(root.get()); @@ -1270,7 +1270,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForReplicaMask) { // target surface. // ClearDamageForAllSurfaces(root.get()); - grand_child1_replica->SetMaskLayer(scoped_ptr()); + grand_child1_replica->SetMaskLayer(nullptr); EmulateDrawingOneFrame(root.get()); grand_child_damage_rect = -- cgit v1.1