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

1 files changed, 2 insertions, 2 deletions

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());