Index: base/task_runner_util_unittest.cc |
diff --git a/base/task_runner_util_unittest.cc b/base/task_runner_util_unittest.cc |
index d4d37692bace08028a619dccb7a752494cbaafdd..f02a388a43100a143f7e625bf46c884943b13392 100644 |
--- a/base/task_runner_util_unittest.cc |
+++ b/base/task_runner_util_unittest.cc |
@@ -6,6 +6,7 @@ |
#include "base/bind.h" |
#include "base/message_loop.h" |
+#include "base/run_loop.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace base { |
@@ -65,31 +66,29 @@ void ExpectScopedFoo(scoped_ptr_malloc<Foo, FreeFooFunctor> foo) { |
} // namespace |
TEST(TaskRunnerHelpersTest, PostTaskAndReplyWithResult) { |
- MessageLoop message_loop; |
int result = 0; |
- PostTaskAndReplyWithResult( |
- message_loop.message_loop_proxy(), |
- FROM_HERE, |
- Bind(&ReturnFourtyTwo), |
- Bind(&StoreValue, &result)); |
+ MessageLoop message_loop; |
+ PostTaskAndReplyWithResult(message_loop.message_loop_proxy(), |
+ FROM_HERE, |
+ Bind(&ReturnFourtyTwo), |
+ Bind(&StoreValue, &result)); |
- message_loop.RunUntilIdle(); |
+ RunLoop().RunUntilIdle(); |
EXPECT_EQ(42, result); |
} |
TEST(TaskRunnerHelpersTest, PostTaskAndReplyWithResultImplicitConvert) { |
- MessageLoop message_loop; |
double result = 0; |
- PostTaskAndReplyWithResult( |
- message_loop.message_loop_proxy(), |
- FROM_HERE, |
- Bind(&ReturnFourtyTwo), |
- Bind(&StoreDoubleValue, &result)); |
+ MessageLoop message_loop; |
+ PostTaskAndReplyWithResult(message_loop.message_loop_proxy(), |
+ FROM_HERE, |
+ Bind(&ReturnFourtyTwo), |
+ Bind(&StoreDoubleValue, &result)); |
- message_loop.RunUntilIdle(); |
+ RunLoop().RunUntilIdle(); |
EXPECT_DOUBLE_EQ(42.0, result); |
} |
@@ -99,14 +98,12 @@ TEST(TaskRunnerHelpersTest, PostTaskAndReplyWithResultPassed) { |
g_foo_free_count = 0; |
MessageLoop message_loop; |
+ PostTaskAndReplyWithResult(message_loop.message_loop_proxy(), |
+ FROM_HERE, |
+ Bind(&CreateFoo), |
+ Bind(&ExpectFoo)); |
- PostTaskAndReplyWithResult( |
- message_loop.message_loop_proxy(), |
- FROM_HERE, |
- Bind(&CreateFoo), |
- Bind(&ExpectFoo)); |
- |
- message_loop.RunUntilIdle(); |
+ RunLoop().RunUntilIdle(); |
EXPECT_EQ(1, g_foo_destruct_count); |
EXPECT_EQ(0, g_foo_free_count); |
@@ -117,14 +114,12 @@ TEST(TaskRunnerHelpersTest, PostTaskAndReplyWithResultPassedFreeProc) { |
g_foo_free_count = 0; |
MessageLoop message_loop; |
+ PostTaskAndReplyWithResult(message_loop.message_loop_proxy(), |
+ FROM_HERE, |
+ Bind(&CreateScopedFoo), |
+ Bind(&ExpectScopedFoo)); |
- PostTaskAndReplyWithResult( |
- message_loop.message_loop_proxy(), |
- FROM_HERE, |
- Bind(&CreateScopedFoo), |
- Bind(&ExpectScopedFoo)); |
- |
- message_loop.RunUntilIdle(); |
+ RunLoop().RunUntilIdle(); |
EXPECT_EQ(1, g_foo_destruct_count); |
EXPECT_EQ(1, g_foo_free_count); |