| Index: trunk/src/sync/sessions/nudge_tracker.cc
|
| ===================================================================
|
| --- trunk/src/sync/sessions/nudge_tracker.cc (revision 244437)
|
| +++ trunk/src/sync/sessions/nudge_tracker.cc (working copy)
|
| @@ -44,13 +44,9 @@
|
| return false;
|
| }
|
|
|
| -bool NudgeTracker::IsGetUpdatesRequired(base::TimeTicks now) const {
|
| +bool NudgeTracker::IsGetUpdatesRequired() const {
|
| if (invalidations_out_of_sync_)
|
| return true;
|
| -
|
| - if (IsRetryRequired(now))
|
| - return true;
|
| -
|
| for (TypeTrackerMap::const_iterator it = type_trackers_.begin();
|
| it != type_trackers_.end(); ++it) {
|
| if (it->second.IsGetUpdatesRequired()) {
|
| @@ -60,17 +56,9 @@
|
| return false;
|
| }
|
|
|
| -bool NudgeTracker::IsRetryRequired(base::TimeTicks now) const {
|
| - return !next_retry_time_.is_null() && next_retry_time_ < now;
|
| -}
|
| -
|
| -void NudgeTracker::RecordSuccessfulSyncCycle(base::TimeTicks now) {
|
| +void NudgeTracker::RecordSuccessfulSyncCycle() {
|
| updates_source_ = sync_pb::GetUpdatesCallerInfo::UNKNOWN;
|
| - last_successful_sync_time_ = now;
|
|
|
| - if (next_retry_time_ < now)
|
| - next_retry_time_ = base::TimeTicks();
|
| -
|
| // A successful cycle while invalidations are enabled puts us back into sync.
|
| invalidations_out_of_sync_ = !invalidations_enabled_;
|
|
|
|
|