Remove AlternateProtocol::NPN_SPDY_3_1.

net/http/http_server_properties.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_server_properties.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "net/socket/ssl_client_socket.h"
@@ skipping 18 matching lines @@
   return protocol >= ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION &&
       protocol <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION;
 }
 
 const char* AlternateProtocolToString(AlternateProtocol protocol) {
   switch (protocol) {
     case QUIC:
       return "quic";
     case NPN_HTTP_2:
       return "h2";
-    case NPN_SPDY_3_1:
-      return "npn-spdy/3.1";
     case UNINITIALIZED_ALTERNATE_PROTOCOL:
       return "Uninitialized";
   }
   NOTREACHED();
   return "";
 }
 
 AlternateProtocol AlternateProtocolFromString(const std::string& str) {
   if (str == "quic")
     return QUIC;
   if (str == "h2")
     return NPN_HTTP_2;
-  // "npn-h2" is accepted here so that persisted settings with the old string
-  // can be loaded from disk.  TODO(bnc):  Remove around 2016 December.
+  // "npn-h2" and "npn-spdy/3.1" are accepted here so that persisted settings
+  // with the old string can be loaded from disk.  TODO(bnc):  Remove around
+  // 2016 December.
   if (str == "npn-h2")
     return NPN_HTTP_2;
   if (str == "npn-spdy/3.1")
-    return NPN_SPDY_3_1;
+    return NPN_HTTP_2;
 
   return UNINITIALIZED_ALTERNATE_PROTOCOL;
 }
 
 AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
   switch (next_proto) {
     case kProtoHTTP2:
       return NPN_HTTP_2;
     case kProtoQUIC1SPDY3:
       return QUIC;
@@ skipping 21 matching lines @@
       exploded.day_of_month, exploded.hour, exploded.minute, exploded.second);
 }
 
 // static
 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
   ssl_config->alpn_protos.clear();
   ssl_config->alpn_protos.push_back(kProtoHTTP11);
 }
 
 }  // namespace net