Add '--host' option to testserver.py and expose it via a new 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 63 matching lines @@
     case CERT_MISMATCHED_NAME:
       return FilePath(FILE_PATH_LITERAL("ok_cert.pem"));
     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(document_root);
+  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(document_root);
+  Init(GetHostname(TYPE_HTTPS, https_options), document_root);
 }
 
 TestServer::~TestServer() {
   TestRootCerts* root_certs = TestRootCerts::GetInstance();
   root_certs->Clear();
   Stop();
 }
 
 bool TestServer::Start() {
   if (type_ == TYPE_HTTPS) {
@@ skipping 150 matching lines @@
     new_file_path += "replace_text=";
     new_file_path += base64_old;
     new_file_path += ":";
     new_file_path += base64_new;
   }
 
   *replacement_path = new_file_path;
   return true;
 }
 
-void TestServer::Init(const FilePath& document_root) {
+void TestServer::Init(const std::string& host, const FilePath& document_root) {
   // At this point, the port that the testserver will listen on is unknown.
   // The testserver will listen on an ephemeral port, and write the port
   // number out over a pipe that this TestServer object will read from. Once
   // that is complete, the host_port_pair_ will contain the actual port.
-  host_port_pair_ = HostPortPair(GetHostname(type_, https_options_), 0);
+  host_port_pair_ = HostPortPair(host, 0);
   process_handle_ = base::kNullProcessHandle;
 
   FilePath src_dir;
   PathService::Get(base::DIR_SOURCE_ROOT, &src_dir);
 
   document_root_ = src_dir.Append(document_root);
 
   certificates_dir_ = src_dir.Append(FILE_PATH_LITERAL("net"))
                        .Append(FILE_PATH_LITERAL("data"))
                        .Append(FILE_PATH_LITERAL("ssl"))
@@ skipping 69 matching lines @@
 FilePath TestServer::GetRootCertificatePath() const {
   return certificates_dir_.AppendASCII("root_ca_cert.crt");
 }
 
 bool TestServer::LoadTestRootCert() {
   TestRootCerts* root_certs = TestRootCerts::GetInstance();
   return root_certs->AddFromFile(GetRootCertificatePath());
 }
 
 bool TestServer::AddCommandLineArguments(CommandLine* command_line) const {
+  command_line->AppendArg("--host=" + host_port_pair_.host());
   command_line->AppendArg("--port=" +
                           base::IntToString(host_port_pair_.port()));
   command_line->AppendArgNative(FILE_PATH_LITERAL("--data-dir=") +
                                 document_root_.value());
 
   if (VLOG_IS_ON(1) || log_to_console_) {
     command_line->AppendArg("--log-to-console");
   }
 
   if (type_ == TYPE_FTP) {
@@ skipping 43 matching lines @@
       command_line->AppendArg(kBulkCipherSwitch + "=3des");
 
     if (https_options_.record_resume)
       command_line->AppendArg("--https-record-resume");
   }
 
   return true;
 }
 
 }  // namespace net