Undo revert http://codereview.chromium.org/23028

Changes since original http://codereview.chromium.org/16207 :
- use Release rather than delete on reference counted objects
- Preserve bool WaitToFinish(int milliseconds) 
  and std::wstring GetDataDirectory() at Tommi's request,
  and add unit test for WaitToFinish().

Review URL: http://codereview.chromium.org/20444

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9992 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 71 insertions, 14 deletions

diff --git a/net/base/ssl_test_util.h b/net/base/ssl_test_util.h
index 9daa4cc..9340126 100644
--- a/net/base/ssl_test_util.h
+++ b/net/base/ssl_test_util.h
@@ -5,49 +5,106 @@
 #ifndef NET_BASE_SSL_TEST_UTIL_H_
 #define NET_BASE_SSL_TEST_UTIL_H_
 
-#include "build/build_config.h"
+#include <string>
 
 #include "base/file_path.h"
+#include "base/process_util.h"
+#include "base/ref_counted.h"
+#include "build/build_config.h"
 
-// TODO(dkegel): share this between net/base and 
+// TODO(dkegel): share this between net/base and
 // chrome/browser without putting it in net.lib
 
-class SSLTestUtil {
- public:
-  SSLTestUtil();
-
-  ~SSLTestUtil();
+namespace net {
 
-  FilePath GetRootCertPath();
+// This object bounds the lifetime of an external python-based HTTP/HTTPS/FTP
+// server that can provide various responses useful for testing.
+// A few basic convenience methods are provided, but no
+// URL handling methods (those belong at a higher layer, e.g. in
+// url_request_unittest.h).
 
+class TestServerLauncher {
+ public:
+  TestServerLauncher();
+
+  virtual ~TestServerLauncher();
+
+  enum Protocol {
+    ProtoHTTP, ProtoFTP
+  };
+
+  // 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.
+  // 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);
+
+  // Stop the server started by Start().
+  bool Stop();
+
+  // If you access the server's Kill url, it will exit by itself
+  // without a call to Stop().
+  // WaitToFinish is handy in that case.
+  // It returns true if the server exited cleanly.
+  bool WaitToFinish(int milliseconds);
+
+  // Paths to a good, an expired, and an invalid server certificate
+  // (use as arguments to Start()).
   FilePath GetOKCertPath();
-
   FilePath GetExpiredCertPath();
 
+  FilePath GetDocumentRootPath() { return document_root_dir_; }
+
+  // Issuer name of the root cert that should be trusted for the test to work.
+  static const wchar_t kCertIssuerName[];
+
   // Hostname to use for test server
   static const char kHostName[];
 
+  // Different hostname to use for test server (that still resolves to same IP)
+  static const char kMismatchedHostName[];
+
   // Port to use for test server
   static const int kOKHTTPSPort;
 
   // Port to use for bad test server
   static const int kBadHTTPSPort;
 
-  // Issuer name of the cert that should be trusted for the test to work.
-  static const wchar_t kCertIssuerName[];
+ private:
+  // Wait a while for the server to start, return whether
+  // we were able to make a connection to it.
+  bool WaitToStart(const std::string& host_name, int port);
+
+  // Append to PYTHONPATH so Python can find pyftpdlib and tlslite.
+  void SetPythonPath();
+
+  // Path to our test root certificate.
+  FilePath GetRootCertPath();
 
   // Returns false if our test root certificate is not trusted.
   bool CheckCATrusted();
 
- private:
+  FilePath document_root_dir_;
+
   FilePath cert_dir_;
 
+  FilePath python_runtime_;
+
+  base::ProcessHandle process_handle_;
+
 #if defined(OS_LINUX)
   struct PrivateCERTCertificate;
   PrivateCERTCertificate *cert_;
 #endif
 
-  DISALLOW_COPY_AND_ASSIGN(SSLTestUtil);
+  DISALLOW_COPY_AND_ASSIGN(TestServerLauncher);
 };
 
-#endif // NET_BASE_SSL_TEST_UTIL_H_
+}
+
+#endif  // NET_BASE_SSL_TEST_UTIL_H_
+