diff options
| author | tbansal <tbansal@chromium.org> | 2016-02-03 18:56:15 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-04 02:57:26 +0000 |
| commit | 28e68f81ac373c44d7aa9f12dc8fe91178a6040e (patch) | |
| tree | 540b031da494e4120ad570f99c25b57527ca9aa7 /net/url_request | |
| parent | 32f0a4367fcc56560c61fce5936b2c33f35ebf7d (diff) | |
| download | chromium_src-28e68f81ac373c44d7aa9f12dc8fe91178a6040e.zip chromium_src-28e68f81ac373c44d7aa9f12dc8fe91178a6040e.tar.gz chromium_src-28e68f81ac373c44d7aa9f12dc8fe91178a6040e.tar.bz2 | |
Set trusted SPDY proxy dynamically on per-profile basis
Set trusted SPDY proxy on per-profile basis if the profile
has DRP enabled, and if Chrome is part of the field trial.
Prior to this CL, it was possible to set the trusted SPDY
proxy only from command line switch.
Setting it on per-profile ensures that it is set only if
DRP is enabled (which is per-profile).
Setting it dynamically ensures that if there is a change in
DataReductionProxy config (e.g., the API tells Chrome to
connect to a different DRP server), then the SPDY session
to the different server has the trusted SPDY proxy set
correctly to the new server. Prior to this CL, trusted
SPDY proxy was set once at the time of Chrome start, and it
was not possible to change it.
Link to design doc: https://code.google.com/p/chromium/issues/detail?id=558682#c11
BUG=558682
Review URL: https://codereview.chromium.org/1547273003
Cr-Commit-Position: refs/heads/master@{#373442}
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request_context_builder.cc | 3 | ||||
| -rw-r--r-- | net/url_request/url_request_context_builder.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index 44109d7..a9ee6a4 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc @@ -11,7 +11,6 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/macros.h" -#include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/thread_task_runner_handle.h" @@ -391,8 +390,6 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() { http_network_session_params_.enable_spdy31; network_session_params.enable_http2 = http_network_session_params_.enable_http2; - network_session_params.trusted_spdy_proxy = - http_network_session_params_.trusted_spdy_proxy; network_session_params.parse_alternative_services = http_network_session_params_.parse_alternative_services; network_session_params.enable_alternative_service_with_different_host = diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h index 83193d1..739c77a 100644 --- a/net/url_request/url_request_context_builder.h +++ b/net/url_request/url_request_context_builder.h @@ -86,7 +86,6 @@ class NET_EXPORT URLRequestContextBuilder { uint16_t testing_fixed_https_port; bool enable_spdy31; bool enable_http2; - std::string trusted_spdy_proxy; bool parse_alternative_services; bool enable_alternative_service_with_different_host; bool enable_quic; |