Avoid long test_server timeouts by using action_timeout_ms

chrome/browser/safe_browsing/safe_browsing_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This test uses the safebrowsing test server published at
 // http://code.google.com/p/google-safe-browsing/ to test the safebrowsing
 // protocol implemetation. Details of the safebrowsing testing flow is
 // documented at
 // http://code.google.com/p/google-safe-browsing/wiki/ProtocolTesting
 //
@@ skipping 449 matching lines @@
     GURL url(base::StringPrintf("http://%s:%d%s?test_step=0",
                                 host, port, kDBResetPath));
     // TODO(lzheng): We should have a way to reliably tell when a server is
     // ready so we could get rid of the Sleep and retry loop.
     while (true) {
       if (FetchUrl(url) == net::URLRequestStatus::SUCCESS)
         break;
       // 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());
     }
   }
 
   // Calls test server to fetch database for verification.
   net::URLRequestStatus::Status FetchDBToVerify(const char* host, int port,
                                                 int test_step) {
     // TODO(lzheng): Remove chunk_type=add once it is not needed by the server.
     GURL url(base::StringPrintf(
         "http://%s:%d%s?"
         "client=chromium&appver=1.0&pver=2.2&test_step=%d&"
@@ skipping 103 matching lines @@
     // Starts safebrowsing update on IO thread. Waits till scheduled
     // update finishes. Stops waiting after kMaxWaitSecPerStep if the update
     // could not finish.
     base::Time now = base::Time::Now();
     SetTestStep(step);
     safe_browsing_helper->ForceUpdate();
 
     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());
 
 
     if (last_update() < now) {
       // This means no data available anymore.
       break;
     }
 
     // Fetches URLs to verify and waits till server responses with data.
@@ skipping 37 matching lines @@
   }
 
   // Verifies with server if test is done and waits till server responses.
   EXPECT_EQ(net::URLRequestStatus::SUCCESS,
             safe_browsing_helper->VerifyTestComplete(server_host,
                                                      server_port,
                                                      last_step));
   EXPECT_EQ("yes", safe_browsing_helper->response_data());
   test_server.Stop();
 }