Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: google_apis/gcm/engine/connection_factory_impl.cc

Issue 2546533003: Respect QuicAllowed policy for new streams (Closed)
Patch Set: Revert accidental format Created 3 years, 11 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 | « google_apis/gcm/engine/connection_factory_impl.h ('k') | net/http/http_network_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « google_apis/gcm/engine/connection_factory_impl.h ('k') | net/http/http_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698