diff options
Diffstat (limited to 'sync/internal_api/model_type_entity.cc')
| -rw-r--r-- | sync/internal_api/model_type_entity.cc | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/sync/internal_api/model_type_entity.cc b/sync/internal_api/model_type_entity.cc index eabdd06..cbfe00c 100644 --- a/sync/internal_api/model_type_entity.cc +++ b/sync/internal_api/model_type_entity.cc @@ -92,8 +92,7 @@ void ModelTypeEntity::ApplyUpdateFromServer( encryption_key_name_ = response_data.encryption_key_name; } -void ModelTypeEntity::MakeLocalChange(const std::string& non_unique_name, - const sync_pb::EntitySpecifics& specifics, +void ModelTypeEntity::MakeLocalChange(scoped_ptr<EntityData> entity_data, base::Time modification_time) { DCHECK(metadata_.has_client_tag_hash()); DCHECK(!metadata_.client_tag_hash().empty()); @@ -102,21 +101,15 @@ void ModelTypeEntity::MakeLocalChange(const std::string& non_unique_name, metadata_.set_modification_time(syncer::TimeToProtoTime(modification_time)); metadata_.set_is_deleted(false); IncrementSequenceNumber(); - UpdateSpecificsHash(specifics); + UpdateSpecificsHash(entity_data->specifics); - // Build and cache commit data. - // TODO(stanisc): Consider moving this out to make caching the data - // optional. - EntityData data; - data.client_tag_hash = metadata_.client_tag_hash(); - data.id = metadata_.server_id(); - data.non_unique_name = non_unique_name; - data.creation_time = syncer::ProtoTimeToTime(metadata_.creation_time()); - data.modification_time = modification_time; - // TODO(stanisc): Consider taking over specifics value without copying. - data.specifics.CopyFrom(specifics); + entity_data->client_tag_hash = metadata_.client_tag_hash(); + entity_data->id = metadata_.server_id(); + entity_data->creation_time = + syncer::ProtoTimeToTime(metadata_.creation_time()); + entity_data->modification_time = modification_time; - CacheCommitData(&data); + CacheCommitData(entity_data.get()); } void ModelTypeEntity::UpdateDesiredEncryptionKey(const std::string& name) { |