| Index: chrome/browser/sync/profile_sync_service_harness.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
|
| index 1caa66d841eb83e336652f74078a69cad612db26..f296f97747661e28a3c8b1cbda1f7490684e251d 100644
|
| --- a/chrome/browser/sync/profile_sync_service_harness.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_harness.cc
|
| @@ -1005,6 +1005,9 @@ bool ProfileSyncServiceHarness::EnableEncryptionForType(
|
|
|
| bool ProfileSyncServiceHarness::WaitForTypeEncryption(
|
| syncable::ModelType type) {
|
| + // The correctness of this if condition depends on the ordering of its
|
| + // sub-expressions. See crbug.com/95619.
|
| + // TODO(rlarocque): Figure out a less brittle way of detecting this.
|
| if (IsTypeEncrypted(type) &&
|
| IsSynced() &&
|
| GetLastSessionSnapshot()->num_conflicting_updates == 0) {
|
|
|