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..42efb612118a751bbc4d833b2ebe82029ec44ebf 100644 |
--- a/google_apis/gcm/engine/connection_factory_impl.cc |
+++ b/google_apis/gcm/engine/connection_factory_impl.cc |
@@ -305,21 +305,22 @@ void ConnectionFactoryImpl::ConnectImpl() { |
GURL current_endpoint = GetCurrentEndpoint(); |
recorder_->RecordConnectionInitiated(current_endpoint.host()); |
RebuildNetworkSessionAuthCache(); |
int status = gcm_network_session_->proxy_service()->ResolveProxy( |
current_endpoint, |
net::LOAD_NORMAL, |
&proxy_info_, |
base::Bind(&ConnectionFactoryImpl::OnProxyResolveDone, |
weak_ptr_factory_.GetWeakPtr()), |
&pac_request_, |
- NULL, |
+ nullptr, |
bengr
2016/02/16 20:00:13
NULL and std::string() here and at 538.
RyanSturm
2016/02/17 21:46:11
Done.
|
+ "", |
bound_net_log_); |
if (status != net::ERR_IO_PENDING) |
OnProxyResolveDone(status); |
} |
void ConnectionFactoryImpl::InitHandler() { |
// May be null in tests. |
mcs_proto::LoginRequest login_request; |
if (!request_builder_.is_null()) { |
request_builder_.Run(&login_request); |
@@ -527,21 +528,22 @@ int ConnectionFactoryImpl::ReconsiderProxyAfterError(int error) { |
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_, |
base::Bind(&ConnectionFactoryImpl::OnProxyResolveDone, |
weak_ptr_factory_.GetWeakPtr()), |
&pac_request_, |
- NULL, |
+ nullptr, |
+ "", |
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 |
// with the last connection error we got. |
status = error; |
} |