| Index: chromecast/media/cma/base/balanced_media_task_runner_unittest.cc
|
| diff --git a/chromecast/media/cma/base/balanced_media_task_runner_unittest.cc b/chromecast/media/cma/base/balanced_media_task_runner_unittest.cc
|
| index 5ac52d30881dc161e35d8ced2843a651664d9283..7f903800dea21d4a9fc151c6d446c8ec2d419efe 100644
|
| --- a/chromecast/media/cma/base/balanced_media_task_runner_unittest.cc
|
| +++ b/chromecast/media/cma/base/balanced_media_task_runner_unittest.cc
|
| @@ -5,12 +5,12 @@
|
| #include <stddef.h>
|
|
|
| #include <list>
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/threading/thread.h"
|
| #include "base/time/time.h"
|
| @@ -207,7 +207,7 @@ void BalancedMediaTaskRunnerTest::OnTestTimeout() {
|
| }
|
|
|
| TEST_F(BalancedMediaTaskRunnerTest, OneTaskRunner) {
|
| - scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
|
| + std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
|
|
|
| // Timestamps of tasks for the single task runner.
|
| int timestamps0_ms[] = {0, 10, 20, 30, 40, 30, 50, 60, 20, 30, 70};
|
| @@ -235,7 +235,7 @@ TEST_F(BalancedMediaTaskRunnerTest, OneTaskRunner) {
|
| }
|
|
|
| TEST_F(BalancedMediaTaskRunnerTest, TwoTaskRunnerUnbalanced) {
|
| - scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
|
| + std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
|
|
|
| // Timestamps of tasks for the 2 task runners.
|
| int timestamps0_ms[] = {0, 10, 20, 30, 40, 30, 50, 60, 20, 30, 70};
|
| @@ -268,7 +268,7 @@ TEST_F(BalancedMediaTaskRunnerTest, TwoTaskRunnerUnbalanced) {
|
| }
|
|
|
| TEST_F(BalancedMediaTaskRunnerTest, TwoStreamsOfDifferentLength) {
|
| - scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
|
| + std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
|
|
|
| std::vector<std::vector<int>> timestamps = {
|
| // One longer stream and one shorter stream.
|
|
|