base: Remove most uses of MessageLoopProxy

base/task/cancelable_task_tracker.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/task/cancelable_task_tracker.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #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;
 using base::Closure;
 using base::hash_map;
 using base::TaskRunner;
 
 namespace {
 
 void RunIfNotCanceled(const CancellationFlag* flag, const Closure& task) {
@@ skipping 51 matching lines @@
 }
 
 CancelableTaskTracker::TaskId CancelableTaskTracker::PostTaskAndReply(
     TaskRunner* task_runner,
     const tracked_objects::Location& from_here,
     const Closure& task,
     const Closure& reply) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // We need a MessageLoop to run reply.
-  DCHECK(base::MessageLoopProxy::current().get());
+  DCHECK(base::ThreadTaskRunnerHandle::Get());

[danakj, 2015/04/21 20:16:30]

Get() already DCHECKs. Do you want to IsSet()?

[Sami, 2015/04/23 17:48:25]

Yes, that makes more sense (checked for any other instances too -- only two are
in this file).

 
   // Owned by reply callback below.
   CancellationFlag* flag = new CancellationFlag();
 
   TaskId id = next_id_;
   next_id_++;  // int64 is big enough that we ignore the potential overflow.
 
   const Closure& untrack_closure =
       Bind(&CancelableTaskTracker::Untrack, weak_factory_.GetWeakPtr(), id);
   bool success =
       task_runner->PostTaskAndReply(from_here,
                                     Bind(&RunIfNotCanceled, flag, task),
                                     Bind(&RunIfNotCanceledThenUntrack,
                                          base::Owned(flag),
                                          reply,
                                          untrack_closure));
 
   if (!success)
     return kBadTaskId;
 
   Track(id, flag);
   return id;
 }
 
 CancelableTaskTracker::TaskId CancelableTaskTracker::NewTrackedTaskId(
     IsCanceledCallback* is_canceled_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(base::MessageLoopProxy::current().get());
+  DCHECK(base::ThreadTaskRunnerHandle::Get());

[danakj, 2015/04/21 20:16:30]

dittos

[Sami, 2015/04/23 17:48:25]

Done.

 
   TaskId id = next_id_;
   next_id_++;  // int64 is big enough that we ignore the potential overflow.
 
   // Will be deleted by |untrack_and_delete_flag| after Untrack().
   CancellationFlag* flag = new CancellationFlag();
 
   Closure untrack_and_delete_flag = Bind(
       &RunAndDeleteFlag,
       Bind(&CancelableTaskTracker::Untrack, weak_factory_.GetWeakPtr(), id),
       flag);
 
   // Will always run |untrack_and_delete_flag| on current MessageLoop.
   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 =
       Bind(&IsCanceled, flag, base::Owned(untrack_and_delete_flag_runner));
 
   Track(id, flag);
   return id;
 }
 
 void CancelableTaskTracker::TryCancel(TaskId id) {
@@ skipping 35 matching lines @@
   DCHECK(success);
 }
 
 void CancelableTaskTracker::Untrack(TaskId id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   size_t num = task_flags_.erase(id);
   DCHECK_EQ(1u, num);
 }
 
 }  // namespace base