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

5 files changed, 15 insertions, 38 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();
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 9ab77a8..5784059 100644
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -565,15 +565,13 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     """This handler sends the contents of the requested file.  Wow, it's like
     a real webserver!"""
 
-    prefix = self.server.file_root_url
+    prefix='/files/'
     if not self.path.startswith(prefix):
       return False
 
     file = self.path[len(prefix):]
     entries = file.split('/');
     path = os.path.join(self.server.data_dir, *entries)
-    if os.path.isdir(path):
-      path = os.path.join(path, 'index.html')
 
     if not os.path.isfile(path):
       print "File not found " + file + " full path:" + path
@@ -1049,7 +1047,6 @@ def main(options, args):
       print 'HTTP server started on port %d...' % port
 
     server.data_dir = MakeDataDir()
-    server.file_root_url = options.file_root_url
     MakeDumpDir(server.data_dir)
 
   # means FTP Server
@@ -1105,8 +1102,6 @@ if __name__ == '__main__':
                            help='Specify that https should be used, specify '
                            'the path to the cert containing the private key '
                            'the server should use')
-  option_parser.add_option('', '--file-root-url', default='/files/',
-                           help='Specify a root URL for files served.')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index e661153..88b83a6 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -260,22 +260,20 @@ class BaseTestServer : public base::RefCounted<BaseTestServer> {
   bool Start(net::TestServerLauncher::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) {
     std::string blank;
     return Start(protocol, host_name, port, document_root, cert_path,
-                 file_root_url, blank, blank);
+                 blank, blank);
   }
 
   bool Start(net::TestServerLauncher::Protocol protocol,
              const std::string& host_name, int port,
              const FilePath& document_root,
              const FilePath& cert_path,
-             const std::wstring& file_root_url,
              const std::string& url_user,
              const std::string& url_password) {
     if (!launcher_.Start(protocol,
-        host_name, port, document_root, cert_path, file_root_url))
+        host_name, port, document_root, cert_path))
       return false;
 
     std::string scheme;
@@ -340,20 +338,13 @@ class HTTPTestServer : public BaseTestServer {
   static scoped_refptr<HTTPTestServer> CreateServer(
       const std::wstring& document_root,
       MessageLoop* loop) {
-    return CreateServerWithFileRootURL(document_root, std::wstring(), loop);
-  }
-
-  static scoped_refptr<HTTPTestServer> CreateServerWithFileRootURL(
-      const std::wstring& document_root,
-      const std::wstring& file_root_url,
-      MessageLoop* loop) {
     scoped_refptr<HTTPTestServer> test_server = new HTTPTestServer();
     test_server->loop_ = loop;
     FilePath no_cert;
     FilePath docroot = FilePath::FromWStringHack(document_root);
     if (!test_server->Start(net::TestServerLauncher::ProtoHTTP,
                             kDefaultHostName, kHTTPDefaultPort,
-                            docroot, no_cert, file_root_url)) {
+                            docroot, no_cert)) {
       return NULL;
     }
     return test_server;
@@ -447,7 +438,7 @@ class HTTPSTestServer : public HTTPTestServer {
     if (!test_server->Start(net::TestServerLauncher::ProtoHTTP,
         net::TestServerLauncher::kHostName,
         net::TestServerLauncher::kOKHTTPSPort,
-        docroot, certpath, std::wstring())) {
+        docroot, certpath)) {
       return NULL;
     }
     return test_server;
@@ -463,7 +454,7 @@ class HTTPSTestServer : public HTTPTestServer {
     if (!test_server->Start(net::TestServerLauncher::ProtoHTTP,
         net::TestServerLauncher::kMismatchedHostName,
         net::TestServerLauncher::kOKHTTPSPort,
-        docroot, certpath, std::wstring())) {
+        docroot, certpath)) {
       return NULL;
     }
     return test_server;
@@ -478,7 +469,7 @@ class HTTPSTestServer : public HTTPTestServer {
     if (!test_server->Start(net::TestServerLauncher::ProtoHTTP,
         net::TestServerLauncher::kHostName,
         net::TestServerLauncher::kBadHTTPSPort,
-        docroot, certpath, std::wstring())) {
+        docroot, certpath)) {
       return NULL;
     }
     return test_server;
@@ -493,7 +484,7 @@ class HTTPSTestServer : public HTTPTestServer {
     FilePath docroot = FilePath::FromWStringHack(document_root);
     FilePath certpath = FilePath::FromWStringHack(cert_path);
     if (!test_server->Start(net::TestServerLauncher::ProtoHTTP,
-        host_name, port, docroot, certpath, std::wstring())) {
+        host_name, port, docroot, certpath)) {
       return NULL;
     }
     return test_server;
@@ -526,7 +517,7 @@ class FTPTestServer : public BaseTestServer {
     FilePath docroot = FilePath::FromWStringHack(document_root);
     FilePath no_cert;
     if (!test_server->Start(net::TestServerLauncher::ProtoFTP,
-        kDefaultHostName, kFTPDefaultPort, docroot, no_cert, std::wstring(),
+        kDefaultHostName, kFTPDefaultPort, docroot, no_cert,
         url_user, url_password)) {
       return NULL;
     }