| Index: content/browser/compositor/gl_helper.h
|
| diff --git a/content/browser/compositor/gl_helper.h b/content/browser/compositor/gl_helper.h
|
| index ebfc1a33c0b2c75bcb4bd08bb18f551d65c61538..582c00b9c12264105aabef1fabad149f798e0640 100644
|
| --- a/content/browser/compositor/gl_helper.h
|
| +++ b/content/browser/compositor/gl_helper.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef CONTENT_BROWSER_COMPOSITOR_GL_HELPER_H_
|
| #define CONTENT_BROWSER_COMPOSITOR_GL_HELPER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/atomicops.h"
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| #include "gpu/command_buffer/common/mailbox_holder.h"
|
| @@ -342,9 +343,9 @@ class CONTENT_EXPORT GLHelper {
|
|
|
| gpu::gles2::GLES2Interface* gl_;
|
| gpu::ContextSupport* context_support_;
|
| - scoped_ptr<CopyTextureToImpl> copy_texture_to_impl_;
|
| - scoped_ptr<GLHelperScaling> scaler_impl_;
|
| - scoped_ptr<GLHelperReadbackSupport> readback_support_;
|
| + std::unique_ptr<CopyTextureToImpl> copy_texture_to_impl_;
|
| + std::unique_ptr<GLHelperScaling> scaler_impl_;
|
| + std::unique_ptr<GLHelperReadbackSupport> readback_support_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GLHelper);
|
| };
|
|
|