Chromium Code Reviews| 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 13df2eeb496af509918f538c99e95d45982ef90d..d31f4b487ac42b128ac90a3f6a14e3b8e38b905f 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 |
| @@ -42,6 +42,7 @@ public class QuicTest extends CronetTestBase { |
| JSONObject quicParams = new JSONObject() |
| .put("connection_options", "PACE,IW10,FOO,DEADBEEF") |
| + .put("host_whitelist", "test.example.com") |
| .put("store_server_configs_in_properties", true) |
| .put("delay_tcp_race", true) |
| .put("max_number_of_lossy_connections", 10) |
| @@ -115,7 +116,6 @@ public class QuicTest extends CronetTestBase { |
| // The total received bytes should be larger than the content length, to account for |
| // headers. |
| assertTrue(callback.mResponseInfo.getReceivedBytesCount() > expectedContent.length()); |
| - |
| // This test takes a long time, since the update will only be scheduled |
| // after kUpdatePrefsDelayMs in http_server_properties_manager.cc. |
| while (true) { |
| @@ -138,6 +138,16 @@ public class QuicTest extends CronetTestBase { |
| builder.setStoragePath(CronetTestFramework.getTestStorage(getContext())); |
| builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024); |
| builder.enableQUIC(true); |
| + JSONObject quicParams = new JSONObject() |
| + .put("connection_options", "PACE,IW10,FOO,DEADBEEF") |
| + .put("host_whitelist", "test.example.com") |
| + .put("store_server_configs_in_properties", true) |
|
mef
2016/01/13 22:18:15
nit: do we need all these options, or did you add
Ryan Hamilton
2016/01/13 22:34:58
Good point. I copied them from the previous setup,
|
| + .put("delay_tcp_race", true) |
| + .put("max_number_of_lossy_connections", 10) |
| + .put("packet_loss_threshold", 0.5) |
| + .put("idle_connection_timeout_seconds", 300); |
| + JSONObject experimentalOptions = new JSONObject().put("QUIC", quicParams); |
| + builder.setExperimentalOptions(experimentalOptions.toString()); |
| builder.setMockCertVerifierForTesting(MockCertVerifier.createMockCertVerifier(CERTS_USED)); |
| mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder); |
| registerHostResolver(mTestFramework); |