Turn SSLClientSocket into an interface.

The original ssl_client_socket.{h,cc} are renamed
ssl_client_socket_win.{h,cc}.

The new ssl_client_socket.h defines the SSLClientSocket
interface, which simply extends the ClientSocket interface
with a new GetSSLInfo method.

ClientSocketFactory::CreateSSLClientSocket returns
SSLClientSocket* instead of ClientSocket*.

Replace the SSL protocol version mask parameter to the
constructor and factory method by a SSLConfig parameter.

R=darin
Review URL: http://codereview.chromium.org/7304

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3387 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 36 insertions, 24 deletions

diff --git a/net/base/ssl_client_socket_unittest.cc b/net/base/ssl_client_socket_unittest.cc
index 2aba7ab..d1f1f82 100644
--- a/net/base/ssl_client_socket_unittest.cc
+++ b/net/base/ssl_client_socket_unittest.cc
@@ -3,9 +3,11 @@
 // found in the LICENSE file.
 
 #include "net/base/address_list.h"
+#include "net/base/client_socket_factory.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_client_socket.h"
+#include "net/base/ssl_config_service.h"
 #include "net/base/tcp_client_socket.h"
 #include "net/base/test_completion_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -14,10 +16,16 @@
 
 namespace {
 
-const unsigned int kDefaultSSLVersionMask = net::SSLClientSocket::SSL3 |
-                                            net::SSLClientSocket::TLS1;
+const net::SSLConfig kDefaultSSLConfig;
 
 class SSLClientSocketTest : public testing::Test {
+ public:
+  SSLClientSocketTest()
+      : socket_factory_(net::ClientSocketFactory::GetDefaultFactory()) {
+  }
+
+ protected:
+  net::ClientSocketFactory* socket_factory_;
 };
 
 }  // namespace
@@ -34,12 +42,13 @@ TEST_F(SSLClientSocketTest, DISABLED_Connect) {
   int rv = resolver.Resolve(hostname, 443, &addr, NULL);
   EXPECT_EQ(net::OK, rv);
 
-  net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname,
-                            kDefaultSSLVersionMask);
+  scoped_ptr<net::SSLClientSocket> sock(
+      socket_factory_->CreateSSLClientSocket(new net::TCPClientSocket(addr),
+                                             hostname, kDefaultSSLConfig));
 
-  EXPECT_FALSE(sock.IsConnected());
+  EXPECT_FALSE(sock->IsConnected());
 
-  rv = sock.Connect(&callback);
+  rv = sock->Connect(&callback);
   if (rv != net::OK) {
     ASSERT_EQ(net::ERR_IO_PENDING, rv);
 
@@ -47,10 +56,10 @@ TEST_F(SSLClientSocketTest, DISABLED_Connect) {
     EXPECT_EQ(net::OK, rv);
   }
 
-  EXPECT_TRUE(sock.IsConnected());
+  EXPECT_TRUE(sock->IsConnected());
 
-  sock.Disconnect();
-  EXPECT_FALSE(sock.IsConnected());
+  sock->Disconnect();
+  EXPECT_FALSE(sock->IsConnected());
 }
 
 // bug 1354783
@@ -66,10 +75,11 @@ TEST_F(SSLClientSocketTest, DISABLED_Read) {
   rv = callback.WaitForResult();
   EXPECT_EQ(rv, net::OK);
 
-  net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname,
-                            kDefaultSSLVersionMask);
+  scoped_ptr<net::SSLClientSocket> sock(
+      socket_factory_->CreateSSLClientSocket(new net::TCPClientSocket(addr),
+                                             hostname, kDefaultSSLConfig));
 
-  rv = sock.Connect(&callback);
+  rv = sock->Connect(&callback);
   if (rv != net::OK) {
     ASSERT_EQ(rv, net::ERR_IO_PENDING);
 
@@ -78,7 +88,7 @@ TEST_F(SSLClientSocketTest, DISABLED_Read) {
   }
 
   const char request_text[] = "GET / HTTP/1.0\r\n\r\n";
-  rv = sock.Write(request_text, arraysize(request_text) - 1, &callback);
+  rv = sock->Write(request_text, arraysize(request_text) - 1, &callback);
   EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
 
   if (rv == net::ERR_IO_PENDING) {
@@ -88,7 +98,7 @@ TEST_F(SSLClientSocketTest, DISABLED_Read) {
 
   char buf[4096];
   for (;;) {
-    rv = sock.Read(buf, sizeof(buf), &callback);
+    rv = sock->Read(buf, sizeof(buf), &callback);
     EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
 
     if (rv == net::ERR_IO_PENDING)
@@ -110,10 +120,11 @@ TEST_F(SSLClientSocketTest, DISABLED_Read_SmallChunks) {
   int rv = resolver.Resolve(hostname, 443, &addr, NULL);
   EXPECT_EQ(rv, net::OK);
 
-  net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname,
-                            kDefaultSSLVersionMask);
+  scoped_ptr<net::SSLClientSocket> sock(
+      socket_factory_->CreateSSLClientSocket(new net::TCPClientSocket(addr),
+                                             hostname, kDefaultSSLConfig));
 
-  rv = sock.Connect(&callback);
+  rv = sock->Connect(&callback);
   if (rv != net::OK) {
     ASSERT_EQ(rv, net::ERR_IO_PENDING);
 
@@ -122,7 +133,7 @@ TEST_F(SSLClientSocketTest, DISABLED_Read_SmallChunks) {
   }
 
   const char request_text[] = "GET / HTTP/1.0\r\n\r\n";
-  rv = sock.Write(request_text, arraysize(request_text) - 1, &callback);
+  rv = sock->Write(request_text, arraysize(request_text) - 1, &callback);
   EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
 
   if (rv == net::ERR_IO_PENDING) {
@@ -132,7 +143,7 @@ TEST_F(SSLClientSocketTest, DISABLED_Read_SmallChunks) {
 
   char buf[1];
   for (;;) {
-    rv = sock.Read(buf, sizeof(buf), &callback);
+    rv = sock->Read(buf, sizeof(buf), &callback);
     EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
 
     if (rv == net::ERR_IO_PENDING)
@@ -154,10 +165,11 @@ TEST_F(SSLClientSocketTest, DISABLED_Read_Interrupted) {
   int rv = resolver.Resolve(hostname, 443, &addr, NULL);
   EXPECT_EQ(rv, net::OK);
 
-  net::SSLClientSocket sock(new net::TCPClientSocket(addr), hostname,
-                            kDefaultSSLVersionMask);
+  scoped_ptr<net::SSLClientSocket> sock(
+      socket_factory_->CreateSSLClientSocket(new net::TCPClientSocket(addr),
+                                             hostname, kDefaultSSLConfig));
 
-  rv = sock.Connect(&callback);
+  rv = sock->Connect(&callback);
   if (rv != net::OK) {
     ASSERT_EQ(rv, net::ERR_IO_PENDING);
 
@@ -166,7 +178,7 @@ TEST_F(SSLClientSocketTest, DISABLED_Read_Interrupted) {
   }
 
   const char request_text[] = "GET / HTTP/1.0\r\n\r\n";
-  rv = sock.Write(request_text, arraysize(request_text) - 1, &callback);
+  rv = sock->Write(request_text, arraysize(request_text) - 1, &callback);
   EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
 
   if (rv == net::ERR_IO_PENDING) {
@@ -176,7 +188,7 @@ TEST_F(SSLClientSocketTest, DISABLED_Read_Interrupted) {
 
   // Do a partial read and then exit.  This test should not crash!
   char buf[512];
-  rv = sock.Read(buf, sizeof(buf), &callback);
+  rv = sock->Read(buf, sizeof(buf), &callback);
   EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
 
   if (rv == net::ERR_IO_PENDING)