| Index: chrome/browser/sync/engine/syncer_util.cc
|
| diff --git a/chrome/browser/sync/engine/syncer_util.cc b/chrome/browser/sync/engine/syncer_util.cc
|
| index 9ffe6dde9f5fc5fd368b9e248aea6331c5349cc8..2851f748ebddb7f2f88ab92c1f0c2e04d0a25c05 100644
|
| --- a/chrome/browser/sync/engine/syncer_util.cc
|
| +++ b/chrome/browser/sync/engine/syncer_util.cc
|
| @@ -299,7 +299,7 @@ UpdateAttemptResponse SyncerUtil::AttemptToUpdateEntry(
|
| cryptographer->Update(nigori);
|
|
|
| // Make sure any unsynced changes are properly encrypted as necessary.
|
| - syncable::ModelTypeSet encrypted_types =
|
| + syncable::ModelEnumSet encrypted_types =
|
| cryptographer->GetEncryptedTypes();
|
| if (!VerifyUnsyncedChangesAreEncrypted(trans, encrypted_types) &&
|
| (!cryptographer->is_ready() ||
|
|
|