| Index: cc/test/test_texture.h
|
| diff --git a/cc/test/test_texture.h b/cc/test/test_texture.h
|
| index 6661aede16f72f87cfe26786346b36481551eb89..ae819ec50c57655b6f9409d57e9c2dc60b62b633 100644
|
| --- a/cc/test/test_texture.h
|
| +++ b/cc/test/test_texture.h
|
| @@ -8,10 +8,10 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <unordered_map>
|
|
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/resources/resource_format.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| #include "ui/gfx/geometry/size.h"
|
| @@ -28,7 +28,7 @@ struct TestTexture : public base::RefCounted<TestTexture> {
|
|
|
| gfx::Size size;
|
| ResourceFormat format;
|
| - scoped_ptr<uint8_t[]> data;
|
| + std::unique_ptr<uint8_t[]> data;
|
|
|
| using TextureParametersMap = std::unordered_map<GLenum, GLint>;
|
| TextureParametersMap params;
|
|
|