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

Unified Diff: net/http/http_proxy_client_socket_pool_unittest.cc

Issue 786123002: Update from https://crrev.com/307330 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_proxy_client_socket_pool_unittest.cc
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index f8184321841d04afa73bb3936ceb056dc3b57a59..909da6233eb9307711402f3482ab99debe01e1a3 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -393,8 +393,8 @@ TEST_P(HttpProxyClientSocketPoolTest, NeedAuth) {
MockRead(ASYNC, 3, "Content-Length: 10\r\n\r\n"),
MockRead(ASYNC, 4, "0123456789"),
};
- scoped_ptr<SpdyFrame> req(
- spdy_util_.ConstructSpdyConnect(NULL, 0, 1, LOW));
+ scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyConnect(
+ NULL, 0, 1, LOW, HostPortPair("www.google.com", 443)));
scoped_ptr<SpdyFrame> rst(
spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL));
MockWrite spdy_writes[] = {
@@ -502,7 +502,8 @@ TEST_P(HttpProxyClientSocketPoolTest, AsyncHaveAuth) {
};
scoped_ptr<SpdyFrame> req(
- spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1, LOW));
+ spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1, LOW,
+ HostPortPair("www.google.com", 443)));
MockWrite spdy_writes[] = {
CreateMockWrite(*req, 0, ASYNC)
};
@@ -544,8 +545,8 @@ TEST_P(HttpProxyClientSocketPoolTest,
return;
scoped_ptr<SpdyFrame> req(
- spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize,
- 1, MEDIUM));
+ spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1, MEDIUM,
+ HostPortPair("www.google.com", 443)));
MockWrite spdy_writes[] = {
CreateMockWrite(*req, 0, ASYNC)
};
@@ -651,7 +652,8 @@ TEST_P(HttpProxyClientSocketPoolTest, TunnelUnexpectedClose) {
MockRead(ASYNC, ERR_CONNECTION_CLOSED, 2),
};
scoped_ptr<SpdyFrame> req(
- spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1, LOW));
+ spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1, LOW,
+ HostPortPair("www.google.com", 443)));
MockWrite spdy_writes[] = {
CreateMockWrite(*req, 0, ASYNC)
};
@@ -725,7 +727,8 @@ TEST_P(HttpProxyClientSocketPoolTest, TunnelSetupError) {
MockRead(ASYNC, 1, "HTTP/1.1 304 Not Modified\r\n\r\n"),
};
scoped_ptr<SpdyFrame> req(
- spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1, LOW));
+ spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1, LOW,
+ HostPortPair("www.google.com", 443)));
scoped_ptr<SpdyFrame> rst(
spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL));
MockWrite spdy_writes[] = {
@@ -776,7 +779,8 @@ TEST_P(HttpProxyClientSocketPoolTest, TunnelSetupRedirect) {
MockRead(ASYNC, 1, responseText.c_str()),
};
scoped_ptr<SpdyFrame> req(
- spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1, LOW));
+ spdy_util_.ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1, LOW,
+ HostPortPair("www.google.com", 443)));
scoped_ptr<SpdyFrame> rst(
spdy_util_.ConstructSpdyRstStream(1, RST_STREAM_CANCEL));
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698