| Index: base/android/jni_string.cc
|
| diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc
|
| index 121755ab75e46cfe6017cdae28f3870056498525..0bc36597d75c34adf2b1fa5fdff55aa329329fe3 100644
|
| --- a/base/android/jni_string.cc
|
| +++ b/base/android/jni_string.cc
|
| @@ -55,6 +55,10 @@ 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) {
|
| @@ -100,6 +104,10 @@ 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) {
|
|
|