| Index: sync/syncable/syncable.cc
|
| diff --git a/sync/syncable/syncable.cc b/sync/syncable/syncable.cc
|
| index 7bf1a58629caa4a85bf5400d34d3493bfc6cd5e5..418042dd99e5ebfcda9b61aa188c090b6c35826c 100644
|
| --- a/sync/syncable/syncable.cc
|
| +++ b/sync/syncable/syncable.cc
|
| @@ -1158,19 +1158,6 @@ int64 Directory::unsynced_entity_count() const {
|
| return kernel_->unsynced_metahandles->size();
|
| }
|
|
|
| -FullModelTypeSet Directory::GetServerTypesWithUnappliedUpdates(
|
| - BaseTransaction* trans) const {
|
| - syncable::FullModelTypeSet server_types;
|
| - ScopedKernelLock lock(this);
|
| - for (int i = UNSPECIFIED; i < MODEL_TYPE_COUNT; ++i) {
|
| - const ModelType type = ModelTypeFromInt(i);
|
| - if (!kernel_->unapplied_update_metahandles[type].empty()) {
|
| - server_types.Put(type);
|
| - }
|
| - }
|
| - return server_types;
|
| -}
|
| -
|
| void Directory::GetUnappliedUpdateMetaHandles(
|
| BaseTransaction* trans,
|
| FullModelTypeSet server_types,
|
| @@ -1180,6 +1167,8 @@ void Directory::GetUnappliedUpdateMetaHandles(
|
| for (int i = UNSPECIFIED; i < MODEL_TYPE_COUNT; ++i) {
|
| const ModelType type = ModelTypeFromInt(i);
|
| if (server_types.Has(type)) {
|
| + if (kernel_->unapplied_update_metahandles[type].empty())
|
| + continue;
|
| std::copy(kernel_->unapplied_update_metahandles[type].begin(),
|
| kernel_->unapplied_update_metahandles[type].end(),
|
| back_inserter(*result));
|
|
|