summaryrefslogtreecommitdiffstats
path: root/net/http/http_stream_factory.cc
diff options
context:
space:
mode:
authorbnc <bnc@chromium.org>2015-02-03 15:12:01 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-03 23:13:00 +0000
commit3c255331e787370ef99f38319ce2d812a89f5b82 (patch)
tree676f03fc59a464fc8419bdb2afc56a51f757ff58 /net/http/http_stream_factory.cc
parent8b497e74ddd1a3be65c311419a57307119473a53 (diff)
downloadchromium_src-3c255331e787370ef99f38319ce2d812a89f5b82.zip
chromium_src-3c255331e787370ef99f38319ce2d812a89f5b82.tar.gz
chromium_src-3c255331e787370ef99f38319ce2d812a89f5b82.tar.bz2
Remove HasAlternateProtocol().
If GetAlternateProtocol() is called but there is no alternate protocol, it now returns one with UNINITIALIZED_ALTERNATE_PROTOCOL. See https://crrev.com/665083009 for the context of this change and how draft future changes might rely on this CL. BUG=392575 Review URL: https://codereview.chromium.org/874603004 Cr-Commit-Position: refs/heads/master@{#314428}
Diffstat (limited to 'net/http/http_stream_factory.cc')
-rw-r--r--net/http/http_stream_factory.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index f84b80c..754372b 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -86,14 +86,6 @@ void HttpStreamFactory::ProcessAlternateProtocol(
if (mapping_rules)
mapping_rules->RewriteHost(&host_port);
- if (http_server_properties->HasAlternateProtocol(host_port)) {
- const AlternateProtocolInfo existing_alternate =
- http_server_properties->GetAlternateProtocol(host_port);
- // If we think the alternate protocol is broken, don't change it.
- if (existing_alternate.is_broken)
- return;
- }
-
http_server_properties->SetAlternateProtocol(
host_port, static_cast<uint16>(port), protocol, probability);
}