net/socket/ssl_server_socket_unittest.cc - Issue 7054010: Update SSLServerSocket to provide the net::StreamSocket interface.

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/socket/ssl_server_socket_unittest.cc

Issue 7054010: Update SSLServerSocket to provide the net::StreamSocket interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add a StartHandshake method, and make Connect NOT_IMPLEMENTED. Created 9 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:

Index: net/socket/ssl_server_socket_unittest.cc

diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc

index 5e08ffe892589724816ad0f4f4406115dd4b9267..5a779c758241470b4097259edfdf129198f0338a 100644

--- a/net/socket/ssl_server_socket_unittest.cc

+++ b/net/socket/ssl_server_socket_unittest.cc

@@ -293,7 +293,7 @@ TEST_F(SSLServerSocketTest, Handshake) {

TestCompletionCallback connect_callback;

TestCompletionCallback accept_callback;

- int server_ret = server_socket_->Accept(&accept_callback);

+ int server_ret = server_socket_->Connect(&accept_callback);

wtc 2011/06/10 22:17:35 These Connect calls should be changed to StartHand

Wez 2011/06/11 01:08:33 Yes. SSLServerSocket has a Connect method inherit

EXPECT_TRUE(server_ret == net::OK || server_ret == net::ERR_IO_PENDING);

int client_ret = client_socket_->Connect(&connect_callback);

@@ -322,7 +322,7 @@ TEST_F(SSLServerSocketTest, DataTransfer) {

int client_ret = client_socket_->Connect(&connect_callback);

ASSERT_TRUE(client_ret == net::OK || client_ret == net::ERR_IO_PENDING);

- int server_ret = server_socket_->Accept(&accept_callback);

+ int server_ret = server_socket_->Connect(&accept_callback);

ASSERT_TRUE(server_ret == net::OK || server_ret == net::ERR_IO_PENDING);

if (client_ret == net::ERR_IO_PENDING) {