| Index: chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
|
| diff --git a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
|
| index 8c488ae8b3bc9f0443aa1ce29e4ce09788367b4b..53b65fc63516b77ac6eae8a9ebdffa2dcd713a1f 100644
|
| --- a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
|
| +++ b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
|
| @@ -23,6 +23,12 @@ bool IsSyncDisabled(browser_sync::ProfileSyncService* service) {
|
| // Returns true if these services have matching progress markers.
|
| bool ProgressMarkersMatch(const browser_sync::ProfileSyncService* service1,
|
| const browser_sync::ProfileSyncService* service2) {
|
| + // GetActiveDataTypes() is always empty during configuration, so progress
|
| + // markers cannot be compared.
|
| + if (!service1->ConfigurationDone() || !service2->ConfigurationDone()) {
|
| + return false;
|
| + }
|
| +
|
| const syncer::ModelTypeSet common_types =
|
| Intersection(service1->GetActiveDataTypes(),
|
| service2->GetActiveDataTypes());
|
|
|