Index: ui/gfx/image/image_util.cc |
diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc |
index 53bcceee073c82fb73af07c17c6aed5407a4317c..d0d79b2f5bae9e3d3564d4a39e3e2aa9c3ef0805 100644 |
--- a/ui/gfx/image/image_util.cc |
+++ b/ui/gfx/image/image_util.cc |
@@ -7,8 +7,8 @@ |
#include <stdint.h> |
#include <algorithm> |
+#include <memory> |
-#include "base/memory/scoped_ptr.h" |
#include "build/build_config.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "ui/gfx/codec/jpeg_codec.h" |
@@ -37,7 +37,7 @@ namespace gfx { |
#if !defined(OS_IOS) |
Image ImageFrom1xJPEGEncodedData(const unsigned char* input, |
size_t input_size) { |
- scoped_ptr<SkBitmap> bitmap(gfx::JPEGCodec::Decode(input, input_size)); |
+ std::unique_ptr<SkBitmap> bitmap(gfx::JPEGCodec::Decode(input, input_size)); |
if (bitmap.get()) |
return Image::CreateFrom1xBitmap(*bitmap); |