Reland - Replace FakeServer's implementation with LoopbackServer invocations.

components/sync/engine_impl/loopback_server/loopback_server_entity.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/engine_impl/loopback_server/loopback_server_entity.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/guid.h"
@@ skipping 28 matching lines @@
 namespace syncer {
 
 LoopbackServerEntity::~LoopbackServerEntity() {}
 
 // static
 std::unique_ptr<LoopbackServerEntity>
 LoopbackServerEntity::CreateEntityFromProto(
     const sync_pb::LoopbackServerEntity& entity) {
   switch (entity.type()) {
     case sync_pb::LoopbackServerEntity_Type_TOMBSTONE:
-      return PersistentTombstoneEntity::Create(entity.entity());
+      return PersistentTombstoneEntity::CreateFromEntity(entity.entity());
     case sync_pb::LoopbackServerEntity_Type_PERMANENT:
       return base::MakeUnique<PersistentPermanentEntity>(
           entity.entity().id_string(), entity.entity().version(),
           syncer::GetModelType(entity.entity()), entity.entity().name(),
           entity.entity().parent_id_string(),
           entity.entity().server_defined_unique_tag(),
           entity.entity().specifics());
     case sync_pb::LoopbackServerEntity_Type_BOOKMARK:
       return PersistentBookmarkEntity::CreateFromEntity(entity.entity());
     case sync_pb::LoopbackServerEntity_Type_UNIQUE:
-      return PersistentUniqueClientEntity::Create(entity.entity());
+      return PersistentUniqueClientEntity::CreateFromEntity(entity.entity());
     case sync_pb::LoopbackServerEntity_Type_UNKNOWN:
       CHECK(false) << "Unknown type encountered";
       return std::unique_ptr<LoopbackServerEntity>(nullptr);
   }
   NOTREACHED();
   return std::unique_ptr<LoopbackServerEntity>(nullptr);
 }
 
 const std::string& LoopbackServerEntity::GetId() const {
   return id_;
@@ skipping 98 matching lines @@
 }
 
 void LoopbackServerEntity::SerializeAsLoopbackServerEntity(
     sync_pb::LoopbackServerEntity* entity) const {
   entity->set_type(GetLoopbackServerEntityType());
   entity->set_model_type(static_cast<int64_t>(GetModelType()));
   SerializeAsProto(entity->mutable_entity());
 }
 
 }  // namespace syncer