[Cronet] Replace setExperimentalQuicConnectionOptions with a more general API

components/cronet/android/api/src/org/chromium/net/CronetEngine.java

Index: components/cronet/android/api/src/org/chromium/net/CronetEngine.java
diff --git a/components/cronet/android/api/src/org/chromium/net/CronetEngine.java b/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
index 4307b35b1ab3cadd9e1a376a19a5b5614124d4c5..6de7b069368b14f6ed7a70f06b0e33cff5627c8f 100644
--- a/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
+++ b/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
@@ -301,15 +301,13 @@ public abstract class CronetEngine {
         }
 
         /**
-         * Sets experimental QUIC connection options, overwriting any pre-existing
-         * options. List of options is subject to change.
+         * Sets experimental options to be used in Cronet.
          *
-         * @param quicConnectionOptions comma-separated QUIC options (for example
-         * "PACE,IW10") to use if QUIC is enabled.
-         * @return the builder to facilitate chaining.
+         * @param experimentalOptions experimental options as a JSON formatted

[pauljensen, 2015/11/04 15:03:26]

experimental options as a JSON formatted string->JSON formatted experimental
options

[xunjieli, 2015/11/06 14:48:51]

Done.

+         *         string
          */
-        public Builder setExperimentalQuicConnectionOptions(String quicConnectionOptions) {
-            return putString(CronetEngineBuilderList.QUIC_OPTIONS, quicConnectionOptions);
+        public Builder setExperimentalOptions(String experimentalOptions) {

[pauljensen, 2015/11/04 15:03:26]

nit: experimentalOptions->options

[xunjieli, 2015/11/06 14:48:51]

Done.

+            return putString(CronetEngineBuilderList.EXPERIMENTAL_OPTIONS, experimentalOptions);
         }
 
         /**