Switch to TimeDelta interfaces for TestTimeouts in sync code.

chrome/browser/sync/test/integration/sessions_helper.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/sessions_helper.h"
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "base/test/test_timeouts.h"
@@ skipping 103 matching lines @@
        it != urls.end(); ++it) {
     DVLOG(1) << "Opening tab: " << it->spec() << " using profile " << index
              << ".";
     chrome::ShowSingletonTab(browser, *it);
   }
   return WaitForTabsToLoad(index, urls);
 }
 
 bool WaitForTabsToLoad(int index, const std::vector<GURL>& urls) {
   DVLOG(1) << "Waiting for session to propagate to associator.";
-  static const int timeout_milli = TestTimeouts::action_max_timeout_ms();
   base::TimeTicks start_time = base::TimeTicks::Now();
-  base::TimeTicks end_time = start_time +
-                             base::TimeDelta::FromMilliseconds(timeout_milli);
+  base::TimeTicks end_time = start_time + TestTimeouts::action_max_timeout();
   bool found;
   for (std::vector<GURL>::const_iterator it = urls.begin();
        it != urls.end(); ++it) {
     found = false;
     while (!found) {
       found = ModelAssociatorHasTabWithUrl(index, *it);
       if (base::TimeTicks::Now() >= end_time) {
-        LOG(ERROR) << "Failed to find all tabs after " << timeout_milli/1000.0
+        LOG(ERROR) << "Failed to find all tabs after "
+                   << TestTimeouts::action_max_timeout().InSecondsF()
                    << " seconds.";
         return false;
       }
       if (!found) {
         ProfileSyncServiceFactory::GetInstance()->GetForProfile(
             test()->GetProfile(index))->GetSessionModelAssociator()->
-            BlockUntilLocalChangeForTest(timeout_milli);
+            BlockUntilLocalChangeForTest(TestTimeouts::action_max_timeout());
         ui_test_utils::RunMessageLoop();
       }
     }
   }
   return true;
 }
 
 bool GetLocalWindows(int index, SessionWindowMap* local_windows) {
   // The local session provided by GetLocalSession is owned, and has lifetime
   // controlled, by the model associator, so we must make our own copy.
@@ skipping 155 matching lines @@
   return true;
 }
 
 void DeleteForeignSession(int index, std::string session_tag) {
   ProfileSyncServiceFactory::GetInstance()->GetForProfile(
       test()->GetProfile(index))->
       GetSessionModelAssociator()->DeleteForeignSession(session_tag);
 }
 
 }  // namespace sessions_helper