| Index: components/mus/surfaces/surfaces_context_provider.h
|
| diff --git a/components/mus/surfaces/surfaces_context_provider.h b/components/mus/surfaces/surfaces_context_provider.h
|
| index 9fa6d47c704d84cf0eb741ff68a5b75fb2031f85..5562af496244fcca784be62c298f70f8c3bc4ba9 100644
|
| --- a/components/mus/surfaces/surfaces_context_provider.h
|
| +++ b/components/mus/surfaces/surfaces_context_provider.h
|
| @@ -7,8 +7,9 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/non_thread_safe.h"
|
| #include "cc/output/context_provider.h"
|
| @@ -72,9 +73,9 @@ class SurfacesContextProvider : public cc::ContextProvider,
|
|
|
| // From GLES2Context:
|
| // Initialized in BindToCurrentThread.
|
| - scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
|
| - scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
|
| - scoped_ptr<gpu::gles2::GLES2Implementation> implementation_;
|
| + std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
|
| + std::unique_ptr<gpu::TransferBuffer> transfer_buffer_;
|
| + std::unique_ptr<gpu::gles2::GLES2Implementation> implementation_;
|
|
|
| cc::ContextProvider::Capabilities capabilities_;
|
| LostContextCallback lost_context_callback_;
|
|
|