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

Unified Diff: chrome/browser/sync/test/integration/profile_sync_service_harness.cc

Issue 2379433002: [Sync] Refactoring of sync integration test checkers to remove boilerplate await methods. (Closed)
Patch Set: Rebase Created 4 years, 2 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/sync/test/integration/profile_sync_service_harness.cc
diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
index 288dd0f247d0af31bb14b8ce819881b8ee94a3f9..e01dd6186c88b9093232a39e820a237527aec750 100644
--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
@@ -228,32 +228,26 @@ bool ProfileSyncServiceHarness::AwaitMutualSyncCycleCompletion(
}
bool ProfileSyncServiceHarness::AwaitGroupSyncCycleCompletion(
- std::vector<ProfileSyncServiceHarness*>& partners) {
+ const std::vector<ProfileSyncServiceHarness*>& partners) {
return AwaitQuiescence(partners);
}
// static
bool ProfileSyncServiceHarness::AwaitQuiescence(
- std::vector<ProfileSyncServiceHarness*>& clients) {
+ const std::vector<ProfileSyncServiceHarness*>& clients) {
std::vector<ProfileSyncService*> services;
if (clients.empty()) {
return true;
}
- for (std::vector<ProfileSyncServiceHarness*>::iterator it = clients.begin();
- it != clients.end(); ++it) {
- services.push_back((*it)->service());
+ for (const ProfileSyncServiceHarness* harness : clients) {
+ services.push_back(harness->service());
}
- QuiesceStatusChangeChecker checker(services);
- checker.Wait();
- return !checker.TimedOut();
+ return QuiesceStatusChangeChecker(services).Wait();
}
bool ProfileSyncServiceHarness::AwaitBackendInitialization() {
- BackendInitializeChecker checker(service());
- checker.Wait();
-
- if (checker.TimedOut()) {
+ if (!BackendInitializeChecker(service()).Wait()) {
LOG(ERROR) << "BackendInitializeChecker timed out.";
return false;
}
@@ -279,10 +273,7 @@ bool ProfileSyncServiceHarness::AwaitBackendInitialization() {
}
bool ProfileSyncServiceHarness::AwaitSyncSetupCompletion() {
- SyncSetupChecker checker(service());
- checker.Wait();
-
- if (checker.TimedOut()) {
+ if (!SyncSetupChecker(service()).Wait()) {
LOG(ERROR) << "SyncSetupChecker timed out.";
return false;
}

Powered by Google App Engine
This is Rietveld 408576698