| Index: base/android/jni_array.cc
|
| diff --git a/base/android/jni_array.cc b/base/android/jni_array.cc
|
| index b287b460353c4f08cdae2d1540b7a1b3571b4586..d70151f275b3d4ea63513f16d754845fb26455ab 100644
|
| --- a/base/android/jni_array.cc
|
| +++ b/base/android/jni_array.cc
|
| @@ -67,15 +67,15 @@ ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings(
|
| }
|
|
|
| void AppendJavaStringArrayToStringVector(JNIEnv* env,
|
| - const JavaRef<jobjectArray>& array,
|
| + jobjectArray array,
|
| std::vector<string16>* out) {
|
| DCHECK(out);
|
| - if (array.is_null())
|
| + if (!array)
|
| return;
|
| - jsize len = env->GetArrayLength(array.obj());
|
| + jsize len = env->GetArrayLength(array);
|
| for (jsize i = 0; i < len; ++i) {
|
| ScopedJavaLocalRef<jstring> str(env,
|
| - static_cast<jstring>(env->GetObjectArrayElement(array.obj(), i)));
|
| + static_cast<jstring>(env->GetObjectArrayElement(array, i)));
|
| out->push_back(ConvertJavaStringToUTF16(str));
|
| }
|
| }
|
|
|