1 files changed, 20 insertions, 11 deletions
diff --git a/sync/internal_api/shared_model_type_processor.cc b/sync/internal_api/shared_model_type_processor.cc
index 97cf8e5..15edd30 100644
--- a/sync/internal_api/shared_model_type_processor.cc
+++ b/sync/internal_api/shared_model_type_processor.cc
@@ -149,16 +149,23 @@ void SharedModelTypeProcessor::OnConnect(scoped_ptr<CommitQueue> worker) {
 }
 
 void SharedModelTypeProcessor::Put(const std::string& client_tag,
-                                   const std::string& non_unique_name,
-                                   const sync_pb::EntitySpecifics& specifics,
+                                   scoped_ptr<EntityData> entity_data,
                                    MetadataChangeList* metadata_change_list) {
-  // TODO(skym): Update for new approach. Different objects, different caching,
-  // different loopups, metadata_change_list, etc.
+  // TODO(skym): Add metadata to persist to MetadataChangeList, crbug/569636.
 
-  DCHECK_EQ(type_, syncer::GetModelTypeFromSpecifics(specifics));
+  DCHECK(entity_data.get());
+  DCHECK(!entity_data->is_deleted());
+  DCHECK(!entity_data->non_unique_name.empty());
+  DCHECK_EQ(type_, syncer::GetModelTypeFromSpecifics(entity_data->specifics));
 
+  // If the service specified an overriding hash, use that, otherwise generate
+  // one from the tag. TODO(skym): This behavior should be delayed, once
+  // crbug/561818 is fixed we will only perform this logic in the create case.
   const std::string client_tag_hash(
-      syncer::syncable::GenerateSyncableHash(type_, client_tag));
+      entity_data->client_tag_hash.empty()
+          ? syncer::syncable::GenerateSyncableHash(type_, client_tag)
+          : entity_data->client_tag_hash);
+
   base::Time now = base::Time::Now();
 
   ModelTypeEntity* entity = nullptr;
@@ -166,28 +173,30 @@ void SharedModelTypeProcessor::Put(const std::string& client_tag,
   // client_tag_hash.
   EntityMap::const_iterator it = entities_.find(client_tag_hash);
   if (it == entities_.end()) {
-    scoped_ptr<ModelTypeEntity> scoped_entity =
-        ModelTypeEntity::CreateNew(client_tag, client_tag_hash, "", now);
+    // The service is creating a new entity.
+    scoped_ptr<ModelTypeEntity> scoped_entity = ModelTypeEntity::CreateNew(
+        client_tag, client_tag_hash, entity_data->id, now);
     entity = scoped_entity.get();
     entities_.insert(
         std::make_pair(client_tag_hash, std::move(scoped_entity)));
   } else {
+    // The service is updating an existing entity.
     entity = it->second.get();
   }
 
-  entity->MakeLocalChange(non_unique_name, specifics, now);
+  entity->MakeLocalChange(entity_data.Pass(), now);
   FlushPendingCommitRequests();
 }
 
 void SharedModelTypeProcessor::Delete(
     const std::string& client_key,
     MetadataChangeList* metadata_change_list) {
-  // TODO(skym): Update for new approach. Different caching, different lookup,
-  // metadata changes.
+  // TODO(skym): Add metadata to persist to MetadataChangeList, crbug/569636.
 
   const std::string client_tag_hash(
       syncer::syncable::GenerateSyncableHash(type_, client_key));
 
+  // TODO(skym): crbug/561818: Search by client_tag rather than client_tag_hash.
   EntityMap::const_iterator it = entities_.find(client_tag_hash);
   if (it == entities_.end()) {
     // That's unusual, but not necessarily a bad thing.