Index: cc/output/renderer_unittest.cc |
diff --git a/cc/output/renderer_unittest.cc b/cc/output/renderer_unittest.cc |
index 1648aece04ac299f3d002de4390c42f2acdbc8a3..67d13caf40a7f6af65e2308488ea2268fc4c30d1 100644 |
--- a/cc/output/renderer_unittest.cc |
+++ b/cc/output/renderer_unittest.cc |
@@ -39,7 +39,8 @@ void TestOutputSurface::SwapBuffers(CompositorFrame* frame) { |
class MockContextProvider : public TestContextProvider { |
public: |
- explicit MockContextProvider(scoped_ptr<TestWebGraphicsContext3D> context) |
+ explicit MockContextProvider( |
+ std::unique_ptr<TestWebGraphicsContext3D> context) |
: TestContextProvider(std::move(context)) {} |
MOCK_METHOD0(DeleteCachedResources, void()); |
@@ -48,13 +49,13 @@ class MockContextProvider : public TestContextProvider { |
}; |
template <class T> |
-scoped_ptr<Renderer> CreateRenderer(RendererClient* client, |
- const RendererSettings* settings, |
- OutputSurface* output_surface, |
- ResourceProvider* resource_provider); |
+std::unique_ptr<Renderer> CreateRenderer(RendererClient* client, |
+ const RendererSettings* settings, |
+ OutputSurface* output_surface, |
+ ResourceProvider* resource_provider); |
template <> |
-scoped_ptr<Renderer> CreateRenderer<DelegatingRenderer>( |
+std::unique_ptr<Renderer> CreateRenderer<DelegatingRenderer>( |
RendererClient* client, |
const RendererSettings* settings, |
OutputSurface* output_surface, |
@@ -64,7 +65,7 @@ scoped_ptr<Renderer> CreateRenderer<DelegatingRenderer>( |
} |
template <> |
-scoped_ptr<Renderer> CreateRenderer<GLRenderer>( |
+std::unique_ptr<Renderer> CreateRenderer<GLRenderer>( |
RendererClient* client, |
const RendererSettings* settings, |
OutputSurface* output_surface, |
@@ -93,9 +94,9 @@ class RendererTest : public ::testing::Test { |
RendererSettings tree_settings_; |
FakeOutputSurfaceClient output_surface_client_; |
scoped_refptr<MockContextProvider> context_provider_; |
- scoped_ptr<OutputSurface> output_surface_; |
- scoped_ptr<ResourceProvider> resource_provider_; |
- scoped_ptr<Renderer> renderer_; |
+ std::unique_ptr<OutputSurface> output_surface_; |
+ std::unique_ptr<ResourceProvider> resource_provider_; |
+ std::unique_ptr<Renderer> renderer_; |
}; |
typedef ::testing::Types<DelegatingRenderer, GLRenderer> RendererTypes; |