Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5453)

Unified Diff: chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc

Issue 2296923003: Make TestSimpleTaskRunner thread-safe. (Closed)
Patch Set: fix asan error Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc b/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
index 56ffc9498a66fa4f5c9f5e685795da0940aa1dd2..f18c38a0128c1e921fc9aceb817d6281a7a0601d 100644
--- a/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
@@ -218,7 +218,7 @@ TEST_F(HeartbeatSchedulerTest, ChangeHeartbeatFrequency) {
gcm_driver_.CompleteRegistration(
kHeartbeatGCMAppID, gcm::GCMClient::SUCCESS);
- EXPECT_EQ(1U, task_runner_->GetPendingTasks().size());
+ EXPECT_EQ(1U, task_runner_->NumPendingTasks());
// Should have a heartbeat task posted with zero delay on startup.
EXPECT_EQ(base::TimeDelta(), task_runner_->NextPendingTaskDelay());
testing::Mock::VerifyAndClearExpectations(&gcm_driver_);
@@ -240,7 +240,7 @@ TEST_F(HeartbeatSchedulerTest, ChangeHeartbeatFrequency) {
// even if the previous attempt failed.
gcm_driver_.CompleteSend(
kHeartbeatGCMAppID, message.id, gcm::GCMClient::SERVER_ERROR);
- EXPECT_EQ(1U, task_runner_->GetPendingTasks().size());
+ EXPECT_EQ(1U, task_runner_->NumPendingTasks());
CheckPendingTaskDelay(scheduler_.last_heartbeat(),
base::TimeDelta::FromMilliseconds(new_delay));
}
@@ -257,7 +257,7 @@ TEST_F(HeartbeatSchedulerTest, DisableHeartbeats) {
gcm_driver_.CompleteRegistration(
kHeartbeatGCMAppID, gcm::GCMClient::SUCCESS);
// Should have a heartbeat task posted.
- EXPECT_EQ(1U, task_runner_->GetPendingTasks().size());
+ EXPECT_EQ(1U, task_runner_->NumPendingTasks());
task_runner_->RunPendingTasks();
// Complete sending a message - we should queue up the next heartbeat.
@@ -265,7 +265,7 @@ TEST_F(HeartbeatSchedulerTest, DisableHeartbeats) {
kHeartbeatGCMAppID, message.id, gcm::GCMClient::SUCCESS);
// Should have a new heartbeat task posted.
- ASSERT_EQ(1U, task_runner_->GetPendingTasks().size());
+ ASSERT_EQ(1U, task_runner_->NumPendingTasks());
CheckPendingTaskDelay(
scheduler_.last_heartbeat(),
base::TimeDelta::FromMilliseconds(

Powered by Google App Engine
This is Rietveld 408576698