SPDY - add support for spdy/2.1 to support flow control.

1) Add spdy/2.1 as a supported NPN protocol.
2) Advertise that chrome supports spdy/2.1 when --flow-control (spdy
flag) is enabled. 
3) When SPDY protocol is negotiated, enable flow_control in
spdy_session if spdy/2.1 is negotiated as NPN protocol. 

BUG=106911
R=willchan
TEST=network unit tests and if possible test with SPDY 2.1 server
with command line flag --flow-control.

This CL is same as the following CL. Implemented changes suggested
by willchan in the following review.
http://codereview.chromium.org/8890044/
Review URL: http://codereview.chromium.org/8892026

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

1 files changed, 8 insertions, 0 deletions

diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index c847e9f..63ad321 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -83,6 +83,7 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
     kProtoHTTP11 = 1,
     kProtoSPDY1 = 2,
     kProtoSPDY2 = 3,
+    kProtoSPDY21 = 4,
   };
 
   // Gets the SSL connection information of the socket.
@@ -126,6 +127,11 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
 
   virtual bool set_was_spdy_negotiated(bool negotiated);
 
+  virtual SSLClientSocket::NextProto next_protocol_negotiated() const;
+
+  virtual void set_next_protocol_negotiated(
+      SSLClientSocket::NextProto next_protocol);
+
   // Returns true if an origin bound certificate was sent on this connection.
   // This may be useful for protocols, like SPDY, which allow the same
   // connection to be shared between multiple origins, each of which need
@@ -139,6 +145,8 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
   bool was_npn_negotiated_;
   // True if NPN successfully negotiated SPDY.
   bool was_spdy_negotiated_;
+  // Protocol that we negotiated with the server.
+  SSLClientSocket::NextProto next_protocol_;
   // True if an origin bound certificate was sent.
   bool was_origin_bound_cert_sent_;
 };