Skip to content

GitLab

T
tangled
Commit 6429ac9b authored by mmenke's avatar mmenke Committed by Commit bot
Browse files
Options

Switch HttpStreamFactoryTest to using SequencedSocketData. 

Some were using DeterministicSocketData instead.

BUG=492685

Review URL: https://codereview.chromium.org/1163733004

Cr-Commit-Position: refs/heads/master@{#333125}
parent 65087588
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 19 deletions
net/http/http_stream_factory_impl_unittest.cc
View file @ 6429ac9b
...@@ -1111,20 +1111,17 @@ TEST_P(HttpStreamFactoryTest, RequestSpdyHttpStream) { ...@@ -1111,20 +1111,17 @@ TEST_P(HttpStreamFactoryTest, RequestSpdyHttpStream) {
ProxyService::CreateDirect()); ProxyService::CreateDirect());
MockRead mock_read(ASYNC, OK); MockRead mock_read(ASYNC, OK);
DeterministicSocketData socket_data(&mock_read, 1, nullptr, 0); SequencedSocketData socket_data(&mock_read, 1, nullptr, 0);
socket_data.set_connect_data(MockConnect(ASYNC, OK)); socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.deterministic_socket_factory->AddSocketDataProvider( session_deps.socket_factory->AddSocketDataProvider(&socket_data);
&socket_data);
SSLSocketDataProvider ssl_socket_data(ASYNC, OK); SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
ssl_socket_data.SetNextProto(GetParam()); ssl_socket_data.SetNextProto(GetParam());
session_deps.deterministic_socket_factory->AddSSLSocketDataProvider( session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
&ssl_socket_data);
HostPortPair host_port_pair("www.google.com", 443); HostPortPair host_port_pair("www.google.com", 443);
scoped_refptr<HttpNetworkSession> scoped_refptr<HttpNetworkSession> session(
session(SpdySessionDependencies::SpdyCreateSessionDeterministic( SpdySessionDependencies::SpdyCreateSession(&session_deps));
&session_deps));
// Now request a stream. // Now request a stream.
HttpRequestInfo request_info; HttpRequestInfo request_info;
...@@ -1296,25 +1293,21 @@ TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) { ...@@ -1296,25 +1293,21 @@ TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
session_deps.use_alternate_protocols = true; session_deps.use_alternate_protocols = true;
MockRead mock_read(ASYNC, OK); MockRead mock_read(ASYNC, OK);
DeterministicSocketData socket_data(&mock_read, 1, nullptr, 0); SequencedSocketData socket_data(&mock_read, 1, nullptr, 0);
socket_data.set_connect_data(MockConnect(ASYNC, OK)); socket_data.set_connect_data(MockConnect(ASYNC, OK));
session_deps.deterministic_socket_factory->AddSocketDataProvider( session_deps.socket_factory->AddSocketDataProvider(&socket_data);
&socket_data);
MockRead mock_read2(ASYNC, OK); MockRead mock_read2(ASYNC, OK);
DeterministicSocketData socket_data2(&mock_read2, 1, nullptr, 0); SequencedSocketData socket_data2(&mock_read2, 1, nullptr, 0);
socket_data2.set_connect_data(MockConnect(ASYNC, ERR_IO_PENDING)); socket_data2.set_connect_data(MockConnect(ASYNC, ERR_IO_PENDING));
session_deps.deterministic_socket_factory->AddSocketDataProvider( session_deps.socket_factory->AddSocketDataProvider(&socket_data2);
&socket_data2);
SSLSocketDataProvider ssl_socket_data(ASYNC, OK); SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
ssl_socket_data.SetNextProto(GetParam()); ssl_socket_data.SetNextProto(GetParam());
session_deps.deterministic_socket_factory->AddSSLSocketDataProvider( session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
&ssl_socket_data);
scoped_refptr<HttpNetworkSession> scoped_refptr<HttpNetworkSession> session(
session(SpdySessionDependencies::SpdyCreateSessionDeterministic( SpdySessionDependencies::SpdyCreateSession(&session_deps));
&session_deps));
// Now request a stream. // Now request a stream.
HttpRequestInfo request_info; HttpRequestInfo request_info;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment