Index: cc/resources/tile_manager_unittest.cc |
diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc |
index 3fb5b134c4bbd9c4be8612e3424e8aae0d4586c3..41c15cda5518f3033fdb649f4558fe901c2c0ec3 100644 |
--- a/cc/resources/tile_manager_unittest.cc |
+++ b/cc/resources/tile_manager_unittest.cc |
@@ -520,7 +520,8 @@ |
} |
virtual void InitializeRenderer() { |
- host_impl_.InitializeRenderer(FakeOutputSurface::Create3d()); |
+ host_impl_.InitializeRenderer( |
+ FakeOutputSurface::Create3d().PassAs<OutputSurface>()); |
} |
void SetupDefaultTrees(const gfx::Size& layer_bounds) { |
@@ -565,7 +566,7 @@ |
scoped_ptr<FakePictureLayerImpl> pending_layer = |
FakePictureLayerImpl::CreateWithPile(pending_tree, id_, pile); |
pending_layer->SetDrawsContent(true); |
- pending_tree->SetRootLayer(pending_layer.Pass()); |
+ pending_tree->SetRootLayer(pending_layer.PassAs<LayerImpl>()); |
pending_layer_ = static_cast<FakePictureLayerImpl*>( |
host_impl_.pending_tree()->LayerById(id_)); |
@@ -940,7 +941,7 @@ |
scoped_ptr<FakePictureLayerImpl> pending_child = |
FakePictureLayerImpl::CreateWithPile( |
host_impl_.pending_tree(), 2, pending_pile); |
- pending_layer_->AddChild(pending_child.Pass()); |
+ pending_layer_->AddChild(pending_child.PassAs<LayerImpl>()); |
FakePictureLayerImpl* pending_child_layer = |
static_cast<FakePictureLayerImpl*>(pending_layer_->children()[0]); |
@@ -1073,7 +1074,7 @@ |
pending_layer->SetDrawsContent(true); |
pending_layer->DoPostCommitInitializationIfNeeded(); |
pending_layer->set_has_valid_tile_priorities(true); |
- pending_layer_->AddChild(pending_layer.Pass()); |
+ pending_layer_->AddChild(pending_layer.PassAs<LayerImpl>()); |
} |
host_impl_.BuildRasterQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES); |
@@ -1122,7 +1123,7 @@ |
pending_layer->SetDrawsContent(true); |
pending_layer->DoPostCommitInitializationIfNeeded(); |
pending_layer->set_has_valid_tile_priorities(true); |
- pending_layer_->AddChild(pending_layer.Pass()); |
+ pending_layer_->AddChild(pending_layer.PassAs<LayerImpl>()); |
} |
host_impl_.BuildEvictionQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES); |