Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(625)

Unified Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 1163733004: Switch HttpStreamFactoryTest to using SequencedSocketData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_unittest.cc
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index 6b20b9a712014a1fa8ebe2cdb5d1a35d593f2488..1f301e3f97dd796294c57d35b16fe04f11bae5e4 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -1111,20 +1111,17 @@ TEST_P(HttpStreamFactoryTest, RequestSpdyHttpStream) {
ProxyService::CreateDirect());
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));
- session_deps.deterministic_socket_factory->AddSocketDataProvider(
- &socket_data);
+ session_deps.socket_factory->AddSocketDataProvider(&socket_data);
SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
ssl_socket_data.SetNextProto(GetParam());
- session_deps.deterministic_socket_factory->AddSSLSocketDataProvider(
- &ssl_socket_data);
+ session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
HostPortPair host_port_pair("www.google.com", 443);
- scoped_refptr<HttpNetworkSession>
- session(SpdySessionDependencies::SpdyCreateSessionDeterministic(
- &session_deps));
+ scoped_refptr<HttpNetworkSession> session(
+ SpdySessionDependencies::SpdyCreateSession(&session_deps));
// Now request a stream.
HttpRequestInfo request_info;
@@ -1296,25 +1293,21 @@ TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
session_deps.use_alternate_protocols = true;
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));
- session_deps.deterministic_socket_factory->AddSocketDataProvider(
- &socket_data);
+ session_deps.socket_factory->AddSocketDataProvider(&socket_data);
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));
- session_deps.deterministic_socket_factory->AddSocketDataProvider(
- &socket_data2);
+ session_deps.socket_factory->AddSocketDataProvider(&socket_data2);
SSLSocketDataProvider ssl_socket_data(ASYNC, OK);
ssl_socket_data.SetNextProto(GetParam());
- session_deps.deterministic_socket_factory->AddSSLSocketDataProvider(
- &ssl_socket_data);
+ session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
- scoped_refptr<HttpNetworkSession>
- session(SpdySessionDependencies::SpdyCreateSessionDeterministic(
- &session_deps));
+ scoped_refptr<HttpNetworkSession> session(
+ SpdySessionDependencies::SpdyCreateSession(&session_deps));
// Now request a stream.
HttpRequestInfo request_info;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698