Index: content/browser/compositor/surface_utils.h |
diff --git a/content/browser/compositor/surface_utils.h b/content/browser/compositor/surface_utils.h |
index 6d986a9c8caea00c72cfe8470c03120e5ebf588b..54f7a32fd33c70a02a0136f4c66018186d4f8128 100644 |
--- a/content/browser/compositor/surface_utils.h |
+++ b/content/browser/compositor/surface_utils.h |
@@ -5,7 +5,8 @@ |
#ifndef CONTENT_BROWSER_COMPOSITOR_SURFACE_UTILS_H_ |
#define CONTENT_BROWSER_COMPOSITOR_SURFACE_UTILS_H_ |
-#include "base/memory/scoped_ptr.h" |
+#include <memory> |
+ |
#include "content/common/content_export.h" |
#include "content/public/browser/readback_types.h" |
#include "third_party/skia/include/core/SkImageInfo.h" |
@@ -19,7 +20,7 @@ class SurfaceManager; |
namespace content { |
-scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator(); |
+std::unique_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator(); |
CONTENT_EXPORT |
cc::SurfaceManager* GetSurfaceManager(); |
@@ -28,7 +29,7 @@ void CopyFromCompositingSurfaceHasResult( |
const gfx::Size& dst_size_in_pixel, |
const SkColorType color_type, |
const ReadbackRequestCallback& callback, |
- scoped_ptr<cc::CopyOutputResult> result); |
+ std::unique_ptr<cc::CopyOutputResult> result); |
} // namespace content |