components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java - Issue 1817553002: Add host resolver rules experimental flag for Cronet

Unified Diff: components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java

Issue 1817553002: Add host resolver rules experimental flag for Cronet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: delete unused definitions, rebase, and fix test Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java

diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java

index 5dbbae9e107a52206d2fdd5c7dbf47f59c709e37..35b432df0b8ec68963f795f36157bda6af255070 100644

--- a/components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java

+++ b/components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java

@@ -72,7 +72,6 @@ public class PkpTest extends CronetTestBase {

byte[] nonMatchingHash = generateSomeSha256();

addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertErrorResponse();

@@ -95,7 +94,6 @@ public class PkpTest extends CronetTestBase {

addPkpSha256(mServerHost, matchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertSuccessfulResponse();

@@ -116,7 +114,6 @@ public class PkpTest extends CronetTestBase {

byte[] nonMatchingHash = generateSomeSha256();

addPkpSha256(mDomain, nonMatchingHash, INCLUDE_SUBDOMAINS, DISTANT_FUTURE);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertErrorResponse();

@@ -137,7 +134,6 @@ public class PkpTest extends CronetTestBase {

byte[] nonMatchingHash = generateSomeSha256();

addPkpSha256(mDomain, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertSuccessfulResponse();

@@ -158,7 +154,6 @@ public class PkpTest extends CronetTestBase {

byte[] nonMatchingHash = generateSomeSha256();

addPkpSha256("otherhost.com", nonMatchingHash, INCLUDE_SUBDOMAINS, DISTANT_FUTURE);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertSuccessfulResponse();

@@ -179,7 +174,6 @@ public class PkpTest extends CronetTestBase {

byte[] nonMatchingHash = generateSomeSha256();

addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, tenSecondsAhead);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertErrorResponse();

@@ -200,7 +194,6 @@ public class PkpTest extends CronetTestBase {

byte[] nonMatchingHash = generateSomeSha256();

addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, oneSecondAgo);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertSuccessfulResponse();

@@ -219,7 +212,6 @@ public class PkpTest extends CronetTestBase {

byte[] nonMatchingHash = generateSomeSha256();

addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertErrorResponse();

@@ -238,7 +230,6 @@ public class PkpTest extends CronetTestBase {

byte[] nonMatchingHash = generateSomeSha256();

addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertSuccessfulResponse();

@@ -257,7 +248,6 @@ public class PkpTest extends CronetTestBase {

byte[] nonMatchingHash = generateSomeSha256();

addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertErrorResponse();

shutdownCronetEngine();

@@ -266,7 +256,6 @@ public class PkpTest extends CronetTestBase {

// a successful response is expected.

createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);

startCronetFramework();

- registerHostResolver(mTestFramework);

sendRequestAndWaitForResult();

assertSuccessfulResponse();

}

@@ -404,7 +393,10 @@ public class PkpTest extends CronetTestBase {

mBuilder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getServerPort(),

QuicTestServer.getServerPort());

JSONObject quicParams = new JSONObject().put("host_whitelist", "test.example.com");

- JSONObject experimentalOptions = new JSONObject().put("QUIC", quicParams);

+ JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules();

+ JSONObject experimentalOptions = new JSONObject()

+ .put("QUIC", quicParams)

+ .put("HostResolverRules", hostResolverParams);

mBuilder.setExperimentalOptions(experimentalOptions.toString());

mBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));

mBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1000 * 1024);