replace string16 with StringPiece16 in ConvertUTF16ToJavaString()

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10532081

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141607 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 8 deletions

diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc
index d0ffeec..c8a90ca 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;
@@ -33,7 +34,8 @@ std::string ConvertJavaStringToUTF8(const JavaRef<jstring>& str) {
 }
 
 ScopedJavaLocalRef<jstring> ConvertUTF8ToJavaString(
-    JNIEnv* env, const base::StringPiece& str) {
+    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
@@ -60,9 +62,9 @@ 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) {
+ScopedJavaLocalRef<jstring> ConvertUTF16ToJavaString(
+    JNIEnv* env,
+    const base::StringPiece16& str) {
   return ScopedJavaLocalRef<jstring>(env,
                                      ConvertUTF16ToJavaStringImpl(env, str));
 }
diff --git a/base/android/jni_string.h b/base/android/jni_string.h
index 1987f04..43194a15 100644
--- a/base/android/jni_string.h
+++ b/base/android/jni_string.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
-#include "base/string16.h"
 #include "base/string_piece.h"
 
 namespace base {
@@ -21,7 +20,8 @@ std::string ConvertJavaStringToUTF8(const JavaRef<jstring>& str);
 
 // Convert a std string to Java string.
 ScopedJavaLocalRef<jstring> ConvertUTF8ToJavaString(
-    JNIEnv* env, const base::StringPiece& str);
+    JNIEnv* env,
+    const base::StringPiece& str);
 
 // Convert a Java string to UTF16. Returns a string16.
 string16 ConvertJavaStringToUTF16(JNIEnv* env, jstring str);
@@ -29,7 +29,8 @@ string16 ConvertJavaStringToUTF16(const JavaRef<jstring>& str);
 
 // Convert a string16 to a Java string.
 ScopedJavaLocalRef<jstring> ConvertUTF16ToJavaString(
-    JNIEnv* env, const string16& str);
+    JNIEnv* env,
+    const base::StringPiece16& str);
 
 }  // namespace android
 }  // namespace base