Refactor ScopedJavaRef

base/android/jni_array.cc

Index: base/android/jni_array.cc
diff --git a/base/android/jni_array.cc b/base/android/jni_array.cc
index 409b44abf77a17be459bc7916c6e2dc638bc9077..08cb42eca0b4a5045a945fb233f03f001e84bc0b 100644
--- a/base/android/jni_array.cc
+++ b/base/android/jni_array.cc
@@ -5,7 +5,8 @@
 #include "base/android/jni_array.h"
 
 #include "base/android/jni_android.h"
-#include "base/android/scoped_java_reference.h"
+#include "base/android/jni_string.h"
+#include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 
 namespace base {
@@ -15,12 +16,10 @@ jbyteArray ToJavaByteArray(JNIEnv* env,
                            const unsigned char* bytes,
                            size_t len) {
   jbyteArray byte_array = env->NewByteArray(len);
-  if (!byte_array) {
-    return NULL;
-  }
+  CheckException(env);
+  CHECK(byte_array);
 
   jbyte* elements = env->GetByteArrayElements(byte_array, NULL);
-  DCHECK(elements);
   memcpy(elements, bytes, len);
   env->ReleaseByteArrayElements(byte_array, elements, 0);
   CheckException(env);
@@ -30,24 +29,33 @@ jbyteArray ToJavaByteArray(JNIEnv* env,
 
 jobjectArray ToJavaArrayOfByteArray(JNIEnv* env,
                                     const std::vector<std::string>& v) {
-  size_t count = v.size();
-  DCHECK_GT(count, 0U);
-  jclass byte_array_class = env->FindClass("[B");
-  jobjectArray joa = env->NewObjectArray(count, byte_array_class, NULL);
-  if (joa == NULL)
-    return NULL;
-
-  for (size_t i = 0; i < count; ++i) {
-    ScopedJavaReference<jobject> byte_array(env, ToJavaByteArray(env,
+  ScopedJavaLocalRef<jclass> byte_array_clazz(env, env->FindClass("[B"));
+  jobjectArray joa = env->NewObjectArray(v.size(),
+                                         byte_array_clazz.obj(), NULL);
+  CheckException(env);
+
+  for (size_t i = 0; i < v.size(); ++i) {
+    ScopedJavaLocalRef<jobject> byte_array(env, ToJavaByteArray(env,
             reinterpret_cast<const uint8*>(v[i].data()), v[i].length()));

[brettw, 2011/09/06 18:12:27]

Can you fix the indenting here (should be 4 spaces).

-    if (!byte_array.obj()) {
-      env->DeleteLocalRef(joa);
-      return NULL;
-    }
     env->SetObjectArrayElement(joa, i, byte_array.obj());
   }
   return joa;
 }
 
+jobjectArray ToJavaArrayOfStrings(JNIEnv* env,
+                                  const std::vector<std::string>& v) {
+  ScopedJavaLocalRef<jclass> string_clazz(env,
+                                          env->FindClass("java/lang/String"));
+  jobjectArray joa = env->NewObjectArray(v.size(), string_clazz.obj(), NULL);
+  CheckException(env);
+
+  for (size_t i = 0; i < v.size(); ++i) {
+    ScopedJavaLocalRef<jstring> item(env,
+                                     ConvertUTF8ToJavaString(env, v[i]));
+    env->SetObjectArrayElement(joa, i, item.obj());
+  }
+  return joa;
+}
+
 }  // namespace android
 }  // namespace base