| Index: cc/surfaces/surface_manager.cc
|
| diff --git a/cc/surfaces/surface_manager.cc b/cc/surfaces/surface_manager.cc
|
| index d22d1e56c73f7892c8af708692caf0fb08c74522..babd173446a5fca2ef2f9285441c55bd3d7657c9 100644
|
| --- a/cc/surfaces/surface_manager.cc
|
| +++ b/cc/surfaces/surface_manager.cc
|
| @@ -57,7 +57,7 @@ void SurfaceManager::DeregisterSurface(SurfaceId surface_id) {
|
| surface_map_.erase(it);
|
| }
|
|
|
| -void SurfaceManager::Destroy(scoped_ptr<Surface> surface) {
|
| +void SurfaceManager::Destroy(std::unique_ptr<Surface> surface) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| surface->set_destroyed(true);
|
| surfaces_to_destroy_.push_back(surface.release());
|
| @@ -127,7 +127,7 @@ void SurfaceManager::GarbageCollectSurfaces() {
|
| for (SurfaceDestroyList::iterator dest_it = surfaces_to_destroy_.begin();
|
| dest_it != surfaces_to_destroy_.end();) {
|
| if (!live_surfaces_set.count((*dest_it)->surface_id())) {
|
| - scoped_ptr<Surface> surf(*dest_it);
|
| + std::unique_ptr<Surface> surf(*dest_it);
|
| DeregisterSurface(surf->surface_id());
|
| dest_it = surfaces_to_destroy_.erase(dest_it);
|
| } else {
|
|
|