summaryrefslogtreecommitdiffstats
path: root/net/base/ssl_test_util.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-09 19:48:55 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-09 19:48:55 +0000
commit120f05fa80e35a372331dfe901e65c74383d3d30 (patch)
tree6db2020ab2f6f41805524b3aa693d04c146f4057 /net/base/ssl_test_util.cc
parent45904e20797f8cd28a776ed0e40ba94dc4eef97e (diff)
downloadchromium_src-120f05fa80e35a372331dfe901e65c74383d3d30.zip
chromium_src-120f05fa80e35a372331dfe901e65c74383d3d30.tar.gz
chromium_src-120f05fa80e35a372331dfe901e65c74383d3d30.tar.bz2
revert until I can figure out why the tests are hanging
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ssl_test_util.cc')
-rw-r--r--net/base/ssl_test_util.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/net/base/ssl_test_util.cc b/net/base/ssl_test_util.cc
index a3fe3b9..71edb6a 100644
--- a/net/base/ssl_test_util.cc
+++ b/net/base/ssl_test_util.cc
@@ -152,8 +152,7 @@ void TestServerLauncher::SetPythonPath() {
bool TestServerLauncher::Start(Protocol protocol,
const std::string& host_name, int port,
const FilePath& document_root,
- const FilePath& cert_path,
- const std::wstring& file_root_url) {
+ const FilePath& cert_path) {
if (!cert_path.value().empty()) {
if (!LoadTestRootCert())
return false;
@@ -199,11 +198,6 @@ bool TestServerLauncher::Start(Protocol protocol,
command_line.append(cert_path.ToWStringHack());
command_line.append(L"\"");
}
- if (!file_root_url.empty()) {
- command_line.append(L" --file-root-url=\"");
- command_line.append(file_root_url);
- command_line.append(L"\"");
- }
if (!base::LaunchApp(command_line, false, true, &process_handle_)) {
LOG(ERROR) << "Failed to launch " << command_line;