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

Unified Diff: net/http/http_stream_factory_impl_job.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 | « net/http/http_network_session.cc ('k') | net/http/http_stream_factory_impl_job_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 731d4d2949516408a6cff7faeb8ee0a2f2a808d7..2cd3bcbe0b6c7cf73b0129896405537a9a92cfcb 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -231,7 +231,7 @@ HttpStreamFactoryImpl::Job::Job(Delegate* delegate,
DCHECK(origin_url_.SchemeIs(url::kHttpsScheme));
}
if (IsQuicAlternative()) {
- DCHECK(session_->params().enable_quic);
+ DCHECK(session_->IsQuicEnabled());
using_quic_ = true;
}
}
@@ -737,7 +737,7 @@ int HttpStreamFactoryImpl::Job::DoResolveProxyComplete(int result) {
ProxyServer::SCHEME_HTTPS | ProxyServer::SCHEME_SOCKS4 |
ProxyServer::SCHEME_SOCKS5;
- if (session_->params().enable_quic)
+ if (session_->IsQuicEnabled())
supported_proxies |= ProxyServer::SCHEME_QUIC;
proxy_info_.RemoveProxiesWithoutScheme(supported_proxies);
@@ -768,7 +768,7 @@ int HttpStreamFactoryImpl::Job::DoResolveProxyComplete(int result) {
}
bool HttpStreamFactoryImpl::Job::ShouldForceQuic() const {
- return session_->params().enable_quic &&
+ return session_->IsQuicEnabled() &&
(base::ContainsKey(session_->params().origins_to_force_quic_on,
HostPortPair()) ||
base::ContainsKey(session_->params().origins_to_force_quic_on,
@@ -819,11 +819,11 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionImpl() {
if (ShouldForceQuic())
using_quic_ = true;
- DCHECK(!using_quic_ || session_->params().enable_quic);
+ DCHECK(!using_quic_ || session_->IsQuicEnabled());
if (proxy_info_.is_quic()) {
using_quic_ = true;
- DCHECK(session_->params().enable_quic);
+ DCHECK(session_->IsQuicEnabled());
}
if (proxy_info_.is_https() || proxy_info_.is_quic()) {
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/http/http_stream_factory_impl_job_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698