Avoid long test_server timeouts by using action_timeout_ms

instead of action_max_timeout_ms.

This increases action_timeout_ms a little bit,
otherwise test_server becomes more flaky (fails to start in time).

This effectively reduces the timeout for TestServer start from 45s to 10s.

BUG=93770

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

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

5 files changed, 5 insertions, 11 deletions

diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 6bcf4bc..524e85e 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -43,7 +43,7 @@ bool TestTimeouts::initialized_ = false;
 // The timeout values should increase in the order they appear in this block.
 // static
 int TestTimeouts::tiny_timeout_ms_ = 100;
-int TestTimeouts::action_timeout_ms_ = 2000;
+int TestTimeouts::action_timeout_ms_ = 10000;
 int TestTimeouts::action_max_timeout_ms_ = 45000;
 int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000;
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 780a3fa..689522d 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -467,7 +467,7 @@ class SafeBrowsingServiceTestHelper
       // Wait and try again if last fetch was failed. The loop will hit the
       // timeout in OutOfProcTestRunner if the fetch can not get success
       // response.
-      base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
+      base::PlatformThread::Sleep(TestTimeouts::tiny_timeout_ms());
     }
   }
 
@@ -591,7 +591,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SafeBrowsingSystemTest) {
     do {
       // Periodically pull the status.
       safe_browsing_helper->WaitForStatusUpdate(
-          TestTimeouts::action_timeout_ms());
+          TestTimeouts::tiny_timeout_ms());
     } while (is_update_scheduled() || is_initial_request() ||
              !is_database_ready());
 
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index d76430d..faf1090 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -39,12 +39,6 @@ namespace net {
 
 namespace {
 
-// Number of connection attempts for tests.
-const int kServerConnectionAttempts = 10;
-
-// Connection timeout in milliseconds for tests.
-const int kServerConnectionTimeoutMs = 1000;
-
 std::string GetHostname(TestServer::Type type,
                         const TestServer::HTTPSOptions& options) {
   if (type == TestServer::TYPE_HTTPS &&
diff --git a/net/test/test_server_posix.cc b/net/test/test_server_posix.cc
index 2efc54f..1200824 100644
--- a/net/test/test_server_posix.cc
+++ b/net/test/test_server_posix.cc
@@ -136,7 +136,7 @@ bool TestServer::WaitToStart() {
   file_util::ScopedFD child_fd_closer(child_fd_closer_.release());
 
   base::TimeDelta remaining_time = base::TimeDelta::FromMilliseconds(
-      TestTimeouts::action_max_timeout_ms());
+      TestTimeouts::action_timeout_ms());
 
   uint32 server_data_len = 0;
   if (!ReadData(child_fd_, sizeof(server_data_len),
diff --git a/net/test/test_server_win.cc b/net/test/test_server_win.cc
index a93e6dc..5d7fa88 100644
--- a/net/test/test_server_win.cc
+++ b/net/test/test_server_win.cc
@@ -52,7 +52,7 @@ bool ReadData(HANDLE read_fd, HANDLE write_fd,
   thread.message_loop()->PostDelayedTask(
       FROM_HERE,
       NewRunnableFunction(UnblockPipe, write_fd, bytes_max, &unblocked),
-      TestTimeouts::action_max_timeout_ms());
+      TestTimeouts::action_timeout_ms());
 
   DWORD bytes_read = 0;
   while (bytes_read < bytes_max) {