Fix crash in Cronet CreateUrlRequestAdapter.

components/cronet/android/chromium_url_request.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 "components/cronet/android/chromium_url_request.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
 #include "components/cronet/android/url_request_adapter.h"
@@ skipping 27 matching lines @@
 
 void SetPostContentType(JNIEnv* env,
                         URLRequestAdapter* request,
                         jstring content_type) {
   DCHECK(request != NULL);
 
   std::string method_post("POST");
   request->SetMethod(method_post);
 
   std::string content_type_header("Content-Type");
-
-  const char* content_type_utf8 = env->GetStringUTFChars(content_type, NULL);
-  std::string content_type_string(content_type_utf8);
-  env->ReleaseStringUTFChars(content_type, content_type_utf8);
+  std::string content_type_string(
+      base::android::ConvertJavaStringToUTF8(env, content_type));
 
   request->AddHeader(content_type_header, content_type_string);
 }
 
 // A delegate of URLRequestAdapter that delivers callbacks to the Java layer.
 class JniURLRequestAdapterDelegate
     : public URLRequestAdapter::URLRequestAdapterDelegate {
  public:
   JniURLRequestAdapterDelegate(JNIEnv* env, jobject owner) {
     owner_ = env->NewGlobalRef(owner);
@@ skipping 45 matching lines @@
 }  // namespace
 
 // Explicitly register static JNI functions.
 bool ChromiumUrlRequestRegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 static jlong CreateRequestAdapter(JNIEnv* env,
                                   jobject object,
                                   jlong urlRequestContextAdapter,
-                                  jstring url_string,
+                                  jstring url_jstring,
                                   jint priority) {
   URLRequestContextAdapter* context =
       reinterpret_cast<URLRequestContextAdapter*>(urlRequestContextAdapter);
   DCHECK(context != NULL);
 
-  const char* url_utf8 = env->GetStringUTFChars(url_string, NULL);
+  std::string url_string(
+      base::android::ConvertJavaStringToUTF8(env, url_jstring));

[mmenke, 2014/09/03 18:43:06]

optional:  Think it's cleaner to just do:
GURL url(base::android::....); and get rid of the string intermediary, and just
use url.spec() in the VLOG.

That does mean if GURL's constructor crashes, we won't log anything, or if it
corrupts the input, we'll log the wrong thing, but I'm skeptical about whether
that actually gets us a whole lot.  Feel free to disagree, it's quite possible I
undervalue VLOG statements, as I never use them for debugging.

[mef, 2014/09/03 18:56:04]

Done. I haven't really used VLOGs either so far.

 
-  VLOG(1) << "New chromium network request. URL:" << url_utf8;
+  VLOG(1) << "New chromium network request. URL:" << url_string;
 
-  GURL url(url_utf8);
-
-  env->ReleaseStringUTFChars(url_string, url_utf8);
+  GURL url(url_string);
 
   URLRequestAdapter* adapter =
       new URLRequestAdapter(context,
                             new JniURLRequestAdapterDelegate(env, object),
                             url,
                             ConvertRequestPriority(priority));
 
   return reinterpret_cast<jlong>(adapter);
 }
 
@@ skipping 247 matching lines @@
 
   // Some implementations (notably HttpURLConnection) include a mapping for the
   // null key; in HTTP's case, this maps to the HTTP status line.
   ScopedJavaLocalRef<jstring> status_line =
       ConvertUTF8ToJavaString(env, headers->GetStatusLine());
   Java_ChromiumUrlRequest_onAppendResponseHeader(
       env, object, headersMap, NULL, status_line.Release());
 }
 
 }  // namespace cronet