| Index: sync/sessions/nudge_tracker.cc
|
| diff --git a/sync/sessions/nudge_tracker.cc b/sync/sessions/nudge_tracker.cc
|
| index d109294a2170c34f52cf7af1d3b683e67758719d..ddb6f218533678c565e35413a9029b5d92693356 100644
|
| --- a/sync/sessions/nudge_tracker.cc
|
| +++ b/sync/sessions/nudge_tracker.cc
|
| @@ -15,8 +15,9 @@ namespace sessions {
|
|
|
| size_t NudgeTracker::kDefaultMaxPayloadsPerType = 10;
|
|
|
| -NudgeTracker::NudgeTracker()
|
| - : updates_source_(sync_pb::GetUpdatesCallerInfo::UNKNOWN),
|
| +NudgeTracker::NudgeTracker(base::Clock* clock)
|
| + : clock_(clock),
|
| + updates_source_(sync_pb::GetUpdatesCallerInfo::UNKNOWN),
|
| invalidations_enabled_(false),
|
| invalidations_out_of_sync_(true) {
|
| ModelTypeSet protocol_types = ProtocolTypes();
|
| @@ -47,6 +48,10 @@ bool NudgeTracker::IsSyncRequired() const {
|
| bool NudgeTracker::IsGetUpdatesRequired() const {
|
| if (invalidations_out_of_sync_)
|
| return true;
|
| +
|
| + if (IsRetryRequired())
|
| + return true;
|
| +
|
| for (TypeTrackerMap::const_iterator it = type_trackers_.begin();
|
| it != type_trackers_.end(); ++it) {
|
| if (it->second.IsGetUpdatesRequired()) {
|
| @@ -56,8 +61,16 @@ bool NudgeTracker::IsGetUpdatesRequired() const {
|
| return false;
|
| }
|
|
|
| +bool NudgeTracker::IsRetryRequired() const {
|
| + return !next_retry_time_.is_null() && next_retry_time_ < clock_->Now();
|
| +}
|
| +
|
| void NudgeTracker::RecordSuccessfulSyncCycle() {
|
| updates_source_ = sync_pb::GetUpdatesCallerInfo::UNKNOWN;
|
| + last_successful_sync_time_ = clock_->Now();
|
| +
|
| + if (next_retry_time_ < clock_->Now())
|
| + next_retry_time_ = base::Time();
|
|
|
| // A successful cycle while invalidations are enabled puts us back into sync.
|
| invalidations_out_of_sync_ = !invalidations_enabled_;
|
| @@ -234,5 +247,9 @@ void NudgeTracker::SetHintBufferSize(size_t size) {
|
| }
|
| }
|
|
|
| +void NudgeTracker::RecordSuccessfulRetry() {
|
| +
|
| +}
|
| +
|
| } // namespace sessions
|
| } // namespace syncer
|
|
|