| Index: chrome/browser/sync/engine/process_updates_command.cc
|
| diff --git a/chrome/browser/sync/engine/process_updates_command.cc b/chrome/browser/sync/engine/process_updates_command.cc
|
| index b0aa54b0962ebcb2b9aea922ce64f7fd82884052..3f4d491ee87470dbc2e76c1ae8fde11ec20fba87 100644
|
| --- a/chrome/browser/sync/engine/process_updates_command.cc
|
| +++ b/chrome/browser/sync/engine/process_updates_command.cc
|
| @@ -148,16 +148,6 @@ ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate(
|
|
|
| SyncerUtil::UpdateServerFieldsFromUpdate(&target_entry, update, name);
|
|
|
| - if (target_entry.Get(syncable::SERVER_VERSION) ==
|
| - target_entry.Get(syncable::BASE_VERSION) &&
|
| - !target_entry.Get(syncable::IS_UNSYNCED) &&
|
| - !target_entry.Get(syncable::IS_UNAPPLIED_UPDATE)) {
|
| - // If these don't match, it means that we have a different view of the
|
| - // truth from other clients. That's a sync bug, though we may be able
|
| - // to recover the next time this item commits.
|
| - LOG_IF(ERROR, !SyncerUtil::ServerAndLocalEntriesMatch(&target_entry))
|
| - << target_entry;
|
| - }
|
| return SUCCESS_PROCESSED;
|
| }
|
|
|
|
|