| Index: chrome/test/ui_test_utils.cc
|
| diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
|
| index eb992b6b94fb5c7600785348eec004436c3b88ca..6298b6281ab76b1a9c7692f4a42c46aa7cc3703a 100644
|
| --- a/chrome/test/ui_test_utils.cc
|
| +++ b/chrome/test/ui_test_utils.cc
|
| @@ -615,11 +615,10 @@ TestWebSocketServer::TestWebSocketServer(const FilePath& root_directory) {
|
| cmd_line->AppendSwitchWithValue("server", "start");
|
| cmd_line->AppendSwitch("chromium");
|
| cmd_line->AppendSwitch("register_cygwin");
|
| - cmd_line->AppendSwitchWithValue("root", root_directory.ToWStringHack());
|
| + cmd_line->AppendSwitchPath("root", root_directory);
|
| temp_dir_.CreateUniqueTempDir();
|
| websocket_pid_file_ = temp_dir_.path().AppendASCII("websocket.pid");
|
| - cmd_line->AppendSwitchWithValue("pidfile",
|
| - websocket_pid_file_.ToWStringHack());
|
| + cmd_line->AppendSwitchPath("pidfile", websocket_pid_file_);
|
| SetPythonPath();
|
| base::LaunchApp(*cmd_line.get(), true, false, NULL);
|
| }
|
| @@ -661,8 +660,7 @@ TestWebSocketServer::~TestWebSocketServer() {
|
| scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
|
| cmd_line->AppendSwitchWithValue("server", "stop");
|
| cmd_line->AppendSwitch("chromium");
|
| - cmd_line->AppendSwitchWithValue("pidfile",
|
| - websocket_pid_file_.ToWStringHack());
|
| + cmd_line->AppendSwitchPath("pidfile", websocket_pid_file_);
|
| base::LaunchApp(*cmd_line.get(), true, false, NULL);
|
| }
|
|
|
|
|