Index: base/deferred_sequenced_task_runner_unittest.cc |
diff --git a/base/deferred_sequenced_task_runner_unittest.cc b/base/deferred_sequenced_task_runner_unittest.cc |
index 1ddc3542496cac4548db160b45f6a223ed8761e2..e34827ab9eee317244d721b0b77e339822c954f9 100644 |
--- a/base/deferred_sequenced_task_runner_unittest.cc |
+++ b/base/deferred_sequenced_task_runner_unittest.cc |
@@ -8,6 +8,7 @@ |
#include "base/bind_helpers.h" |
#include "base/location.h" |
#include "base/memory/ref_counted.h" |
+#include "base/run_loop.h" |
#include "base/single_thread_task_runner.h" |
#include "base/threading/non_thread_safe.h" |
#include "base/threading/thread.h" |
@@ -69,14 +70,14 @@ class DeferredSequencedTaskRunnerTest : public testing::Test, |
TEST_F(DeferredSequencedTaskRunnerTest, Stopped) { |
PostExecuteTask(1); |
- loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
EXPECT_THAT(executed_task_ids_, testing::ElementsAre()); |
} |
TEST_F(DeferredSequencedTaskRunnerTest, Start) { |
StartRunner(); |
PostExecuteTask(1); |
- loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
EXPECT_THAT(executed_task_ids_, testing::ElementsAre(1)); |
} |
@@ -85,34 +86,34 @@ TEST_F(DeferredSequencedTaskRunnerTest, StartWithMultipleElements) { |
for (int i = 1; i < 5; ++i) |
PostExecuteTask(i); |
- loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
EXPECT_THAT(executed_task_ids_, testing::ElementsAre(1, 2, 3, 4)); |
} |
TEST_F(DeferredSequencedTaskRunnerTest, DeferredStart) { |
PostExecuteTask(1); |
- loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
EXPECT_THAT(executed_task_ids_, testing::ElementsAre()); |
StartRunner(); |
- loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
EXPECT_THAT(executed_task_ids_, testing::ElementsAre(1)); |
PostExecuteTask(2); |
- loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
EXPECT_THAT(executed_task_ids_, testing::ElementsAre(1, 2)); |
} |
TEST_F(DeferredSequencedTaskRunnerTest, DeferredStartWithMultipleElements) { |
for (int i = 1; i < 5; ++i) |
PostExecuteTask(i); |
- loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
EXPECT_THAT(executed_task_ids_, testing::ElementsAre()); |
StartRunner(); |
for (int i = 5; i < 9; ++i) |
PostExecuteTask(i); |
- loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
EXPECT_THAT(executed_task_ids_, testing::ElementsAre(1, 2, 3, 4, 5, 6, 7, 8)); |
} |
@@ -139,7 +140,7 @@ TEST_F(DeferredSequencedTaskRunnerTest, DeferredStartWithMultipleThreads) { |
} |
} |
- loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
EXPECT_THAT(executed_task_ids_, |
testing::WhenSorted(testing::ElementsAre(0, 1, 2, 3, 4, 5, 6, 7, 8, 9))); |
} |