diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 00:51:00 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 00:51:00 +0000 |
| commit | 4c56dc0e08ef3ae130df7844c805936f3f2080af (patch) | |
| tree | 5ee8d591becae33e6cf57b497792c335a2199158 /net | |
| parent | 3a8a43b9036c8a820a23ead896a0ff9793cda9fc (diff) | |
| download | chromium_src-4c56dc0e08ef3ae130df7844c805936f3f2080af.zip chromium_src-4c56dc0e08ef3ae130df7844c805936f3f2080af.tar.gz chromium_src-4c56dc0e08ef3ae130df7844c805936f3f2080af.tar.bz2 | |
Small cleanup of spdy next protocol negotiation configuration in tests.
Review URL: http://codereview.chromium.org/9536022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 20 | ||||
| -rw-r--r-- | net/http/http_proxy_client_socket_pool_unittest.cc | 5 |
2 files changed, 5 insertions, 20 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index a93b732..eb38f9c 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -8341,10 +8341,7 @@ TEST_F(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) { data_writes_2, arraysize(data_writes_2))); SSLSocketDataProvider ssl(ASYNC, OK); - ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl.next_proto = "spdy/2.1"; - ssl.was_npn_negotiated = true; - ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21; + ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING); StaticSocketDataProvider hanging_non_alternate_protocol_socket( @@ -8625,10 +8622,7 @@ TEST_F(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) { session_deps.socket_factory.AddSocketDataProvider(spdy_data.get()); SSLSocketDataProvider ssl(ASYNC, OK); - ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl.next_proto = "spdy/2.1"; - ssl.was_npn_negotiated = true; - ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21; + ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); @@ -9055,10 +9049,7 @@ TEST_F(HttpNetworkTransactionTest, UseIPConnectionPooling) { pool_peer.DisableDomainAuthenticationVerification(); SSLSocketDataProvider ssl(ASYNC, OK); - ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl.next_proto = "spdy/2.1"; - ssl.was_npn_negotiated = true; - ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21; + ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); scoped_ptr<spdy::SpdyFrame> host1_req(ConstructSpdyGet( @@ -9209,10 +9200,7 @@ TEST_F(HttpNetworkTransactionTest, pool_peer.DisableDomainAuthenticationVerification(); SSLSocketDataProvider ssl(ASYNC, OK); - ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl.next_proto = "spdy/2.1"; - ssl.was_npn_negotiated = true; - ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21; + ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); scoped_ptr<spdy::SpdyFrame> host1_req(ConstructSpdyGet( diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc index e2276e4..4797391 100644 --- a/net/http/http_proxy_client_socket_pool_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_unittest.cc @@ -173,10 +173,7 @@ class HttpProxyClientSocketPoolTest : public TestWithHttpParam { void InitializeSpdySsl() { spdy::SpdyFramer::set_enable_compression_default(false); - ssl_data_->next_proto_status = SSLClientSocket::kNextProtoNegotiated; - ssl_data_->next_proto = "spdy/2.1"; - ssl_data_->was_npn_negotiated = true; - ssl_data_->protocol_negotiated = SSLClientSocket::kProtoSPDY21; + ssl_data_->SetNextProto(SSLClientSocket::kProtoSPDY21); } HttpNetworkSession* CreateNetworkSession() { |