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

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: Remove const qualifier on RSAPrivateKey parameter. Created 9 years, 7 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
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..ef5636899a64db312b7db8ff419f8237bab70cba 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -269,7 +269,7 @@ class SSLServerSocketTest : public PlatformTest {
FakeDataChannel channel_1_;
FakeDataChannel channel_2_;
scoped_ptr<net::SSLClientSocket> client_socket_;
- scoped_ptr<net::SSLServerSocket> server_socket_;
+ scoped_ptr<net::StreamSocket> server_socket_;
net::ClientSocketFactory* socket_factory_;
net::CertVerifier cert_verifier_;
};
@@ -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);
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) {

Powered by Google App Engine
This is Rietveld 408576698