Index: content/renderer/render_thread_impl_browsertest.cc |
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc |
index f1b21a4f7c9e52edbd58a426ea71431532d962cc..534a324a4c3ccd78f2ddd9bafed17a058a8029f1 100644 |
--- a/content/renderer/render_thread_impl_browsertest.cc |
+++ b/content/renderer/render_thread_impl_browsertest.cc |
@@ -103,10 +103,9 @@ class RenderThreadImplForTest : public RenderThreadImpl { |
public: |
RenderThreadImplForTest( |
const InProcessChildThreadParams& params, |
- scoped_ptr<scheduler::RendererScheduler> scheduler, |
+ std::unique_ptr<scheduler::RendererScheduler> scheduler, |
scoped_refptr<base::SingleThreadTaskRunner>& test_task_counter) |
- : RenderThreadImpl(params, std::move(scheduler), test_task_counter) { |
- } |
+ : RenderThreadImpl(params, std::move(scheduler), test_task_counter) {} |
~RenderThreadImplForTest() override {} |
@@ -176,7 +175,7 @@ class RenderThreadImplBrowserTest : public testing::Test { |
} |
cmd->AppendSwitchASCII(switches::kContentImageTextureTarget, image_targets); |
- scoped_ptr<scheduler::RendererScheduler> renderer_scheduler = |
+ std::unique_ptr<scheduler::RendererScheduler> renderer_scheduler = |
scheduler::RendererScheduler::Create(); |
InitializeMojo(); |
scoped_refptr<base::SingleThreadTaskRunner> test_task_counter( |
@@ -194,11 +193,11 @@ class RenderThreadImplBrowserTest : public testing::Test { |
} |
scoped_refptr<TestTaskCounter> test_task_counter_; |
- scoped_ptr<ContentClient> content_client_; |
- scoped_ptr<ContentBrowserClient> content_browser_client_; |
- scoped_ptr<ContentRendererClient> content_renderer_client_; |
- scoped_ptr<RenderThreadImplBrowserIPCTestHelper> test_helper_; |
- scoped_ptr<MockRenderProcess> mock_process_; |
+ std::unique_ptr<ContentClient> content_client_; |
+ std::unique_ptr<ContentBrowserClient> content_browser_client_; |
+ std::unique_ptr<ContentRendererClient> content_renderer_client_; |
+ std::unique_ptr<RenderThreadImplBrowserIPCTestHelper> test_helper_; |
+ std::unique_ptr<MockRenderProcess> mock_process_; |
scoped_refptr<QuitOnTestMsgFilter> test_msg_filter_; |
RenderThreadImplForTest* thread_; // Owned by mock_process_. |
std::string channel_id_; |