diff options
| -rw-r--r-- | chrome/browser/io_thread_unittest.cc | 3 | ||||
| -rw-r--r-- | net/socket/next_proto.cc | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc index d8291cf..11f6a69 100644 --- a/chrome/browser/io_thread_unittest.cc +++ b/chrome/browser/io_thread_unittest.cc @@ -93,8 +93,7 @@ TEST_F(IOThreadTest, SpdyFieldTrialSpdy4Enabled) { ElementsAre(net::kProtoHTTP11, net::kProtoQUIC1SPDY3, net::kProtoSPDY31, - net::kProtoSPDY4_14, - net::kProtoSPDY4_15)); + net::kProtoSPDY4_14)); globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols); EXPECT_TRUE(use_alternate_protocols); } diff --git a/net/socket/next_proto.cc b/net/socket/next_proto.cc index 0d1b400..6d6f563 100644 --- a/net/socket/next_proto.cc +++ b/net/socket/next_proto.cc @@ -17,7 +17,6 @@ NextProtoVector NextProtosDefaults() { next_protos.push_back(kProtoHTTP11); next_protos.push_back(kProtoSPDY31); next_protos.push_back(kProtoSPDY4_14); - next_protos.push_back(kProtoSPDY4_15); return next_protos; } @@ -30,7 +29,6 @@ NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled, if (spdy_enabled) { next_protos.push_back(kProtoSPDY31); next_protos.push_back(kProtoSPDY4_14); - next_protos.push_back(kProtoSPDY4_15); } return next_protos; } @@ -49,7 +47,6 @@ NextProtoVector NextProtosSpdy4Http2() { next_protos.push_back(kProtoQUIC1SPDY3); next_protos.push_back(kProtoSPDY31); next_protos.push_back(kProtoSPDY4_14); - next_protos.push_back(kProtoSPDY4_15); return next_protos; } |