Advertise HTTP/2 support.

net/spdy/spdy_network_transaction_unittest.cc

Index: net/spdy/spdy_network_transaction_unittest.cc
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index a79d76a8bfeda79de4db1cc1d6eda1dfa4ec46c8..a790772f506708e4c6eb16b7a53f6974182814dd 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -731,7 +731,10 @@ INSTANTIATE_TEST_CASE_P(
         SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYNPN),
         SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNOSSL),
         SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYSSL),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNPN)));
+        SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNPN),
+        SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYNOSSL),
+        SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYSSL),
+        SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYNPN)));
 
 // Verify HttpNetworkTransaction constructor.
 TEST_P(SpdyNetworkTransactionTest, Constructor) {
@@ -4622,6 +4625,7 @@ TEST_P(SpdyNetworkTransactionTest, HTTP11RequiredRetry) {
   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);
   helper.AddDataWithSSLSocketDataProvider(&data0, ssl_provider0.Pass());
@@ -4715,6 +4719,7 @@ TEST_P(SpdyNetworkTransactionTest, HTTP11RequiredProxyRetry) {
   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);
   helper.AddDataWithSSLSocketDataProvider(&data0, ssl_provider0.Pass());
@@ -6806,9 +6811,9 @@ class SpdyNetworkTransactionTLSUsageCheckTest
 INSTANTIATE_TEST_CASE_P(
     Spdy,
     SpdyNetworkTransactionTLSUsageCheckTest,
-    ::testing::Values(
-        SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYNPN),
-        SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNPN)));
+    ::testing::Values(SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYNPN),
+                      SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNPN),
+                      SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYNPN)));
 
 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSVersionTooOld) {
   scoped_ptr<SSLSocketDataProvider> ssl_provider(