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

content/browser/android/java/gin_java_script_to_java_types_coercion.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_script_to_java_types_coercion.h"
 
 #include <unistd.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/android/gin_java_bridge_value.h"
-
-using base::android::ConvertUTF8ToJavaString;
+#include "third_party/WebKit/public/platform/WebString.h"
 
 namespace content {
 
 namespace {
 
 const char kJavaLangString[] = "java/lang/String";
 const char kUndefined[] = "undefined";
 
+// This is an intermediate solution until we fix http://crbug.com/391492.
+jstring ConvertUTF8ToJString(JNIEnv* env, const std::string& string) {
+  base::string16 utf16(
+      blink::WebString::fromUTF8(string.c_str(), string.size()));
+  return env->NewString(utf16.data(), utf16.length());
+}
+
 double RoundDoubleTowardsZero(const double& x) {
   if (std::isnan(x)) {
     return 0.0;
   }
   return x > 0.0 ? floor(x) : ceil(x);
 }
 
 // Rounds to jlong using Java's type conversion rules.
 jlong RoundDoubleToLong(const double& x) {
   double intermediate = RoundDoubleTowardsZero(x);
@@ skipping 58 matching lines @@
     case JavaType::TypeDouble:
       result.d = int_value;
       break;
     case JavaType::TypeObject:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to null. Spec
       // requires handling object equivalents of primitive types.
       result.l = NULL;
       break;
     case JavaType::TypeString:
       result.l = coerce_to_string
-                     ? ConvertUTF8ToJavaString(
-                           env, base::Int64ToString(int_value)).Release()
+                     ? ConvertUTF8ToJString(env, base::Int64ToString(int_value))
                      : NULL;
       break;
     case JavaType::TypeBoolean:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to false. Spec
       // requires converting to false for 0 or NaN, true otherwise.
       result.z = JNI_FALSE;
       break;
     case JavaType::TypeArray:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to null. Spec
       // requires raising a JavaScript exception.
@@ skipping 39 matching lines @@
       break;
     case JavaType::TypeDouble:
       result.d = double_value;
       break;
     case JavaType::TypeObject:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to null. Spec
       // requires handling object equivalents of primitive types.
       result.l = NULL;
       break;
     case JavaType::TypeString:
-      result.l =
-          coerce_to_string
-              ? ConvertUTF8ToJavaString(
-                    env, base::StringPrintf("%.6lg", double_value)).Release()
-              : NULL;
+      result.l = coerce_to_string
+                     ? ConvertUTF8ToJString(
+                           env, base::StringPrintf("%.6lg", double_value))
+                     : NULL;
       break;
     case JavaType::TypeBoolean:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to false. Spec
       // requires converting to false for 0 or NaN, true otherwise.
       result.z = JNI_FALSE;
       break;
     case JavaType::TypeArray:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to null. Spec
       // requires raising a JavaScript exception.
       result.l = NULL;
@@ skipping 17 matching lines @@
   switch (target_type.type) {
     case JavaType::TypeBoolean:
       result.z = boolean_value ? JNI_TRUE : JNI_FALSE;
       break;
     case JavaType::TypeObject:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to NULL. Spec
       // requires handling java.lang.Boolean and java.lang.Object.
       result.l = NULL;
       break;
     case JavaType::TypeString:
-      result.l = coerce_to_string
-                     ? ConvertUTF8ToJavaString(
-                           env, boolean_value ? "true" : "false").Release()
-                     : NULL;
+      result.l = coerce_to_string ? ConvertUTF8ToJString(
+                                        env, boolean_value ? "true" : "false")
+                                  : NULL;
       break;
     case JavaType::TypeByte:
     case JavaType::TypeChar:
     case JavaType::TypeShort:
     case JavaType::TypeInt:
     case JavaType::TypeLong:
     case JavaType::TypeFloat:
     case JavaType::TypeDouble: {
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to 0. Spec
       // requires converting to 0 or 1.
@@ skipping 16 matching lines @@
 
 jvalue CoerceJavaScriptStringToJavaValue(JNIEnv* env,
                                          const base::Value* value,
                                          const JavaType& target_type) {
   // See http://jdk6.java.net/plugin2/liveconnect/#JS_STRING_VALUES.
   jvalue result;
   switch (target_type.type) {
     case JavaType::TypeString: {
       std::string string_result;
       value->GetAsString(&string_result);
-      result.l = ConvertUTF8ToJavaString(env, string_result).Release();
+      result.l = ConvertUTF8ToJString(env, string_result);
       break;
     }
     case JavaType::TypeObject:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to NULL. Spec
       // requires handling java.lang.Object.
       result.l = NULL;
       break;
     case JavaType::TypeByte:
     case JavaType::TypeShort:
     case JavaType::TypeInt:
@@ skipping 133 matching lines @@
   }
   jvalue result;
   switch (target_type.type) {
     case JavaType::TypeObject:
       result.l = NULL;
       break;
     case JavaType::TypeString:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert undefined to
       // "undefined". Spec requires converting undefined to NULL.
       result.l = (coerce_to_string && is_undefined)
-                     ? ConvertUTF8ToJavaString(env, kUndefined).Release()
+                     ? ConvertUTF8ToJString(env, kUndefined)
                      : NULL;
       break;
     case JavaType::TypeByte:
     case JavaType::TypeChar:
     case JavaType::TypeShort:
     case JavaType::TypeInt:
     case JavaType::TypeLong:
     case JavaType::TypeFloat:
     case JavaType::TypeDouble: {
       jvalue null_value = {0};
@@ skipping 165 matching lines @@
         // requires converting if the target type is
         // netscape.javascript.JSObject, otherwise raising a JavaScript
         // exception.
         result.l = NULL;
       }
       break;
     }
     case JavaType::TypeString:
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to
       // "undefined". Spec requires calling toString() on the Java object.
-      result.l = coerce_to_string
-                     ? ConvertUTF8ToJavaString(env, kUndefined).Release()
-                     : NULL;
+      result.l =
+          coerce_to_string ? ConvertUTF8ToJString(env, kUndefined) : NULL;
       break;
     case JavaType::TypeByte:
     case JavaType::TypeShort:
     case JavaType::TypeInt:
     case JavaType::TypeLong:
     case JavaType::TypeFloat:
     case JavaType::TypeDouble:
     case JavaType::TypeChar: {
       // LIVECONNECT_COMPLIANCE: Existing behavior is to convert to 0. Spec
       // requires raising a JavaScript exception.
@@ skipping 97 matching lines @@
           env, value, target_type, coerce_to_string);
     case base::Value::TYPE_BINARY:
       return CoerceGinJavaBridgeValueToJavaValue(
           env, value, target_type, coerce_to_string, object_refs);
   }
   NOTREACHED();
   return jvalue();
 }
 
 }  // namespace content