| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.net; | 5 package org.chromium.net; |
| 6 | 6 |
| 7 import android.support.test.filters.SmallTest; | 7 import android.support.test.filters.SmallTest; |
| 8 | 8 |
| 9 import org.json.JSONObject; | 9 import org.json.JSONObject; |
| 10 | 10 |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 } | 386 } |
| 387 | 387 |
| 388 private void createCronetEngineBuilder(boolean bypassPinningForLocalAnchors,
boolean knownRoot) | 388 private void createCronetEngineBuilder(boolean bypassPinningForLocalAnchors,
boolean knownRoot) |
| 389 throws Exception { | 389 throws Exception { |
| 390 // Set common CronetEngine parameters | 390 // Set common CronetEngine parameters |
| 391 mBuilder = new ExperimentalCronetEngine.Builder(getContext()); | 391 mBuilder = new ExperimentalCronetEngine.Builder(getContext()); |
| 392 mBuilder.enablePublicKeyPinningBypassForLocalTrustAnchors(bypassPinningF
orLocalAnchors); | 392 mBuilder.enablePublicKeyPinningBypassForLocalTrustAnchors(bypassPinningF
orLocalAnchors); |
| 393 mBuilder.enableQuic(true); | 393 mBuilder.enableQuic(true); |
| 394 mBuilder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getS
erverPort(), | 394 mBuilder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getS
erverPort(), |
| 395 QuicTestServer.getServerPort()); | 395 QuicTestServer.getServerPort()); |
| 396 JSONObject quicParams = new JSONObject().put("host_whitelist", "test.exa
mple.com"); | |
| 397 JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules
(); | 396 JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules
(); |
| 398 JSONObject experimentalOptions = new JSONObject() | 397 JSONObject experimentalOptions = new JSONObject() |
| 399 .put("QUIC", quicParams) | |
| 400 .put("HostResolverRules", hostR
esolverParams); | 398 .put("HostResolverRules", hostR
esolverParams); |
| 401 mBuilder.setExperimentalOptions(experimentalOptions.toString()); | 399 mBuilder.setExperimentalOptions(experimentalOptions.toString()); |
| 402 mBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext())
); | 400 mBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext())
); |
| 403 mBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1
000 * 1024); | 401 mBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1
000 * 1024); |
| 404 CronetTestUtil.setMockCertVerifierForTesting( | 402 CronetTestUtil.setMockCertVerifierForTesting( |
| 405 mBuilder, MockCertVerifier.createMockCertVerifier(CERTS_USED, kn
ownRoot)); | 403 mBuilder, MockCertVerifier.createMockCertVerifier(CERTS_USED, kn
ownRoot)); |
| 406 } | 404 } |
| 407 | 405 |
| 408 private void startCronetFramework() { | 406 private void startCronetFramework() { |
| 409 mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(n
ull, mBuilder); | 407 mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(n
ull, mBuilder); |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 if (!shouldThrowNpe) { | 480 if (!shouldThrowNpe) { |
| 483 fail("Null pointer exception was not expected: " + ex.toString()
); | 481 fail("Null pointer exception was not expected: " + ex.toString()
); |
| 484 } | 482 } |
| 485 return; | 483 return; |
| 486 } | 484 } |
| 487 if (shouldThrowNpe) { | 485 if (shouldThrowNpe) { |
| 488 fail("NullPointerException was expected"); | 486 fail("NullPointerException was expected"); |
| 489 } | 487 } |
| 490 } | 488 } |
| 491 } | 489 } |
| OLD | NEW |