Allow ConvertJavaStringTo* to be called with (JNIEnv, JavaRef).

base/android/jni_string.cc

 // Copyright (c) 2012 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 "base/android/jni_string.h"
 
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 
@@ skipping 37 matching lines @@
 std::string ConvertJavaStringToUTF8(JNIEnv* env, jstring str) {
   std::string result;
   ConvertJavaStringToUTF8(env, str, &result);
   return result;
 }
 
 std::string ConvertJavaStringToUTF8(const JavaRef<jstring>& str) {
   return ConvertJavaStringToUTF8(AttachCurrentThread(), str.obj());
 }
 
+std::string ConvertJavaStringToUTF8(JNIEnv* env, const JavaRef<jstring>& str) {
+  return ConvertJavaStringToUTF8(env, str.obj());
+}
+
 ScopedJavaLocalRef<jstring> ConvertUTF8ToJavaString(
     JNIEnv* env,
     const base::StringPiece& str) {
   // JNI's NewStringUTF expects "modified" UTF8 so instead create the string
   // via our own UTF16 conversion utility.
   // Further, Dalvik requires the string passed into NewStringUTF() to come from
   // a trusted source. We can't guarantee that all UTF8 will be sanitized before
   // it gets here, so constructing via UTF16 side-steps this issue.
   // (Dalvik stores strings internally as UTF16 anyway, so there shouldn't be
   // a significant performance hit by doing it this way).
@@ skipping 25 matching lines @@
 string16 ConvertJavaStringToUTF16(JNIEnv* env, jstring str) {
   string16 result;
   ConvertJavaStringToUTF16(env, str, &result);
   return result;
 }
 
 string16 ConvertJavaStringToUTF16(const JavaRef<jstring>& str) {
   return ConvertJavaStringToUTF16(AttachCurrentThread(), str.obj());
 }
 
+string16 ConvertJavaStringToUTF16(JNIEnv* env, const JavaRef<jstring>& str) {
+  return ConvertJavaStringToUTF16(env, str.obj());
+}
+
 ScopedJavaLocalRef<jstring> ConvertUTF16ToJavaString(
     JNIEnv* env,
     const base::StringPiece16& str) {
   return ScopedJavaLocalRef<jstring>(env,
                                      ConvertUTF16ToJavaStringImpl(env, str));
 }
 
 }  // namespace android
 }  // namespace base