[Cronet] Replace setExperimentalQuicConnectionOptions with a more general API

components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java

Index: components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
index 458554b58eef411adc544f4c3badece8ed9fe38d..7fdb38301af283a3f9f4b0223cab6adbaab71244 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
@@ -10,6 +10,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
+import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,7 +37,12 @@ public class QuicTest extends CronetTestBase {
         builder.enableQUIC(true);
         builder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getServerPort(),
                 QuicTestServer.getServerPort());
-        builder.setExperimentalQuicConnectionOptions("PACE,IW10,FOO,DEADBEEF");
+
+        JSONObject quicParams =
+                new JSONObject().put("connection_options", "PACE,IW10,FOO,DEADBEEF");
+        JSONObject experimentalOptions = new JSONObject().put("QUIC", quicParams);
+        builder.setExperimentalOptions(experimentalOptions.toString());
+
         builder.setMockCertVerifierForTesting(MockCertVerifier.createMockCertVerifier(CERTS_USED));
 
         String[] commandLineArgs = {CronetTestFramework.CONFIG_KEY, builder.toString(),