Switch to TimeDelta interfaces for TestTimeouts in sync code.

chrome/browser/sync/test/integration/sync_test.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 497 matching lines @@
   CommandLine::StringType delimiters(FILE_PATH_LITERAL(" "));
   Tokenize(server_cmdline_string, delimiters, &server_cmdline_vector);
   CommandLine server_cmdline(server_cmdline_vector);
   base::LaunchOptions options;
 #if defined(OS_WIN)
   options.start_hidden = true;
 #endif
   if (!base::LaunchProcess(server_cmdline, options, &test_server_handle_))
     LOG(ERROR) << "Could not launch local test server.";
 
-  const int kMaxWaitTime = TestTimeouts::action_max_timeout_ms();
+  const base::TimeDelta kMaxWaitTime = TestTimeouts::action_max_timeout();
   const int kNumIntervals = 15;
   if (WaitForTestServerToStart(kMaxWaitTime, kNumIntervals)) {
     DVLOG(1) << "Started local test server at "
              << cl->GetSwitchValueASCII(switches::kSyncServiceURL) << ".";
     return true;
   } else {
     LOG(ERROR) << "Could not start local test server at "
                << cl->GetSwitchValueASCII(switches::kSyncServiceURL) << ".";
     return false;
   }
@@ skipping 11 matching lines @@
 bool SyncTest::TearDownLocalTestServer() {
   if (test_server_handle_ != base::kNullProcessHandle) {
     EXPECT_TRUE(base::KillProcess(test_server_handle_, 0, false))
         << "Could not stop local test server.";
     base::CloseProcessHandle(test_server_handle_);
     test_server_handle_ = base::kNullProcessHandle;
   }
   return true;
 }
 
-bool SyncTest::WaitForTestServerToStart(int time_ms, int intervals) {
+bool SyncTest::WaitForTestServerToStart(base::TimeDelta time, int intervals) {
   for (int i = 0; i < intervals; ++i) {
     if (IsTestServerRunning())
       return true;
-    base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(
-        time_ms / intervals));
+    base::PlatformThread::Sleep(time / intervals);
   }
   return false;
 }
 
 bool SyncTest::IsTestServerRunning() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   std::string sync_url = cl->GetSwitchValueASCII(switches::kSyncServiceURL);
   GURL sync_url_status(sync_url.append("/healthz"));
   SyncServerStatusChecker delegate;
   scoped_ptr<net::URLFetcher> fetcher(net::URLFetcher::Create(
@@ skipping 220 matching lines @@
 
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetProxyConfigCallback, &done,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }