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..9992ebcf87930af6e5567762cb7d21b0710f89e5 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,10 @@ 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() && |
+ proxy_server.ToString().compare(":65535")==0) || |
+ data_reduction_proxy_params_->ssl_origin().host_port_pair().Equals( |
+ proxy_server)) == expect_ssl) { |
AddAuthorizationHeader(request_headers); |
} |
} |