summaryrefslogtreecommitdiffstats
path: root/net/base
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
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')
-rw-r--r--net/base/ssl_client_socket_unittest.cc6
-rw-r--r--net/base/ssl_test_util.cc8
-rw-r--r--net/base/ssl_test_util.h5
3 files changed, 5 insertions, 14 deletions
diff --git a/net/base/ssl_client_socket_unittest.cc b/net/base/ssl_client_socket_unittest.cc
index 2399466..7c7b170 100644
--- a/net/base/ssl_client_socket_unittest.cc
+++ b/net/base/ssl_client_socket_unittest.cc
@@ -27,21 +27,21 @@ class SSLClientSocketTest : public PlatformTest {
void StartOKServer() {
bool success = server_.Start(net::TestServerLauncher::ProtoHTTP,
server_.kHostName, server_.kOKHTTPSPort,
- FilePath(), server_.GetOKCertPath(), std::wstring());
+ FilePath(), server_.GetOKCertPath());
ASSERT_TRUE(success);
}
void StartMismatchedServer() {
bool success = server_.Start(net::TestServerLauncher::ProtoHTTP,
server_.kMismatchedHostName, server_.kOKHTTPSPort,
- FilePath(), server_.GetOKCertPath(), std::wstring());
+ FilePath(), server_.GetOKCertPath());
ASSERT_TRUE(success);
}
void StartExpiredServer() {
bool success = server_.Start(net::TestServerLauncher::ProtoHTTP,
server_.kHostName, server_.kBadHTTPSPort,
- FilePath(), server_.GetExpiredCertPath(), std::wstring());
+ FilePath(), server_.GetExpiredCertPath());
ASSERT_TRUE(success);
}
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;
diff --git a/net/base/ssl_test_util.h b/net/base/ssl_test_util.h
index 54449ee..b75453b 100644
--- a/net/base/ssl_test_util.h
+++ b/net/base/ssl_test_util.h
@@ -39,15 +39,12 @@ class TestServerLauncher {
// Start src/net/tools/testserver/testserver.py and
// ask it to serve the given protocol.
// If protocol is HTTP, and cert_path is not empty, serves HTTPS.
- // file_root_url specifies the root url on the server that documents will be
- // served out of. This is /files/ by default.
// Returns true on success, false if files not found or root cert
// not trusted.
bool 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);
// Stop the server started by Start().
bool Stop();