Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Unified Diff: chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc

Issue 10689157: Switch to TimeDelta interfaces for TestTimeouts in sync code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix error messaging again. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
diff --git a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
index 5ae44d021838e69c4973bcc88cac1a49dd228dea..2c485d8109a86939f53ae3737654e7fedb08a7bf 100644
--- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
+++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
@@ -39,7 +39,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
}
// 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().
void ScheduleWork() {
// We wait until the callback is done. So it is safe to use unretained.
syncer::WorkCallback c =
@@ -47,7 +47,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
base::Unretained(this));
timer()->Start(
FROM_HERE,
- TimeDelta::FromMilliseconds(TestTimeouts::action_timeout_ms()),
+ TestTimeouts::action_timeout(),
this,
&SyncBrowserThreadModelWorkerTest::Timeout);
worker()->DoWorkAndWaitUntilDone(c);
« no previous file with comments | « no previous file | chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698