CommandLine refactoring and cleanup.

net/test/test_server.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.
 
 #include "net/test/test_server.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 324 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->AppendSwitchASCII("port",
-                                  base::IntToString(host_port_pair_.port()));
-  command_line->AppendSwitchPath("data-dir", document_root_);
+  command_line->AppendArg("--port=" +
+                          base::IntToString(host_port_pair_.port()));
+  command_line->AppendArgNative(FILE_PATH_LITERAL("--data-dir=") +
+                                document_root_.value());
 
   if (logging::GetMinLogLevel() == logging::LOG_VERBOSE) {
     command_line->AppendArg("--log-to-console");
   }
 
   if (type_ == TYPE_FTP) {
     command_line->AppendArg("-f");
   } else if (type_ == TYPE_SYNC) {
     command_line->AppendArg("--sync");
   } else if (type_ == TYPE_HTTPS) {
     FilePath certificate_path(certificates_dir_);
     certificate_path = certificate_path.Append(
         https_options_.GetCertificateFile());
     if (!file_util::PathExists(certificate_path)) {
       LOG(ERROR) << "Certificate path " << certificate_path.value()
                  << " doesn't exist. Can't launch https server.";
       return false;
     }
-    command_line->AppendSwitchPath("https", certificate_path);
+    command_line->AppendArgNative(FILE_PATH_LITERAL("--https=") +
+                                  certificate_path.value());
 
     if (https_options_.request_client_certificate)
-      command_line->AppendSwitch("ssl-client-auth");
+      command_line->AppendArg("--ssl-client-auth");
 
     for (std::vector<FilePath>::const_iterator it =
              https_options_.client_authorities.begin();
          it != https_options_.client_authorities.end(); ++it) {
       if (!file_util::PathExists(*it)) {
         LOG(ERROR) << "Client authority path " << it->value()
                    << " doesn't exist. Can't launch https server.";
         return false;
       }
 
-      command_line->AppendSwitchPath("ssl-client-ca", *it);
+      command_line->AppendArgNative(FILE_PATH_LITERAL("--ssl-client-ca=") +
+                                                      it->value());
     }
 
-    const char kBulkCipherSwitch[] = "ssl-bulk-cipher";
+    const std::string kBulkCipherSwitch("--ssl-bulk-cipher");
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_RC4)
-      command_line->AppendSwitchASCII(kBulkCipherSwitch, "rc4");
+      command_line->AppendArg(kBulkCipherSwitch + "=rc4");
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_AES128)
-      command_line->AppendSwitchASCII(kBulkCipherSwitch, "aes128");
+      command_line->AppendArg(kBulkCipherSwitch + "=aes128");
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_AES256)
-      command_line->AppendSwitchASCII(kBulkCipherSwitch, "aes256");
+      command_line->AppendArg(kBulkCipherSwitch + "=aes256");
     if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_3DES)
-      command_line->AppendSwitchASCII(kBulkCipherSwitch, "3des");
+      command_line->AppendArg(kBulkCipherSwitch + "=3des");
   }
 
   return true;
 }
 
 }  // namespace net