CroNet: Allow null strings in config when creating a UrlRequestContextConfig

components/cronet/android/cronet_url_request_context_adapter.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/cronet_url_request_context_adapter.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <map>
 #include <utility>
@@ skipping 245 matching lines @@
   }
 
   bool OnCanAccessFile(const net::URLRequest& request,
                        const base::FilePath& path) const override {
     return false;
   }
 
   DISALLOW_COPY_AND_ASSIGN(BasicNetworkDelegate);
 };
 
+// Helper method that takes a Java string that can be null, in which case it
+// will get converted to an empty string.
+std::string ConvertNullableJavaStringToUTF8(JNIEnv* env,
+                                            const JavaParamRef<jstring>& jstr) {
+  std::string str;
+  if (!jstr.is_null())
+    base::android::ConvertJavaStringToUTF8(env, jstr, &str);
+  return str;
+}
+
 }  // namespace
 
 namespace cronet {
 
 // Explicitly register static JNI functions.
 bool CronetUrlRequestContextAdapterRegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 CronetURLRequestContextAdapter::CronetURLRequestContextAdapter(
@@ skipping 417 matching lines @@
     const JavaParamRef<jstring>& jdata_reduction_proxy_primary_proxy,
     const JavaParamRef<jstring>& jdata_reduction_proxy_fallback_proxy,
     const JavaParamRef<jstring>& jdata_reduction_proxy_secure_proxy_check_url,
     jboolean jdisable_cache,
     jint jhttp_cache_mode,
     jlong jhttp_cache_max_size,
     const JavaParamRef<jstring>& jexperimental_quic_connection_options,
     jlong jmock_cert_verifier) {
   return reinterpret_cast<jlong>(new URLRequestContextConfig(
       jquic_enabled,
-      base::android::ConvertJavaStringToUTF8(env, jquic_default_user_agent_id),
+      ConvertNullableJavaStringToUTF8(env, jquic_default_user_agent_id),
       jhttp2_enabled, jsdch_enabled,
       static_cast<URLRequestContextConfig::HttpCacheType>(jhttp_cache_mode),
       jhttp_cache_max_size, jdisable_cache,
-      base::android::ConvertJavaStringToUTF8(env, jstorage_path),
-      base::android::ConvertJavaStringToUTF8(env, juser_agent),
-      base::android::ConvertJavaStringToUTF8(
-          env, jexperimental_quic_connection_options),
-      base::android::ConvertJavaStringToUTF8(env, jdata_reduction_proxy_key),
-      base::android::ConvertJavaStringToUTF8(
-          env, jdata_reduction_proxy_primary_proxy),
-      base::android::ConvertJavaStringToUTF8(
-          env, jdata_reduction_proxy_fallback_proxy),
-      base::android::ConvertJavaStringToUTF8(
+      ConvertNullableJavaStringToUTF8(env, jstorage_path),
+      ConvertNullableJavaStringToUTF8(env, juser_agent),
+      ConvertNullableJavaStringToUTF8(env,
+                                      jexperimental_quic_connection_options),
+      ConvertNullableJavaStringToUTF8(env, jdata_reduction_proxy_key),
+      ConvertNullableJavaStringToUTF8(env, jdata_reduction_proxy_primary_proxy),
+      ConvertNullableJavaStringToUTF8(env,
+                                      jdata_reduction_proxy_fallback_proxy),
+      ConvertNullableJavaStringToUTF8(
           env, jdata_reduction_proxy_secure_proxy_check_url),
       make_scoped_ptr(
           reinterpret_cast<net::CertVerifier*>(jmock_cert_verifier))));
 }
 
 // Add a QUIC hint to a URLRequestContextConfig.
 static void AddQuicHint(JNIEnv* env,
                         const JavaParamRef<jclass>& jcaller,
                         jlong jurl_request_context_config,
                         const JavaParamRef<jstring>& jhost,
@@ skipping 73 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jclass>& jcaller) {
   base::StatisticsRecorder::Initialize();
   std::vector<uint8_t> data;
   if (!HistogramManager::GetInstance()->GetDeltas(&data))
     return ScopedJavaLocalRef<jbyteArray>();
   return base::android::ToJavaByteArray(env, &data[0], data.size());
 }
 
 }  // namespace cronet