| Index: base/test/test_mock_time_task_runner.cc
|
| diff --git a/base/test/test_mock_time_task_runner.cc b/base/test/test_mock_time_task_runner.cc
|
| index 655a6745b05354b4c99cbddd1774b5fdfd830e48..7dca3a931d7f60252924dbcc5f1a416976278bad 100644
|
| --- a/base/test/test_mock_time_task_runner.cc
|
| +++ b/base/test/test_mock_time_task_runner.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/time/clock.h"
|
| #include "base/time/tick_clock.h"
|
| @@ -162,14 +163,14 @@ TimeTicks TestMockTimeTaskRunner::NowTicks() const {
|
| return now_ticks_;
|
| }
|
|
|
| -scoped_ptr<Clock> TestMockTimeTaskRunner::GetMockClock() const {
|
| +std::unique_ptr<Clock> TestMockTimeTaskRunner::GetMockClock() const {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - return make_scoped_ptr(new MockClock(this));
|
| + return WrapUnique(new MockClock(this));
|
| }
|
|
|
| -scoped_ptr<TickClock> TestMockTimeTaskRunner::GetMockTickClock() const {
|
| +std::unique_ptr<TickClock> TestMockTimeTaskRunner::GetMockTickClock() const {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - return make_scoped_ptr(new MockTickClock(this));
|
| + return WrapUnique(new MockTickClock(this));
|
| }
|
|
|
| bool TestMockTimeTaskRunner::HasPendingTask() const {
|
|
|