components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc - Issue 863203009: Store Proxy Servers as proxy servers and not GURLs.

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: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc

Issue 863203009: Store Proxy Servers as proxy servers and not GURLs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed failing test code. Created 5 years, 10 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

« no previous file with comments | « components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc

index 88aa3176d0f6ae6ec6f3c7122300840a353426b4..26fad478e18f7411bbebe146fa19f8d22395c8fa 100644

--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc

+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.cc

@@ -30,6 +30,7 @@

#include "net/base/net_util.h"

#include "net/http/http_network_session.h"

#include "net/http/http_response_headers.h"

+#include "net/proxy/proxy_server.h"

#include "net/url_request/url_fetcher.h"

#include "net/url_request/url_fetcher_delegate.h"

#include "net/url_request/url_request_context_getter.h"

@@ -437,14 +438,14 @@ void DataReductionProxySettings::SetProxyConfigs(bool enabled,

if (alternative_enabled) {

configurator_->Enable(restricted,

!params()->alternative_fallback_allowed(),

- params()->alt_origin().spec(),

+ params()->alt_origin().ToURI(),

std::string(),

- params()->ssl_origin().spec());

+ params()->ssl_origin().ToURI());

} else {

configurator_->Enable(restricted,

!params()->fallback_allowed(),

- params()->origin().spec(),

- params()->fallback_origin().spec(),

+ params()->origin().ToURI(),

+ params()->fallback_origin().ToURI(),

std::string());

}

} else {