s/SPDY4/HTTP2/g in enum NextProto value names.

BUG=419722

Review URL: https://codereview.chromium.org/1211873002

Cr-Commit-Position: refs/heads/master@{#336548}

24 files changed, 95 insertions, 95 deletions

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 15acb77..ae2e110 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -991,8 +991,8 @@ void IOThread::ConfigureSpdyGlobals(
   }
   if (spdy_trial_group.starts_with(kSpdyFieldTrialSpdy4GroupNamePrefix)) {
     globals->next_protos.push_back(net::kProtoSPDY31);
-    globals->next_protos.push_back(net::kProtoSPDY4_14);
-    globals->next_protos.push_back(net::kProtoSPDY4);
+    globals->next_protos.push_back(net::kProtoHTTP2_14);
+    globals->next_protos.push_back(net::kProtoHTTP2);
     globals->use_alternate_protocols.set(true);
     return;
   }
@@ -1005,12 +1005,12 @@ void IOThread::ConfigureSpdyGlobals(
     }
     if (base::LowerCaseEqualsASCII(
             GetVariationParam(spdy_trial_params, "enable_http2_14"), "true")) {
-      globals->next_protos.push_back(net::kProtoSPDY4_14);
+      globals->next_protos.push_back(net::kProtoHTTP2_14);
       spdy_enabled = true;
     }
     if (base::LowerCaseEqualsASCII(
             GetVariationParam(spdy_trial_params, "enable_http2"), "true")) {
-      globals->next_protos.push_back(net::kProtoSPDY4);
+      globals->next_protos.push_back(net::kProtoHTTP2);
       spdy_enabled = true;
     }
     // TODO(bnc): HttpStreamFactory::spdy_enabled_ is redundant with
@@ -1022,8 +1022,8 @@ void IOThread::ConfigureSpdyGlobals(
 
   // By default, enable HTTP/2.
   globals->next_protos.push_back(net::kProtoSPDY31);
-  globals->next_protos.push_back(net::kProtoSPDY4_14);
-  globals->next_protos.push_back(net::kProtoSPDY4);
+  globals->next_protos.push_back(net::kProtoHTTP2_14);
+  globals->next_protos.push_back(net::kProtoHTTP2);
   globals->use_alternate_protocols.set(true);
 }
 
diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc
index c7effe1..1f6e00a 100644
--- a/chrome/browser/io_thread_unittest.cc
+++ b/chrome/browser/io_thread_unittest.cc
@@ -113,7 +113,7 @@ TEST_F(IOThreadTest, SpdyFieldTrialSpdy4Enabled) {
   ConfigureSpdyGlobals();
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11, net::kProtoSPDY31,
-                          net::kProtoSPDY4_14, net::kProtoSPDY4));
+                          net::kProtoHTTP2_14, net::kProtoHTTP2));
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
   EXPECT_TRUE(use_alternate_protocols);
 }
@@ -123,7 +123,7 @@ TEST_F(IOThreadTest, SpdyFieldTrialDefault) {
   ConfigureSpdyGlobals();
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11, net::kProtoSPDY31,
-                          net::kProtoSPDY4_14, net::kProtoSPDY4));
+                          net::kProtoHTTP2_14, net::kProtoHTTP2));
   bool use_alternate_protocols = false;
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
   EXPECT_TRUE(use_alternate_protocols);
@@ -136,7 +136,7 @@ TEST_F(IOThreadTest, SpdyFieldTrialParametrized) {
   field_trial_group_ = "ParametrizedHTTP2Only";
   ConfigureSpdyGlobals();
   EXPECT_THAT(globals_.next_protos,
-              ElementsAre(net::kProtoHTTP11, net::kProtoSPDY4));
+              ElementsAre(net::kProtoHTTP11, net::kProtoHTTP2));
   bool use_alternate_protocols = false;
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
   EXPECT_TRUE(use_alternate_protocols);
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 39d58eb..b3947fc 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -426,8 +426,8 @@ class HttpNetworkTransactionTest
 INSTANTIATE_TEST_CASE_P(NextProto,
                         HttpNetworkTransactionTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 namespace {
 
@@ -11874,8 +11874,8 @@ class AltSvcCertificateVerificationTest : public HttpNetworkTransactionTest {
 INSTANTIATE_TEST_CASE_P(NextProto,
                         AltSvcCertificateVerificationTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 // The alternative service host must exhibit a certificate that is valid for the
 // origin host.  Test that this is enforced when pooling to an existing
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index 9e736f2..4fdebb2 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -323,16 +323,16 @@ class HttpProxyClientSocketPoolTest
 INSTANTIATE_TEST_CASE_P(
     HttpProxyClientSocketPoolTests,
     HttpProxyClientSocketPoolTest,
-    ::testing::Values(
-        HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY31),
-        HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY31),
-        HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY31),
-        HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4_14),
-        HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4_14),
-        HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4_14),
-        HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4),
-        HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4),
-        HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4)));
+    ::testing::Values(HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY31),
+                      HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY31),
+                      HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY31),
+                      HttpProxyClientSocketPoolTestParams(HTTP, kProtoHTTP2_14),
+                      HttpProxyClientSocketPoolTestParams(HTTPS,
+                                                          kProtoHTTP2_14),
+                      HttpProxyClientSocketPoolTestParams(SPDY, kProtoHTTP2_14),
+                      HttpProxyClientSocketPoolTestParams(HTTP, kProtoHTTP2),
+                      HttpProxyClientSocketPoolTestParams(HTTPS, kProtoHTTP2),
+                      HttpProxyClientSocketPoolTestParams(SPDY, kProtoHTTP2)));
 
 TEST_P(HttpProxyClientSocketPoolTest, NoTunnel) {
   Initialize(NULL, 0, NULL, 0, NULL, 0, NULL, 0);
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc
index d569d05..dbfb62e 100644
--- a/net/http/http_response_info.cc
+++ b/net/http/http_response_info.cc
@@ -377,9 +377,9 @@ HttpResponseInfo::ConnectionInfo HttpResponseInfo::ConnectionInfoFromNextProto(
     case kProtoSPDY3:
     case kProtoSPDY31:
       return CONNECTION_INFO_SPDY3;
-    case kProtoSPDY4_14:
+    case kProtoHTTP2_14:
       return CONNECTION_INFO_HTTP2_14;
-    case kProtoSPDY4:
+    case kProtoHTTP2:
       return CONNECTION_INFO_HTTP2;
     case kProtoQUIC1SPDY3:
       return CONNECTION_INFO_QUIC1_SPDY3;
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
index 82ce06e..d76f777 100644
--- a/net/http/http_server_properties.cc
+++ b/net/http/http_server_properties.cc
@@ -84,9 +84,9 @@ AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
       return NPN_SPDY_3;
     case kProtoSPDY31:
       return NPN_SPDY_3_1;
-    case kProtoSPDY4_14:
+    case kProtoHTTP2_14:
       return NPN_SPDY_4_14;
-    case kProtoSPDY4:
+    case kProtoHTTP2:
       return NPN_SPDY_4;
     case kProtoQUIC1SPDY3:
       return QUIC;
diff --git a/net/http/http_stream_factory_impl_request_unittest.cc b/net/http/http_stream_factory_impl_request_unittest.cc
index 65a9637..0e31c1e 100644
--- a/net/http/http_stream_factory_impl_request_unittest.cc
+++ b/net/http/http_stream_factory_impl_request_unittest.cc
@@ -20,8 +20,8 @@ class HttpStreamFactoryImplRequestTest
 INSTANTIATE_TEST_CASE_P(NextProto,
                         HttpStreamFactoryImplRequestTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 namespace {
 
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index c3afedd..ee4eaf7 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -422,8 +422,8 @@ class HttpStreamFactoryTest : public ::testing::Test,
 INSTANTIATE_TEST_CASE_P(NextProto,
                         HttpStreamFactoryTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 TEST_P(HttpStreamFactoryTest, PreconnectDirect) {
   for (size_t i = 0; i < arraysize(kTests); ++i) {
diff --git a/net/socket/next_proto.cc b/net/socket/next_proto.cc
index cfc6578..8ef27ec 100644
--- a/net/socket/next_proto.cc
+++ b/net/socket/next_proto.cc
@@ -10,8 +10,8 @@ NextProtoVector NextProtosDefaults() {
   NextProtoVector next_protos;
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoSPDY31);
-  next_protos.push_back(kProtoSPDY4_14);
-  next_protos.push_back(kProtoSPDY4);
+  next_protos.push_back(kProtoHTTP2_14);
+  next_protos.push_back(kProtoHTTP2);
   return next_protos;
 }
 
@@ -23,8 +23,8 @@ NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled,
     next_protos.push_back(kProtoQUIC1SPDY3);
   if (spdy_enabled) {
     next_protos.push_back(kProtoSPDY31);
-    next_protos.push_back(kProtoSPDY4_14);
-    next_protos.push_back(kProtoSPDY4);
+    next_protos.push_back(kProtoHTTP2_14);
+    next_protos.push_back(kProtoHTTP2);
   }
   return next_protos;
 }
diff --git a/net/socket/next_proto.h b/net/socket/next_proto.h
index 872b49a..a96b677 100644
--- a/net/socket/next_proto.h
+++ b/net/socket/next_proto.h
@@ -28,14 +28,14 @@ enum NextProto {
   kProtoSPDYHistogramOffset = kProtoDeprecatedSPDY2,
   kProtoSPDY3 = 101,
   kProtoSPDY31 = 102,
-  kProtoSPDY4_14 = 103,  // HTTP/2 draft-14, designated implementation draft.
-  kProtoSPDY4MinimumVersion = kProtoSPDY4_14,
-  // 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, see https://tools.ietf.org/html/rfc7540.
-  kProtoSPDY4MaximumVersion = kProtoSPDY4,
-  kProtoSPDYMaximumVersion = kProtoSPDY4MaximumVersion,
+  kProtoHTTP2_14 = 103,  // HTTP/2 draft-14, designated implementation draft.
+  kProtoHTTP2MinimumVersion = kProtoHTTP2_14,
+  // kProtoHTTP2_15 = 104,  // HTTP/2 draft-15
+  // kProtoHTTP2_16 = 105,  // HTTP/2 draft-16
+  // kProtoHTTP2_17 = 106,  // HTTP/2 draft-17
+  kProtoHTTP2 = 107,  // HTTP/2, see https://tools.ietf.org/html/rfc7540.
+  kProtoHTTP2MaximumVersion = kProtoHTTP2,
+  kProtoSPDYMaximumVersion = kProtoHTTP2MaximumVersion,
 
   kProtoQUIC1SPDY3 = 200,
 
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
index f0161b9..8dd7a9d 100644
--- a/net/socket/ssl_client_socket.cc
+++ b/net/socket/ssl_client_socket.cc
@@ -37,9 +37,9 @@ NextProto SSLClientSocket::NextProtoFromString(
   } else if (proto_string == "h2-14") {
     // For internal consistency, HTTP/2 is named SPDY4 within Chromium.
     // This is the HTTP/2 draft-14 identifier.
-    return kProtoSPDY4_14;
+    return kProtoHTTP2_14;
   } else if (proto_string == "h2") {
-    return kProtoSPDY4;
+    return kProtoHTTP2;
   } else if (proto_string == "quic/1+spdy/3") {
     return kProtoQUIC1SPDY3;
   } else {
@@ -58,11 +58,11 @@ const char* SSLClientSocket::NextProtoToString(NextProto next_proto) {
       return "spdy/3";
     case kProtoSPDY31:
       return "spdy/3.1";
-    case kProtoSPDY4_14:
+    case kProtoHTTP2_14:
       // For internal consistency, HTTP/2 is named SPDY4 within Chromium.
       // This is the HTTP/2 draft-14 identifier.
       return "h2-14";
-    case kProtoSPDY4:
+    case kProtoHTTP2:
       return "h2";
     case kProtoQUIC1SPDY3:
       return "quic/1+spdy/3";
@@ -201,8 +201,8 @@ std::vector<uint8_t> SSLClientSocket::SerializeNextProtos(
     bool can_advertise_http2) {
   std::vector<uint8_t> wire_protos;
   for (const NextProto next_proto : next_protos) {
-    if (!can_advertise_http2 && kProtoSPDY4MinimumVersion <= next_proto &&
-        next_proto <= kProtoSPDY4MaximumVersion) {
+    if (!can_advertise_http2 && kProtoHTTP2MinimumVersion <= next_proto &&
+        next_proto <= kProtoHTTP2MaximumVersion) {
       continue;
     }
     const std::string proto = NextProtoToString(next_proto);
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 05a5127..28a6f09 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -205,8 +205,8 @@ class SSLClientSocketPoolTest
 INSTANTIATE_TEST_CASE_P(NextProto,
                         SSLClientSocketPoolTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 TEST_P(SSLClientSocketPoolTest, TCPFail) {
   StaticSocketDataProvider data;
diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc
index d61291c..d9d35ec 100644
--- a/net/spdy/buffered_spdy_framer.cc
+++ b/net/spdy/buffered_spdy_framer.cc
@@ -15,8 +15,8 @@ SpdyMajorVersion NextProtoToSpdyMajorVersion(NextProto next_proto) {
     case kProtoSPDY3:
     case kProtoSPDY31:
       return SPDY3;
-    case kProtoSPDY4_14:
-    case kProtoSPDY4:
+    case kProtoHTTP2_14:
+    case kProtoHTTP2:
       return HTTP2;
     case kProtoUnknown:
     case kProtoHTTP11:
diff --git a/net/spdy/buffered_spdy_framer_unittest.cc b/net/spdy/buffered_spdy_framer_unittest.cc
index 2f2a683..5fba0aa 100644
--- a/net/spdy/buffered_spdy_framer_unittest.cc
+++ b/net/spdy/buffered_spdy_framer_unittest.cc
@@ -214,8 +214,8 @@ class BufferedSpdyFramerTest
 INSTANTIATE_TEST_CASE_P(NextProto,
                         BufferedSpdyFramerTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 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 b71353b..691f389 100644
--- a/net/spdy/spdy_http_stream_unittest.cc
+++ b/net/spdy/spdy_http_stream_unittest.cc
@@ -110,8 +110,8 @@ class SpdyHttpStreamTest : public testing::Test,
 INSTANTIATE_TEST_CASE_P(NextProto,
                         SpdyHttpStreamTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 // 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 ba18cd1..166ab83 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -715,10 +715,10 @@ INSTANTIATE_TEST_CASE_P(
     ::testing::Values(
         SpdyNetworkTransactionTestParams(kProtoSPDY31, HTTPS_SPDY_VIA_NPN),
         SpdyNetworkTransactionTestParams(kProtoSPDY31, HTTP_SPDY_VIA_ALT_SVC),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4_14, HTTPS_SPDY_VIA_NPN),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4_14, HTTP_SPDY_VIA_ALT_SVC),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4, HTTPS_SPDY_VIA_NPN),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4, HTTP_SPDY_VIA_ALT_SVC)));
+        SpdyNetworkTransactionTestParams(kProtoHTTP2_14, HTTPS_SPDY_VIA_NPN),
+        SpdyNetworkTransactionTestParams(kProtoHTTP2_14, HTTP_SPDY_VIA_ALT_SVC),
+        SpdyNetworkTransactionTestParams(kProtoHTTP2, HTTPS_SPDY_VIA_NPN),
+        SpdyNetworkTransactionTestParams(kProtoHTTP2, HTTP_SPDY_VIA_ALT_SVC)));
 
 // Verify HttpNetworkTransaction constructor.
 TEST_P(SpdyNetworkTransactionTest, Constructor) {
@@ -3407,7 +3407,7 @@ TEST_P(SpdyNetworkTransactionTest, CorruptFrameSessionErrorSpdy4) {
 }
 
 TEST_P(SpdyNetworkTransactionTest, GoAwayOnDecompressionFailure) {
-  if (GetParam().protocol < kProtoSPDY4MinimumVersion) {
+  if (GetParam().protocol < kProtoHTTP2MinimumVersion) {
     // Decompression failures are a stream error in SPDY3 and above.
     return;
   }
@@ -4421,8 +4421,8 @@ TEST_P(SpdyNetworkTransactionTest, HTTP11RequiredRetry) {
   // Expect HTTP/2 protocols too in SSLConfig.
   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);
+  ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoHTTP2_14);
+  ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoHTTP2);
   // Force SPDY.
   ssl_provider0->SetNextProto(GetParam().protocol);
   helper.AddDataWithSSLSocketDataProvider(&data0, ssl_provider0.Pass());
@@ -4512,8 +4512,8 @@ TEST_P(SpdyNetworkTransactionTest, HTTP11RequiredProxyRetry) {
   // Expect HTTP/2 protocols too in SSLConfig.
   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);
+  ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoHTTP2_14);
+  ssl_provider0->next_protos_expected_in_ssl_config.push_back(kProtoHTTP2);
   // Force SPDY.
   ssl_provider0->SetNextProto(GetParam().protocol);
   helper.AddDataWithSSLSocketDataProvider(&data0, ssl_provider0.Pass());
@@ -5920,8 +5920,8 @@ TEST_P(SpdyNetworkTransactionTest, WindowUpdateSent) {
       spdy_util_.ConstructSpdyWindowUpdate(1, stream_window_update_delta));
 
   std::vector<MockWrite> writes;
-  if ((GetParam().protocol >= kProtoSPDY4MinimumVersion) &&
-      (GetParam().protocol <= kProtoSPDY4MaximumVersion)) {
+  if ((GetParam().protocol >= kProtoHTTP2MinimumVersion) &&
+      (GetParam().protocol <= kProtoHTTP2MaximumVersion)) {
     writes.push_back(MockWrite(ASYNC, kHttp2ConnectionHeaderPrefix,
                                kHttp2ConnectionHeaderPrefixSize, 0));
   }
@@ -6574,8 +6574,8 @@ INSTANTIATE_TEST_CASE_P(
     Spdy,
     SpdyNetworkTransactionTLSUsageCheckTest,
     ::testing::Values(
-        SpdyNetworkTransactionTestParams(kProtoSPDY4_14, HTTPS_SPDY_VIA_NPN),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4, HTTPS_SPDY_VIA_NPN)));
+        SpdyNetworkTransactionTestParams(kProtoHTTP2_14, HTTPS_SPDY_VIA_NPN),
+        SpdyNetworkTransactionTestParams(kProtoHTTP2, HTTPS_SPDY_VIA_NPN)));
 
 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSVersionTooOld) {
   scoped_ptr<SSLSocketDataProvider> ssl_provider(
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index c42ff3f..e3f370f 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -143,8 +143,8 @@ class SpdyProxyClientSocketTest
 INSTANTIATE_TEST_CASE_P(NextProto,
                         SpdyProxyClientSocketTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 SpdyProxyClientSocketTest::SpdyProxyClientSocketTest()
     : spdy_util_(GetParam()),
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index d6daf6b..1eaa715b 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -737,8 +737,8 @@ void SpdySession::InitializeWithSocket(
   DCHECK_GE(protocol_, kProtoSPDYMinimumVersion);
   DCHECK_LE(protocol_, kProtoSPDYMaximumVersion);
 
-  if ((protocol_ >= kProtoSPDY4MinimumVersion) &&
-      (protocol_ <= kProtoSPDY4MaximumVersion))
+  if ((protocol_ >= kProtoHTTP2MinimumVersion) &&
+      (protocol_ <= kProtoHTTP2MaximumVersion))
     send_connection_header_prefix_ = true;
 
   if (protocol_ >= kProtoSPDY31) {
@@ -2470,8 +2470,8 @@ void SpdySession::OnPing(SpdyPingId unique_id, bool is_ack) {
       base::Bind(&NetLogSpdyPingCallback, unique_id, is_ack, "received"));
 
   // Send response to a PING from server.
-  if ((protocol_ >= kProtoSPDY4MinimumVersion && !is_ack) ||
-      (protocol_ < kProtoSPDY4MinimumVersion && unique_id % 2 == 0)) {
+  if ((protocol_ >= kProtoHTTP2MinimumVersion && !is_ack) ||
+      (protocol_ < kProtoHTTP2MinimumVersion && unique_id % 2 == 0)) {
     WritePingFrame(unique_id, true);
     return;
   }
@@ -2748,8 +2748,8 @@ void SpdySession::SendInitialData() {
   DCHECK(enable_sending_initial_data_);
 
   if (send_connection_header_prefix_) {
-    DCHECK_GE(protocol_, kProtoSPDY4MinimumVersion);
-    DCHECK_LE(protocol_, kProtoSPDY4MaximumVersion);
+    DCHECK_GE(protocol_, kProtoHTTP2MinimumVersion);
+    DCHECK_LE(protocol_, kProtoHTTP2MaximumVersion);
     scoped_ptr<SpdyFrame> connection_header_prefix_frame(
         new SpdyFrame(const_cast<char*>(kHttp2ConnectionHeaderPrefix),
                       kHttp2ConnectionHeaderPrefixSize,
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index bb86664..5a9172e 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -502,7 +502,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   // Default value of SETTINGS_INITIAL_WINDOW_SIZE per protocol specification.
   // A session is always created with this initial window size.
   static int32 GetDefaultInitialWindowSize(NextProto protocol) {
-    return protocol < kProtoSPDY4MinimumVersion ? 65536 : 65535;
+    return protocol < kProtoHTTP2MinimumVersion ? 65536 : 65535;
   }
 
   // https://http2.github.io/http2-spec/#TLSUsage mandates minimum security
diff --git a/net/spdy/spdy_session_pool_unittest.cc b/net/spdy/spdy_session_pool_unittest.cc
index 4a0841b..3f12e61 100644
--- a/net/spdy/spdy_session_pool_unittest.cc
+++ b/net/spdy/spdy_session_pool_unittest.cc
@@ -51,8 +51,8 @@ class SpdySessionPoolTest : public ::testing::Test,
 INSTANTIATE_TEST_CASE_P(NextProto,
                         SpdySessionPoolTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 // 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 81e5581..32e8536 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -177,8 +177,8 @@ class SpdySessionTest : public PlatformTest,
 INSTANTIATE_TEST_CASE_P(NextProto,
                         SpdySessionTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 // Try to create a SPDY session that will fail during
 // initialization. Nothing should blow up.
@@ -1314,7 +1314,7 @@ TEST_P(SpdySessionTest, OnSettings) {
   int seq = 0;
   std::vector<MockWrite> writes;
   scoped_ptr<SpdyFrame> settings_ack(spdy_util_.ConstructSpdySettingsAck());
-  if (GetParam() >= kProtoSPDY4MinimumVersion) {
+  if (GetParam() >= kProtoHTTP2MinimumVersion) {
     writes.push_back(CreateMockWrite(*settings_ack, ++seq));
   }
 
@@ -1523,8 +1523,8 @@ TEST_P(SpdySessionTest, SendInitialDataOnNewSession) {
   scoped_ptr<SpdyFrame> settings_frame(
       spdy_util_.ConstructSpdySettings(settings));
   std::vector<MockWrite> writes;
-  if ((GetParam() >= kProtoSPDY4MinimumVersion) &&
-     (GetParam() <= kProtoSPDY4MaximumVersion)) {
+  if ((GetParam() >= kProtoHTTP2MinimumVersion) &&
+      (GetParam() <= kProtoHTTP2MaximumVersion)) {
     writes.push_back(
         MockWrite(ASYNC,
                   kHttp2ConnectionHeaderPrefix,
@@ -3526,7 +3526,7 @@ TEST_P(SpdySessionTest, SessionFlowControlInactiveStream) {
 // (including optional pad length and padding) is.
 TEST_P(SpdySessionTest, SessionFlowControlPadding) {
   // Padding only exists in HTTP/2.
-  if (GetParam() < kProtoSPDY4MinimumVersion)
+  if (GetParam() < kProtoHTTP2MinimumVersion)
     return;
 
   session_deps_.host_resolver->set_synchronous_mode(true);
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index f538e0f..b87634f 100644
--- a/net/spdy/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -111,8 +111,8 @@ class SpdyStreamTest : public ::testing::Test,
 INSTANTIATE_TEST_CASE_P(NextProto,
                         SpdyStreamTest,
                         testing::Values(kProtoSPDY31,
-                                        kProtoSPDY4_14,
-                                        kProtoSPDY4));
+                                        kProtoHTTP2_14,
+                                        kProtoHTTP2));
 
 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 7451a37..846f965 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -55,8 +55,8 @@ NextProtoVector SpdyNextProtos() {
   NextProtoVector next_protos;
   next_protos.push_back(kProtoHTTP11);
   next_protos.push_back(kProtoSPDY31);
-  next_protos.push_back(kProtoSPDY4_14);
-  next_protos.push_back(kProtoSPDY4);
+  next_protos.push_back(kProtoHTTP2_14);
+  next_protos.push_back(kProtoHTTP2);
   next_protos.push_back(kProtoQUIC1SPDY3);
   return next_protos;
 }
@@ -1109,7 +1109,7 @@ SpdyFrame* SpdyTestUtil::ConstructSpdySyn(int stream_id,
                                           RequestPriority priority,
                                           bool compressed,
                                           bool fin) const {
-  if (protocol_ < kProtoSPDY4MinimumVersion) {
+  if (protocol_ < kProtoHTTP2MinimumVersion) {
     SpdySynStreamIR syn_stream(stream_id);
     syn_stream.set_name_value_block(block);
     syn_stream.set_priority(
@@ -1129,7 +1129,7 @@ SpdyFrame* SpdyTestUtil::ConstructSpdySyn(int stream_id,
 
 SpdyFrame* SpdyTestUtil::ConstructSpdyReply(int stream_id,
                                             const SpdyHeaderBlock& headers) {
-  if (protocol_ < kProtoSPDY4MinimumVersion) {
+  if (protocol_ < kProtoHTTP2MinimumVersion) {
     SpdySynReplyIR syn_reply(stream_id);
     syn_reply.set_name_value_block(headers);
     return CreateFramer(false)->SerializeFrame(syn_reply);
@@ -1278,7 +1278,7 @@ const char* SpdyTestUtil::GetStatusKey() const {
 }
 
 const char* SpdyTestUtil::GetHostKey() const {
-  if (protocol_ < kProtoSPDY4MinimumVersion)
+  if (protocol_ < kProtoHTTP2MinimumVersion)
     return ":host";
   else
     return ":authority";
diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h
index 74bf694..ac37774 100644
--- a/net/spdy/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.h
@@ -559,7 +559,7 @@ class SpdyTestUtil {
   NextProto protocol() const { return protocol_; }
   SpdyMajorVersion spdy_version() const { return spdy_version_; }
   bool include_version_header() const {
-    return protocol_ < kProtoSPDY4MinimumVersion;
+    return protocol_ < kProtoHTTP2MinimumVersion;
   }
   scoped_ptr<SpdyFramer> CreateFramer(bool compressed) const;