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}

19 files changed, 55 insertions, 67 deletions

diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 5ab9886..e27fbcc 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -420,10 +420,11 @@ class HttpNetworkTransactionTest
   int old_max_pool_sockets_;
 };
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    HttpNetworkTransactionTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        HttpNetworkTransactionTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 namespace {
 
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index 2cd1ff0..fd6de0c 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -346,9 +346,6 @@ INSTANTIATE_TEST_CASE_P(
         HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4_14),
         HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4_14),
         HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4_14),
-        HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4_15),
-        HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4_15),
-        HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4_15),
         HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4),
         HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4),
         HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4)));
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc
index 7626b07..eb4b3c5 100644
--- a/net/http/http_response_info.cc
+++ b/net/http/http_response_info.cc
@@ -380,8 +380,6 @@ HttpResponseInfo::ConnectionInfo HttpResponseInfo::ConnectionInfoFromNextProto(
       return CONNECTION_INFO_SPDY3;
     case kProtoSPDY4_14:
       return CONNECTION_INFO_HTTP2_14;
-    case kProtoSPDY4_15:
-      return CONNECTION_INFO_HTTP2_15;
     case kProtoSPDY4:
       return CONNECTION_INFO_HTTP2;
     case kProtoQUIC1SPDY3:
@@ -413,8 +411,10 @@ std::string HttpResponseInfo::ConnectionInfoToString(
       // This is the HTTP/2 draft-14 identifier.
       return "h2-14";
     case CONNECTION_INFO_HTTP2_15:
-      // This is the HTTP/2 draft-15 identifier.
-      return "h2-15";
+      // Since ConnectionInfo is persisted to disk, this value has to be
+      // handled, but h2-15 is removed.  Note that h2-14 and h2-15 are wire
+      // compatible for all practical purposes.
+      return "h2-14";
     case CONNECTION_INFO_HTTP2:
       return "h2";
     case CONNECTION_INFO_QUIC1_SPDY3:
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:
diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h
index e8796cb..9fdd623 100644
--- a/net/http/http_server_properties.h
+++ b/net/http/http_server_properties.h
@@ -62,7 +62,6 @@ enum AlternateProtocol {
   NPN_SPDY_3,
   NPN_SPDY_3_1,
   NPN_SPDY_4_14,  // HTTP/2 draft-14
-  NPN_SPDY_4_15,  // HTTP/2 draft-15
   NPN_SPDY_4,     // HTTP/2
   NPN_SPDY_MAXIMUM_VERSION = NPN_SPDY_4,
   QUIC,
diff --git a/net/http/http_stream_factory_impl_request_unittest.cc b/net/http/http_stream_factory_impl_request_unittest.cc
index 7ff9391..b7afbfe 100644
--- a/net/http/http_stream_factory_impl_request_unittest.cc
+++ b/net/http/http_stream_factory_impl_request_unittest.cc
@@ -16,10 +16,11 @@ class HttpStreamFactoryImplRequestTest
     : public ::testing::Test,
       public ::testing::WithParamInterface<NextProto> {};
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    HttpStreamFactoryImplRequestTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        HttpStreamFactoryImplRequestTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 namespace {
 
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index 4f31e71..8f71595 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -422,10 +422,11 @@ class HttpStreamFactoryTest : public ::testing::Test,
                               public ::testing::WithParamInterface<NextProto> {
 };
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    HttpStreamFactoryTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        HttpStreamFactoryTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 TEST_P(HttpStreamFactoryTest, PreconnectDirect) {
   for (size_t i = 0; i < arraysize(kTests); ++i) {
diff --git a/net/socket/next_proto.h b/net/socket/next_proto.h
index 0cc76cb..22cfbd1 100644
--- a/net/socket/next_proto.h
+++ b/net/socket/next_proto.h
@@ -30,7 +30,7 @@ enum NextProto {
   kProtoSPDY31 = 102,
   kProtoSPDY4_14 = 103,  // HTTP/2 draft-14, designated implementation draft.
   kProtoSPDY4MinimumVersion = kProtoSPDY4_14,
-  kProtoSPDY4_15 = 104,  // HTTP/2 draft-15
+  // kProtoSPDY4_15 = 104,  // HTTP/2 draft-15
   // kProtoSPDY4_16 = 105,  // HTTP/2 draft-16
   // kProtoSPDY4_17 = 106,  // HTTP/2 draft-17
   kProtoSPDY4 = 107,  // HTTP/2.  TODO(bnc):  Add RFC number when published.
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
index 5268ad2..5f2b8ac 100644
--- a/net/socket/ssl_client_socket.cc
+++ b/net/socket/ssl_client_socket.cc
@@ -43,9 +43,6 @@ NextProto SSLClientSocket::NextProtoFromString(
     // For internal consistency, HTTP/2 is named SPDY4 within Chromium.
     // This is the HTTP/2 draft-14 identifier.
     return kProtoSPDY4_14;
-  } else if (proto_string == "h2-15") {
-    // This is the HTTP/2 draft-15 identifier.
-    return kProtoSPDY4_15;
   } else if (proto_string == "h2") {
     return kProtoSPDY4;
   } else if (proto_string == "quic/1+spdy/3") {
@@ -70,9 +67,6 @@ const char* SSLClientSocket::NextProtoToString(NextProto next_proto) {
       // For internal consistency, HTTP/2 is named SPDY4 within Chromium.
       // This is the HTTP/2 draft-14 identifier.
       return "h2-14";
-    case kProtoSPDY4_15:
-      // This is the HTTP/2 draft-15 identifier.
-      return "h2-15";
     case kProtoSPDY4:
       return "h2";
     case kProtoQUIC1SPDY3:
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 2f56e86..3d5d9d3 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -227,10 +227,11 @@ class SSLClientSocketPoolTest
   bool enable_ssl_connect_job_waiting_;
 };
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    SSLClientSocketPoolTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        SSLClientSocketPoolTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 // Tests that the final socket will connect even if all sockets
 // prior to it fail.
diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc
index 242f2af..33492b4 100644
--- a/net/spdy/buffered_spdy_framer.cc
+++ b/net/spdy/buffered_spdy_framer.cc
@@ -16,7 +16,6 @@ SpdyMajorVersion NextProtoToSpdyMajorVersion(NextProto next_proto) {
     case kProtoSPDY31:
       return SPDY3;
     case kProtoSPDY4_14:
-    case kProtoSPDY4_15:
     case kProtoSPDY4:
       return SPDY4;
     case kProtoUnknown:
diff --git a/net/spdy/buffered_spdy_framer_unittest.cc b/net/spdy/buffered_spdy_framer_unittest.cc
index 1185264..2f87551 100644
--- a/net/spdy/buffered_spdy_framer_unittest.cc
+++ b/net/spdy/buffered_spdy_framer_unittest.cc
@@ -205,10 +205,11 @@ class BufferedSpdyFramerTest
   }
 };
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    BufferedSpdyFramerTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        BufferedSpdyFramerTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 TEST_P(BufferedSpdyFramerTest, OnSetting) {
   SpdyFramer framer(spdy_version());
diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc
index c74f413..11f4e69 100644
--- a/net/spdy/spdy_http_stream_unittest.cc
+++ b/net/spdy/spdy_http_stream_unittest.cc
@@ -127,10 +127,11 @@ class SpdyHttpStreamTest : public testing::Test,
   MockECSignatureCreatorFactory ec_signature_creator_factory_;
 };
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    SpdyHttpStreamTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        SpdyHttpStreamTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 // SpdyHttpStream::GetUploadProgress() should still work even before the
 // stream is initialized.
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index b4c2085..48c7fcf 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -729,9 +729,6 @@ INSTANTIATE_TEST_CASE_P(
         SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYNOSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYNPN),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNOSSL),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYSSL),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNPN),
         SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYNOSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYNPN)));
@@ -4622,7 +4619,6 @@ TEST_P(SpdyNetworkTransactionTest, HTTP11RequiredRetry) {
   ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoHTTP11);
   ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoSPDY31);
   ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoSPDY4_14);
-  ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoSPDY4_15);
   ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoSPDY4);
   // Force SPDY.
   ssl_provider0->SetNextProto(GetParam().protocol);
@@ -4716,7 +4712,6 @@ TEST_P(SpdyNetworkTransactionTest, HTTP11RequiredProxyRetry) {
   ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoHTTP11);
   ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoSPDY31);
   ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoSPDY4_14);
-  ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoSPDY4_15);
   ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoSPDY4);
   // Force SPDY.
   ssl_provider0->SetNextProto(GetParam().protocol);
@@ -6810,7 +6805,6 @@ INSTANTIATE_TEST_CASE_P(
     Spdy,
     SpdyNetworkTransactionTLSUsageCheckTest,
     ::testing::Values(SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYNPN),
-                      SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNPN),
                       SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYNPN)));
 
 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSVersionTooOld) {
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 9d1f3a0..b81017b 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -139,10 +139,11 @@ class SpdyProxyClientSocketTest
   DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocketTest);
 };
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    SpdyProxyClientSocketTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        SpdyProxyClientSocketTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 SpdyProxyClientSocketTest::SpdyProxyClientSocketTest()
     : spdy_util_(GetParam()),
diff --git a/net/spdy/spdy_session_pool_unittest.cc b/net/spdy/spdy_session_pool_unittest.cc
index be11deb..356926f 100644
--- a/net/spdy/spdy_session_pool_unittest.cc
+++ b/net/spdy/spdy_session_pool_unittest.cc
@@ -48,10 +48,11 @@ class SpdySessionPoolTest : public ::testing::Test,
   SpdySessionPool* spdy_session_pool_;
 };
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    SpdySessionPoolTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        SpdySessionPoolTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 // A delegate that opens a new session when it is closed.
 class SessionOpeningDelegate : public SpdyStream::Delegate {
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index 5f97328..5b4862a 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -178,10 +178,11 @@ class SpdySessionTest : public PlatformTest,
   SpdySessionKey key_;
 };
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    SpdySessionTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        SpdySessionTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 // Try to create a SPDY session that will fail during
 // initialization. Nothing should blow up.
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index cf49419..71a4142 100644
--- a/net/spdy/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -107,10 +107,11 @@ class SpdyStreamTest : public ::testing::Test,
   int offset_;
 };
 
-INSTANTIATE_TEST_CASE_P(
-    NextProto,
-    SpdyStreamTest,
-    testing::Values(kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+                        SpdyStreamTest,
+                        testing::Values(kProtoSPDY31,
+                                        kProtoSPDY4_14,
+                                        kProtoSPDY4));
 
 TEST_P(SpdyStreamTest, SendDataAfterOpen) {
   GURL url(kStreamUrl);
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index 9c43f37..48c50d4 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -56,7 +56,6 @@ NextProtoVector SpdyNextProtos() {
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoSPDY31);
   next_protos.push_back(kProtoSPDY4_14);
-  next_protos.push_back(kProtoSPDY4_15);
   next_protos.push_back(kProtoSPDY4);
   next_protos.push_back(kProtoQUIC1SPDY3);
   return next_protos;