| Index: net/socket/next_proto.cc
|
| diff --git a/net/socket/next_proto.cc b/net/socket/next_proto.cc
|
| index c9172365c383fec7e0a1089b3284fb1c0d7aa7cd..4ae4511eddd72b96983067c6a84b3463d0de85d4 100644
|
| --- a/net/socket/next_proto.cc
|
| +++ b/net/socket/next_proto.cc
|
| @@ -15,7 +15,6 @@ NextProtoVector NextProtosHttpOnly() {
|
| NextProtoVector NextProtosDefaults() {
|
| NextProtoVector next_protos;
|
| next_protos.push_back(kProtoHTTP11);
|
| - next_protos.push_back(kProtoSPDY3);
|
| next_protos.push_back(kProtoSPDY31);
|
| return next_protos;
|
| }
|
| @@ -27,7 +26,6 @@ NextProtoVector NextProtosWithSpdyAndQuic(bool spdy_enabled,
|
| if (quic_enabled)
|
| next_protos.push_back(kProtoQUIC1SPDY3);
|
| if (spdy_enabled) {
|
| - next_protos.push_back(kProtoSPDY3);
|
| next_protos.push_back(kProtoSPDY31);
|
| }
|
| return next_protos;
|
| @@ -37,7 +35,6 @@ NextProtoVector NextProtosSpdy3() {
|
| NextProtoVector next_protos;
|
| next_protos.push_back(kProtoHTTP11);
|
| next_protos.push_back(kProtoQUIC1SPDY3);
|
| - next_protos.push_back(kProtoSPDY3);
|
| return next_protos;
|
| }
|
|
|
| @@ -45,7 +42,6 @@ NextProtoVector NextProtosSpdy31() {
|
| NextProtoVector next_protos;
|
| next_protos.push_back(kProtoHTTP11);
|
| next_protos.push_back(kProtoQUIC1SPDY3);
|
| - next_protos.push_back(kProtoSPDY3);
|
| next_protos.push_back(kProtoSPDY31);
|
| return next_protos;
|
| }
|
| @@ -55,7 +51,6 @@ NextProtoVector NextProtosSpdy31WithSpdy2() {
|
| next_protos.push_back(kProtoHTTP11);
|
| next_protos.push_back(kProtoQUIC1SPDY3);
|
| next_protos.push_back(kProtoDeprecatedSPDY2);
|
| - next_protos.push_back(kProtoSPDY3);
|
| next_protos.push_back(kProtoSPDY31);
|
| return next_protos;
|
| }
|
| @@ -64,7 +59,6 @@ NextProtoVector NextProtosSpdy4Http2() {
|
| NextProtoVector next_protos;
|
| next_protos.push_back(kProtoHTTP11);
|
| next_protos.push_back(kProtoQUIC1SPDY3);
|
| - next_protos.push_back(kProtoSPDY3);
|
| next_protos.push_back(kProtoSPDY31);
|
| next_protos.push_back(kProtoSPDY4);
|
| return next_protos;
|
|
|