Revert "Speculative revert by sheriff"

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 SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID
 #define SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID
 
 #include <jni.h>
 
+#include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
 #include "sync/test/fake_server/entity_builder_factory.h"
 
 // Helper for utilizing native FakeServer infrastructure in Android tests.
 class FakeServerHelperAndroid {
  public:
   // Registers the native methods.
   static bool Register(JNIEnv* env);
 
   // Creates a FakeServerHelperAndroid.
@@ skipping 20 matching lines @@
                                           jstring model_type_string,
                                           jstring name);
 
   // Injects a UniqueClientEntity into |fake_server|.
   void InjectUniqueClientEntity(JNIEnv* env,
                                 jobject obj,
                                 jlong fake_server,
                                 jstring name,
                                 jbyteArray serialized_entity_specifics);
 
+  // Injects a BookmarkEntity into |fake_server|.
+  void InjectBookmarkEntity(JNIEnv* env,
+                            jobject obj,
+                            jlong fake_server,
+                            jstring title,
+                            jstring url,
+                            jstring parent_id);
+
+  // Returns the bookmark bar folder ID.
+  base::android::ScopedJavaLocalRef<jstring> GetBookmarkBarFolderId(
+      JNIEnv* env,
+      jobject obj,
+      jlong fake_server);
+
  private:
   virtual ~FakeServerHelperAndroid();
 };
 
 #endif  // SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID