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

Unified Diff: chrome/browser/sync/glue/session_model_associator.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
Index: chrome/browser/sync/glue/session_model_associator.cc
diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc
index 393334a6e7c18adcab92721bf944a7e85021d513..e89980aa5caefacee623cdfe05f20f01dfba0ab9 100644
--- a/chrome/browser/sync/glue/session_model_associator.cc
+++ b/chrome/browser/sync/glue/session_model_associator.cc
@@ -1567,7 +1567,7 @@ void SessionModelAssociator::QuitLoopForSubtleTesting() {
}
void SessionModelAssociator::BlockUntilLocalChangeForTest(
- int64 timeout_milliseconds) {
+ base::TimeDelta timeout) {
if (test_weak_factory_.HasWeakPtrs())
return;
waiting_for_change_ = true;
@@ -1575,7 +1575,7 @@ void SessionModelAssociator::BlockUntilLocalChangeForTest(
FROM_HERE,
base::Bind(&SessionModelAssociator::QuitLoopForSubtleTesting,
test_weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(timeout_milliseconds));
+ timeout);
}
bool SessionModelAssociator::CryptoReadyIfNecessary() {
« no previous file with comments | « chrome/browser/sync/glue/session_model_associator.h ('k') | chrome/browser/sync/glue/typed_url_model_associator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698