Commit bdac06c0 authored by tzik's avatar tzik Committed by Commit bot

Use TestSimpleTaskRunner::NumPendingTasks instead of GetPendingTasks().size()

TestSimpleTaskRunner::GetPendingTasks returns a full copy of the queued
pending tasks, which is less clean, and also that prevents a refactoring
that makes tasks move-only.

This CL replaces them with an equivalent NumPendingTasks to avoid the copy.

BUG=554299

Review-Url: https://codereview.chromium.org/2335153002
Cr-Commit-Position: refs/heads/master@{#418496}
parent 4808123c
...@@ -112,7 +112,7 @@ TEST_F(CancelableTaskTrackerTest, CancelPostedTask) { ...@@ -112,7 +112,7 @@ TEST_F(CancelableTaskTrackerTest, CancelPostedTask) {
test_task_runner.get(), FROM_HERE, MakeExpectedNotRunClosure(FROM_HERE)); test_task_runner.get(), FROM_HERE, MakeExpectedNotRunClosure(FROM_HERE));
EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id); EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id);
EXPECT_EQ(1U, test_task_runner->GetPendingTasks().size()); EXPECT_EQ(1U, test_task_runner->NumPendingTasks());
task_tracker_.TryCancel(task_id); task_tracker_.TryCancel(task_id);
......
...@@ -482,7 +482,7 @@ TEST_F(ExtensionWelcomeNotificationTest, TimeExpiredNotification) { ...@@ -482,7 +482,7 @@ TEST_F(ExtensionWelcomeNotificationTest, TimeExpiredNotification) {
base::TimeDelta::FromDays( base::TimeDelta::FromDays(
ExtensionWelcomeNotification::kRequestedShowTimeDays); ExtensionWelcomeNotification::kRequestedShowTimeDays);
EXPECT_EQ(task_runner()->GetPendingTasks().size(), 1U); EXPECT_EQ(task_runner()->NumPendingTasks(), 1U);
EXPECT_EQ(task_runner()->NextPendingTaskDelay(), requested_show_time); EXPECT_EQ(task_runner()->NextPendingTaskDelay(), requested_show_time);
EXPECT_EQ(message_center()->add_notification_calls(), 1); EXPECT_EQ(message_center()->add_notification_calls(), 1);
......
...@@ -30,9 +30,9 @@ TEST(OneShotEventTest, CallsQueue) { ...@@ -30,9 +30,9 @@ TEST(OneShotEventTest, CallsQueue) {
int i = 0; int i = 0;
event.Post(FROM_HERE, base::Bind(&Increment, &i), runner); event.Post(FROM_HERE, base::Bind(&Increment, &i), runner);
event.Post(FROM_HERE, base::Bind(&Increment, &i), runner); event.Post(FROM_HERE, base::Bind(&Increment, &i), runner);
EXPECT_EQ(0U, runner->GetPendingTasks().size()); EXPECT_EQ(0U, runner->NumPendingTasks());
event.Signal(); event.Signal();
ASSERT_EQ(2U, runner->GetPendingTasks().size()); ASSERT_EQ(2U, runner->NumPendingTasks());
EXPECT_NE(runner->GetPendingTasks()[0].location.line_number(), EXPECT_NE(runner->GetPendingTasks()[0].location.line_number(),
runner->GetPendingTasks()[1].location.line_number()) runner->GetPendingTasks()[1].location.line_number())
<< "Make sure FROM_HERE is propagated."; << "Make sure FROM_HERE is propagated.";
...@@ -49,7 +49,7 @@ TEST(OneShotEventTest, CallsAfterSignalDontRunInline) { ...@@ -49,7 +49,7 @@ TEST(OneShotEventTest, CallsAfterSignalDontRunInline) {
event.Signal(); event.Signal();
event.Post(FROM_HERE, base::Bind(&Increment, &i), runner); event.Post(FROM_HERE, base::Bind(&Increment, &i), runner);
EXPECT_EQ(1U, runner->GetPendingTasks().size()); EXPECT_EQ(1U, runner->NumPendingTasks());
EXPECT_EQ(0, i); EXPECT_EQ(0, i);
runner->RunPendingTasks(); runner->RunPendingTasks();
EXPECT_EQ(1, i); EXPECT_EQ(1, i);
...@@ -66,7 +66,7 @@ TEST(OneShotEventTest, PostDefaultsToCurrentMessageLoop) { ...@@ -66,7 +66,7 @@ TEST(OneShotEventTest, PostDefaultsToCurrentMessageLoop) {
event.Post(FROM_HERE, base::Bind(&Increment, &runner_i), runner); event.Post(FROM_HERE, base::Bind(&Increment, &runner_i), runner);
event.Post(FROM_HERE, base::Bind(&Increment, &loop_i)); event.Post(FROM_HERE, base::Bind(&Increment, &loop_i));
event.Signal(); event.Signal();
EXPECT_EQ(1U, runner->GetPendingTasks().size()); EXPECT_EQ(1U, runner->NumPendingTasks());
EXPECT_EQ(0, runner_i); EXPECT_EQ(0, runner_i);
runner->RunPendingTasks(); runner->RunPendingTasks();
EXPECT_EQ(1, runner_i); EXPECT_EQ(1, runner_i);
...@@ -96,15 +96,15 @@ TEST(OneShotEventTest, IsSignaledAndPostsFromCallbackWork) { ...@@ -96,15 +96,15 @@ TEST(OneShotEventTest, IsSignaledAndPostsFromCallbackWork) {
event.Signal(); event.Signal();
// CheckSignaledAndPostIncrement is queued on |runner|. // CheckSignaledAndPostIncrement is queued on |runner|.
EXPECT_EQ(1U, runner->GetPendingTasks().size()); EXPECT_EQ(1U, runner->NumPendingTasks());
EXPECT_EQ(0, i); EXPECT_EQ(0, i);
runner->RunPendingTasks(); runner->RunPendingTasks();
// Increment is queued on |runner|. // Increment is queued on |runner|.
EXPECT_EQ(1U, runner->GetPendingTasks().size()); EXPECT_EQ(1U, runner->NumPendingTasks());
EXPECT_EQ(0, i); EXPECT_EQ(0, i);
runner->RunPendingTasks(); runner->RunPendingTasks();
// Increment has run. // Increment has run.
EXPECT_EQ(0U, runner->GetPendingTasks().size()); EXPECT_EQ(0U, runner->NumPendingTasks());
EXPECT_EQ(1, i); EXPECT_EQ(1, i);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment