components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.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_auth_request_handler.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_auth_request_handler.h ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_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_auth_request_handler.cc

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

index b4bad4fcee32e16f121f3c2a25ef6b9062c5ef41..768db6682f1ba3a67c663ffc0f39d6b7f9d07122 100644

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

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

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

#include "net/base/host_port_pair.h"

#include "net/proxy/proxy_server.h"

#include "net/url_request/url_request.h"

-#include "url/gurl.h"

#if !defined(OS_ANDROID) && !defined(OS_IOS)

#include "google_apis/google_api_keys.h"

@@ -241,9 +240,9 @@ void DataReductionProxyAuthRequestHandler::MaybeAddRequestHeaderImpl(

return;

if (data_reduction_proxy_params_ &&

data_reduction_proxy_params_->IsDataReductionProxy(proxy_server, NULL) &&

- net::HostPortPair::FromURL(

- data_reduction_proxy_params_->ssl_origin()).Equals(

- proxy_server) == expect_ssl) {

+ ((data_reduction_proxy_params_->ssl_origin().is_valid() &&

+ data_reduction_proxy_params_->ssl_origin().host_port_pair().Equals(

+ proxy_server)) == expect_ssl)) {

AddAuthorizationHeader(request_headers);

}