| Index: chrome/browser/sync/engine/nigori_util.cc
|
| diff --git a/chrome/browser/sync/engine/nigori_util.cc b/chrome/browser/sync/engine/nigori_util.cc
|
| index 9b089ecf162b10a0487f67fab300bb12ddc505c6..f8a26a9f4e5b127dc8bfa0e59309649cc2119ef2 100644
|
| --- a/chrome/browser/sync/engine/nigori_util.cc
|
| +++ b/chrome/browser/sync/engine/nigori_util.cc
|
| @@ -38,7 +38,7 @@ bool ProcessUnsyncedChangesForEncryption(
|
|
|
| bool VerifyUnsyncedChangesAreEncrypted(
|
| BaseTransaction* const trans,
|
| - ModelEnumSet encrypted_types) {
|
| + ModelTypeSet encrypted_types) {
|
| std::vector<int64> handles;
|
| browser_sync::SyncerUtil::GetUnsyncedEntries(trans, &handles);
|
| for (size_t i = 0; i < handles.size(); ++i) {
|
| @@ -53,7 +53,7 @@ bool VerifyUnsyncedChangesAreEncrypted(
|
| return true;
|
| }
|
|
|
| -bool EntryNeedsEncryption(ModelEnumSet encrypted_types,
|
| +bool EntryNeedsEncryption(ModelTypeSet encrypted_types,
|
| const Entry& entry) {
|
| if (!entry.Get(UNIQUE_SERVER_TAG).empty())
|
| return false; // We don't encrypt unique server nodes.
|
| @@ -68,7 +68,7 @@ bool EntryNeedsEncryption(ModelEnumSet encrypted_types,
|
| entry.Get(NON_UNIQUE_NAME) != kEncryptedString);
|
| }
|
|
|
| -bool SpecificsNeedsEncryption(ModelEnumSet encrypted_types,
|
| +bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types,
|
| const sync_pb::EntitySpecifics& specifics) {
|
| const ModelType type = GetModelTypeFromSpecifics(specifics);
|
| if (type == PASSWORDS || type == NIGORI)
|
|
|