QUIC/1+SPYD/3 => QUIC

net/socket/ssl_client_socket.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/socket/ssl_client_socket.h"
 
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 16 matching lines @@
 SSLClientSocket::SSLClientSocket()
     : signed_cert_timestamps_received_(false),
       stapled_ocsp_response_received_(false) {}
 
 // static
 NextProto SSLClientSocket::NextProtoFromString(base::StringPiece proto_string) {
   if (proto_string == "http1.1" || proto_string == "http/1.1") {
     return kProtoHTTP11;
   } else if (proto_string == "h2") {
     return kProtoHTTP2;
   } else if (proto_string == "quic/1+spdy/3") {

[Ryan Hamilton, 2016/10/19 23:07:52]

(And here and below).  Weird that we have these strings repeated in multiple
places instead of being kSomething somewhere).

[Bence, 2016/10/20 12:22:50]

Indeed.  From e-mail thread consensus it seems like this string will include
QUIC version, so I will create a helper function to generate such string in a
subsequent CL.

-    return kProtoQUIC1SPDY3;
+    return kProtoQUIC;
   } else {
     return kProtoUnknown;
   }
 }
 
 // static
 const char* SSLClientSocket::NextProtoToString(NextProto next_proto) {
   switch (next_proto) {
     case kProtoHTTP11:
       return "http/1.1";
     case kProtoHTTP2:
       return "h2";
-    case kProtoQUIC1SPDY3:
+    case kProtoQUIC:
       return "quic/1+spdy/3";
     case kProtoUnknown:
       break;
   }
   return "unknown";
 }
 
 // static
 void SSLClientSocket::SetSSLKeyLogFile(
     const base::FilePath& path,
@@ skipping 38 matching lines @@
     wire_protos.push_back(proto.size());
     for (const char ch : proto) {
       wire_protos.push_back(static_cast<uint8_t>(ch));
     }
   }
 
   return wire_protos;
 }
 
 }  // namespace net