summaryrefslogtreecommitdiffstats
path: root/components/cronet/url_request_context_config.cc
diff options
context:
space:
mode:
authorxunjieli <xunjieli@chromium.org>2015-04-29 10:36:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-29 17:36:59 +0000
commitb8a6d56ffe39823af7b09ce6b816d3cd9fbac2a6 (patch)
tree60e0bafa48d564006038b39606871f82632337b5 /components/cronet/url_request_context_config.cc
parente9ac6f320030c764af9dca7f662d2f828c1aa223 (diff)
downloadchromium_src-b8a6d56ffe39823af7b09ce6b816d3cd9fbac2a6.zip
chromium_src-b8a6d56ffe39823af7b09ce6b816d3cd9fbac2a6.tar.gz
chromium_src-b8a6d56ffe39823af7b09ce6b816d3cd9fbac2a6.tar.bz2
Enable sdch in Cronet
This CL combined rdsmith@'s CL(747453004) and mef@'s CL(1073193002), and added tests to make sure sdch works for both the old and the new API. BUG=414885 Review URL: https://codereview.chromium.org/1085903002 Cr-Commit-Position: refs/heads/master@{#327517}
Diffstat (limited to 'components/cronet/url_request_context_config.cc')
-rw-r--r--components/cronet/url_request_context_config.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
index 0aa2089..c8f2150 100644
--- a/components/cronet/url_request_context_config.cc
+++ b/components/cronet/url_request_context_config.cc
@@ -78,6 +78,7 @@ void URLRequestContextConfig::ConfigureURLRequestContextBuilder(
context_builder->SetSpdyAndQuicEnabled(enable_spdy, enable_quic);
context_builder->set_quic_connection_options(
net::QuicUtils::ParseQuicConnectionOptions(quic_connection_options));
+ context_builder->set_sdch_enabled(enable_sdch);
// TODO(mef): Use |config| to set cookies.
}
@@ -92,6 +93,8 @@ void URLRequestContextConfig::RegisterJSONConverter(
&URLRequestContextConfig::enable_quic);
converter->RegisterBoolField(REQUEST_CONTEXT_CONFIG_ENABLE_SPDY,
&URLRequestContextConfig::enable_spdy);
+ converter->RegisterBoolField(REQUEST_CONTEXT_CONFIG_ENABLE_SDCH,
+ &URLRequestContextConfig::enable_sdch);
converter->RegisterStringField(REQUEST_CONTEXT_CONFIG_HTTP_CACHE,
&URLRequestContextConfig::http_cache);
converter->RegisterBoolField(REQUEST_CONTEXT_CONFIG_LOAD_DISABLE_CACHE,