[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 9316a7c0e25e02ce30f26e93e09645620fe4e0a6..c35849352b5272599967a5c6d459a59097d7a270 100644
--- a/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
+++ b/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
@@ -314,15 +314,23 @@ 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.
+         * Experimental options encoded as a string in a JSON format containing
+         * experiments and their corresponding configuration options. The format
+         * is a JSON object with the name of the experiment as the key, and
+         * experiment options as the value. The experiment options for an
+         * experiment is encoded as a JSON object with option name as the key
+         * and option value as the value:
+         *   {"experiment1": {"option1": "option_value1", "option2":
+         *   "option_value2", ...}, "experiment2: {"option3", "option_value3",
+         *   ...}, ...}

[mef, 2015/10/30 17:15:41]

Maybe add an example of how existing quicConnectionOptions should convert into
experimentalOptions?

Do I understand correctly that it would be something like:

"{\"QUIC\": {\"connection_options\": \"PACE,IW10\"}}" 

[xunjieli, 2015/10/30 17:44:48]

Done. Yes, that is right.

+         *
+         * @param experimentalOptions experimental options as a JSON formatted
+         *         string
          */
-        public Builder setExperimentalQuicConnectionOptions(String quicConnectionOptions) {
-            return putString(CronetEngineBuilderList.QUIC_OPTIONS, quicConnectionOptions);
+        public Builder setExperimentalOptions(String experimentalOptions) {
+            return putString(CronetEngineBuilderList.EXPERIMENTAL_OPTIONS, experimentalOptions);
         }
 
         /**