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

1 files changed, 9 insertions, 18 deletions

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;
     }