Update SSLServerSocket to provide the net::StreamSocket interface.

net/socket/ssl_server_socket_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This test suite uses SSLClientSocket to test the implementation of
 // SSLServerSocket. In order to establish connections between the sockets
 // we need two additional classes:
 // 1. FakeSocket
 //    Connects SSL socket to FakeDataChannel. This class is just a stub.
 //
@@ skipping 251 matching lines @@
             fake_client_socket, host_and_pair, ssl_config, NULL,
             &cert_verifier_));
     server_socket_.reset(net::CreateSSLServerSocket(fake_server_socket,
                                                     cert, private_key.get(),
                                                     net::SSLConfig()));
   }
 
   FakeDataChannel channel_1_;
   FakeDataChannel channel_2_;
   scoped_ptr<net::SSLClientSocket> client_socket_;
-  scoped_ptr<net::SSLServerSocket> server_socket_;
+  scoped_ptr<net::StreamSocket> server_socket_;

[wtc, 2011/06/02 23:12:58]

Change this back to SSLServerSocket.

[Wez, 2011/06/03 17:47:07]

Done.

   net::ClientSocketFactory* socket_factory_;
   net::CertVerifier cert_verifier_;
 };
 
 // SSLServerSocket is only implemented using NSS.
 #if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
 
 // This test only executes creation of client and server sockets. This is to
 // test that creation of sockets doesn't crash and have minimal code to run
 // under valgrind in order to help debugging memory problems.
 TEST_F(SSLServerSocketTest, Initialize) {
   Initialize();
 }
 
 // This test executes Connect() of SSLClientSocket and Accept() of
 // SSLServerSocket to make sure handshaking between the two sockets are
 // completed successfully.
 TEST_F(SSLServerSocketTest, Handshake) {
   Initialize();
 
   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);
   EXPECT_TRUE(client_ret == net::OK || client_ret == net::ERR_IO_PENDING);
 
   if (client_ret == net::ERR_IO_PENDING) {
     EXPECT_EQ(net::OK, connect_callback.WaitForResult());
   }
   if (server_ret == net::ERR_IO_PENDING) {
     EXPECT_EQ(net::OK, accept_callback.WaitForResult());
   }
 
   // Make sure the cert status is expected.
   SSLInfo ssl_info;
   client_socket_->GetSSLInfo(&ssl_info);
   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, ssl_info.cert_status);
 }
 
 TEST_F(SSLServerSocketTest, DataTransfer) {
   Initialize();
 
   TestCompletionCallback connect_callback;
   TestCompletionCallback accept_callback;
 
   // Establish connection.
   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) {
     ASSERT_EQ(net::OK, connect_callback.WaitForResult());
   }
   if (server_ret == net::ERR_IO_PENDING) {
     ASSERT_EQ(net::OK, accept_callback.WaitForResult());
   }
 
   const int kReadBufSize = 1024;
@@ skipping 30 matching lines @@
     EXPECT_GT(read_callback.WaitForResult(), 0);
   }
   if (client_ret == net::ERR_IO_PENDING) {
     EXPECT_GT(write_callback.WaitForResult(), 0);
   }
   EXPECT_EQ(0, memcmp(write_buf->data(), read_buf->data(), write_buf->size()));
 }
 #endif
 
 }  // namespace net