Index: google_apis/gcm/engine/connection_factory_impl.cc |
diff --git a/google_apis/gcm/engine/connection_factory_impl.cc b/google_apis/gcm/engine/connection_factory_impl.cc |
index 43bac40cd4d4a778b588be09f57e2be8849bf48a..0da994b8d0178f2967bc98119a49661b956827c6 100644 |
--- a/google_apis/gcm/engine/connection_factory_impl.cc |
+++ b/google_apis/gcm/engine/connection_factory_impl.cc |
@@ -300,20 +300,21 @@ void ConnectionFactoryImpl::ConnectImpl() { |
// TODO(zea): if the network is offline, don't attempt to connect. |
// See crbug.com/396687 |
connecting_ = true; |
GURL current_endpoint = GetCurrentEndpoint(); |
recorder_->RecordConnectionInitiated(current_endpoint.host()); |
RebuildNetworkSessionAuthCache(); |
int status = gcm_network_session_->proxy_service()->ResolveProxy( |
current_endpoint, |
+ std::string(), |
bengr
2016/02/26 23:43:33
#include <string>
|
net::LOAD_NORMAL, |
&proxy_info_, |
base::Bind(&ConnectionFactoryImpl::OnProxyResolveDone, |
weak_ptr_factory_.GetWeakPtr()), |
&pac_request_, |
NULL, |
bound_net_log_); |
if (status != net::ERR_IO_PENDING) |
OnProxyResolveDone(status); |
} |
@@ -523,21 +524,22 @@ int ConnectionFactoryImpl::ReconsiderProxyAfterError(int error) { |
} |
net::SSLConfig ssl_config; |
gcm_network_session_->ssl_config_service()->GetSSLConfig(&ssl_config); |
if (proxy_info_.is_https() && ssl_config.send_client_cert) { |
gcm_network_session_->ssl_client_auth_cache()->Remove( |
proxy_info_.proxy_server().host_port_pair()); |
} |
int status = gcm_network_session_->proxy_service()->ReconsiderProxyAfterError( |
- GetCurrentEndpoint(), net::LOAD_NORMAL, error, &proxy_info_, |
+ GetCurrentEndpoint(), |
+ std::string(), net::LOAD_NORMAL, error, &proxy_info_, |
base::Bind(&ConnectionFactoryImpl::OnProxyResolveDone, |
weak_ptr_factory_.GetWeakPtr()), |
&pac_request_, |
NULL, |
bound_net_log_); |
if (status == net::OK || status == net::ERR_IO_PENDING) { |
CloseSocket(); |
} else { |
// If ReconsiderProxyAfterError() failed synchronously, it means |
// there was nothing left to fall-back to, so fail the transaction |