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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 2318053004: Remove obsolete QUIC disabling code. (Closed)
Patch Set: Rebase Created 4 years, 3 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 481a740d2a6bd00e9f7767606f4a4020524eca9d..2b9d42c54f5f13cc7bad6becd1b98c800b5e9189 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -865,8 +865,7 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionImpl() {
replacements.ClearRef();
url = url.ReplaceComponents(replacements);
- // If QUIC is disabled on the destination port, return error.
- if (session_->quic_stream_factory()->IsQuicDisabled(destination.port()))
+ if (session_->quic_stream_factory()->IsQuicDisabled())
return ERR_QUIC_PROTOCOL_ERROR;
} else {
DCHECK(using_ssl_);
@@ -995,10 +994,10 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionComplete(int result) {
}
if (proxy_info_.is_quic() && using_quic_) {
- // Mark QUIC proxy as bad if QUIC got disabled on the destination port.
+ // Mark QUIC proxy as bad if QUIC got disabled.
// Underlying QUIC layer would have closed the connection.
HostPortPair destination = proxy_info_.proxy_server().host_port_pair();
- if (session_->quic_stream_factory()->IsQuicDisabled(destination.port())) {
+ if (session_->quic_stream_factory()->IsQuicDisabled()) {
using_quic_ = false;
return ReconsiderProxyAfterError(ERR_QUIC_PROTOCOL_ERROR);
}
« 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