net/http/http_network_transaction_spdy3_unittest.cc - Issue 10796085: Give MockRead and MockWrite distinct types.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_network_transaction_spdy3_unittest.cc

Issue 10796085: Give MockRead and MockWrite distinct types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix jingle tests. Created 8 years, 5 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 | « net/http/http_network_transaction_spdy2_unittest.cc ('k') | net/http/http_proxy_client_socket_pool_spdy2_unittest.cc » ('j') | net/socket/socket_test_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_network_transaction_spdy3_unittest.cc

diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc

index 0f665e8a164cf842e8795a7b8a10c219daf0b8ab..bcf088cc970986524df9347ffa6892c6e0c1417a 100644

--- a/net/http/http_network_transaction_spdy3_unittest.cc

+++ b/net/http/http_network_transaction_spdy3_unittest.cc

@@ -5774,8 +5774,8 @@ TEST_F(HttpNetworkTransactionSpdy3Test, SOCKS4_SSL_GET) {

};

MockRead data_reads[] = {

- MockWrite(ASYNC, reinterpret_cast<char*>(read_buffer),

- arraysize(read_buffer)),

+ MockRead(ASYNC, reinterpret_cast<char*>(read_buffer),

+ arraysize(read_buffer)),

MockRead("HTTP/1.0 200 OK\r\n"),

MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),

MockRead("Payload"),

@@ -5842,8 +5842,8 @@ TEST_F(HttpNetworkTransactionSpdy3Test, SOCKS5_HTTP_GET) {

};

MockRead data_reads[] = {

- MockWrite(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),

- MockWrite(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),

+ MockRead(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),

+ MockRead(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),

MockRead("HTTP/1.0 200 OK\r\n"),

MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),

MockRead("Payload"),

@@ -5909,8 +5909,8 @@ TEST_F(HttpNetworkTransactionSpdy3Test, SOCKS5_SSL_GET) {

};

MockRead data_reads[] = {

- MockWrite(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),

- MockWrite(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),

+ MockRead(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),

+ MockRead(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),

MockRead("HTTP/1.0 200 OK\r\n"),

MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),

MockRead("Payload"),

@@ -7892,7 +7892,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, GenerateAuthToken) {

}

TestRound(const MockWrite& write_arg, const MockRead& read_arg,

int expected_rv_arg, const MockWrite* extra_write_arg,

- const MockWrite* extra_read_arg)

+ const MockRead* extra_read_arg)

: write(write_arg),

read(read_arg),

expected_rv(expected_rv_arg),