SPDY: Change Chrome code to support new NPN protocols.

net/socket/ssl_client_socket.h

Index: net/socket/ssl_client_socket.h
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index f592a1bfd2cd22de6b5e981db9dd0165512031be..77537eaea72c9f1b8c1bbc36a4aa9f4b0042346b 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -39,7 +39,7 @@ class SSLClientSocket : public ClientSocket {
   enum NextProto {
     kProtoUnknown = 0,
     kProtoHTTP11 = 1,
-    kProtoSPDY = 2,
+    kProtoSPDY1 = 2,
   };
 
   // Gets the SSL connection information of the socket.
@@ -60,10 +60,10 @@ class SSLClientSocket : public ClientSocket {
   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;
     }