jingle/glue/proxy_resolving_client_socket.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: jingle/glue/proxy_resolving_client_socket.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') | « components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc ('k') | net/base/default_trusted_spdy_proxy_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: jingle/glue/proxy_resolving_client_socket.cc

diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc

index ae25614437f8a9608fef2583a75c3d5057f526ee..821aab3426d34d6ee1fa62ee93ab2d9775717d84 100644

--- a/jingle/glue/proxy_resolving_client_socket.cc

+++ b/jingle/glue/proxy_resolving_client_socket.cc

@@ -13,6 +13,7 @@

#include "net/base/io_buffer.h"

#include "net/base/load_flags.h"

#include "net/base/net_errors.h"

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

#include "net/http/http_auth_controller.h"

#include "net/http/http_network_session.h"

#include "net/http/proxy_client_socket.h"

@@ -84,7 +85,8 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(

session_params.testing_fixed_https_port =

reference_params->testing_fixed_https_port;

session_params.next_protos = reference_params->next_protos;

- session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy;

+ session_params.trusted_spdy_proxy_provider =

+ reference_params->trusted_spdy_proxy_provider;

session_params.forced_spdy_exclusions =

reference_params->forced_spdy_exclusions;

session_params.use_alternative_services =