[Android] Use Blink UTF8<->UTF16 strings conversion in Gin Java Bridge

content/browser/android/java/gin_java_method_invocation_helper.cc

 // Copyright 2014 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 "content/browser/android/java/gin_java_method_invocation_helper.h"
 
 #include <unistd.h>
 
 #include "base/android/event_log.h"
 #include "base/android/jni_android.h"
-#include "base/android/jni_string.h"
 #include "base/float_util.h"
 #include "content/browser/android/java/gin_java_script_to_java_types_coercion.h"
 #include "content/browser/android/java/java_method.h"
 #include "content/browser/android/java/jni_helper.h"
 #include "content/common/android/gin_java_bridge_value.h"
 #include "content/public/browser/browser_thread.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
 namespace {
 
 // See frameworks/base/core/java/android/webkit/EventLogTags.logtags
 const int kObjectGetClassInvocationAttemptLogTag = 70151;
 
+// This is an intermediate solution until we fix http://crbug.com/391492.
+std::string ConvertJavaStringToUTF8(JNIEnv* env, jstring str) {
+  const jchar* chars = env->GetStringChars(str, NULL);
+  DCHECK(chars);
+  blink::WebString utf16(chars, env->GetStringLength(str));
+  env->ReleaseStringChars(str, chars);
+  return utf16.utf8();
+}
+
 }  // namespace
 
 GinJavaMethodInvocationHelper::GinJavaMethodInvocationHelper(
     scoped_ptr<ObjectDelegate> object,
     const std::string& method_name,
     const base::ListValue& arguments)
     : object_(object.Pass()),
       method_name_(method_name),
       arguments_(arguments.DeepCopy()),
       invocation_error_(kGinJavaBridgeNoError) {
@@ skipping 255 matching lines @@
       }
       ScopedJavaLocalRef<jstring> scoped_java_string(env, java_string);
       if (!scoped_java_string.obj()) {
         // LIVECONNECT_COMPLIANCE: Existing behavior is to return undefined.
         // Spec requires returning a null string.
         result_wrapper.Append(
             GinJavaBridgeValue::CreateUndefinedValue().release());
         break;
       }
       result_wrapper.AppendString(
-          base::android::ConvertJavaStringToUTF8(scoped_java_string));
+          ConvertJavaStringToUTF8(env, scoped_java_string.obj()));
       break;
     }
     case JavaType::TypeObject: {
       // If an exception was raised, we must clear it before calling most JNI
       // methods. ScopedJavaLocalRef is liable to make such calls, so we test
       // first.
       jobject java_object =
           object ? env->CallObjectMethodA(object, id, parameters)
                  : env->CallStaticObjectMethodA(clazz, id, parameters);
       if (base::android::ClearException(env)) {
@@ skipping 11 matching lines @@
   }
   // This is for all cases except JavaType::TypeObject.
   if (!base::android::ClearException(env)) {
     SetPrimitiveResult(result_wrapper);
   } else {
     SetInvocationError(kGinJavaBridgeJavaExceptionRaised);
   }
 }
 
 }  // namespace content