Submitting http://codereview.chromium.org/164076 for syf1984@gmail.com (aka miletus):

Make the timeout in WaitToStart() of TestServerLauncher parametrized and expose this parameter to HTTPTestServer::CreateServer()

TBR=syf1984@gmail.com, tommi@chromium.org

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

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

1 files changed, 8 insertions, 0 deletions

diff --git a/net/socket/ssl_test_util.h b/net/socket/ssl_test_util.h
index acda685..ad9bbab 100644
--- a/net/socket/ssl_test_util.h
+++ b/net/socket/ssl_test_util.h
@@ -26,6 +26,7 @@ namespace net {
 class TestServerLauncher {
  public:
   TestServerLauncher();
+  TestServerLauncher(int connection_attempts, int connection_timeout);
 
   virtual ~TestServerLauncher();
 
@@ -94,6 +95,9 @@ class TestServerLauncher {
   // Returns false if our test root certificate is not trusted.
   bool CheckCATrusted();
 
+  // Initilize the certificate path.
+  void InitCertPath();
+
   FilePath document_root_dir_;
 
   FilePath cert_dir_;
@@ -102,6 +106,10 @@ class TestServerLauncher {
 
   base::ProcessHandle process_handle_;
 
+  // Number of tries and timeout for each try used for WaitToStart.
+  int connection_attempts_;
+  int connection_timeout_;
+
 #if defined(OS_LINUX)
   struct PrivateCERTCertificate;
   PrivateCERTCertificate *cert_;