| Index: chrome/browser/sync_file_system/sync_process_runner.cc
|
| diff --git a/chrome/browser/sync_file_system/sync_process_runner.cc b/chrome/browser/sync_file_system/sync_process_runner.cc
|
| index d7c71cecdd5649859cb6c03cd7f7d3234d44b204..dd82e19e8c9aebef1b89f2f2e77d79855c010e85 100644
|
| --- a/chrome/browser/sync_file_system/sync_process_runner.cc
|
| +++ b/chrome/browser/sync_file_system/sync_process_runner.cc
|
| @@ -44,6 +44,10 @@ class BaseTimerHelper : public SyncProcessRunner::TimerHelper {
|
| timer_.Start(from_here, delay, closure);
|
| }
|
|
|
| + virtual base::TimeTicks Now() const OVERRIDE {
|
| + return base::TimeTicks::Now();
|
| + }
|
| +
|
| virtual ~BaseTimerHelper() {}
|
|
|
| private:
|
| @@ -153,7 +157,7 @@ void SyncProcessRunner::Finished(const base::TimeTicks& start_time,
|
| util::Log(logging::LOG_VERBOSE, FROM_HERE,
|
| "[%s] * Finished (elapsed: %" PRId64 " sec)",
|
| name_.c_str(),
|
| - (base::TimeTicks::Now() - start_time).InSeconds());
|
| + (timer_helper_->Now() - start_time).InSeconds());
|
| if (status == SYNC_STATUS_NO_CHANGE_TO_SYNC ||
|
| status == SYNC_STATUS_FILE_BUSY)
|
| ScheduleInternal(kSyncDelayMaxInMilliseconds);
|
| @@ -168,7 +172,7 @@ void SyncProcessRunner::Run() {
|
| if (running_tasks_ >= max_parallel_task_)
|
| return;
|
| ++running_tasks_;
|
| - last_scheduled_ = base::TimeTicks::Now();
|
| + last_scheduled_ = timer_helper_->Now();
|
| last_delay_ = current_delay_;
|
|
|
| util::Log(logging::LOG_VERBOSE, FROM_HERE,
|
| @@ -185,7 +189,7 @@ void SyncProcessRunner::ScheduleInternal(int64 delay) {
|
| if (current_delay_ == delay)
|
| return;
|
|
|
| - base::TimeDelta elapsed = base::TimeTicks::Now() - last_scheduled_;
|
| + base::TimeDelta elapsed = timer_helper_->Now() - last_scheduled_;
|
| if (elapsed < time_to_next) {
|
| time_to_next = time_to_next - elapsed;
|
| } else {
|
|
|