Switch to TimeDelta interfaces for TestTimeouts in sync code.

chrome/browser/sync/glue/session_model_associator.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/glue/session_model_associator.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 1549 matching lines @@
 void SessionModelAssociator::QuitLoopForSubtleTesting() {
   if (waiting_for_change_) {
     DVLOG(1) << "Quitting MessageLoop for test.";
     waiting_for_change_ = false;
     test_weak_factory_.InvalidateWeakPtrs();
     MessageLoop::current()->Quit();
   }
 }
 
 void SessionModelAssociator::BlockUntilLocalChangeForTest(
-    int64 timeout_milliseconds) {
+    base::TimeDelta timeout) {
   if (test_weak_factory_.HasWeakPtrs())
     return;
   waiting_for_change_ = true;
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&SessionModelAssociator::QuitLoopForSubtleTesting,
                  test_weak_factory_.GetWeakPtr()),
-      base::TimeDelta::FromMilliseconds(timeout_milliseconds));
+      timeout);
 }
 
 bool SessionModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   const syncer::ModelTypeSet encrypted_types =
       syncer::GetEncryptedTypes(&trans);
   return !encrypted_types.Has(SESSIONS) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync