Index: cc/surfaces/surface_factory.cc |
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc |
index d7f4810d688db85c9474571ce69035f15c796dc5..0cbe9d5cebcdcfe97982e4fcee2917e38dda2551 100644 |
--- a/cc/surfaces/surface_factory.cc |
+++ b/cc/surfaces/surface_factory.cc |
@@ -38,7 +38,7 @@ void SurfaceFactory::DestroyAll() { |
} |
void SurfaceFactory::Create(SurfaceId surface_id) { |
- scoped_ptr<Surface> surface(new Surface(surface_id, this)); |
+ std::unique_ptr<Surface> surface(new Surface(surface_id, this)); |
manager_->RegisterSurface(surface.get()); |
DCHECK(!surface_map_.count(surface_id)); |
surface_map_[surface_id] = std::move(surface); |
@@ -48,14 +48,15 @@ void SurfaceFactory::Destroy(SurfaceId surface_id) { |
OwningSurfaceMap::iterator it = surface_map_.find(surface_id); |
DCHECK(it != surface_map_.end()); |
DCHECK(it->second->factory().get() == this); |
- scoped_ptr<Surface> surface(std::move(it->second)); |
+ std::unique_ptr<Surface> surface(std::move(it->second)); |
surface_map_.erase(it); |
manager_->Destroy(std::move(surface)); |
} |
-void SurfaceFactory::SubmitCompositorFrame(SurfaceId surface_id, |
- scoped_ptr<CompositorFrame> frame, |
- const DrawCallback& callback) { |
+void SurfaceFactory::SubmitCompositorFrame( |
+ SurfaceId surface_id, |
+ std::unique_ptr<CompositorFrame> frame, |
+ const DrawCallback& callback) { |
TRACE_EVENT0("cc", "SurfaceFactory::SubmitCompositorFrame"); |
OwningSurfaceMap::iterator it = surface_map_.find(surface_id); |
DCHECK(it != surface_map_.end()); |
@@ -69,7 +70,7 @@ void SurfaceFactory::SubmitCompositorFrame(SurfaceId surface_id, |
void SurfaceFactory::RequestCopyOfSurface( |
SurfaceId surface_id, |
- scoped_ptr<CopyOutputRequest> copy_request) { |
+ std::unique_ptr<CopyOutputRequest> copy_request) { |
OwningSurfaceMap::iterator it = surface_map_.find(surface_id); |
if (it == surface_map_.end()) { |
copy_request->SendEmptyResult(); |