| Index: ui/compositor/test/in_process_context_provider.h
|
| diff --git a/ui/compositor/test/in_process_context_provider.h b/ui/compositor/test/in_process_context_provider.h
|
| index 5e0447c56acc03fde3a6e4b20e271a1a87f93c3f..1bc2cc393f22f5f3c246806e7630a723730d1d4d 100644
|
| --- a/ui/compositor/test/in_process_context_provider.h
|
| +++ b/ui/compositor/test/in_process_context_provider.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "cc/output/context_provider.h"
|
| @@ -69,7 +69,7 @@ class InProcessContextProvider : public cc::ContextProvider {
|
| base::ThreadChecker main_thread_checker_;
|
| base::ThreadChecker context_thread_checker_;
|
|
|
| - scoped_ptr<gpu::GLInProcessContext> context_;
|
| + std::unique_ptr<gpu::GLInProcessContext> context_;
|
| skia::RefPtr<class GrContext> gr_context_;
|
|
|
| gpu::gles2::ContextCreationAttribHelper attribs_;
|
|
|