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() { |