diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-26 22:39:33 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-26 22:39:33 +0000 |
| commit | 51343d5ae5d463fc4f84f4af79b44962a580cd4f (patch) | |
| tree | 8d53ff6a0097950f2732ee5376bf0c83297c9c87 /net/socket/ssl_test_util.cc | |
| parent | 7b9db43fbc1731cabc985f6e026a07a2ceaafc28 (diff) | |
| download | chromium_src-51343d5ae5d463fc4f84f4af79b44962a580cd4f.zip chromium_src-51343d5ae5d463fc4f84f4af79b44962a580cd4f.tar.gz chromium_src-51343d5ae5d463fc4f84f4af79b44962a580cd4f.tar.bz2 | |
Remove deprecated CommandLine(std::wstring) ctor.
Add a ctor for creating a CommandLine for carrying arguments;
convert all the users to either that or the FilePath version.
BUG=24672
Review URL: http://codereview.chromium.org/329017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_test_util.cc')
| -rw-r--r-- | net/socket/ssl_test_util.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc index c0ef832..a58863e 100644 --- a/net/socket/ssl_test_util.cc +++ b/net/socket/ssl_test_util.cc @@ -277,14 +277,13 @@ bool TestServerLauncher::Start(Protocol protocol, #elif defined(OS_POSIX) std::vector<std::string> command_line; command_line.push_back("python"); - command_line.push_back(WideToUTF8(testserver_path.ToWStringHack())); + command_line.push_back(testserver_path.value()); command_line.push_back("--port=" + port_str); - command_line.push_back("--data-dir=" + - WideToUTF8(document_root_dir_.ToWStringHack())); + command_line.push_back("--data-dir=" + document_root_dir_.value()); if (protocol == ProtoFTP) command_line.push_back("-f"); if (!cert_path.value().empty()) - command_line.push_back("--https=" + WideToUTF8(cert_path.ToWStringHack())); + command_line.push_back("--https=" + cert_path.value()); if (forking_) command_line.push_back("--forking"); |