Index: cc/layers/surface_layer.cc |
diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc |
index f31a8aebcb1e72ea97435670909450bb3f4ccf4c..8f0e0512af83859ba923e57cf747aca5a6b1bc31 100644 |
--- a/cc/layers/surface_layer.cc |
+++ b/cc/layers/surface_layer.cc |
@@ -70,7 +70,8 @@ void SurfaceLayer::SetSurfaceId(SurfaceId surface_id, |
SetNeedsPushProperties(); |
} |
-scoped_ptr<LayerImpl> SurfaceLayer::CreateLayerImpl(LayerTreeImpl* tree_impl) { |
+std::unique_ptr<LayerImpl> SurfaceLayer::CreateLayerImpl( |
+ LayerTreeImpl* tree_impl) { |
return SurfaceLayerImpl::Create(tree_impl, id()); |
} |
@@ -111,7 +112,7 @@ void SurfaceLayer::SatisfyDestroySequence() { |
if (!layer_tree_host()) |
return; |
DCHECK(!destroy_sequence_.is_null()); |
- scoped_ptr<SatisfySwapPromise> satisfy( |
+ std::unique_ptr<SatisfySwapPromise> satisfy( |
new SatisfySwapPromise(destroy_sequence_, satisfy_callback_)); |
layer_tree_host()->QueueSwapPromise(std::move(satisfy)); |
destroy_sequence_ = SurfaceSequence(); |