Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(516)

Unified Diff: net/socket/next_proto.cc

Issue 851503003: Update from https://crrev.com/311076 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/client_socket_pool_manager_impl.cc ('k') | net/socket/socket_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/next_proto.cc
diff --git a/net/socket/next_proto.cc b/net/socket/next_proto.cc
index 0d1b40095336b0bd68c0d14517aedf40021ca347..6d6f563801b74551177e5cd2618350ee45e21837 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;
}
« no previous file with comments | « net/socket/client_socket_pool_manager_impl.cc ('k') | net/socket/socket_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698