Revert of [Cronet] Remove JSON serialization of CronetEngine.Builder

components/cronet/android/chromium_url_request_context.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_context.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 48 matching lines @@
 bool ChromiumUrlRequestContextRegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // Sets global user-agent to be used for all subsequent requests.
 static jlong CreateRequestContextAdapter(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller,
     const JavaParamRef<jstring>& juser_agent,
     jint jlog_level,
-    jlong jconfig) {
+    const JavaParamRef<jstring>& jconfig) {
   std::string user_agent = ConvertJavaStringToUTF8(env, juser_agent);
 
+  std::string config = ConvertJavaStringToUTF8(env, jconfig);
+
+  scoped_ptr<base::Value> config_value = base::JSONReader::Read(config);
+  if (!config_value || !config_value->IsType(base::Value::TYPE_DICTIONARY)) {
+    DLOG(ERROR) << "Bad JSON: " << config;
+    return 0;
+  }
+
   scoped_ptr<URLRequestContextConfig> context_config(
-      reinterpret_cast<URLRequestContextConfig*>(jconfig));
+      new URLRequestContextConfig());
+  base::JSONValueConverter<URLRequestContextConfig> converter;
+  if (!converter.Convert(*config_value, context_config.get())) {
+    DLOG(ERROR) << "Bad Config: " << config_value;
+    return 0;
+  }
 
   // TODO(mef): MinLogLevel is global, shared by all URLRequestContexts.
   // Revisit this if each URLRequestContext would need an individual log level.
   logging::SetMinLogLevel(static_cast<int>(jlog_level));
 
   // TODO(dplotnikov): set application context.
   URLRequestContextAdapter* context_adapter = new URLRequestContextAdapter(
       new JniURLRequestContextAdapterDelegate(env, jcaller), user_agent);
   context_adapter->AddRef();  // Hold onto this ref-counted object.
   context_adapter->Initialize(context_config.Pass());
@@ skipping 55 matching lines @@
 // Called on application's main Java thread.
 static void InitRequestContextOnMainThread(JNIEnv* env,
                                            const JavaParamRef<jobject>& jcaller,
                                            jlong jurl_request_context_adapter) {
   URLRequestContextAdapter* context_adapter =
       reinterpret_cast<URLRequestContextAdapter*>(jurl_request_context_adapter);
   context_adapter->InitRequestContextOnMainThread();
 }
 
 }  // namespace cronet