Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1415)

Unified Diff: base/task/cancelable_task_tracker.cc

Issue 137263007: Move CancelableTaskTracker to //base/task/CancelableTaskTracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move to base/task/cancelable_task_tracker* Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/task/cancelable_task_tracker.h ('k') | base/task/cancelable_task_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/task/cancelable_task_tracker.cc
diff --git a/chrome/common/cancelable_task_tracker.cc b/base/task/cancelable_task_tracker.cc
similarity index 83%
rename from chrome/common/cancelable_task_tracker.cc
rename to base/task/cancelable_task_tracker.cc
index 4f2c9afc5b428e14f87aecfa809ddf7075b98c25..e99067560a4ebdbbabc751e5523ee7cedbe844e0 100644
--- a/chrome/common/cancelable_task_tracker.cc
+++ b/base/task/cancelable_task_tracker.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/common/cancelable_task_tracker.h"
+#include "base/task/cancelable_task_tracker.h"
#include <utility>
@@ -54,12 +54,13 @@ void RunOrPostToTaskRunner(TaskRunner* task_runner, const Closure& closure) {
} // namespace
+namespace base {
+
// static
const CancelableTaskTracker::TaskId CancelableTaskTracker::kBadTaskId = 0;
CancelableTaskTracker::CancelableTaskTracker()
- : weak_factory_(this),
- next_id_(1) {}
+ : weak_factory_(this), next_id_(1) {}
CancelableTaskTracker::~CancelableTaskTracker() {
DCHECK(thread_checker_.CalledOnValidThread());
@@ -92,13 +93,15 @@ CancelableTaskTracker::TaskId CancelableTaskTracker::PostTaskAndReply(
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));
+ 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;
@@ -125,13 +128,12 @@ CancelableTaskTracker::TaskId CancelableTaskTracker::NewTrackedTaskId(
// 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(),
- untrack_and_delete_flag));
+ new base::ScopedClosureRunner(Bind(&RunOrPostToTaskRunner,
+ base::MessageLoopProxy::current(),
+ untrack_and_delete_flag));
- *is_canceled_cb = Bind(
- &IsCanceled, flag, base::Owned(untrack_and_delete_flag_runner));
+ *is_canceled_cb =
+ Bind(&IsCanceled, flag, base::Owned(untrack_and_delete_flag_runner));
Track(id, flag);
return id;
@@ -181,3 +183,5 @@ void CancelableTaskTracker::Untrack(TaskId id) {
size_t num = task_flags_.erase(id);
DCHECK_EQ(1u, num);
}
+
+} // namespace base
« no previous file with comments | « base/task/cancelable_task_tracker.h ('k') | base/task/cancelable_task_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698