SPDY: Change Chrome code to support new NPN protocols.

net/socket/ssl_client_socket.h

 // Copyright (c) 2006-2009 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.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_
 
 #include <string>
 
 #include "net/socket/client_socket.h"
@@ skipping 21 matching lines @@
                                 // the first protocol in our list.
   };
 
   // Next Protocol Negotiation (NPN), if successful, results in agreement on an
   // application-level string that specifies the application level protocol to
   // use over the TLS connection. NextProto enumerates the application level
   // protocols that we recognise.
   enum NextProto {
     kProtoUnknown = 0,
     kProtoHTTP11 = 1,
-    kProtoSPDY = 2,
+    kProtoSPDY1 = 2,
   };
 
   // Gets the SSL connection information of the socket.
   virtual void GetSSLInfo(SSLInfo* ssl_info) = 0;
 
   // Gets the SSL CertificateRequest info of the socket after Connect failed
   // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) = 0;
 
   // Get the application level protocol that we negotiated with the server.
   // *proto is set to the resulting protocol (n.b. that the string may have
   // embedded NULs).
   //   kNextProtoUnsupported: *proto is cleared.
   //   kNextProtoNegotiated:  *proto is set to the negotiated protocol.
   //   kNextProtoNoOverlap:   *proto is set to the first protocol in the
   //                          supported list.
   virtual NextProtoStatus GetNextProto(std::string* proto) = 0;
 
   static NextProto NextProtoFromString(const std::string& proto_string) {
-    if (proto_string == "http1.1") {
+    if (proto_string == "http1.1" || proto_string == "http/1.1") {
       return kProtoHTTP11;
-    } else if (proto_string == "spdy") {
-      return kProtoSPDY;
+    } else if (proto_string == "spdy" || proto_string == "spdy/1") {
+      return kProtoSPDY1;
     } else {
       return kProtoUnknown;
     }
   }
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_H_