jni: Pass method parameters as JavaParamRef in sync.

Pass all object parameters to JNI methods in JavaParamRef<> wrappers.
This matches previous changes made to do this for JNI non-method
functions.

BUG=519562
R=pvalenzuela@chromium.org

Review URL: https://codereview.chromium.org/1481543002

Cr-Commit-Position: refs/heads/master@{#361683}

2 files changed, 120 insertions, 98 deletions

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 ed5d639..434d280 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.cc
+++ b/sync/test/fake_server/android/fake_server_helper_android.cc
@@ -36,14 +36,17 @@ static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   return reinterpret_cast<intptr_t>(fake_server_android);
 }
 
-jlong FakeServerHelperAndroid::CreateFakeServer(JNIEnv* env, jobject obj) {
+jlong FakeServerHelperAndroid::CreateFakeServer(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj) {
   fake_server::FakeServer* fake_server = new fake_server::FakeServer();
   return reinterpret_cast<intptr_t>(fake_server);
 }
 
-jlong FakeServerHelperAndroid::CreateNetworkResources(JNIEnv* env,
-                                                      jobject obj,
-                                                      jlong fake_server) {
+jlong FakeServerHelperAndroid::CreateNetworkResources(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jlong fake_server) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
   syncer::NetworkResources* resources =
@@ -52,7 +55,7 @@ jlong FakeServerHelperAndroid::CreateNetworkResources(JNIEnv* env,
 }
 
 void FakeServerHelperAndroid::DeleteFakeServer(JNIEnv* env,
-                                               jobject obj,
+                                               const JavaParamRef<jobject>& obj,
                                                jlong fake_server) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
@@ -61,11 +64,11 @@ void FakeServerHelperAndroid::DeleteFakeServer(JNIEnv* env,
 
 jboolean FakeServerHelperAndroid::VerifyEntityCountByTypeAndName(
     JNIEnv* env,
-    jobject obj,
+    const JavaParamRef<jobject>& obj,
     jlong fake_server,
     jlong count,
     jint model_type_int,
-    jstring name) {
+    const JavaParamRef<jstring>& name) {
   syncer::ModelType model_type = static_cast<syncer::ModelType>(model_type_int);
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
@@ -82,9 +85,9 @@ jboolean FakeServerHelperAndroid::VerifyEntityCountByTypeAndName(
 
 jboolean FakeServerHelperAndroid::VerifySessions(
     JNIEnv* env,
-    jobject obj,
+    const JavaParamRef<jobject>& obj,
     jlong fake_server,
-    jobjectArray url_array) {
+    const JavaParamRef<jobjectArray>& url_array) {
   std::multiset<std::string> tab_urls;
   for (int i = 0; i < env->GetArrayLength(url_array); i++) {
     jstring s = (jstring) env->GetObjectArrayElement(url_array, i);
@@ -106,10 +109,11 @@ jboolean FakeServerHelperAndroid::VerifySessions(
 }
 
 base::android::ScopedJavaLocalRef<jobjectArray>
-FakeServerHelperAndroid::GetSyncEntitiesByModelType(JNIEnv* env,
-                                                    jobject obj,
-                                                    jlong fake_server,
-                                                    jint model_type_int) {
+FakeServerHelperAndroid::GetSyncEntitiesByModelType(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jlong fake_server,
+    jint model_type_int) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
 
@@ -129,10 +133,10 @@ FakeServerHelperAndroid::GetSyncEntitiesByModelType(JNIEnv* env,
 
 void FakeServerHelperAndroid::InjectUniqueClientEntity(
     JNIEnv* env,
-    jobject obj,
+    const JavaParamRef<jobject>& obj,
     jlong fake_server,
-    jstring name,
-    jbyteArray serialized_entity_specifics) {
+    const JavaParamRef<jstring>& name,
+    const JavaParamRef<jbyteArray>& serialized_entity_specifics) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
 
@@ -147,10 +151,10 @@ void FakeServerHelperAndroid::InjectUniqueClientEntity(
 
 void FakeServerHelperAndroid::ModifyEntitySpecifics(
     JNIEnv* env,
-    jobject obj,
+    const JavaParamRef<jobject>& obj,
     jlong fake_server,
-    jstring id,
-    jbyteArray serialized_entity_specifics) {
+    const JavaParamRef<jstring>& id,
+    const JavaParamRef<jbyteArray>& serialized_entity_specifics) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
 
@@ -178,22 +182,23 @@ void FakeServerHelperAndroid::DeserializeEntitySpecifics(
 
 void FakeServerHelperAndroid::InjectBookmarkEntity(
     JNIEnv* env,
-    jobject obj,
+    const JavaParamRef<jobject>& obj,
     jlong fake_server,
-    jstring title,
-    jstring url,
-    jstring parent_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);
   fake_server_ptr->InjectEntity(
       CreateBookmarkEntity(env, title, url, parent_id));
 }
 
-void FakeServerHelperAndroid::InjectBookmarkFolderEntity(JNIEnv* env,
-                                                         jobject obj,
-                                                         jlong fake_server,
-                                                         jstring title,
-                                                         jstring parent_id) {
+void FakeServerHelperAndroid::InjectBookmarkFolderEntity(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jlong fake_server,
+    const JavaParamRef<jstring>& title,
+    const JavaParamRef<jstring>& parent_id) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
 
@@ -207,13 +212,14 @@ void FakeServerHelperAndroid::InjectBookmarkFolderEntity(JNIEnv* env,
   fake_server_ptr->InjectEntity(bookmark_builder.BuildFolder());
 }
 
-void FakeServerHelperAndroid::ModifyBookmarkEntity(JNIEnv* env,
-                                                   jobject obj,
-                                                   jlong fake_server,
-                                                   jstring entity_id,
-                                                   jstring title,
-                                                   jstring url,
-                                                   jstring parent_id) {
+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);
   scoped_ptr<fake_server::FakeServerEntity> bookmark =
@@ -226,12 +232,13 @@ void FakeServerHelperAndroid::ModifyBookmarkEntity(JNIEnv* env,
       proto.specifics());
 }
 
-void FakeServerHelperAndroid::ModifyBookmarkFolderEntity(JNIEnv* env,
-                                                         jobject obj,
-                                                         jlong fake_server,
-                                                         jstring entity_id,
-                                                         jstring title,
-                                                         jstring parent_id) {
+void FakeServerHelperAndroid::ModifyBookmarkFolderEntity(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jlong fake_server,
+    const JavaParamRef<jstring>& entity_id,
+    const JavaParamRef<jstring>& title,
+    const JavaParamRef<jstring>& parent_id) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
 
@@ -274,7 +281,7 @@ FakeServerHelperAndroid::CreateBookmarkEntity(JNIEnv* env,
 base::android::ScopedJavaLocalRef<jstring>
 FakeServerHelperAndroid::GetBookmarkBarFolderId(
     JNIEnv* env,
-    jobject obj,
+    const JavaParamRef<jobject>& obj,
     jlong fake_server) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
@@ -282,11 +289,10 @@ FakeServerHelperAndroid::GetBookmarkBarFolderId(
       env, fake_server_ptr->GetBookmarkBarFolderId());
 }
 
-void FakeServerHelperAndroid::DeleteEntity(
-    JNIEnv* env,
-    jobject obj,
-    jlong fake_server,
-    jstring id) {
+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);
@@ -295,7 +301,7 @@ void FakeServerHelperAndroid::DeleteEntity(
 }
 
 void FakeServerHelperAndroid::ClearServerData(JNIEnv* env,
-                                              jobject obj,
+                                              const JavaParamRef<jobject>& obj,
                                               jlong fake_server) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
diff --git a/sync/test/fake_server/android/fake_server_helper_android.h b/sync/test/fake_server/android/fake_server_helper_android.h
index fb95af1..0f4ed34 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.h
+++ b/sync/test/fake_server/android/fake_server_helper_android.h
@@ -22,100 +22,116 @@ class FakeServerHelperAndroid {
 
   // Factory method for creating a native FakeServer object. The caller assumes
   // ownership.
-  jlong CreateFakeServer(JNIEnv* env, jobject obj);
+  jlong CreateFakeServer(JNIEnv* env,
+                         const base::android::JavaParamRef<jobject>& obj);
 
   // Factory method for creating a native NetworkResources object. The caller
   // assumes ownership.
-  jlong CreateNetworkResources(JNIEnv* env, jobject obj, jlong fake_server);
+  jlong CreateNetworkResources(JNIEnv* env,
+                               const base::android::JavaParamRef<jobject>& obj,
+                               jlong fake_server);
 
   // Deletes the given |fake_server| (a FakeServer pointer created via
   // CreateFakeServer).
-  void DeleteFakeServer(JNIEnv* env, jobject obj, jlong fake_server);
+  void DeleteFakeServer(JNIEnv* env,
+                        const base::android::JavaParamRef<jobject>& obj,
+                        jlong fake_server);
 
   // Returns true if and only if |fake_server| contains |count| entities that
   // match |model_type_string| and |name|.
-  jboolean VerifyEntityCountByTypeAndName(JNIEnv* env,
-                                          jobject obj,
-                                          jlong fake_server,
-                                          jlong count,
-                                          jint model_type_int,
-                                          jstring name);
+  jboolean VerifyEntityCountByTypeAndName(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jlong fake_server,
+      jlong count,
+      jint model_type_int,
+      const base::android::JavaParamRef<jstring>& name);
 
   // Returns true iff |fake_server| has exactly one window of sessions with
   // tabs matching |url_array|. The order of the array does not matter.
-  jboolean VerifySessions(JNIEnv* env,
-                          jobject obj,
-                          jlong fake_server,
-                          jobjectArray url_array);
+  jboolean VerifySessions(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jlong fake_server,
+      const base::android::JavaParamRef<jobjectArray>& url_array);
 
   // Return the entities for |model_type_string| on |fake_server|.
   base::android::ScopedJavaLocalRef<jobjectArray> GetSyncEntitiesByModelType(
       JNIEnv* env,
-      jobject obj,
+      const base::android::JavaParamRef<jobject>& obj,
       jlong fake_server,
       jint model_type_int);
 
   // Injects a UniqueClientEntity into |fake_server|.
-  void InjectUniqueClientEntity(JNIEnv* env,
-                                jobject obj,
-                                jlong fake_server,
-                                jstring name,
-                                jbyteArray serialized_entity_specifics);
+  void InjectUniqueClientEntity(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jlong fake_server,
+      const base::android::JavaParamRef<jstring>& name,
+      const base::android::JavaParamRef<jbyteArray>&
+          serialized_entity_specifics);
 
   // Modifies the entity with |id| on |fake_server|.
   void ModifyEntitySpecifics(JNIEnv* env,
-                             jobject obj,
+                             const base::android::JavaParamRef<jobject>& obj,
                              jlong fake_server,
-                             jstring name,
-                             jbyteArray serialized_entity_specifics);
+                             const base::android::JavaParamRef<jstring>& name,
+                             const base::android::JavaParamRef<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);
+  void InjectBookmarkEntity(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jlong fake_server,
+      const base::android::JavaParamRef<jstring>& title,
+      const base::android::JavaParamRef<jstring>& url,
+      const base::android::JavaParamRef<jstring>& parent_id);
 
   // Injects a bookmark folder entity into |fake_server|.
-  void InjectBookmarkFolderEntity(JNIEnv* env,
-                                  jobject obj,
-                                  jlong fake_server,
-                                  jstring title,
-                                  jstring parent_id);
+  void InjectBookmarkFolderEntity(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jlong fake_server,
+      const base::android::JavaParamRef<jstring>& title,
+      const base::android::JavaParamRef<jstring>& parent_id);
 
   // Modify the BookmarkEntity with |entity_id| on |fake_server|.
-  void ModifyBookmarkEntity(JNIEnv* env,
-                            jobject obj,
-                            jlong fake_server,
-                            jstring entity_id,
-                            jstring title,
-                            jstring url,
-                            jstring parent_id);
+  void ModifyBookmarkEntity(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jlong fake_server,
+      const base::android::JavaParamRef<jstring>& entity_id,
+      const base::android::JavaParamRef<jstring>& title,
+      const base::android::JavaParamRef<jstring>& url,
+      const base::android::JavaParamRef<jstring>& parent_id);
 
   // Modify the bookmark folder with |entity_id| on |fake_server|.
-  void ModifyBookmarkFolderEntity(JNIEnv* env,
-                                  jobject obj,
-                                  jlong fake_server,
-                                  jstring entity_id,
-                                  jstring title,
-                                  jstring parent_id);
+  void ModifyBookmarkFolderEntity(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jlong fake_server,
+      const base::android::JavaParamRef<jstring>& entity_id,
+      const base::android::JavaParamRef<jstring>& title,
+      const base::android::JavaParamRef<jstring>& parent_id);
 
   // Returns the bookmark bar folder ID.
   base::android::ScopedJavaLocalRef<jstring> GetBookmarkBarFolderId(
       JNIEnv* env,
-      jobject obj,
+      const base::android::JavaParamRef<jobject>& obj,
       jlong fake_server);
 
   // Deletes an entity on the server. This is the JNI way of injecting a
   // tombstone.
   void DeleteEntity(JNIEnv* env,
-                    jobject obj,
+                    const base::android::JavaParamRef<jobject>& obj,
                     jlong fake_server,
-                    jstring id);
+                    const base::android::JavaParamRef<jstring>& id);
 
   // Simulates a dashboard stop and clear.
-  void ClearServerData(JNIEnv* env, jobject obj, jlong fake_server);
+  void ClearServerData(JNIEnv* env,
+                       const base::android::JavaParamRef<jobject>& obj,
+                       jlong fake_server);
 
  private:
   virtual ~FakeServerHelperAndroid();