Index: cc/layers/texture_layer_impl.cc |
diff --git a/cc/layers/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc |
index 27d3c971f64a8b8b8c39e221f86cbc2ce9a1dca1..1474bbf19309b3065ca8e80013f9cde2e7409bd2 100644 |
--- a/cc/layers/texture_layer_impl.cc |
+++ b/cc/layers/texture_layer_impl.cc |
@@ -43,7 +43,7 @@ TextureLayerImpl::~TextureLayerImpl() { FreeTextureMailbox(); } |
void TextureLayerImpl::SetTextureMailbox( |
const TextureMailbox& mailbox, |
- scoped_ptr<SingleReleaseCallbackImpl> release_callback) { |
+ std::unique_ptr<SingleReleaseCallbackImpl> release_callback) { |
DCHECK_EQ(mailbox.IsValid(), !!release_callback); |
FreeTextureMailbox(); |
texture_mailbox_ = mailbox; |
@@ -53,7 +53,7 @@ void TextureLayerImpl::SetTextureMailbox( |
SetNeedsPushProperties(); |
} |
-scoped_ptr<LayerImpl> TextureLayerImpl::CreateLayerImpl( |
+std::unique_ptr<LayerImpl> TextureLayerImpl::CreateLayerImpl( |
LayerTreeImpl* tree_impl) { |
return TextureLayerImpl::Create(tree_impl, id()); |
} |