diff options
| author | bnc <bnc@chromium.org> | 2015-03-10 14:27:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-10 21:28:45 +0000 |
| commit | 57685ae6d32cdc8c77734488726867a0f88a17e7 (patch) | |
| tree | d08ed6de34c424cde4d2a4c86e5bb0b4668e6903 /net/http/http_server_properties.cc | |
| parent | 6e67d3553ecb77b3f88cdba2e1f3099f5aa287da (diff) | |
| download | chromium_src-57685ae6d32cdc8c77734488726867a0f88a17e7.zip chromium_src-57685ae6d32cdc8c77734488726867a0f88a17e7.tar.gz chromium_src-57685ae6d32cdc8c77734488726867a0f88a17e7.tar.bz2 | |
Remove HTTP/2 draft-15 enum values and test cases.
Remove NextProto::kProtoSPDY4_15 and AlternateProtocol::NPN_SPDY_4_15 enum
values. Remove HTTP/2 draft-15 test cases. (Our draft-15 implementation is
currently identical to draft-14 anyway.) Leave
ConnectionInfo::CONNECTION_INFO_HTTP2_15 enum value as is might be persisted to
cache.
Note that "h2-15" has not been advertised by Chrome since
https://crrev.com/822153003, so these enum values were not normally used.
This CL is git cl formatted.
BUG=447587
Review URL: https://codereview.chromium.org/993033002
Cr-Commit-Position: refs/heads/master@{#319973}
Diffstat (limited to 'net/http/http_server_properties.cc')
| -rw-r--r-- | net/http/http_server_properties.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc index 514ef4f..60084ea 100644 --- a/net/http/http_server_properties.cc +++ b/net/http/http_server_properties.cc @@ -23,7 +23,6 @@ const char* const kAlternateProtocolStrings[] = { "npn-spdy/3", "npn-spdy/3.1", "npn-h2-14", // HTTP/2 draft-14. Called SPDY4 internally. - "npn-h2-15", // HTTP/2 draft-15. Called SPDY4 internally. "npn-h2", "quic"}; @@ -55,7 +54,6 @@ const char* AlternateProtocolToString(AlternateProtocol protocol) { case NPN_SPDY_3: case NPN_SPDY_3_1: case NPN_SPDY_4_14: - case NPN_SPDY_4_15: case NPN_SPDY_4: case QUIC: DCHECK(IsAlternateProtocolValid(protocol)); @@ -88,8 +86,6 @@ AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) { return NPN_SPDY_3_1; case kProtoSPDY4_14: return NPN_SPDY_4_14; - case kProtoSPDY4_15: - return NPN_SPDY_4_15; case kProtoSPDY4: return NPN_SPDY_4; case kProtoQUIC1SPDY3: |