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

Unified Diff: chrome/common/cancelable_task_tracker_unittest.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | « chrome/common/cancelable_task_tracker.cc ('k') | chrome/common/extensions/extension_set.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/cancelable_task_tracker_unittest.cc
diff --git a/chrome/common/cancelable_task_tracker_unittest.cc b/chrome/common/cancelable_task_tracker_unittest.cc
index 11cff80d7bc364129af6b6e57c8af5b9a20ca11c..e5147e3f00dcc92024474ee12fc24bf4e1ea2738 100644
--- a/chrome/common/cancelable_task_tracker_unittest.cc
+++ b/chrome/common/cancelable_task_tracker_unittest.cc
@@ -87,18 +87,15 @@ TEST_F(CancelableTaskTrackerTest, NoCancel) {
base::Thread worker_thread("worker thread");
ASSERT_TRUE(worker_thread.Start());
- ignore_result(
- task_tracker_.PostTask(
- worker_thread.message_loop_proxy(),
- FROM_HERE,
- MakeExpectedRunClosure(FROM_HERE)));
+ ignore_result(task_tracker_.PostTask(worker_thread.message_loop_proxy().get(),
+ FROM_HERE,
+ MakeExpectedRunClosure(FROM_HERE)));
ignore_result(
- task_tracker_.PostTaskAndReply(
- worker_thread.message_loop_proxy(),
- FROM_HERE,
- MakeExpectedRunClosure(FROM_HERE),
- MakeExpectedRunClosure(FROM_HERE)));
+ task_tracker_.PostTaskAndReply(worker_thread.message_loop_proxy().get(),
+ FROM_HERE,
+ MakeExpectedRunClosure(FROM_HERE),
+ MakeExpectedRunClosure(FROM_HERE)));
CancelableTaskTracker::IsCanceledCallback is_canceled;
ignore_result(task_tracker_.NewTrackedTaskId(&is_canceled));
@@ -178,11 +175,10 @@ TEST_F(CancelableTaskTrackerTest, CancelReplyDifferentThread) {
ASSERT_TRUE(worker_thread.Start());
CancelableTaskTracker::TaskId task_id =
- task_tracker_.PostTaskAndReply(
- worker_thread.message_loop_proxy(),
- FROM_HERE,
- base::Bind(&base::DoNothing),
- MakeExpectedNotRunClosure(FROM_HERE));
+ task_tracker_.PostTaskAndReply(worker_thread.message_loop_proxy().get(),
+ FROM_HERE,
+ base::Bind(&base::DoNothing),
+ MakeExpectedNotRunClosure(FROM_HERE));
EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id);
task_tracker_.TryCancel(task_id);
@@ -385,10 +381,11 @@ void MaybeRunDeadlyTaskTrackerMemberFunction(
void PostDoNothingTask(CancelableTaskTracker* task_tracker) {
ignore_result(
- task_tracker->PostTask(
- scoped_refptr<base::TestSimpleTaskRunner>(
- new base::TestSimpleTaskRunner()),
- FROM_HERE, base::Bind(&base::DoNothing)));
+ task_tracker->PostTask(scoped_refptr<base::TestSimpleTaskRunner>(
+ new base::TestSimpleTaskRunner())
+ .get(),
+ FROM_HERE,
+ base::Bind(&base::DoNothing)));
}
TEST_F(CancelableTaskTrackerDeathTest, PostFromDifferentThread) {
« no previous file with comments | « chrome/common/cancelable_task_tracker.cc ('k') | chrome/common/extensions/extension_set.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698