Update from https://crrev.com/308331

net/socket/next_proto.cc

Index: net/socket/next_proto.cc
diff --git a/net/socket/next_proto.cc b/net/socket/next_proto.cc
index 0e59ce7fdc132fffc30487161b654f8ca1fc7edf..0d1b40095336b0bd68c0d14517aedf40021ca347 100644
--- a/net/socket/next_proto.cc
+++ b/net/socket/next_proto.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "next_proto.h"
+#include "net/socket/next_proto.h"
 
 namespace net {
 
@@ -16,6 +16,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_15);
   return next_protos;
 }
 
@@ -27,6 +29,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_15);
   }
   return next_protos;
 }