Revert of [sync] Replace FakeServer's implementation with LoopbackServer invocations.

components/sync/engine_impl/loopback_server/loopback_server.cc

Index: components/sync/engine_impl/loopback_server/loopback_server.cc
diff --git a/components/sync/engine_impl/loopback_server/loopback_server.cc b/components/sync/engine_impl/loopback_server/loopback_server.cc
index 602b0e603b165bbab054b6811fffaeb599b5137c..61094cf4d0e3abd31723bf837d91d0c23a5c022a 100644
--- a/components/sync/engine_impl/loopback_server/loopback_server.cc
+++ b/components/sync/engine_impl/loopback_server/loopback_server.cc
@@ -134,10 +134,7 @@
 }  // namespace
 
 LoopbackServer::LoopbackServer(const base::FilePath& persistent_file)
-    : version_(0),
-      store_birthday_(0),
-      persistent_file_(persistent_file),
-      observer_for_tests_(NULL) {
+    : version_(0), store_birthday_(0), persistent_file_(persistent_file) {
   Init();
 }
 
@@ -163,9 +160,8 @@
     const std::string& name) {
   DCHECK(thread_checker_.CalledOnValidThread());
   std::unique_ptr<LoopbackServerEntity> entity =
-      PersistentPermanentEntity::CreateNew(
-          syncer::BOOKMARKS, server_tag, name,
-          ModelTypeToRootTag(syncer::BOOKMARKS));
+      PersistentPermanentEntity::Create(syncer::BOOKMARKS, server_tag, name,
+                                        ModelTypeToRootTag(syncer::BOOKMARKS));
   if (!entity)
     return false;
 
@@ -328,7 +324,7 @@
 
   std::unique_ptr<LoopbackServerEntity> entity;
   if (client_entity.deleted()) {
-    entity = PersistentTombstoneEntity::CreateFromEntity(client_entity);
+    entity = PersistentTombstoneEntity::Create(client_entity);
     DeleteChildren(client_entity.id_string());
   } else if (GetModelType(client_entity) == syncer::NIGORI) {
     // NIGORI is the only permanent item type that should be updated by the
@@ -338,7 +334,7 @@
     entity = PersistentPermanentEntity::CreateUpdatedNigoriEntity(
         client_entity, *iter->second);
   } else if (client_entity.has_client_defined_unique_tag()) {
-    entity = PersistentUniqueClientEntity::CreateFromEntity(client_entity);
+    entity = PersistentUniqueClientEntity::Create(client_entity);
   } else {
     // TODO(pvalenzuela): Validate entity's parent ID.
     EntityMap::const_iterator iter = entities_.find(client_entity.id_string());
@@ -410,7 +406,7 @@
   }
 
   for (auto& tombstone : tombstones) {
-    SaveEntity(PersistentTombstoneEntity::CreateFromEntity(tombstone));
+    SaveEntity(PersistentTombstoneEntity::Create(tombstone));
   }
 }
 
@@ -450,9 +446,6 @@
     committed_model_types.Put(iter->second->GetModelType());
   }
 
-  if (observer_for_tests_)
-    observer_for_tests_->OnCommit(invalidator_client_id, committed_model_types);
-
   return true;
 }
 
@@ -461,105 +454,12 @@
   entities_.clear();
   keystore_keys_.clear();
   ++store_birthday_;
-  base::DeleteFile(persistent_file_, false);
   Init();
 }
 
 std::string LoopbackServer::GetStoreBirthday() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return base::Int64ToString(store_birthday_);
-}
-
-std::vector<sync_pb::SyncEntity> LoopbackServer::GetSyncEntitiesByModelType(
-    ModelType model_type) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  std::vector<sync_pb::SyncEntity> sync_entities;
-  for (EntityMap::const_iterator it = entities_.begin(); it != entities_.end();
-       ++it) {
-    const LoopbackServerEntity& entity = *it->second;
-    if (!(entity.IsDeleted() || entity.IsPermanent()) &&
-        entity.GetModelType() == model_type) {
-      sync_pb::SyncEntity sync_entity;
-      entity.SerializeAsProto(&sync_entity);
-      sync_entities.push_back(sync_entity);
-    }
-  }
-  return sync_entities;
-}
-
-std::unique_ptr<base::DictionaryValue>
-LoopbackServer::GetEntitiesAsDictionaryValue() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  std::unique_ptr<base::DictionaryValue> dictionary(
-      new base::DictionaryValue());
-
-  // Initialize an empty ListValue for all ModelTypes.
-  ModelTypeSet all_types = ModelTypeSet::All();
-  for (ModelTypeSet::Iterator it = all_types.First(); it.Good(); it.Inc()) {
-    dictionary->Set(ModelTypeToString(it.Get()),
-                    base::MakeUnique<base::ListValue>());
-  }
-
-  for (EntityMap::const_iterator it = entities_.begin(); it != entities_.end();
-       ++it) {
-    const LoopbackServerEntity& entity = *it->second;
-    if (entity.IsDeleted() || entity.IsPermanent()) {
-      // Tombstones are ignored as they don't represent current data. Folders
-      // are also ignored as current verification infrastructure does not
-      // consider them.
-      continue;
-    }
-    base::ListValue* list_value;
-    if (!dictionary->GetList(ModelTypeToString(entity.GetModelType()),
-                             &list_value)) {
-      return std::unique_ptr<base::DictionaryValue>();
-    }
-    // TODO(pvalenzuela): Store more data for each entity so additional
-    // verification can be performed. One example of additional verification
-    // is checking the correctness of the bookmark hierarchy.
-    list_value->AppendString(entity.GetName());
-  }
-
-  return dictionary;
-}
-
-bool LoopbackServer::ModifyEntitySpecifics(
-    const std::string& id,
-    const sync_pb::EntitySpecifics& updated_specifics) {
-  EntityMap::const_iterator iter = entities_.find(id);
-  if (iter == entities_.end() ||
-      iter->second->GetModelType() !=
-          GetModelTypeFromSpecifics(updated_specifics)) {
-    return false;
-  }
-
-  LoopbackServerEntity* entity = iter->second.get();
-  entity->SetSpecifics(updated_specifics);
-  UpdateEntityVersion(entity);
-  return true;
-}
-
-bool LoopbackServer::ModifyBookmarkEntity(
-    const std::string& id,
-    const std::string& parent_id,
-    const sync_pb::EntitySpecifics& updated_specifics) {
-  EntityMap::const_iterator iter = entities_.find(id);
-  if (iter == entities_.end() ||
-      iter->second->GetModelType() != syncer::BOOKMARKS ||
-      GetModelTypeFromSpecifics(updated_specifics) != syncer::BOOKMARKS) {
-    return false;
-  }
-
-  PersistentBookmarkEntity* entity =
-      static_cast<PersistentBookmarkEntity*>(iter->second.get());
-
-  entity->SetParentId(parent_id);
-  entity->SetSpecifics(updated_specifics);
-  if (updated_specifics.has_bookmark()) {
-    entity->SetName(updated_specifics.bookmark().title());
-  }
-  UpdateEntityVersion(entity);
-  return true;
 }
 
 void LoopbackServer::SerializeState(sync_pb::LoopbackServerProto* proto) const {