Index: cc/layers/layer_unittest.cc |
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc |
index 61d05270265fc04dd8fbc1f7d174e1155ed35a78..7a1cb796363805e0870cbf0a7befec93625cfa0f 100644 |
--- a/cc/layers/layer_unittest.cc |
+++ b/cc/layers/layer_unittest.cc |
@@ -167,7 +167,7 @@ TEST_F(LayerTest, AddAndRemoveChild) { |
EXPECT_SET_NEEDS_FULL_TREE_SYNC(1, parent->AddChild(child)); |
ASSERT_EQ(1U, parent->children().size()); |
- EXPECT_EQ(child.get(), parent->children()[0]); |
+ EXPECT_EQ(child.get(), parent->children()[0].get()); |
EXPECT_EQ(parent.get(), child->parent()); |
EXPECT_EQ(parent.get(), child->RootLayer()); |
@@ -392,23 +392,23 @@ TEST_F(LayerTest, SetChildren) { |
TEST_F(LayerTest, HasAncestor) { |
scoped_refptr<Layer> parent = Layer::Create(); |
- EXPECT_FALSE(parent->HasAncestor(parent)); |
+ EXPECT_FALSE(parent->HasAncestor(parent.get())); |
scoped_refptr<Layer> child = Layer::Create(); |
parent->AddChild(child); |
- EXPECT_FALSE(child->HasAncestor(child)); |
- EXPECT_TRUE(child->HasAncestor(parent)); |
- EXPECT_FALSE(parent->HasAncestor(child)); |
+ EXPECT_FALSE(child->HasAncestor(child.get())); |
+ EXPECT_TRUE(child->HasAncestor(parent.get())); |
+ EXPECT_FALSE(parent->HasAncestor(child.get())); |
scoped_refptr<Layer> child_child = Layer::Create(); |
child->AddChild(child_child); |
- EXPECT_FALSE(child_child->HasAncestor(child_child)); |
- EXPECT_TRUE(child_child->HasAncestor(parent)); |
- EXPECT_TRUE(child_child->HasAncestor(child)); |
- EXPECT_FALSE(parent->HasAncestor(child)); |
- EXPECT_FALSE(parent->HasAncestor(child_child)); |
+ EXPECT_FALSE(child_child->HasAncestor(child_child.get())); |
+ EXPECT_TRUE(child_child->HasAncestor(parent.get())); |
+ EXPECT_TRUE(child_child->HasAncestor(child.get())); |
+ EXPECT_FALSE(parent->HasAncestor(child.get())); |
+ EXPECT_FALSE(parent->HasAncestor(child_child.get())); |
} |
TEST_F(LayerTest, GetRootLayerAfterTreeManipulations) { |
@@ -782,24 +782,24 @@ TEST_F(LayerTest, MaskAndReplicaHasParent) { |
child->SetReplicaLayer(replica.get()); |
replica->SetMaskLayer(replica_mask.get()); |
- EXPECT_EQ(parent, child->parent()); |
- EXPECT_EQ(child, mask->parent()); |
- EXPECT_EQ(child, replica->parent()); |
- EXPECT_EQ(replica, replica_mask->parent()); |
+ EXPECT_EQ(parent.get(), child->parent()); |
+ EXPECT_EQ(child.get(), mask->parent()); |
+ EXPECT_EQ(child.get(), replica->parent()); |
+ EXPECT_EQ(replica.get(), replica_mask->parent()); |
replica->SetMaskLayer(replica_mask_replacement.get()); |
EXPECT_EQ(NULL, replica_mask->parent()); |
- EXPECT_EQ(replica, replica_mask_replacement->parent()); |
+ EXPECT_EQ(replica.get(), replica_mask_replacement->parent()); |
child->SetMaskLayer(mask_replacement.get()); |
EXPECT_EQ(NULL, mask->parent()); |
- EXPECT_EQ(child, mask_replacement->parent()); |
+ EXPECT_EQ(child.get(), mask_replacement->parent()); |
child->SetReplicaLayer(replica_replacement.get()); |
EXPECT_EQ(NULL, replica->parent()); |
- EXPECT_EQ(child, replica_replacement->parent()); |
+ EXPECT_EQ(child.get(), replica_replacement->parent()); |
- EXPECT_EQ(replica, replica->mask_layer()->parent()); |
+ EXPECT_EQ(replica.get(), replica->mask_layer()->parent()); |
} |
TEST_F(LayerTest, CheckTranformIsInvertible) { |
@@ -856,7 +856,7 @@ TEST_F(LayerTest, TranformIsInvertibleAnimation) { |
gfx::Transform identity_transform; |
layer->SetTransform(identity_transform); |
- static_cast<LayerAnimationValueObserver*>(layer) |
+ static_cast<LayerAnimationValueObserver*>(layer.get()) |
->OnTransformAnimated(singular_transform); |
layer->PushPropertiesTo(impl_layer.get()); |
EXPECT_FALSE(layer->transform_is_invertible()); |