| Index: sync/syncable/mutable_entry.cc
|
| diff --git a/sync/syncable/mutable_entry.cc b/sync/syncable/mutable_entry.cc
|
| index c61bcb3dbd747d1bf566c4f048ab989f6b5f5e29..869320f33e20aa487ebbc4ecaefc015ed9f1d90e 100644
|
| --- a/sync/syncable/mutable_entry.cc
|
| +++ b/sync/syncable/mutable_entry.cc
|
| @@ -232,8 +232,7 @@ bool MutableEntry::Put(ProtoField field,
|
| if (update_unapplied_updates_index) {
|
| // Remove ourselves from unapplied_update_metahandles with our
|
| // old server type.
|
| - const syncer::ModelType old_server_type =
|
| - kernel_->GetServerModelType();
|
| + const ModelType old_server_type = kernel_->GetServerModelType();
|
| const int64 metahandle = kernel_->ref(META_HANDLE);
|
| size_t erase_count =
|
| dir()->kernel_->unapplied_update_metahandles[old_server_type]
|
| @@ -247,8 +246,7 @@ bool MutableEntry::Put(ProtoField field,
|
| if (update_unapplied_updates_index) {
|
| // Add ourselves back into unapplied_update_metahandles with our
|
| // new server type.
|
| - const syncer::ModelType new_server_type =
|
| - kernel_->GetServerModelType();
|
| + const ModelType new_server_type = kernel_->GetServerModelType();
|
| const int64 metahandle = kernel_->ref(META_HANDLE);
|
| dir()->kernel_->unapplied_update_metahandles[new_server_type]
|
| .insert(metahandle);
|
|
|