Remove old TestServer constructor.

net/test/test_server.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/test/test_server.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
 #include "net/base/host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_root_certs.h"
 #include "net/socket/tcp_client_socket.h"
 #include "net/test/python_utils.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
-namespace {
-
-std::string GetHostname(TestServer::Type type,
-                        const TestServer::HTTPSOptions& options) {
-  if (type == TestServer::TYPE_HTTPS &&
-      options.server_certificate ==
-          TestServer::HTTPSOptions::CERT_MISMATCHED_NAME) {
-    // Return a different hostname string that resolves to the same hostname.
-    return "localhost";
-  }
-
-  return "127.0.0.1";
-}
-
-}  // namespace
-
 TestServer::HTTPSOptions::HTTPSOptions()
     : server_certificate(CERT_OK),
       request_client_certificate(false),
       bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY),
       record_resume(false) {}
 
 TestServer::HTTPSOptions::HTTPSOptions(
     TestServer::HTTPSOptions::ServerCertificate cert)
     : server_certificate(cert),
       request_client_certificate(false),
@@ skipping 10 matching lines @@
     case CERT_EXPIRED:
       return FilePath(FILE_PATH_LITERAL("expired_cert.pem"));
     default:
       NOTREACHED();
   }
   return FilePath();
 }
 
 const char* TestServer::kLocalhost = "127.0.0.1";
 
-TestServer::TestServer(Type type, const FilePath& document_root)
-    : type_(type),
-      started_(false),
-      log_to_console_(false) {
-  Init("127.0.0.1", document_root);
-}
-
 TestServer::TestServer(Type type,
                        const std::string& host,
                        const FilePath& document_root)
     : type_(type),
       started_(false),
       log_to_console_(false) {
   Init(host, document_root);
 }
 
 TestServer::TestServer(const HTTPSOptions& https_options,
                        const FilePath& document_root)
     : https_options_(https_options),
       type_(TYPE_HTTPS),
       started_(false),
       log_to_console_(false) {
-  Init(GetHostname(TYPE_HTTPS, https_options), document_root);
+  const char* host = "127.0.0.1";
+  if (https_options_.server_certificate ==
+      TestServer::HTTPSOptions::CERT_MISMATCHED_NAME) {
+    // Use a different hostname string that resolves to the same address.
+    host = "localhost";
+  }
+
+  Init(host, document_root);
 }
 
 TestServer::~TestServer() {
   TestRootCerts* root_certs = TestRootCerts::GetInstance();
   root_certs->Clear();
   Stop();
 }
 
 bool TestServer::Start() {
   if (type_ == TYPE_HTTPS) {
@@ skipping 309 matching lines @@
       command_line->AppendArg(kBulkCipherSwitch + "=3des");
 
     if (https_options_.record_resume)
       command_line->AppendArg("--https-record-resume");
   }
 
   return true;
 }
 
 }  // namespace net