Index: gpu/gles2_conform_support/egl/display.h |
diff --git a/gpu/gles2_conform_support/egl/display.h b/gpu/gles2_conform_support/egl/display.h |
index 52252323ecad050bdedfb22c6712bb4ce43e4716..3c5c6ed4f31bb9ee06e96634b4706ce870c6bb4d 100644 |
--- a/gpu/gles2_conform_support/egl/display.h |
+++ b/gpu/gles2_conform_support/egl/display.h |
@@ -9,8 +9,9 @@ |
#include <stddef.h> |
#include <stdint.h> |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "gpu/command_buffer/client/gles2_cmd_helper.h" |
#include "gpu/command_buffer/client/gpu_control.h" |
#include "gpu/command_buffer/service/command_buffer_service.h" |
@@ -116,18 +117,18 @@ class Display : private gpu::GpuControl { |
uint64_t next_fence_sync_release_; |
scoped_refptr<gpu::TransferBufferManagerInterface> transfer_buffer_manager_; |
- scoped_ptr<gpu::CommandBufferService> command_buffer_; |
- scoped_ptr<gpu::CommandExecutor> executor_; |
- scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; |
+ std::unique_ptr<gpu::CommandBufferService> command_buffer_; |
+ std::unique_ptr<gpu::CommandExecutor> executor_; |
+ std::unique_ptr<gpu::gles2::GLES2Decoder> decoder_; |
scoped_refptr<gfx::GLContext> gl_context_; |
scoped_refptr<gfx::GLSurface> gl_surface_; |
- scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_; |
- scoped_ptr<gpu::TransferBuffer> transfer_buffer_; |
+ std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_; |
+ std::unique_ptr<gpu::TransferBuffer> transfer_buffer_; |
// TODO(alokp): Support more than one config, surface, and context. |
- scoped_ptr<Config> config_; |
- scoped_ptr<Surface> surface_; |
- scoped_ptr<gpu::gles2::GLES2Implementation> context_; |
+ std::unique_ptr<Config> config_; |
+ std::unique_ptr<Surface> surface_; |
+ std::unique_ptr<gpu::gles2::GLES2Implementation> context_; |
DISALLOW_COPY_AND_ASSIGN(Display); |
}; |