| Index: ui/gl/test/gl_image_test_template.h
|
| diff --git a/ui/gl/test/gl_image_test_template.h b/ui/gl/test/gl_image_test_template.h
|
| index e10c64c77396624d3dda5c5e1faa97e01c202787..9ca605c7889889cca0eca30e2207a1d07e65ed5f 100644
|
| --- a/ui/gl/test/gl_image_test_template.h
|
| +++ b/ui/gl/test/gl_image_test_template.h
|
| @@ -10,7 +10,8 @@
|
|
|
| #include <stdint.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/strings/stringize_macros.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "build/build_config.h"
|
| @@ -257,7 +258,7 @@ TYPED_TEST_P(GLImageCopyTest, CopyTexImage) {
|
| // Create a solid color blue texture of the same size as |image|.
|
| unsigned target = this->delegate_.GetTextureTarget();
|
| GLuint texture = GLTestHelper::CreateTexture(target);
|
| - scoped_ptr<uint8_t[]> pixels(new uint8_t[BufferSizeForBufferFormat(
|
| + std::unique_ptr<uint8_t[]> pixels(new uint8_t[BufferSizeForBufferFormat(
|
| image_size, gfx::BufferFormat::RGBA_8888)]);
|
| GLImageTestSupport::SetBufferDataToColor(
|
| image_size.width(), image_size.height(),
|
|
|