[Sync] Add bookmark move tests.

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 "sync/test/fake_server/android/fake_server_helper_android.h"
 
 #include <jni.h>
 
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
@@ skipping 91 matching lines @@
   fake_server::FakeServerVerifier fake_server_verifier(fake_server_ptr);
   testing::AssertionResult result =
       fake_server_verifier.VerifySessions(expected_sessions);
 
   if (!result)
     LOG(WARNING) << result.message();
 
   return result;
 }
 
+base::android::ScopedJavaLocalRef<jobjectArray>
+FakeServerHelperAndroid::GetSyncEntitiesByModelType(JNIEnv* env,
+                                                    jobject obj,
+                                                    jlong fake_server,
+                                                    jstring model_type_string) {
+  fake_server::FakeServer* fake_server_ptr =
+      reinterpret_cast<fake_server::FakeServer*>(fake_server);
+
+  syncer::ModelType model_type;
+  if (!NotificationTypeToRealModelType(
+      base::android::ConvertJavaStringToUTF8(env, model_type_string),
+      &model_type)) {
+    LOG(WARNING) << "Invalid ModelType string.";
+    NOTREACHED();
+  }
+
+  std::vector<sync_pb::SyncEntity> entities =
+      fake_server_ptr->GetSyncEntitiesByModelType(model_type);
+
+  // "[B" is the type specifier for the Java byte[]; so, this returns the class
+  // type for a Java byte[].
+  jclass byte_array_class = env->FindClass("[B");
+  jobjectArray object_array =
+      env->NewObjectArray(entities.size(), byte_array_class, nullptr);
+  for (size_t i = 0; i < entities.size(); ++i) {
+    env->SetObjectArrayElement(object_array, i,
+                               ProtoToJbyteArray(env, entities[i]));
+  }
+  return base::android::ScopedJavaLocalRef<jobjectArray>(env, object_array);
+}
+
+jbyteArray FakeServerHelperAndroid::ProtoToJbyteArray(

[nyquist, 2015/07/13 18:52:46]

Could you instead use MessageLite::SerializeToString
(https://developers.google.com/protocol-buffers/docs/reference/cpp/google.prot...)
and base::android::ToJavaArrayOfByteArray ?

[maxbogue, 2015/07/13 19:44:54]

Done.

+    JNIEnv* env,
+    const google::protobuf::MessageLite& proto) {
+  int size = proto.ByteSize();
+  jbyteArray ret_arr = env->NewByteArray(size);
+  jbyte* memory = reinterpret_cast<jbyte*>(
+      env->GetPrimitiveArrayCritical(ret_arr, nullptr));
+  proto.SerializeToArray(memory, size);
+  env->ReleasePrimitiveArrayCritical(ret_arr, memory, 0);
+  return ret_arr;
+}
+
 void FakeServerHelperAndroid::InjectUniqueClientEntity(
     JNIEnv* env,
     jobject obj,
     jlong fake_server,
     jstring name,
     jbyteArray serialized_entity_specifics) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
 
   sync_pb::EntitySpecifics entity_specifics;
@@ skipping 73 matching lines @@
                                                    jstring entity_id,
                                                    jstring title,
                                                    jstring url,
                                                    jstring parent_id) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
   scoped_ptr<fake_server::FakeServerEntity> bookmark =
       CreateBookmarkEntity(env, title, url, parent_id);
   sync_pb::SyncEntity proto;
   bookmark->SerializeAsProto(&proto);
-  fake_server_ptr->ModifyEntitySpecifics(
+  fake_server_ptr->ModifyBookmarkEntity(
       base::android::ConvertJavaStringToUTF8(env, entity_id),
+      base::android::ConvertJavaStringToUTF8(env, parent_id),
       proto.specifics());
 }
 
 void FakeServerHelperAndroid::ModifyBookmarkFolderEntity(JNIEnv* env,
                                                          jobject obj,
                                                          jlong fake_server,
                                                          jstring entity_id,
                                                          jstring title,
                                                          jstring parent_id) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
 
   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));
 
   sync_pb::SyncEntity proto;
   bookmark_builder.BuildFolder()->SerializeAsProto(&proto);
-  fake_server_ptr->ModifyEntitySpecifics(
+  fake_server_ptr->ModifyBookmarkEntity(
       base::android::ConvertJavaStringToUTF8(env, entity_id),
+      base::android::ConvertJavaStringToUTF8(env, parent_id),
       proto.specifics());
 }
 
 scoped_ptr<fake_server::FakeServerEntity>
 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);
@@ skipping 31 matching lines @@
       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));
 }
 
 // static
 bool FakeServerHelperAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }