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

components/sync/test/fake_server/android/fake_server_helper_android.cc

Index: components/sync/test/fake_server/android/fake_server_helper_android.cc
diff --git a/components/sync/test/fake_server/android/fake_server_helper_android.cc b/components/sync/test/fake_server/android/fake_server_helper_android.cc
index e3f61f768b8fd3e31d693bca31ca4098e4d98510..6ce249c1f8d9824f98428d35a78e68ac51ab03b2 100644
--- a/components/sync/test/fake_server/android/fake_server_helper_android.cc
+++ b/components/sync/test/fake_server/android/fake_server_helper_android.cc
@@ -19,6 +19,8 @@
 #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/tombstone_entity.h"
+#include "components/sync/test/fake_server/unique_client_entity.h"
 #include "jni/FakeServerHelper_jni.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
@@ -144,7 +146,7 @@
                              &entity_specifics);
 
   fake_server_ptr->InjectEntity(
-      syncer::PersistentUniqueClientEntity::CreateFromEntitySpecifics(
+      fake_server::UniqueClientEntity::CreateForInjection(
           base::android::ConvertJavaStringToUTF8(env, name), entity_specifics));
 }
 
@@ -221,7 +223,7 @@
     const JavaParamRef<jstring>& parent_id) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
-  std::unique_ptr<syncer::LoopbackServerEntity> bookmark =
+  std::unique_ptr<fake_server::FakeServerEntity> bookmark =
       CreateBookmarkEntity(env, title, url, parent_id);
   sync_pb::SyncEntity proto;
   bookmark->SerializeAsProto(&proto);
@@ -256,7 +258,7 @@
       proto.specifics());
 }
 
-std::unique_ptr<syncer::LoopbackServerEntity>
+std::unique_ptr<fake_server::FakeServerEntity>
 FakeServerHelperAndroid::CreateBookmarkEntity(JNIEnv* env,
                                               jstring title,
                                               jstring url,
@@ -282,9 +284,10 @@
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jlong fake_server) {
-  // Rather hard code this here then incur the cost of yet another method.
-  // It is very unlikely that this will ever change.
-  return base::android::ConvertUTF8ToJavaString(env, "32904_bookmark_bar");
+  fake_server::FakeServer* fake_server_ptr =
+      reinterpret_cast<fake_server::FakeServer*>(fake_server);
+  return base::android::ConvertUTF8ToJavaString(
+      env, fake_server_ptr->GetBookmarkBarFolderId());
 }
 
 void FakeServerHelperAndroid::DeleteEntity(JNIEnv* env,
@@ -295,7 +298,7 @@
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
   std::string native_id = base::android::ConvertJavaStringToUTF8(env, id);
   fake_server_ptr->InjectEntity(
-      syncer::PersistentTombstoneEntity::CreateNew(native_id, std::string()));
+      fake_server::TombstoneEntity::Create(native_id, std::string()));
 }
 
 void FakeServerHelperAndroid::ClearServerData(JNIEnv* env,