Switch to TimeDelta interfaces for TestTimeouts in sync code.

chrome/browser/sync/glue/browser_thread_model_worker_unittest.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 21 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
 
   bool did_do_work() { return did_do_work_; }
   BrowserThreadModelWorker* worker() { return worker_.get(); }
   OneShotTimer<SyncBrowserThreadModelWorkerTest>* timer() { return &timer_; }
   base::WeakPtrFactory<SyncBrowserThreadModelWorkerTest>* factory() {
     return &weak_factory_;
   }
 
   // Schedule DoWork to be executed on the DB thread and have the test fail if
-  // DoWork hasn't executed within action_timeout_ms() ms.
+  // DoWork hasn't executed within action_timeout() ms.

[akalin, 2012/07/11 20:35:15]

remove ' ms'?

   void ScheduleWork() {
    // We wait until the callback is done. So it is safe to use unretained.
     syncer::WorkCallback c =
         base::Bind(&SyncBrowserThreadModelWorkerTest::DoWork,
                    base::Unretained(this));
     timer()->Start(
         FROM_HERE,
-        TimeDelta::FromMilliseconds(TestTimeouts::action_timeout_ms()),
+        TestTimeouts::action_timeout(),
         this,
         &SyncBrowserThreadModelWorkerTest::Timeout);
     worker()->DoWorkAndWaitUntilDone(c);
   }
 
   // This is the work that will be scheduled to be done on the DB thread.
   syncer::SyncerError DoWork() {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
     timer_.Stop();  // Stop the failure timer so the test succeeds.
     BrowserThread::PostTask(
@@ skipping 37 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&SyncBrowserThreadModelWorkerTest::ScheduleWork,
                  factory()->GetWeakPtr()));
   MessageLoop::current()->Run();
   EXPECT_TRUE(did_do_work());
 }
 
 }  // namespace
 
 }  // namespace browser_sync