From 42baef7a5c2658d767cc15db5834e1f4b7bd4746 Mon Sep 17 00:00:00 2001 From: "rtenneti@google.com" Date: Sat, 10 Dec 2011 04:52:10 +0000 Subject: 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 --- net/socket/socket_test_util.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'net/socket/socket_test_util.h') diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index 84c9c05..e4909c5 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -761,6 +761,9 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket { std::string* server_protos) OVERRIDE; virtual bool was_npn_negotiated() const OVERRIDE; virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE; + virtual SSLClientSocket::NextProto next_protocol_negotiated() const OVERRIDE; + virtual void set_next_protocol_negotiated( + SSLClientSocket::NextProto next_protocol) OVERRIDE; // This MockSocket does not implement the manual async IO feature. virtual void OnReadComplete(const MockRead& data) OVERRIDE; @@ -775,6 +778,8 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket { bool is_npn_state_set_; bool new_npn_value_; bool was_used_to_convey_data_; + bool is_next_protocol_set_; + SSLClientSocket::NextProto next_protocol_; }; class MockUDPClientSocket : public DatagramClientSocket, -- cgit v1.1