Index: base/memory/weak_ptr_unittest.cc |
diff --git a/base/memory/weak_ptr_unittest.cc b/base/memory/weak_ptr_unittest.cc |
index d89a5c6bbda66d9417d05ef94d68eb4a6128e31b..10c6984b11ee8da0e291ba7f49c572b3ebdf36fc 100644 |
--- a/base/memory/weak_ptr_unittest.cc |
+++ b/base/memory/weak_ptr_unittest.cc |
@@ -8,8 +8,9 @@ |
#include "base/bind.h" |
#include "base/debug/leak_annotations.h" |
+#include "base/location.h" |
#include "base/memory/scoped_ptr.h" |
-#include "base/message_loop/message_loop.h" |
+#include "base/single_thread_task_runner.h" |
#include "base/synchronization/waitable_event.h" |
#include "base/threading/thread.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -25,9 +26,8 @@ class OffThreadObjectCreator { |
{ |
Thread creator_thread("creator_thread"); |
creator_thread.Start(); |
- creator_thread.message_loop()->PostTask( |
- FROM_HERE, |
- base::Bind(OffThreadObjectCreator::CreateObject, &result)); |
+ creator_thread.message_loop()->task_runner()->PostTask( |
danakj
2015/04/21 20:16:30
why message_loop()->task_runner() instead of just
Sami
2015/04/23 17:48:24
Hmm, I thought I applied that shortcut everywhere
|
+ FROM_HERE, base::Bind(OffThreadObjectCreator::CreateObject, &result)); |
} |
DCHECK(result); // We synchronized on thread destruction above. |
return result; |
@@ -66,25 +66,23 @@ class BackgroundThread : public Thread { |
void CreateArrowFromTarget(Arrow** arrow, Target* target) { |
WaitableEvent completion(true, false); |
- message_loop()->PostTask( |
- FROM_HERE, |
- base::Bind(&BackgroundThread::DoCreateArrowFromTarget, |
- arrow, target, &completion)); |
+ message_loop()->task_runner()->PostTask( |
danakj
2015/04/21 20:16:30
dittos
Sami
2015/04/23 17:48:24
Done.
|
+ FROM_HERE, base::Bind(&BackgroundThread::DoCreateArrowFromTarget, arrow, |
+ target, &completion)); |
completion.Wait(); |
} |
void CreateArrowFromArrow(Arrow** arrow, const Arrow* other) { |
WaitableEvent completion(true, false); |
- message_loop()->PostTask( |
- FROM_HERE, |
- base::Bind(&BackgroundThread::DoCreateArrowFromArrow, |
- arrow, other, &completion)); |
+ message_loop()->task_runner()->PostTask( |
+ FROM_HERE, base::Bind(&BackgroundThread::DoCreateArrowFromArrow, arrow, |
+ other, &completion)); |
completion.Wait(); |
} |
void DeleteTarget(Target* object) { |
WaitableEvent completion(true, false); |
- message_loop()->PostTask( |
+ message_loop()->task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&BackgroundThread::DoDeleteTarget, object, &completion)); |
completion.Wait(); |
@@ -92,25 +90,23 @@ class BackgroundThread : public Thread { |
void CopyAndAssignArrow(Arrow* object) { |
WaitableEvent completion(true, false); |
- message_loop()->PostTask( |
- FROM_HERE, |
- base::Bind(&BackgroundThread::DoCopyAndAssignArrow, |
- object, &completion)); |
+ message_loop()->task_runner()->PostTask( |
+ FROM_HERE, base::Bind(&BackgroundThread::DoCopyAndAssignArrow, object, |
+ &completion)); |
completion.Wait(); |
} |
void CopyAndAssignArrowBase(Arrow* object) { |
WaitableEvent completion(true, false); |
- message_loop()->PostTask( |
- FROM_HERE, |
- base::Bind(&BackgroundThread::DoCopyAndAssignArrowBase, |
- object, &completion)); |
+ message_loop()->task_runner()->PostTask( |
+ FROM_HERE, base::Bind(&BackgroundThread::DoCopyAndAssignArrowBase, |
+ object, &completion)); |
completion.Wait(); |
} |
void DeleteArrow(Arrow* object) { |
WaitableEvent completion(true, false); |
- message_loop()->PostTask( |
+ message_loop()->task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&BackgroundThread::DoDeleteArrow, object, &completion)); |
completion.Wait(); |
@@ -119,7 +115,7 @@ class BackgroundThread : public Thread { |
Target* DeRef(const Arrow* arrow) { |
WaitableEvent completion(true, false); |
Target* result = NULL; |
- message_loop()->PostTask( |
+ message_loop()->task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&BackgroundThread::DoDeRef, arrow, &result, &completion)); |
completion.Wait(); |