Index: base/callback_helpers_unittest.cc |
diff --git a/base/callback_helpers_unittest.cc b/base/callback_helpers_unittest.cc |
index 0e42852f67315b69bdb6e79c93d16c23ff58d448..a2f62911204c020599742ace3b58c31126d575d8 100644 |
--- a/base/callback_helpers_unittest.cc |
+++ b/base/callback_helpers_unittest.cc |
@@ -36,23 +36,25 @@ TEST(BindHelpersTest, TestScopedClosureRunnerRelease) { |
EXPECT_EQ(1, run_count); |
} |
-TEST(BindHelpersTest, TestScopedClosureRunnerReset) { |
+TEST(BindHelpersTest, TestScopedClosureRunnerReplaceClosure) { |
int run_count_1 = 0; |
int run_count_2 = 0; |
{ |
base::ScopedClosureRunner runner; |
- runner.Reset(base::Bind(&Increment, &run_count_1)); |
- runner.Reset(base::Bind(&Increment, &run_count_2)); |
+ runner.ReplaceClosure(base::Bind(&Increment, &run_count_1)); |
+ runner.ReplaceClosure(base::Bind(&Increment, &run_count_2)); |
EXPECT_EQ(1, run_count_1); |
danakj
2016/06/27 22:49:57
won't it be 0 now?
Sergey Ulanov
2016/06/28 19:15:57
Done.
|
EXPECT_EQ(0, run_count_2); |
} |
EXPECT_EQ(1, run_count_2); |
+} |
+TEST(BindHelpersTest, TestScopedClosureRunnerRunNow) { |
int run_count_3 = 0; |
{ |
base::ScopedClosureRunner runner(base::Bind(&Increment, &run_count_3)); |
EXPECT_EQ(0, run_count_3); |
- runner.Reset(); |
+ runner.RunNow(); |
EXPECT_EQ(1, run_count_3); |
} |
EXPECT_EQ(1, run_count_3); |
@@ -83,22 +85,4 @@ TEST(BindHelpersTest, TestScopedClosureRunnerMoveAssignment) { |
EXPECT_EQ(1, run_count); |
} |
-TEST(BindHelpersTest, TestScopedClosureRunnerRunOnReplace) { |
- int run_count1 = 0; |
- int run_count2 = 0; |
- { |
- base::ScopedClosureRunner runner1(base::Bind(&Increment, &run_count1)); |
- { |
- base::ScopedClosureRunner runner2(base::Bind(&Increment, &run_count2)); |
- runner1 = std::move(runner2); |
- EXPECT_EQ(1, run_count1); |
- EXPECT_EQ(0, run_count2); |
- } |
- EXPECT_EQ(1, run_count1); |
- EXPECT_EQ(0, run_count2); |
- } |
- EXPECT_EQ(1, run_count1); |
- EXPECT_EQ(1, run_count2); |
-} |
- |
} // namespace |