Index: cc/layers/video_layer_impl.h |
diff --git a/cc/layers/video_layer_impl.h b/cc/layers/video_layer_impl.h |
index 6db19302c2a901bfb48de8babb814a041cdfbede..4a2480acdf26a540c308288486a97a2274b288e5 100644 |
--- a/cc/layers/video_layer_impl.h |
+++ b/cc/layers/video_layer_impl.h |
@@ -26,14 +26,15 @@ class CC_EXPORT VideoLayerImpl : public LayerImpl { |
public: |
// Must be called on the impl thread while the main thread is blocked. This is |
// so that |provider| stays alive while this is being created. |
- static scoped_ptr<VideoLayerImpl> Create(LayerTreeImpl* tree_impl, |
- int id, |
- VideoFrameProvider* provider, |
- media::VideoRotation video_rotation); |
+ static std::unique_ptr<VideoLayerImpl> Create( |
+ LayerTreeImpl* tree_impl, |
+ int id, |
+ VideoFrameProvider* provider, |
+ media::VideoRotation video_rotation); |
~VideoLayerImpl() override; |
// LayerImpl implementation. |
- scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; |
+ std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; |
bool WillDraw(DrawMode draw_mode, |
ResourceProvider* resource_provider) override; |
void AppendQuads(RenderPass* render_pass, |
@@ -61,7 +62,7 @@ class CC_EXPORT VideoLayerImpl : public LayerImpl { |
media::VideoRotation video_rotation_; |
- scoped_ptr<VideoResourceUpdater> updater_; |
+ std::unique_ptr<VideoResourceUpdater> updater_; |
VideoFrameExternalResources::ResourceType frame_resource_type_; |
float frame_resource_offset_; |
float frame_resource_multiplier_; |