Chromium Code Reviews| Index: sync/engine/process_updates_command.cc |
| diff --git a/sync/engine/process_updates_command.cc b/sync/engine/process_updates_command.cc |
| index de6be0f64a5aa3ae925e014d4449a326c6fa4231..137c736e0864bd2f293a55e99ef9301c3b30ee26 100644 |
| --- a/sync/engine/process_updates_command.cc |
| +++ b/sync/engine/process_updates_command.cc |
| @@ -19,6 +19,10 @@ |
| #include "sync/syncable/write_transaction.h" |
| #include "sync/util/cryptographer.h" |
| +// Temporary include to be removed after the int64->ordinal |
|
akalin
2012/10/05 22:40:27
make same as other comments?
vishwath
2012/10/08 20:17:49
Done.
|
| +// migration is complete. |
| +#include "sync/internal_api/public/base/node_ordinal.h" |
| + |
| using std::vector; |
| namespace syncer { |
| @@ -152,7 +156,8 @@ ServerUpdateProcessingResult ProcessUpdatesCommand::ProcessUpdate( |
| (SyncableIdFromProto(update.parent_id_string()) == |
| target_entry.Get(syncable::SERVER_PARENT_ID)) && |
| (update.position_in_parent() == |
| - target_entry.Get(syncable::SERVER_POSITION_IN_PARENT)) && |
| + NodeOrdinalToInt64( |
| + target_entry.Get(syncable::SERVER_ORDINAL_IN_PARENT))) && |
| update.has_specifics() && update.specifics().has_encrypted() && |
| !cryptographer->CanDecrypt(update.specifics().encrypted())) { |
| sync_pb::EntitySpecifics prev_specifics = |