Index: cc/output/output_surface.cc |
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc |
index b3b18da4fa54b5151e1fae0a50de30dcff06663c..64b1d3bb12b0625b43bf2052a6e0281b5afa97bb 100644 |
--- a/cc/output/output_surface.cc |
+++ b/cc/output/output_surface.cc |
@@ -124,7 +124,7 @@ OutputSurface::OutputSurface( |
#if defined(ENABLE_VULKAN) |
scoped_refptr<VulkanContextProvider> vulkan_context_provider, |
#endif |
- scoped_ptr<SoftwareOutputDevice> software_device) |
+ std::unique_ptr<SoftwareOutputDevice> software_device) |
: client_(NULL), |
context_provider_(std::move(context_provider)), |
worker_context_provider_(std::move(worker_context_provider)), |
@@ -168,7 +168,8 @@ OutputSurface::OutputSurface( |
nullptr) {} |
#endif |
-OutputSurface::OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device) |
+OutputSurface::OutputSurface( |
+ std::unique_ptr<SoftwareOutputDevice> software_device) |
: OutputSurface(nullptr, |
nullptr, |
#if defined(ENABLE_VULKAN) |
@@ -177,8 +178,9 @@ OutputSurface::OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device) |
std::move(software_device)) { |
} |
-OutputSurface::OutputSurface(scoped_refptr<ContextProvider> context_provider, |
- scoped_ptr<SoftwareOutputDevice> software_device) |
+OutputSurface::OutputSurface( |
+ scoped_refptr<ContextProvider> context_provider, |
+ std::unique_ptr<SoftwareOutputDevice> software_device) |
: OutputSurface(std::move(context_provider), |
nullptr, |
#if defined(ENABLE_VULKAN) |