[SPDY] Add flag to turn on SPDY/3.1 (with per-session flow control)

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/string_util.h"
 
 namespace net {
 
 SSLClientSocket::SSLClientSocket()
     : was_npn_negotiated_(false),
       was_spdy_negotiated_(false),
       protocol_negotiated_(kProtoUnknown),
       channel_id_sent_(false) {
 }
 
 // static
 NextProto SSLClientSocket::NextProtoFromString(
     const std::string& proto_string) {
   if (proto_string == "http1.1" || proto_string == "http/1.1") {
     return kProtoHTTP11;
   } else if (proto_string == "spdy/1") {
     return kProtoSPDY1;
   } else if (proto_string == "spdy/2") {
     return kProtoSPDY2;
   } else if (proto_string == "spdy/3") {
     return kProtoSPDY3;
+  } else if (proto_string == "spdy/3.1") {
+    return kProtoSPDY31;
   } else {
     return kProtoUnknown;
   }
 }
 
 // static
 const char* SSLClientSocket::NextProtoToString(NextProto next_proto) {
   switch (next_proto) {
     case kProtoHTTP11:
       return "http/1.1";
     case kProtoSPDY1:
       return "spdy/1";
     case kProtoSPDY2:
       return "spdy/2";
     case kProtoSPDY3:
       return "spdy/3";
+    case kProtoSPDY31:
+      return "spdy/3.1";
     default:
       break;
   }
   return "unknown";
 }
 
 // static
 const char* SSLClientSocket::NextProtoStatusToString(
     const SSLClientSocket::NextProtoStatus status) {
   switch (status) {
@@ skipping 67 matching lines @@
 
 bool SSLClientSocket::WasChannelIDSent() const {
   return channel_id_sent_;
 }
 
 void SSLClientSocket::set_channel_id_sent(bool channel_id_sent) {
   channel_id_sent_ = channel_id_sent;
 }
 
 }  // namespace net