diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 03:51:20 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 03:51:20 +0000 |
| commit | 1ad77dc23b51198e2b0ce4ba0f8a55635b25474c (patch) | |
| tree | 2898a3bfd758ae1f5e3583acdc349dcb88b68ae6 /net/socket | |
| parent | 55e31b02ec039da2a348c618f5683ea2af686287 (diff) | |
| download | chromium_src-1ad77dc23b51198e2b0ce4ba0f8a55635b25474c.zip chromium_src-1ad77dc23b51198e2b0ce4ba0f8a55635b25474c.tar.gz chromium_src-1ad77dc23b51198e2b0ce4ba0f8a55635b25474c.tar.bz2 | |
SPDY - Change all tests to use SPDY/2.1 protocol. Made
changes to SPDY code to support enabling or disabling
flow_control independent of NPN protocol negotiated.
TEST=network unit tests
R=wtc
Review URL: http://codereview.chromium.org/9252029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_pool_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index 125cba9..53e6382 100644 --- a/net/socket/ssl_client_socket_pool_unittest.cc +++ b/net/socket/ssl_client_socket_pool_unittest.cc @@ -373,8 +373,8 @@ TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) { socket_factory_.AddSocketDataProvider(&data); SSLSocketDataProvider ssl(true, OK); ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl.next_proto = "spdy/2"; - ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2; + ssl.next_proto = "spdy/2.1"; + ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21; socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(true /* tcp pool */, false, false); @@ -399,7 +399,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) { std::string server_protos; ssl_socket->GetNextProto(&proto, &server_protos); EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto), - SSLClientSocket::kProtoSPDY2); + SSLClientSocket::kProtoSPDY21); } TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) { @@ -407,8 +407,8 @@ TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) { socket_factory_.AddSocketDataProvider(&data); SSLSocketDataProvider ssl(true, OK); ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl.next_proto = "spdy/2"; - ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2; + ssl.next_proto = "spdy/2.1"; + ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21; socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(true /* tcp pool */, false, false); @@ -433,7 +433,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) { std::string server_protos; ssl_socket->GetNextProto(&proto, &server_protos); EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto), - SSLClientSocket::kProtoSPDY2); + SSLClientSocket::kProtoSPDY21); } TEST_F(SSLClientSocketPoolTest, SOCKSFail) { @@ -709,8 +709,8 @@ TEST_F(SSLClientSocketPoolTest, IPPooling) { ssl.cert = X509Certificate::CreateFromBytes( reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der)); ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl.next_proto = "spdy/2"; - ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2; + ssl.next_proto = "spdy/2.1"; + ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21; socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(true /* tcp pool */, false, false); @@ -735,7 +735,7 @@ TEST_F(SSLClientSocketPoolTest, IPPooling) { std::string server_protos; ssl_socket->GetNextProto(&proto, &server_protos); EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto), - SSLClientSocket::kProtoSPDY2); + SSLClientSocket::kProtoSPDY21); // TODO(rtenneti): MockClientSocket::GetPeerAddress returns 0 as the port // number. Fix it to return port 80 and then use GetPeerAddress to AddAlias. @@ -797,9 +797,9 @@ TEST_F(SSLClientSocketPoolTest, IPPoolingClientCert) { ssl.cert = X509Certificate::CreateFromBytes( reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der)); ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl.next_proto = "spdy/2"; + ssl.next_proto = "spdy/2.1"; ssl.client_cert_sent = true; - ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY2; + ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21; socket_factory_.AddSSLSocketDataProvider(&ssl); CreatePool(true /* tcp pool */, false, false); @@ -823,7 +823,7 @@ TEST_F(SSLClientSocketPoolTest, IPPoolingClientCert) { std::string server_protos; ssl_socket->GetNextProto(&proto, &server_protos); EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto), - SSLClientSocket::kProtoSPDY2); + SSLClientSocket::kProtoSPDY21); // TODO(rtenneti): MockClientSocket::GetPeerAddress returns 0 as the port // number. Fix it to return port 80 and then use GetPeerAddress to AddAlias. |