[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 89c4c892e973e1d25c9bdbc22d79965fa33428db..5047ab6e23f289342e02621113f98ffaaf7afa9d 100644
--- a/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
+++ b/components/cronet/android/api/src/org/chromium/net/CronetEngine.java
@@ -303,15 +303,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.
+         * @param options JSON formatted experimental options.
          * @return the builder to facilitate chaining.
          */
-        public Builder setExperimentalQuicConnectionOptions(String quicConnectionOptions) {

[pauljensen, 2015/11/17 18:31:10]

Normally we don't get rid of old APIs, we @deprecate them for a milestone.  I
think it's okay in this case as there are so few callers.

[xunjieli, 2015/11/17 22:13:33]

Acknowledged.

-            return putString(CronetEngineBuilderList.QUIC_OPTIONS, quicConnectionOptions);
+        public Builder setExperimentalOptions(String options) {
+            return putString(CronetEngineBuilderList.EXPERIMENTAL_OPTIONS, options);
         }
 
         /**