Index: media/blink/run_all_unittests.cc |
diff --git a/media/blink/run_all_unittests.cc b/media/blink/run_all_unittests.cc |
index d757b83892950aa1390f07aee388939581c8e7b5..8873803f5de39c697ad5cb8bd84d5d879c211e87 100644 |
--- a/media/blink/run_all_unittests.cc |
+++ b/media/blink/run_all_unittests.cc |
@@ -63,9 +63,9 @@ class CurrentThreadMock : public blink::WebThread { |
private: |
scoped_refptr<scheduler::SchedulerTqmDelegate> task_runner_delegate_; |
- scoped_ptr<scheduler::RendererSchedulerImpl> scheduler_; |
- scoped_ptr<blink::WebScheduler> web_scheduler_; |
- scoped_ptr<blink::WebTaskRunner> web_task_runner_; |
+ std::unique_ptr<scheduler::RendererSchedulerImpl> scheduler_; |
+ std::unique_ptr<blink::WebScheduler> web_scheduler_; |
+ std::unique_ptr<blink::WebTaskRunner> web_task_runner_; |
}; |
class TestBlinkPlatformSupport : NON_EXPORTED_BASE(public blink::Platform) { |
@@ -92,7 +92,7 @@ class BlinkMediaTestSuite : public base::TestSuite { |
void Initialize() override; |
private: |
- scoped_ptr<TestBlinkPlatformSupport> blink_platform_support_; |
+ std::unique_ptr<TestBlinkPlatformSupport> blink_platform_support_; |
}; |
BlinkMediaTestSuite::BlinkMediaTestSuite(int argc, char** argv) |
@@ -126,7 +126,7 @@ void BlinkMediaTestSuite::Initialize() { |
// Dummy task runner is initialized here because the blink::initialize creates |
// IsolateHolder which needs the current task runner handle. There should be |
// no task posted to this task runner. |
- scoped_ptr<base::MessageLoop> message_loop; |
+ std::unique_ptr<base::MessageLoop> message_loop; |
if (!base::MessageLoop::current()) |
message_loop.reset(new base::MessageLoop()); |
blink::initialize(blink_platform_support_.get()); |