| 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 9bac8f3cc6e3a082cb3c29d97dce3bb8cb87cd07..899317884277c7e4217a8d3de30a15ee4284353b 100644
|
| --- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
|
| +++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
|
| @@ -8,7 +8,6 @@
|
| #include <iterator>
|
| #include <ostream>
|
| #include <sstream>
|
| -#include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/json/json_writer.h"
|
| @@ -230,32 +229,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;
|
| }
|
| @@ -281,10 +274,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;
|
| }
|
|
|