Reland - Replace FakeServer's implementation with LoopbackServer invocations.

ios/chrome/test/app/sync_test_util.mm

 // Copyright 2016 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.
 
 #import "ios/chrome/test/app/sync_test_util.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
 #import "base/mac/bind_objc_block.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "base/test/ios/wait_util.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/keyed_service/core/service_access_type.h"
 #include "components/sync/engine/net/http_bridge_network_resources.h"
 #include "components/sync/test/fake_server/entity_builder_factory.h"
 #include "components/sync/test/fake_server/fake_server.h"
 #include "components/sync/test/fake_server/fake_server_network_resources.h"
 #include "components/sync/test/fake_server/fake_server_verifier.h"
 #include "components/sync/test/fake_server/sessions_hierarchy.h"
-#include "components/sync/test/fake_server/tombstone_entity.h"
-#include "components/sync/test/fake_server/unique_client_entity.h"
 #include "ios/chrome/browser/autofill/personal_data_manager_factory.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h"
 #include "ios/chrome/browser/sync/sync_setup_service.h"
 #include "ios/chrome/browser/sync/sync_setup_service_factory.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ skipping 133 matching lines @@
 
 void InjectAutofillProfileOnFakeSyncServer(std::string guid,
                                            std::string full_name) {
   DCHECK(gSyncFakeServer);
   sync_pb::EntitySpecifics entity_specifics;
   sync_pb::AutofillProfileSpecifics* autofill_profile =
       entity_specifics.mutable_autofill_profile();
   autofill_profile->add_name_full(full_name);
   autofill_profile->set_guid(guid);
 
-  std::unique_ptr<fake_server::FakeServerEntity> entity =
-      fake_server::UniqueClientEntity::CreateForInjection(guid,
-                                                          entity_specifics);
+  std::unique_ptr<syncer::LoopbackServerEntity> entity =
+      syncer::PersistentUniqueClientEntity::CreateFromEntitySpecifics(
+          guid, entity_specifics);
   gSyncFakeServer->InjectEntity(std::move(entity));
 }
 
 void DeleteAutofillProfileOnFakeSyncServer(std::string guid) {
   DCHECK(gSyncFakeServer);
   std::vector<sync_pb::SyncEntity> autofill_profiles =
       gSyncFakeServer->GetSyncEntitiesByModelType(syncer::AUTOFILL_PROFILE);
   std::string entity_id;
   for (const sync_pb::SyncEntity& autofill_profile : autofill_profiles) {
     if (autofill_profile.specifics().autofill_profile().guid() == guid) {
       entity_id = autofill_profile.id_string();
       break;
     }
   }
   // Delete the entity if it exists.
   if (!entity_id.empty()) {
-    std::unique_ptr<fake_server::FakeServerEntity> entity;
-    entity = fake_server::TombstoneEntity::Create(entity_id, std::string());
+    std::unique_ptr<syncer::LoopbackServerEntity> entity;
+    entity =
+        syncer::PersistentTombstoneEntity::CreateNew(entity_id, std::string());
     gSyncFakeServer->InjectEntity(std::move(entity));
   }
 }
 
 bool IsAutofillProfilePresent(std::string guid, std::string full_name) {
   ios::ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   autofill::PersonalDataManager* personal_data_manager =
       autofill::PersonalDataManagerFactory::GetForBrowserState(browser_state);
   autofill::AutofillProfile* autofill_profile =
@@ skipping 48 matching lines @@
 
 void InjectTypedURLOnFakeSyncServer(const std::string& url) {
   DCHECK(gSyncFakeServer);
   sync_pb::EntitySpecifics entitySpecifics;
   sync_pb::TypedUrlSpecifics* typedUrl = entitySpecifics.mutable_typed_url();
   typedUrl->set_url(url);
   typedUrl->set_title(url);
   typedUrl->add_visits(base::Time::Max().ToInternalValue());
   typedUrl->add_visit_transitions(sync_pb::SyncEnums::TYPED);
 
-  std::unique_ptr<fake_server::FakeServerEntity> entity =
-      fake_server::UniqueClientEntity::CreateForInjection(url, entitySpecifics);
+  std::unique_ptr<syncer::LoopbackServerEntity> entity =
+      syncer::PersistentUniqueClientEntity::CreateFromEntitySpecifics(
+          url, entitySpecifics);
   gSyncFakeServer->InjectEntity(std::move(entity));
 }
 
 BOOL IsTypedUrlPresentOnClient(const GURL& url,
                                BOOL expect_present,
                                NSError** error) {
   // Call the history service.
   ios::ChromeBrowserState* browser_state =
       chrome_test_util::GetOriginalBrowserState();
   history::HistoryService* history_service =
@@ skipping 57 matching lines @@
   std::vector<sync_pb::SyncEntity> typed_urls =
       gSyncFakeServer->GetSyncEntitiesByModelType(syncer::TYPED_URLS);
   std::string entity_id;
   for (const sync_pb::SyncEntity& typed_url : typed_urls) {
     if (typed_url.specifics().typed_url().url() == url) {
       entity_id = typed_url.id_string();
       break;
     }
   }
   if (!entity_id.empty()) {
-    std::unique_ptr<fake_server::FakeServerEntity> entity;
-    entity = fake_server::TombstoneEntity::Create(entity_id, std::string());
+    std::unique_ptr<syncer::LoopbackServerEntity> entity;
+    entity =
+        syncer::PersistentTombstoneEntity::CreateNew(entity_id, std::string());
     gSyncFakeServer->InjectEntity(std::move(entity));
   }
 }
 
 }  // namespace chrome_test_util