Reland - Replace FakeServer's implementation with LoopbackServer invocations.

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

 // 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.
 
 #ifndef COMPONENTS_SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID_H_
 #define COMPONENTS_SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID_H_
 
 #include <jni.h>
 
 #include <memory>
@@ skipping 126 matching lines @@
 
  private:
   virtual ~FakeServerHelperAndroid();
 
   // Deserializes |serialized_entity_specifics| into |entity_specifics|.
   void DeserializeEntitySpecifics(JNIEnv* env,
                                   jbyteArray serialized_entity_specifics,
                                   sync_pb::EntitySpecifics* entity_specifics);
 
   // Creates a bookmark entity.
-  std::unique_ptr<fake_server::FakeServerEntity> CreateBookmarkEntity(
+  std::unique_ptr<syncer::LoopbackServerEntity> CreateBookmarkEntity(
       JNIEnv* env,
       jstring title,
       jstring url,
       jstring parent_id);
 };
 
 #endif  // COMPONENTS_SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID_H_