Revert "Speculative revert by sheriff"

sync/test/fake_server/android/fake_server_helper_android.cc

Index: sync/test/fake_server/android/fake_server_helper_android.cc
diff --git a/sync/test/fake_server/android/fake_server_helper_android.cc b/sync/test/fake_server/android/fake_server_helper_android.cc
index cc8fe814a85357f10bc82a224ffbeb39fda9a31d..79c0babc2621f34a77a0ed6de2b7427f14e1a26e 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.cc
+++ b/sync/test/fake_server/android/fake_server_helper_android.cc
@@ -14,11 +14,14 @@
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/network_resources.h"
 #include "sync/protocol/sync.pb.h"
+#include "sync/test/fake_server/bookmark_entity_builder.h"
+#include "sync/test/fake_server/entity_builder_factory.h"
 #include "sync/test/fake_server/fake_server.h"
 #include "sync/test/fake_server/fake_server_network_resources.h"
 #include "sync/test/fake_server/fake_server_verifier.h"
 #include "sync/test/fake_server/unique_client_entity.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) {
 }
@@ -105,6 +108,44 @@ void FakeServerHelperAndroid::InjectUniqueClientEntity(
           entity_specifics));
 }
 
+void FakeServerHelperAndroid::InjectBookmarkEntity(
+    JNIEnv* env,
+    jobject obj,
+    jlong fake_server,
+    jstring title,
+    jstring url,
+    jstring parent_id) {
+  fake_server::FakeServer* fake_server_ptr =
+      reinterpret_cast<fake_server::FakeServer*>(fake_server);
+
+  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), gurl);
+  bookmark_builder.SetParentId(
+          base::android::ConvertJavaStringToUTF8(env, parent_id));
+  scoped_ptr<fake_server::FakeServerEntity> bookmark = bookmark_builder.Build();
+  fake_server_ptr->InjectEntity(bookmark.Pass());
+}
+
+base::android::ScopedJavaLocalRef<jstring>
+FakeServerHelperAndroid::GetBookmarkBarFolderId(
+    JNIEnv* env,
+    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());
+}
+
 // static
 bool FakeServerHelperAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);