[Sync] Adding storage key concept for ModelTypeServices.

components/sync/core/processor_entity_tracker.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync/core/processor_entity_tracker.h"
 
 #include <stdint.h>
 
 #include "base/base64.h"
 #include "base/sha1.h"
 #include "base/time/time.h"
 #include "components/sync/base/time.h"
 #include "components/sync/core/non_blocking_sync_common.h"
 #include "components/sync/syncable/syncable_util.h"
 
 namespace syncer_v2 {
 
 namespace {
 
 void HashSpecifics(const sync_pb::EntitySpecifics& specifics,
                    std::string* hash) {
   DCHECK_GT(specifics.ByteSize(), 0);
   base::Base64Encode(base::SHA1HashString(specifics.SerializeAsString()), hash);
 }
 
 }  // namespace
 
 std::unique_ptr<ProcessorEntityTracker> ProcessorEntityTracker::CreateNew(
-    const std::string& client_tag,
+    const std::string& storage_key,
     const std::string& client_tag_hash,
     const std::string& id,
     base::Time creation_time) {
   // Initialize metadata
   sync_pb::EntityMetadata metadata;
   metadata.set_client_tag_hash(client_tag_hash);
   if (!id.empty())
     metadata.set_server_id(id);
   metadata.set_sequence_number(0);
   metadata.set_acked_sequence_number(0);
   metadata.set_server_version(kUncommittedVersion);
   metadata.set_creation_time(syncer::TimeToProtoTime(creation_time));
 
   return std::unique_ptr<ProcessorEntityTracker>(
-      new ProcessorEntityTracker(client_tag, &metadata));
+      new ProcessorEntityTracker(storage_key, &metadata));
 }
 
 std::unique_ptr<ProcessorEntityTracker>
-ProcessorEntityTracker::CreateFromMetadata(const std::string& client_tag,
+ProcessorEntityTracker::CreateFromMetadata(const std::string& storage_key,
                                            sync_pb::EntityMetadata* metadata) {
   return std::unique_ptr<ProcessorEntityTracker>(
-      new ProcessorEntityTracker(client_tag, metadata));
+      new ProcessorEntityTracker(storage_key, metadata));
 }
 
 ProcessorEntityTracker::ProcessorEntityTracker(
-    const std::string& client_tag,
+    const std::string& storage_key,
     sync_pb::EntityMetadata* metadata)
-    : client_tag_(client_tag),
+    : storage_key_(storage_key),
       commit_requested_sequence_number_(metadata->acked_sequence_number()) {
   DCHECK(metadata->has_client_tag_hash());
   DCHECK(metadata->has_creation_time());
   metadata_.Swap(metadata);
 }
 
 ProcessorEntityTracker::~ProcessorEntityTracker() {}
 
 void ProcessorEntityTracker::CacheCommitData(EntityData* data) {
   DCHECK(data);
@@ skipping 178 matching lines @@
 void ProcessorEntityTracker::UpdateSpecificsHash(
     const sync_pb::EntitySpecifics& specifics) {
   if (specifics.ByteSize() > 0) {
     HashSpecifics(specifics, metadata_.mutable_specifics_hash());
   } else {
     metadata_.clear_specifics_hash();
   }
 }
 
 }  // namespace syncer_v2