| Index: base/task/cancelable_task_tracker.cc
|
| diff --git a/base/task/cancelable_task_tracker.cc b/base/task/cancelable_task_tracker.cc
|
| index 801223e2806cf4d189b0661be7616017ea8183f8..aba7fa562a461710dd3b871184601777f6969e08 100644
|
| --- a/base/task/cancelable_task_tracker.cc
|
| +++ b/base/task/cancelable_task_tracker.cc
|
| @@ -11,9 +11,10 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/location.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/message_loop/message_loop_proxy.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/synchronization/cancellation_flag.h"
|
| #include "base/task_runner.h"
|
| +#include "base/thread_task_runner_handle.h"
|
|
|
| using base::Bind;
|
| using base::CancellationFlag;
|
| @@ -84,8 +85,8 @@ CancelableTaskTracker::TaskId CancelableTaskTracker::PostTaskAndReply(
|
| const Closure& reply) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| - // We need a MessageLoop to run reply.
|
| - DCHECK(base::MessageLoopProxy::current().get());
|
| + // We need a task runner to run reply.
|
| + DCHECK(base::ThreadTaskRunnerHandle::Get().get());
|
|
|
| // Owned by reply callback below.
|
| CancellationFlag* flag = new CancellationFlag();
|
| @@ -113,7 +114,7 @@ CancelableTaskTracker::TaskId CancelableTaskTracker::PostTaskAndReply(
|
| CancelableTaskTracker::TaskId CancelableTaskTracker::NewTrackedTaskId(
|
| IsCanceledCallback* is_canceled_cb) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - DCHECK(base::MessageLoopProxy::current().get());
|
| + DCHECK(base::ThreadTaskRunnerHandle::Get().get());
|
|
|
| TaskId id = next_id_;
|
| next_id_++; // int64 is big enough that we ignore the potential overflow.
|
| @@ -126,10 +127,10 @@ CancelableTaskTracker::TaskId CancelableTaskTracker::NewTrackedTaskId(
|
| Bind(&CancelableTaskTracker::Untrack, weak_factory_.GetWeakPtr(), id),
|
| flag);
|
|
|
| - // Will always run |untrack_and_delete_flag| on current MessageLoop.
|
| + // Will always run |untrack_and_delete_flag| on current task runner.
|
| base::ScopedClosureRunner* untrack_and_delete_flag_runner =
|
| new base::ScopedClosureRunner(Bind(&RunOrPostToTaskRunner,
|
| - base::MessageLoopProxy::current(),
|
| + base::ThreadTaskRunnerHandle::Get(),
|
| untrack_and_delete_flag));
|
|
|
| *is_canceled_cb =
|
|
|