sync: Merge GU retry logic into normal GU

sync/sessions/nudge_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 outstanding work required to bring the client back into
 // sync with the server.
 #ifndef SYNC_SESSIONS_NUDGE_TRACKER_H_
 #define SYNC_SESSIONS_NUDGE_TRACKER_H_
 
 #include <list>
@@ skipping 76 matching lines @@
   ModelTypeSet GetThrottledTypes() const;
 
   // Returns the 'source' of the GetUpdate request.
   //
   // This flag is deprecated, but still used by the server.  There can be more
   // than one reason to perform a particular sync cycle.  The GetUpdatesTrigger
   // message will contain more reliable information about the reasons for
   // performing a sync.
   //
   // See the implementation for important information about the coalesce logic.
-  sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source() const;
+  sync_pb::GetUpdatesCallerInfo::GetUpdatesSource GetLegacySource() const;
 
   // Fills a GetUpdatesTrigger message for the next GetUpdates request.  This is
   // used by the DownloadUpdatesCommand to dump lots of useful per-type state
   // information into the GetUpdate request before sending it off to the server.
   void FillProtoMessage(
       ModelType type,
       sync_pb::GetUpdateTriggers* msg) const;
 
   // Fills a ProgressMarker with single legacy notification hint expected by the
   // sync server.  Newer servers will rely on the data set by FillProtoMessage()
@@ skipping 63 matching lines @@
   // currently in a sync cycle.
   base::TimeTicks sync_cycle_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(NudgeTracker);
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_NUDGE_TRACKER_H_