Reland - Replace FakeServer's implementation with LoopbackServer invocations.

components/sync/test/fake_server/android/fake_server_helper_android.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/test/fake_server/android/fake_server_helper_android.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <vector>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/engine/net/network_resources.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/test/fake_server/bookmark_entity_builder.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/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"
 
 using base::android::JavaParamRef;
 
 FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) {}
 
 FakeServerHelperAndroid::~FakeServerHelperAndroid() {}
 
@@ skipping 105 matching lines @@
     const JavaParamRef<jstring>& name,
     const JavaParamRef<jbyteArray>& serialized_entity_specifics) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
 
   sync_pb::EntitySpecifics entity_specifics;
   DeserializeEntitySpecifics(env, serialized_entity_specifics,
                              &entity_specifics);
 
   fake_server_ptr->InjectEntity(
-      fake_server::UniqueClientEntity::CreateForInjection(
+      syncer::PersistentUniqueClientEntity::CreateFromEntitySpecifics(
           base::android::ConvertJavaStringToUTF8(env, name), entity_specifics));
 }
 
 void FakeServerHelperAndroid::ModifyEntitySpecifics(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jlong fake_server,
     const JavaParamRef<jstring>& id,
     const JavaParamRef<jbyteArray>& serialized_entity_specifics) {
   fake_server::FakeServer* fake_server_ptr =
@@ skipping 56 matching lines @@
 void FakeServerHelperAndroid::ModifyBookmarkEntity(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jlong fake_server,
     const JavaParamRef<jstring>& entity_id,
     const JavaParamRef<jstring>& title,
     const JavaParamRef<jstring>& url,
     const JavaParamRef<jstring>& parent_id) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
-  std::unique_ptr<fake_server::FakeServerEntity> bookmark =
+  std::unique_ptr<syncer::LoopbackServerEntity> bookmark =
       CreateBookmarkEntity(env, title, url, parent_id);
   sync_pb::SyncEntity proto;
   bookmark->SerializeAsProto(&proto);
   fake_server_ptr->ModifyBookmarkEntity(
       base::android::ConvertJavaStringToUTF8(env, entity_id),
       base::android::ConvertJavaStringToUTF8(env, parent_id),
       proto.specifics());
 }
 
 void FakeServerHelperAndroid::ModifyBookmarkFolderEntity(
@@ skipping 14 matching lines @@
       base::android::ConvertJavaStringToUTF8(env, parent_id));
 
   sync_pb::SyncEntity proto;
   bookmark_builder.BuildFolder()->SerializeAsProto(&proto);
   fake_server_ptr->ModifyBookmarkEntity(
       base::android::ConvertJavaStringToUTF8(env, entity_id),
       base::android::ConvertJavaStringToUTF8(env, parent_id),
       proto.specifics());
 }
 
-std::unique_ptr<fake_server::FakeServerEntity>
+std::unique_ptr<syncer::LoopbackServerEntity>
 FakeServerHelperAndroid::CreateBookmarkEntity(JNIEnv* env,
                                               jstring title,
                                               jstring url,
                                               jstring parent_id) {
   std::string url_as_string = base::android::ConvertJavaStringToUTF8(env, url);
   GURL gurl = GURL(url_as_string);
   if (!gurl.is_valid()) {
     NOTREACHED() << "The given string (" << url_as_string
                  << ") is not a valid URL.";
   }
 
   fake_server::EntityBuilderFactory entity_builder_factory;
   fake_server::BookmarkEntityBuilder bookmark_builder =
       entity_builder_factory.NewBookmarkEntityBuilder(
           base::android::ConvertJavaStringToUTF8(env, title));
   bookmark_builder.SetParentId(
       base::android::ConvertJavaStringToUTF8(env, parent_id));
   return bookmark_builder.BuildBookmark(gurl);
 }
 
 base::android::ScopedJavaLocalRef<jstring>
 FakeServerHelperAndroid::GetBookmarkBarFolderId(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jlong fake_server) {
-  fake_server::FakeServer* fake_server_ptr =
-      reinterpret_cast<fake_server::FakeServer*>(fake_server);
-  return base::android::ConvertUTF8ToJavaString(
-      env, fake_server_ptr->GetBookmarkBarFolderId());
+  // 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");
 }
 
 void FakeServerHelperAndroid::DeleteEntity(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj,
                                            jlong fake_server,
                                            const JavaParamRef<jstring>& id) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
   std::string native_id = base::android::ConvertJavaStringToUTF8(env, id);
   fake_server_ptr->InjectEntity(
-      fake_server::TombstoneEntity::Create(native_id, std::string()));
+      syncer::PersistentTombstoneEntity::CreateNew(native_id, std::string()));
 }
 
 void FakeServerHelperAndroid::ClearServerData(JNIEnv* env,
                                               const JavaParamRef<jobject>& obj,
                                               jlong fake_server) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
   fake_server_ptr->ClearServerData();
 }
 
 // static
 bool FakeServerHelperAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }