Make client tag IDs consistent in sync fake server

sync/test/fake_server/fake_server.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 "sync/test/fake_server/fake_server.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 318 matching lines @@
     if (!DeleteChildren(client_entity.id_string())) {
       return string();
     }
   } else if (GetModelType(client_entity) == syncer::NIGORI) {
     // NIGORI is the only permanent item type that should be updated by the
     // client.
     entity = PermanentEntity::CreateUpdatedNigoriEntity(
         client_entity,
         entities_[client_entity.id_string()]);
   } else if (client_entity.has_client_defined_unique_tag()) {
-    if (entities_.find(client_entity.id_string()) != entities_.end()) {
-      entity = UniqueClientEntity::CreateUpdatedVersion(
-          client_entity,
-          entities_[client_entity.id_string()]);
-    } else {
-      entity = UniqueClientEntity::CreateNew(client_entity);
-    }
+    entity = UniqueClientEntity::Create(client_entity);
   } else {
     // TODO(pvalenzuela): Validate entity's parent ID.
     if (entities_.find(client_entity.id_string()) != entities_.end()) {
       entity = BookmarkEntity::CreateUpdatedVersion(
         client_entity,
         entities_[client_entity.id_string()],
         parent_id);
     } else {
       entity = BookmarkEntity::CreateNew(client_entity, parent_id, client_guid);
     }
@@ skipping 164 matching lines @@
 
 void FakeServer::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void FakeServer::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace fake_server