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

components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java

 // 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.
 
 package org.chromium.net;
 
 import android.os.Build;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
@@ skipping 55 matching lines @@
             new ObserverList<NetworkQualityRttListener>();
 
     @GuardedBy("mNetworkQualityLock")
     private final ObserverList<NetworkQualityThroughputListener> mThroughputListenerList =
             new ObserverList<NetworkQualityThroughputListener>();
 
     @UsedByReflection("CronetEngine.java")
     public CronetUrlRequestContext(CronetEngine.Builder builder) {
         CronetLibraryLoader.ensureInitialized(builder.getContext(), builder);
         nativeSetMinLogLevel(getLoggingLevel());
-        mUrlRequestContextAdapter =
-                nativeCreateRequestContextAdapter(createNativeUrlRequestContextConfig(builder));
+        mUrlRequestContextAdapter = nativeCreateRequestContextAdapter(builder.toJSONString());
         if (mUrlRequestContextAdapter == 0) {
             throw new NullPointerException("Context Adapter creation failed.");
         }
 
         // Init native Chromium URLRequestContext on main UI thread.
         Runnable task = new Runnable() {
             @Override
             public void run() {
                 synchronized (mLock) {
                     // mUrlRequestContextAdapter is guaranteed to exist until
                     // initialization on main and network threads completes and
                     // initNetworkThread is called back on network thread.
                     nativeInitRequestContextOnMainThread(mUrlRequestContextAdapter);
                 }
             }
         };
         // Run task immediately or post it to the UI thread.
         if (Looper.getMainLooper() == Looper.myLooper()) {
             task.run();
         } else {
             new Handler(Looper.getMainLooper()).post(task);
         }
     }
 
-    static long createNativeUrlRequestContextConfig(CronetEngine.Builder builder) {
-        final long urlRequestContextConfig = nativeCreateRequestContextConfig(
-                builder.getUserAgent(), builder.storagePath(), builder.quicEnabled(),
-                builder.http2Enabled(), builder.sdchEnabled(), builder.dataReductionProxyKey(),
-                builder.dataReductionProxyPrimaryProxy(), builder.dataReductionProxyFallbackProxy(),
-                builder.dataReductionProxySecureProxyCheckUrl(), builder.cacheDisabled(),
-                builder.httpCacheMode(), builder.httpCacheMaxSize(), builder.experimentalOptions(),
-                builder.mockCertVerifier());
-        for (Builder.QuicHint quicHint : builder.quicHints()) {
-            nativeAddQuicHint(urlRequestContextConfig, quicHint.mHost, quicHint.mPort,
-                    quicHint.mAlternatePort);
-        }
-        for (Builder.Pkp pkp : builder.publicKeyPins()) {
-            nativeAddPkp(urlRequestContextConfig, pkp.mHost, pkp.mHashes, pkp.mIncludeSubdomains,
-                    pkp.mExpirationDate.getTime());
-        }
-        return urlRequestContextConfig;
-    }
-
     @Override
     public UrlRequest createRequest(String url, UrlRequest.Callback callback, Executor executor) {
         synchronized (mLock) {
             checkHaveAdapter();
             return new CronetUrlRequest(this, mUrlRequestContextAdapter, url,
                     UrlRequest.Builder.REQUEST_PRIORITY_MEDIUM, callback, executor);
         }
     }
 
     @Override
@@ skipping 282 matching lines @@
     void postObservationTaskToNetworkQualityExecutor(Runnable task) {
         try {
             mNetworkQualityExecutor.execute(task);
         } catch (RejectedExecutionException failException) {
             Log.e(CronetUrlRequestContext.LOG_TAG, "Exception posting task to executor",
                     failException);
         }
     }
 
     // Native methods are implemented in cronet_url_request_context_adapter.cc.
-    private static native long nativeCreateRequestContextConfig(String userAgent,
-            String storagePath, boolean quicEnabled, boolean http2Enabled, boolean sdchEnabled,
-            String dataReductionProxyKey, String dataReductionProxyPrimaryProxy,
-            String dataReductionProxyFallbackProxy, String dataReductionProxySecureProxyCheckUrl,
-            boolean disableCache, int httpCacheMode, long httpCacheMaxSize,
-            String experimentalOptions, long mockCertVerifier);
-
-    private static native void nativeAddQuicHint(
-            long urlRequestContextConfig, String host, int port, int alternatePort);
-
-    private static native void nativeAddPkp(long urlRequestContextConfig, String host,
-            byte[][] hashes, boolean includeSubdomains, long expirationTime);
-
-    private static native long nativeCreateRequestContextAdapter(long urlRequestContextConfig);
+    private static native long nativeCreateRequestContextAdapter(String config);
 
     private static native int nativeSetMinLogLevel(int loggingLevel);
 
     private static native byte[] nativeGetHistogramDeltas();
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeDestroy(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeStartNetLogToFile(long nativePtr,
             String fileName, boolean logAll);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeStopNetLog(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeInitRequestContextOnMainThread(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeEnableNetworkQualityEstimator(
             long nativePtr, boolean useLocalHostRequests, boolean useSmallerResponses);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideRTTObservations(long nativePtr, boolean should);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideThroughputObservations(long nativePtr, boolean should);
 }