| Index: cc/test/test_in_process_context_provider.h
|
| diff --git a/cc/test/test_in_process_context_provider.h b/cc/test/test_in_process_context_provider.h
|
| index 33034201c8db8bcff8310057abb3d755b14386d5..3205cc25db8436a846fabdfadfc28d045a486fcd 100644
|
| --- a/cc/test/test_in_process_context_provider.h
|
| +++ b/cc/test/test_in_process_context_provider.h
|
| @@ -21,8 +21,8 @@ class GLInProcessContext;
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<gpu::GLInProcessContext> CreateTestInProcessContext();
|
| -scoped_ptr<gpu::GLInProcessContext> CreateTestInProcessContext(
|
| +std::unique_ptr<gpu::GLInProcessContext> CreateTestInProcessContext();
|
| +std::unique_ptr<gpu::GLInProcessContext> CreateTestInProcessContext(
|
| TestGpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| TestImageFactory* image_factory,
|
| gpu::GLInProcessContext* shared_context);
|
| @@ -51,7 +51,7 @@ class TestInProcessContextProvider : public ContextProvider {
|
| private:
|
| TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
|
| TestImageFactory image_factory_;
|
| - scoped_ptr<gpu::GLInProcessContext> context_;
|
| + std::unique_ptr<gpu::GLInProcessContext> context_;
|
| skia::RefPtr<class GrContext> gr_context_;
|
| base::Lock context_lock_;
|
| };
|
|
|