[Cronet] Replace setExperimentalQuicConnectionOptions with a more general API

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

 // Copyright 2015 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.support.annotation.IntDef;
 import android.util.Log;
 
@@ skipping 283 matching lines @@
                 hint.put(CronetEngineBuilderList.QUIC_HINT_PORT, port);
                 hint.put(CronetEngineBuilderList.QUIC_HINT_ALT_PORT, alternatePort);
                 quicHints.put(hint);
             } catch (JSONException e) {
                 // Intentionally do nothing.
             }
             return this;
         }
 
         /**
-         * 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);
         }
 
         /**
          * Sets a native MockCertVerifier for testing.
          */
         Builder setMockCertVerifierForTesting(long mockCertVerifier) {
             return putString(
                     CronetEngineBuilderList.MOCK_CERT_VERIFIER, String.valueOf(mockCertVerifier));
         }
 
@@ skipping 338 matching lines @@
                 cronetEngine = possibleEngine;
             }
         } catch (ClassNotFoundException e) {
             // Leave as null.
         } catch (Exception e) {
             throw new IllegalStateException("Cannot instantiate: " + CRONET_URL_REQUEST_CONTEXT, e);
         }
         return cronetEngine;
     }
 }