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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/background_sync/background_sync_manager_unittest.cc

Issue 2954433002: BackgroundSync: Convert to base::BindOnce/OnceCallback/OnceClosure (Closed)
Patch Set: rename local variable Created 3 years, 6 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
« no previous file with comments | « content/browser/background_sync/background_sync_manager.cc ('k') | content/browser/background_sync/background_sync_network_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/background_sync/background_sync_manager_unittest.cc
diff --git a/content/browser/background_sync/background_sync_manager_unittest.cc b/content/browser/background_sync/background_sync_manager_unittest.cc
index 7b10ed8692831351a46de76abd0a5951bbc5871a..d9db9de3f6ef29fc03d5cea23035b1a452bbe497 100644
--- a/content/browser/background_sync/background_sync_manager_unittest.cc
+++ b/content/browser/background_sync/background_sync_manager_unittest.cc
@@ -161,13 +161,15 @@ class BackgroundSyncManagerTest : public testing::Test {
bool called_2 = false;
helper_->context()->RegisterServiceWorker(
GURL(kPattern1), GURL(kScript1), NULL,
- base::Bind(&RegisterServiceWorkerCallback, &called_1,
- &sw_registration_id_1_));
+ base::AdaptCallbackForRepeating(
+ base::BindOnce(&RegisterServiceWorkerCallback, &called_1,
+ &sw_registration_id_1_)));
helper_->context()->RegisterServiceWorker(
GURL(kPattern2), GURL(kScript2), NULL,
- base::Bind(&RegisterServiceWorkerCallback, &called_2,
- &sw_registration_id_2_));
+ base::AdaptCallbackForRepeating(
+ base::BindOnce(&RegisterServiceWorkerCallback, &called_2,
+ &sw_registration_id_2_)));
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(called_1);
EXPECT_TRUE(called_2);
@@ -176,11 +178,13 @@ class BackgroundSyncManagerTest : public testing::Test {
// calling BackgroundSyncManager::Register.
helper_->context_wrapper()->FindReadyRegistrationForId(
sw_registration_id_1_, GURL(kPattern1).GetOrigin(),
- base::Bind(FindServiceWorkerRegistrationCallback, &sw_registration_1_));
+ base::AdaptCallbackForRepeating(base::BindOnce(
+ FindServiceWorkerRegistrationCallback, &sw_registration_1_)));
helper_->context_wrapper()->FindReadyRegistrationForId(
sw_registration_id_2_, GURL(kPattern1).GetOrigin(),
- base::Bind(FindServiceWorkerRegistrationCallback, &sw_registration_2_));
+ base::AdaptCallbackForRepeating(base::BindOnce(
+ FindServiceWorkerRegistrationCallback, &sw_registration_2_)));
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(sw_registration_1_);
EXPECT_TRUE(sw_registration_2_);
@@ -276,8 +280,9 @@ class BackgroundSyncManagerTest : public testing::Test {
bool was_called = false;
background_sync_manager_->Register(
sw_registration_id, options,
- base::Bind(&BackgroundSyncManagerTest::StatusAndRegistrationCallback,
- base::Unretained(this), &was_called));
+ base::BindOnce(
+ &BackgroundSyncManagerTest::StatusAndRegistrationCallback,
+ base::Unretained(this), &was_called));
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(was_called);
return callback_status_ == BACKGROUND_SYNC_STATUS_OK;
@@ -300,8 +305,9 @@ class BackgroundSyncManagerTest : public testing::Test {
bool was_called = false;
background_sync_manager_->GetRegistrations(
sw_registration_id,
- base::Bind(&BackgroundSyncManagerTest::StatusAndRegistrationsCallback,
- base::Unretained(this), &was_called));
+ base::BindOnce(
+ &BackgroundSyncManagerTest::StatusAndRegistrationsCallback,
+ base::Unretained(this), &was_called));
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(was_called);
@@ -328,8 +334,9 @@ class BackgroundSyncManagerTest : public testing::Test {
bool was_called = false;
background_sync_manager_->GetRegistrations(
sw_registration_id,
- base::Bind(&BackgroundSyncManagerTest::StatusAndRegistrationsCallback,
- base::Unretained(this), &was_called));
+ base::BindOnce(
+ &BackgroundSyncManagerTest::StatusAndRegistrationsCallback,
+ base::Unretained(this), &was_called));
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(was_called);
@@ -349,7 +356,8 @@ class BackgroundSyncManagerTest : public testing::Test {
bool called = false;
helper_->context()->UnregisterServiceWorker(
PatternForSWId(sw_registration_id),
- base::Bind(&UnregisterServiceWorkerCallback, &called));
+ base::AdaptCallbackForRepeating(
+ base::BindOnce(&UnregisterServiceWorkerCallback, &called)));
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(called);
}
@@ -367,18 +375,19 @@ class BackgroundSyncManagerTest : public testing::Test {
}
void InitSyncEventTest() {
- SetupForSyncEvent(
- base::Bind(DispatchSyncSuccessfulCallback, &sync_events_called_));
+ SetupForSyncEvent(base::BindRepeating(DispatchSyncSuccessfulCallback,
+ &sync_events_called_));
}
void InitFailedSyncEventTest() {
SetupForSyncEvent(
- base::Bind(DispatchSyncFailedCallback, &sync_events_called_));
+ base::BindRepeating(DispatchSyncFailedCallback, &sync_events_called_));
}
void InitDelayedSyncEventTest() {
- SetupForSyncEvent(base::Bind(DispatchSyncDelayedCallback,
- &sync_events_called_, &sync_fired_callback_));
+ SetupForSyncEvent(base::BindRepeating(DispatchSyncDelayedCallback,
+ &sync_events_called_,
+ &sync_fired_callback_));
}
void RegisterAndVerifySyncEventDelayed(
@@ -656,12 +665,14 @@ TEST_F(BackgroundSyncManagerTest, SequentialOperations) {
bool get_registrations_called = false;
test_background_sync_manager_->Register(
sw_registration_id_1_, sync_options_1_,
- base::Bind(&BackgroundSyncManagerTest::StatusAndRegistrationCallback,
- base::Unretained(this), &register_called));
+ base::AdaptCallbackForRepeating(base::BindOnce(
+ &BackgroundSyncManagerTest::StatusAndRegistrationCallback,
+ base::Unretained(this), &register_called)));
test_background_sync_manager_->GetRegistrations(
sw_registration_id_1_,
- base::Bind(&BackgroundSyncManagerTest::StatusAndRegistrationsCallback,
- base::Unretained(this), &get_registrations_called));
+ base::AdaptCallbackForRepeating(base::BindOnce(
+ &BackgroundSyncManagerTest::StatusAndRegistrationsCallback,
+ base::Unretained(this), &get_registrations_called)));
base::RunLoop().RunUntilIdle();
// Init should be blocked while loading from the backend.
@@ -696,8 +707,9 @@ TEST_F(BackgroundSyncManagerTest,
bool callback_called = false;
test_background_sync_manager_->Register(
sw_registration_id_1_, sync_options_2_,
- base::Bind(&BackgroundSyncManagerTest::StatusAndRegistrationCallback,
- base::Unretained(this), &callback_called));
+ base::AdaptCallbackForRepeating(base::BindOnce(
+ &BackgroundSyncManagerTest::StatusAndRegistrationCallback,
+ base::Unretained(this), &callback_called)));
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(callback_called);
@@ -1171,7 +1183,7 @@ TEST_F(BackgroundSyncManagerTest, TwoAttempts) {
// The first run will fail but it will setup a timer to try again.
EXPECT_TRUE(Register(sync_options_1_));
EXPECT_TRUE(GetRegistration(sync_options_1_));
- EXPECT_FALSE(test_background_sync_manager_->delayed_task().is_null());
+ EXPECT_TRUE(test_background_sync_manager_->IsDelayedTaskScheduled());
// Make sure the delay is reasonable.
EXPECT_LT(base::TimeDelta::FromMinutes(1),
@@ -1181,7 +1193,7 @@ TEST_F(BackgroundSyncManagerTest, TwoAttempts) {
// Fire again and this time it should permanently fail.
test_clock_->Advance(test_background_sync_manager_->delayed_task_delta());
- test_background_sync_manager_->delayed_task().Run();
+ test_background_sync_manager_->RunDelayedTask();
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(GetRegistration(sync_options_1_));
}
@@ -1193,13 +1205,13 @@ TEST_F(BackgroundSyncManagerTest, ThreeAttempts) {
// The first run will fail but it will setup a timer to try again.
EXPECT_TRUE(Register(sync_options_1_));
EXPECT_TRUE(GetRegistration(sync_options_1_));
- EXPECT_FALSE(test_background_sync_manager_->delayed_task().is_null());
+ EXPECT_TRUE(test_background_sync_manager_->IsDelayedTaskScheduled());
// The second run will fail but it will setup a timer to try again.
base::TimeDelta first_delta =
test_background_sync_manager_->delayed_task_delta();
test_clock_->Advance(test_background_sync_manager_->delayed_task_delta());
- test_background_sync_manager_->delayed_task().Run();
+ test_background_sync_manager_->RunDelayedTask();
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(GetRegistration(sync_options_1_));
@@ -1208,7 +1220,7 @@ TEST_F(BackgroundSyncManagerTest, ThreeAttempts) {
// The third run will permanently fail.
test_clock_->Advance(test_background_sync_manager_->delayed_task_delta());
- test_background_sync_manager_->delayed_task().Run();
+ test_background_sync_manager_->RunDelayedTask();
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(GetRegistration(sync_options_1_));
}
@@ -1220,13 +1232,13 @@ TEST_F(BackgroundSyncManagerTest, WaitsFullDelayTime) {
// The first run will fail but it will setup a timer to try again.
EXPECT_TRUE(Register(sync_options_1_));
EXPECT_TRUE(GetRegistration(sync_options_1_));
- EXPECT_FALSE(test_background_sync_manager_->delayed_task().is_null());
+ EXPECT_TRUE(test_background_sync_manager_->IsDelayedTaskScheduled());
// Fire again one second before it's ready to retry. Expect it to reschedule
// the delay timer for one more second.
test_clock_->Advance(test_background_sync_manager_->delayed_task_delta() -
base::TimeDelta::FromSeconds(1));
- test_background_sync_manager_->delayed_task().Run();
+ test_background_sync_manager_->RunDelayedTask();
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(GetRegistration(sync_options_1_));
EXPECT_EQ(base::TimeDelta::FromSeconds(1),
@@ -1234,7 +1246,7 @@ TEST_F(BackgroundSyncManagerTest, WaitsFullDelayTime) {
// Fire one second later and it should fail permanently.
test_clock_->Advance(base::TimeDelta::FromSeconds(1));
- test_background_sync_manager_->delayed_task().Run();
+ test_background_sync_manager_->RunDelayedTask();
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(GetRegistration(sync_options_1_));
}
@@ -1303,7 +1315,7 @@ TEST_F(BackgroundSyncManagerTest, AllTestsEventuallyFire) {
// Run it a second time.
test_clock_->Advance(test_background_sync_manager_->delayed_task_delta());
- test_background_sync_manager_->delayed_task().Run();
+ test_background_sync_manager_->RunDelayedTask();
base::RunLoop().RunUntilIdle();
base::TimeDelta delay_delta =
@@ -1313,10 +1325,10 @@ TEST_F(BackgroundSyncManagerTest, AllTestsEventuallyFire) {
EXPECT_TRUE(Register(sync_options_2_));
EXPECT_GT(delay_delta, test_background_sync_manager_->delayed_task_delta());
- while (!test_background_sync_manager_->delayed_task().is_null()) {
+ while (test_background_sync_manager_->IsDelayedTaskScheduled()) {
test_clock_->Advance(test_background_sync_manager_->delayed_task_delta());
- test_background_sync_manager_->delayed_task().Run();
- test_background_sync_manager_->ClearDelayedTask();
+ test_background_sync_manager_->RunDelayedTask();
+ EXPECT_FALSE(test_background_sync_manager_->IsDelayedTaskScheduled());
base::RunLoop().RunUntilIdle();
}
@@ -1335,7 +1347,7 @@ TEST_F(BackgroundSyncManagerTest, LastChance) {
// Run it again.
test_clock_->Advance(test_background_sync_manager_->delayed_task_delta());
- test_background_sync_manager_->delayed_task().Run();
+ test_background_sync_manager_->RunDelayedTask();
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(GetRegistration(sync_options_1_));
EXPECT_EQ(blink::mojom::BackgroundSyncEventLastChance::IS_LAST_CHANCE,
« no previous file with comments | « content/browser/background_sync/background_sync_manager.cc ('k') | content/browser/background_sync/background_sync_network_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698