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

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.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.content.Context;
 import android.content.ContextWrapper;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.PathUtils;
-import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.TestUrlRequestCallback.ResponseStep;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
 import java.util.concurrent.Executor;
 
 /**
  * Test CronetEngine.
  */
-@JNINamespace("cronet")
 public class CronetUrlRequestContextTest extends CronetTestBase {
     // URLs used for tests.
     private static final String TEST_URL = "http://127.0.0.1:8000";
     private static final String URL_404 = "http://127.0.0.1:8000/notfound404";
     private static final String MOCK_CRONET_TEST_FAILED_URL =
             "http://mock.failed.request/-2";
     private static final String MOCK_CRONET_TEST_SUCCESS_URL =
             "http://mock.http/success.txt";
 
     CronetTestFramework mTestFramework;
@@ skipping 745 matching lines @@
 
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
         UrlRequest.Builder builder = new UrlRequest.Builder(
                 TEST_URL, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
         builder.build().start();
         callback.blockForDone();
         byte delta2[] = mTestFramework.mCronetEngine.getGlobalMetricsDeltas();
         assertTrue(delta2.length != 0);
         assertFalse(Arrays.equals(delta1, delta2));
     }
-
-    @SmallTest
-    @Feature({"Cronet"})
-    public void testCronetEngineBuilderConfig() throws Exception {
-        // This is to prompt load of native library.
-        startCronetTestFramework();
-        // Verify CronetEngine.Builder config is passed down accurately to native code.
-        CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
-        builder.enableHTTP2(false);
-        builder.enableQUIC(true);
-        builder.enableSDCH(true);
-        builder.addQuicHint("example.com", 12, 34);
-        builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_IN_MEMORY, 54321);
-        builder.enableDataReductionProxy("abcd");
-        builder.setUserAgent("efgh");
-        builder.setExperimentalOptions("ijkl");
-        builder.setDataReductionProxyOptions("mnop", "qrst", "uvwx");
-        builder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
-        nativeVerifyUrlRequestContextConfig(
-                CronetUrlRequestContext.createNativeUrlRequestContextConfig(builder),
-                CronetTestFramework.getTestStorage(getContext()));
-    }
-
-    // Verifies that CronetEngine.Builder config from testCronetEngineBuilderConfig() is properly
-    // translated to a native UrlRequestContextConfig.
-    private static native void nativeVerifyUrlRequestContextConfig(long config, String storagePath);
 }