| Index: chrome/browser/sync/engine/get_commit_ids_command.cc
|
| diff --git a/chrome/browser/sync/engine/get_commit_ids_command.cc b/chrome/browser/sync/engine/get_commit_ids_command.cc
|
| index aa90ccc74a45f060f3a3fb784b9a7f7f27fc0ede..2fbd9ed077f65f902fb9cfd386b9b3b70dfd4c54 100644
|
| --- a/chrome/browser/sync/engine/get_commit_ids_command.cc
|
| +++ b/chrome/browser/sync/engine/get_commit_ids_command.cc
|
| @@ -97,8 +97,7 @@ bool IsEntryReadyForCommit(syncable::ModelEnumSet encrypted_types,
|
| // We special case the nigori node because even though it is considered an
|
| // "encrypted type", not all nigori node changes require valid encryption
|
| // (ex: sync_tabs).
|
| - if (syncable::IsRealDataType(type) &&
|
| - (type != syncable::NIGORI) &&
|
| + if ((type != syncable::NIGORI) &&
|
| encrypted_types.Has(type) &&
|
| (passphrase_missing ||
|
| syncable::EntryNeedsEncryption(encrypted_types, entry))) {
|
| @@ -112,7 +111,7 @@ bool IsEntryReadyForCommit(syncable::ModelEnumSet encrypted_types,
|
| }
|
|
|
| // Look at the throttled types.
|
| - if (syncable::IsRealDataType(type) && throttled_types.Has(type))
|
| + if (throttled_types.Has(type))
|
| return false;
|
|
|
| return true;
|
|
|