| Index: android_webview/browser/aw_render_thread_context_provider.h
|
| diff --git a/android_webview/browser/aw_render_thread_context_provider.h b/android_webview/browser/aw_render_thread_context_provider.h
|
| index cb763236ccb29c0a732a4925ef78ed1e2fd231fc..839f1a9346d6c4ea4de0b5d8345d431c4e096450 100644
|
| --- a/android_webview/browser/aw_render_thread_context_provider.h
|
| +++ b/android_webview/browser/aw_render_thread_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/thread_checker.h"
|
| #include "cc/output/context_provider.h"
|
| @@ -54,7 +55,7 @@ class AwRenderThreadContextProvider : public cc::ContextProvider {
|
|
|
| base::ThreadChecker main_thread_checker_;
|
|
|
| - scoped_ptr<gpu::GLInProcessContext> context_;
|
| + std::unique_ptr<gpu::GLInProcessContext> context_;
|
| skia::RefPtr<class GrContext> gr_context_;
|
|
|
| cc::ContextProvider::Capabilities capabilities_;
|
|
|