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 20117b60db11abe01941b47bf1a56d813cc71f7e..153e5bc54d8e5bc2e4a2ee5d5d7ef638b781decb 100644 |
--- a/google_apis/gcm/engine/connection_factory_impl.cc |
+++ b/google_apis/gcm/engine/connection_factory_impl.cc |
@@ -319,7 +319,7 @@ void ConnectionFactoryImpl::StartConnection() { |
connecting_ = true; |
GURL current_endpoint = GetCurrentEndpoint(); |
recorder_->RecordConnectionInitiated(current_endpoint.host()); |
- RebuildNetworkSessionAuthCache(); |
+ UpdateFromHttpNetworkSession(); |
int status = gcm_network_session_->proxy_service()->ResolveProxy( |
current_endpoint, |
std::string(), |
@@ -590,12 +590,15 @@ void ConnectionFactoryImpl::CloseSocket() { |
socket_handle_.Reset(); |
} |
-void ConnectionFactoryImpl::RebuildNetworkSessionAuthCache() { |
+void ConnectionFactoryImpl::UpdateFromHttpNetworkSession() { |
if (!http_network_session_ || !http_network_session_->http_auth_cache()) |
return; |
gcm_network_session_->http_auth_cache()->UpdateAllFrom( |
*http_network_session_->http_auth_cache()); |
+ |
+ if (!http_network_session_->IsQuicEnabled()) |
+ gcm_network_session_->DisableQuic(); |
} |
} // namespace gcm |