CommandLine refactoring and cleanup.

net/test/test_server_posix.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 <poll.h>
 
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 93 matching lines @@
     return false;
   }
 
   // Save the read half. The write half is sent to the child.
   child_fd_ = pipefd[0];
   child_fd_closer_.reset(&child_fd_);
   file_util::ScopedFD write_closer(&pipefd[1]);
   base::file_handle_mapping_vector map_write_fd;
   map_write_fd.push_back(std::make_pair(pipefd[1], pipefd[1]));
 
-  python_command.AppendSwitchASCII("startup-pipe",
-                                   base::IntToString(pipefd[1]));
+  python_command.AppendArg("--startup-pipe=" + base::IntToString(pipefd[1]));
 
   // Try to kill any orphaned testserver processes that may be running.
   OrphanedTestServerFilter filter(testserver_path.value(),
                                   base::IntToString(host_port_pair_.port()));
   if (!base::KillProcesses("python", -1, &filter)) {
     LOG(WARNING) << "Failed to clean up older orphaned testserver instances.";
   }
 
   // Launch a new testserver process.
   if (!base::LaunchApp(python_command.argv(), map_write_fd, false,
@@ skipping 30 matching lines @@
 
   if (!ParseServerData(server_data)) {
     LOG(ERROR) << "Could not parse server_data: " << server_data;
     return false;
   }
 
   return true;
 }
 
 }  // namespace net