Index: base/android/jni_string.cc |
diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc |
index d0ffeecc418fa410095a56a6dbc879a5ba06da20..633b7243112e64d96d052071cf05ad55612fcd10 100644 |
--- a/base/android/jni_string.cc |
+++ b/base/android/jni_string.cc |
@@ -11,7 +11,8 @@ |
namespace { |
// Internal version that does not use a scoped local pointer. |
-jstring ConvertUTF16ToJavaStringImpl(JNIEnv* env, const string16& str) { |
+jstring ConvertUTF16ToJavaStringImpl(JNIEnv* env, |
+ const base::StringPiece16& str) { |
jstring result = env->NewString(str.data(), str.length()); |
base::android::CheckException(env); |
return result; |
@@ -60,9 +61,8 @@ string16 ConvertJavaStringToUTF16(const JavaRef<jstring>& str) { |
return ConvertJavaStringToUTF16(AttachCurrentThread(), str.obj()); |
} |
-// TODO(joth): change this to accept const StringPiece16&. |
ScopedJavaLocalRef<jstring> ConvertUTF16ToJavaString(JNIEnv* env, |
- const string16& str) { |
+ const base::StringPiece16& str) { |
joth
2012/06/11 23:39:38
likewise as this fit when aligned with the open pa
Wei James(wistoch)
2012/06/12 01:25:29
fixed. thanks
|
return ScopedJavaLocalRef<jstring>(env, |
ConvertUTF16ToJavaStringImpl(env, str)); |
} |