Refactoring for merging WebSocket test server to net::TestServer

net/socket/ssl_client_socket_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "net/socket/ssl_client_socket.h"
 
 #include "net/base/address_list.h"
 #include "net/base/cert_test_util.h"
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
@@ skipping 92 matching lines @@
   EXPECT_EQ(net::OK, rv);
   EXPECT_TRUE(sock->IsConnected());
   log.GetEntries(&entries);
   EXPECT_TRUE(LogContainsSSLConnectEndEvent(entries, -1));
 
   sock->Disconnect();
   EXPECT_FALSE(sock->IsConnected());
 }
 
 TEST_F(SSLClientSocketTest, ConnectExpired) {
-  net::TestServer::HTTPSOptions https_options(
-      net::TestServer::HTTPSOptions::CERT_EXPIRED);
-  net::TestServer test_server(https_options, FilePath());
+  net::TestServer::SSLOptions ssl_options(
+      net::TestServer::SSLOptions::CERT_EXPIRED);
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              ssl_options,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   cert_verifier_->set_default_result(net::ERR_CERT_DATE_INVALID);
 
   net::AddressList addr;
   ASSERT_TRUE(test_server.GetAddressList(&addr));
 
   net::TestCompletionCallback callback;
   net::CapturingNetLog log;
   net::StreamSocket* transport = new net::TCPClientSocket(
@@ skipping 22 matching lines @@
 
   // Rather than testing whether or not the underlying socket is connected,
   // test that the handshake has finished. This is because it may be
   // desirable to disconnect the socket before showing a user prompt, since
   // the user may take indefinitely long to respond.
   log.GetEntries(&entries);
   EXPECT_TRUE(LogContainsSSLConnectEndEvent(entries, -1));
 }
 
 TEST_F(SSLClientSocketTest, ConnectMismatched) {
-  net::TestServer::HTTPSOptions https_options(
-      net::TestServer::HTTPSOptions::CERT_MISMATCHED_NAME);
-  net::TestServer test_server(https_options, FilePath());
+  net::TestServer::SSLOptions ssl_options(
+      net::TestServer::SSLOptions::CERT_MISMATCHED_NAME);
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              ssl_options,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   cert_verifier_->set_default_result(net::ERR_CERT_COMMON_NAME_INVALID);
 
   net::AddressList addr;
   ASSERT_TRUE(test_server.GetAddressList(&addr));
 
   net::TestCompletionCallback callback;
   net::CapturingNetLog log;
   net::StreamSocket* transport = new net::TCPClientSocket(
@@ skipping 24 matching lines @@
   // test that the handshake has finished. This is because it may be
   // desirable to disconnect the socket before showing a user prompt, since
   // the user may take indefinitely long to respond.
   log.GetEntries(&entries);
   EXPECT_TRUE(LogContainsSSLConnectEndEvent(entries, -1));
 }
 
 // Attempt to connect to a page which requests a client certificate. It should
 // return an error code on connect.
 TEST_F(SSLClientSocketTest, ConnectClientAuthCertRequested) {
-  net::TestServer::HTTPSOptions https_options;
-  https_options.request_client_certificate = true;
-  net::TestServer test_server(https_options, FilePath());
+  net::TestServer::SSLOptions ssl_options;
+  ssl_options.request_client_certificate = true;
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              ssl_options,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
   ASSERT_TRUE(test_server.GetAddressList(&addr));
 
   net::TestCompletionCallback callback;
   net::CapturingNetLog log;
   net::StreamSocket* transport = new net::TCPClientSocket(
       addr, &log, net::NetLog::Source());
   int rv = transport->Connect(callback.callback());
@@ skipping 37 matching lines @@
       entries, 0, net::NetLog::TYPE_SSL_CONNECT, net::NetLog::PHASE_END);
   EXPECT_EQ(net::ERR_SSL_CLIENT_AUTH_CERT_NEEDED, rv);
   EXPECT_FALSE(sock->IsConnected());
 }
 
 // Connect to a server requesting optional client authentication. Send it a
 // null certificate. It should allow the connection.
 //
 // TODO(davidben): Also test providing an actual certificate.
 TEST_F(SSLClientSocketTest, ConnectClientAuthSendNullCert) {
-  net::TestServer::HTTPSOptions https_options;
-  https_options.request_client_certificate = true;
-  net::TestServer test_server(https_options, FilePath());
+  net::TestServer::SSLOptions ssl_options;
+  ssl_options.request_client_certificate = true;
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              ssl_options,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
   ASSERT_TRUE(test_server.GetAddressList(&addr));
 
   net::TestCompletionCallback callback;
   net::CapturingNetLog log;
   net::StreamSocket* transport = new net::TCPClientSocket(
       addr, &log, net::NetLog::Source());
   int rv = transport->Connect(callback.callback());
@@ skipping 382 matching lines @@
 // performing client authentication, it will not be tested here.
 TEST_F(SSLClientSocketTest, CipherSuiteDisables) {
   // Rather than exhaustively disabling every RC4 ciphersuite defined at
   // http://www.iana.org/assignments/tls-parameters/tls-parameters.xml,
   // only disabling those cipher suites that the test server actually
   // implements.
   const uint16 kCiphersToDisable[] = {
     0x0005,  // TLS_RSA_WITH_RC4_128_SHA
   };
 
-  net::TestServer::HTTPSOptions https_options;
+  net::TestServer::SSLOptions ssl_options;
   // Enable only RC4 on the test server.
-  https_options.bulk_ciphers =
-      net::TestServer::HTTPSOptions::BULK_CIPHER_RC4;
-  net::TestServer test_server(https_options, FilePath());
+  ssl_options.bulk_ciphers =
+      net::TestServer::SSLOptions::BULK_CIPHER_RC4;
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              ssl_options,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
   ASSERT_TRUE(test_server.GetAddressList(&addr));
 
   net::TestCompletionCallback callback;
   net::CapturingNetLog log;
   net::StreamSocket* transport = new net::TCPClientSocket(
       addr, &log, net::NetLog::Source());
   int rv = transport->Connect(callback.callback());
@@ skipping 177 matching lines @@
   cert_verifier_->AddResultForCert(certs[0], verify_result, net::OK);
 
   // Load and install the root for the validated chain.
   scoped_refptr<net::X509Certificate> root_cert =
     net::ImportCertFromFile(net::GetTestCertsDirectory(),
                            "redundant-validated-chain-root.pem");
   ASSERT_NE(static_cast<net::X509Certificate*>(NULL), root_cert);
   net::ScopedTestRoot scoped_root(root_cert);
 
   // Set up a test server with CERT_CHAIN_WRONG_ROOT.
-  net::TestServer::HTTPSOptions https_options(
-      net::TestServer::HTTPSOptions::CERT_CHAIN_WRONG_ROOT);
-  net::TestServer test_server(https_options,
+  net::TestServer::SSLOptions ssl_options(
+      net::TestServer::SSLOptions::CERT_CHAIN_WRONG_ROOT);
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              ssl_options,
                               FilePath(FILE_PATH_LITERAL("net/data/ssl")));
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
   ASSERT_TRUE(test_server.GetAddressList(&addr));
 
   net::TestCompletionCallback callback;
   net::CapturingNetLog log;
   net::StreamSocket* transport = new net::TCPClientSocket(
       addr, &log, net::NetLog::Source());
@@ skipping 32 matching lines @@
       ssl_info.cert->os_cert_handle(), certs[0]->os_cert_handle()));
   EXPECT_TRUE(net::X509Certificate::IsSameOSCert(
       intermediates[0], certs[1]->os_cert_handle()));
   EXPECT_TRUE(net::X509Certificate::IsSameOSCert(
       intermediates[1], certs[2]->os_cert_handle()));
 
   sock->Disconnect();
   EXPECT_FALSE(sock->IsConnected());
 }