Skip to content

Commit

Permalink
Add a missing config setup in CronetUrlRequestContextTest.
Browse files Browse the repository at this point in the history
This CL also removes TODOs that were determined not doable.

Bug: 1078039, b/156130164
Change-Id: I53c38dc49b9e1c744954e988f1d9e5cf7afba404
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2194176
Commit-Queue: Zhongyi Shi <zhongyi@chromium.org>
Auto-Submit: Renjie Tang <renjietang@chromium.org>
Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#767488}
  • Loading branch information
Renjie Tang authored and Commit Bot committed May 11, 2020
1 parent e5d8e43 commit d264af8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ namespace cronet {
// Verifies that all the configuration options set by
// CronetUrlRequestContextTest.testCronetEngineBuilderConfig
// made it from the CronetEngine.Builder to the URLRequestContextConfig.
// TODO(b/1078039): Make this function take an expected config instead of
// comparing against a hardcoded one.
static void JNI_CronetUrlRequestContextTest_VerifyUrlRequestContextConfig(
JNIEnv* env,
jlong jurl_request_context_config,
Expand All @@ -48,9 +46,8 @@ static void JNI_CronetUrlRequestContextTest_VerifyUrlRequestContextConfig(
}

// Verify that QUIC can be turned off in CronetEngine.Builder.
// TODO(http://crbug.com/1078039): Make VerifyUrlRequestContextConfig() take an
// expected config instead of hardcoded values so that this method can be
// removed.
// Note that the config expectation is hard coded here because it's very hard to
// create an expected config in the JAVA package.
static void
JNI_CronetUrlRequestContextTest_VerifyUrlRequestContextQuicOffConfig(
JNIEnv* env,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1265,6 +1265,7 @@ public void testCronetEngineQuicOffConfig() throws Exception {
// reflect the change.
builder.enableQuic(false);
builder.enableHttpCache(HTTP_CACHE_IN_MEMORY, 54321);
builder.setUserAgent("efgh");
builder.setExperimentalOptions("ijkl");
builder.setStoragePath(getTestStorage(getContext()));
builder.enablePublicKeyPinningBypassForLocalTrustAnchors(false);
Expand Down

0 comments on commit d264af8

Please sign in to comment.