net/url_request/url_request_context_builder.cc - Issue 1547273003: Set trusted SPDY proxy dynamically on per-profile basis

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/url_request/url_request_context_builder.cc

Issue 1547273003: Set trusted SPDY proxy dynamically on per-profile basis (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

« components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc ('K') | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/url_request/url_request_context_builder.cc

diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc

index 8290c5d33620632459f4b8fbedbd4d1df099bcd6..027d332e21c6926654f83fe60bfb13592316240f 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"

@@ -20,6 +19,7 @@

#include "net/base/net_errors.h"

#include "net/base/network_delegate_impl.h"

#include "net/base/sdch_manager.h"

+#include "net/base/trusted_spdy_proxy_provider.h"

#include "net/cert/cert_verifier.h"

#include "net/cookies/cookie_monster.h"

#include "net/dns/host_resolver.h"

@@ -387,8 +387,8 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {

http_network_session_params_.testing_fixed_https_port;

network_session_params.use_alternative_services =

http_network_session_params_.use_alternative_services;

- network_session_params.trusted_spdy_proxy =

- http_network_session_params_.trusted_spdy_proxy;

+ network_session_params.trusted_spdy_proxy_provider =

+ http_network_session_params_.trusted_spdy_proxy_provider;

network_session_params.next_protos = http_network_session_params_.next_protos;

network_session_params.enable_quic = http_network_session_params_.enable_quic;

network_session_params.quic_store_server_configs_in_properties =