sync: Attempt to fix sync scheduler test flakiness

sync/sessions/nudge_tracker.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/sessions/nudge_tracker.h"
 
 #include "base/basictypes.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
@@ skipping 45 matching lines @@
   return false;
 }
 
 bool NudgeTracker::IsRetryRequired() const {
   if (sync_cycle_start_time_.is_null())
     return false;
 
   if (current_retry_time_.is_null())
     return false;
 
-  return current_retry_time_ < sync_cycle_start_time_;
+  return current_retry_time_ <= sync_cycle_start_time_;
 }
 
 void NudgeTracker::RecordSuccessfulSyncCycle() {
   // If a retry was required, we've just serviced it.  Unset the flag.
   if (IsRetryRequired())
     current_retry_time_ = base::TimeTicks();
 
   // A successful cycle while invalidations are enabled puts us back into sync.
   invalidations_out_of_sync_ = !invalidations_enabled_;
 
@@ skipping 216 matching lines @@
   // flag so we leave this variable set regardless of whether or not there is an
   // overwrite pending.
   if (!current_retry_time_.is_null()) {
     return;
   }
 
   // If do not have a current_retry_time_, but we do have a next_retry_time_ and
   // it is ready to go, then we set it as the current_retry_time_.  It will stay
   // there until a GU retry has succeeded.
   if (!next_retry_time_.is_null() &&
-      next_retry_time_ < sync_cycle_start_time_) {
+      next_retry_time_ <= sync_cycle_start_time_) {
     current_retry_time_ = next_retry_time_;
     next_retry_time_ = base::TimeTicks();
   }
 }
 
 void NudgeTracker::SetHintBufferSize(size_t size) {
   for (TypeTrackerMap::iterator it = type_trackers_.begin();
        it != type_trackers_.end(); ++it) {
     it->second->UpdatePayloadBufferSize(size);
   }
 }
 
 void NudgeTracker::SetNextRetryTime(base::TimeTicks retry_time) {
   next_retry_time_ = retry_time;
 }
 
 }  // namespace sessions
 }  // namespace syncer