sync: Merge GU retry logic into normal GU

sync/sessions/data_type_tracker.h

 // Copyright 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.
 //
 // A class to track the per-type scheduling data.
 #ifndef SYNC_SESSIONS_DATA_TYPE_TRACKER_H_
 #define SYNC_SESSIONS_DATA_TYPE_TRACKER_H_
 
 #include <deque>
 #include <string>
@@ skipping 49 matching lines @@
   // part of the next sync cycle.
   bool IsGetUpdatesRequired() const;
 
   // Returns true if there is an uncommitted local change.
   bool HasLocalChangePending() const;
 
   // Returns true if we've received an invalidation since we last fetched
   // updates.
   bool HasPendingInvalidation() const;
 
+  // Returns true if an explicit refresh request is still outstanding.
+  bool HasRefreshRequestPending() const;
+
   // Fills in the legacy invalidaiton payload information fields.
   void SetLegacyNotificationHint(
       sync_pb::DataTypeProgressMarker* progress) const;
 
   // Fills some type-specific contents of a GetUpdates request protobuf.  These
   // messages provide the server with the information it needs to decide how to
   // handle a request.
   void FillGetUpdatesTriggersMessage(sync_pb::GetUpdateTriggers* msg) const;
 
   // Returns true if the type is currently throttled.
@@ skipping 31 matching lines @@
   base::TimeTicks unthrottle_time_;
 
   // A helper to keep track invalidations we dropped due to overflow.
   DroppedInvalidationTracker drop_tracker_;
 };
 
 }  // namespace syncer
 }  // namespace sessions
 
 #endif  // SYNC_SESSIONS_DATA_TYPE_TRACKER_H_