Bump the SPDY protocol version to version 2.

Remove "http1.1" and "spdy" from the NPN advertisement string (the
proper values are "http/1.1" and "spdy/2", which were included redundantly).


BUG=50550
TEST=existing

Review URL: http://codereview.chromium.org/3044034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54258 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 6 deletions

diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index ec41c43..7e5e080 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -45,6 +45,7 @@ class SSLClientSocket : public ClientSocket {
     kProtoUnknown = 0,
     kProtoHTTP11 = 1,
     kProtoSPDY1 = 2,
+    kProtoSPDY2 = 3,
   };
 
   // Gets the SSL connection information of the socket.
@@ -67,8 +68,10 @@ class SSLClientSocket : public ClientSocket {
   static NextProto NextProtoFromString(const std::string& proto_string) {
     if (proto_string == "http1.1" || proto_string == "http/1.1") {
       return kProtoHTTP11;
-    } else if (proto_string == "spdy" || proto_string == "spdy/1") {
+    } else if (proto_string == "spdy/1") {
       return kProtoSPDY1;
+    } else if (proto_string == "spdy/2") {
+      return kProtoSPDY2;
     } else {
       return kProtoUnknown;
     }
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index f13c1cf..03e2e80 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -288,7 +288,7 @@ int SSLConnectJob::DoSSLConnectComplete(int result) {
   if (status == SSLClientSocket::kNextProtoNegotiated) {
     ssl_socket_->setWasNpnNegotiated(true);
     if (SSLClientSocket::NextProtoFromString(proto) ==
-        SSLClientSocket::kProtoSPDY1) {
+        SSLClientSocket::kProtoSPDY2) {
           spdy_over_npn_succeeded = true;
     }
   }
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index d8b6339..efc4795 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -297,7 +297,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) {
   socket_factory_.AddSocketDataProvider(&data);
   SSLSocketDataProvider ssl(true, OK);
   ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
-  ssl.next_proto = "spdy/1";
+  ssl.next_proto = "spdy/2";
   socket_factory_.AddSSLSocketDataProvider(&ssl);
 
   CreatePool(true /* tcp pool */, false, false);
@@ -320,7 +320,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) {
   std::string proto;
   ssl_socket->GetNextProto(&proto);
   EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto),
-            SSLClientSocket::kProtoSPDY1);
+            SSLClientSocket::kProtoSPDY2);
 }
 
 TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
@@ -328,7 +328,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
   socket_factory_.AddSocketDataProvider(&data);
   SSLSocketDataProvider ssl(true, OK);
   ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
-  ssl.next_proto = "spdy/1";
+  ssl.next_proto = "spdy/2";
   socket_factory_.AddSSLSocketDataProvider(&ssl);
 
   CreatePool(true /* tcp pool */, false, false);
@@ -351,7 +351,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
   std::string proto;
   ssl_socket->GetNextProto(&proto);
   EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto),
-            SSLClientSocket::kProtoSPDY1);
+            SSLClientSocket::kProtoSPDY2);
 }
 
 TEST_F(SSLClientSocketPoolTest, SOCKSFail) {