Client-side changes to support retry GU.

sync/engine/sync_scheduler_impl.h

 // Copyright 2012 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.
 
 #ifndef SYNC_ENGINE_SYNC_SCHEDULER_IMPL_H_
 #define SYNC_ENGINE_SYNC_SCHEDULER_IMPL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 71 matching lines @@
   virtual bool IsCurrentlyThrottled() OVERRIDE;
   virtual void OnReceivedShortPollIntervalUpdate(
       const base::TimeDelta& new_interval) OVERRIDE;
   virtual void OnReceivedLongPollIntervalUpdate(
       const base::TimeDelta& new_interval) OVERRIDE;
   virtual void OnReceivedSessionsCommitDelay(
       const base::TimeDelta& new_delay) OVERRIDE;
   virtual void OnReceivedClientInvalidationHintBufferSize(int size) OVERRIDE;
   virtual void OnSyncProtocolError(
       const sessions::SyncSessionSnapshot& snapshot) OVERRIDE;
+  virtual void OnReceivedGuRetryDelaySeconds(int delay_seconds) OVERRIDE;
 
  private:
   enum JobPriority {
     // Non-canary jobs respect exponential backoff.
     NORMAL_PRIORITY,
     // Canary jobs bypass exponential backoff, so use with extreme caution.
     CANARY_PRIORITY
   };
 
   enum PollAdjustType {
@@ skipping 45 matching lines @@
     WaitInterval(Mode mode, base::TimeDelta length);
 
     static const char* GetModeString(Mode mode);
 
     Mode mode;
     base::TimeDelta length;
   };
 
   static const char* GetModeString(Mode mode);
 
-  // Invoke the syncer to perform a nudge job.
-  void DoNudgeSyncSessionJob(JobPriority priority);
-
   // Invoke the syncer to perform a configuration job.
   void DoConfigurationSyncSessionJob(JobPriority priority);
 
   // Helper function for Do{Nudge,Configuration}SyncSessionJob.
   void HandleFailure(
       const sessions::ModelNeutralState& model_neutral_state);
 
-  // Invoke the Syncer to perform a poll job.
-  void DoPollSyncSessionJob();
+  // Invoke the syncer to perform a nudge job. Return true if session didn't
+  // abort pre-maturely.
+  bool DoNudgeSyncSessionJob(sessions::SyncSession* session);
+
+  // Invoke the Syncer to perform a poll job. Return true if session didn't
+  // abort pre-maturely.
+  bool DoPollSyncSessionJob(sessions::SyncSession* session);
+
+  // Invoke the Syncer to perform a retry job. Return true if session didn't
+  // abort pre-maturely.
+  bool DoRetrySyncSessionJob(sessions::SyncSession* session);
 
   // Helper function to calculate poll interval.
   base::TimeDelta GetPollInterval();
 
   // Adjusts the poll timer to account for new poll interval, and possibly
   // resets the poll interval, depedning on the flag's value.
   void AdjustPolling(PollAdjustType type);
 
   // Helper to restart waiting with |wait_interval_|'s timer.
   void RestartWaiting();
@@ skipping 26 matching lines @@
 
   // Looks for pending work and, if it finds any, run this work at "canary"
   // priority.
   void TryCanaryJob();
 
   // At the moment TrySyncSessionJob just posts call to TrySyncSessionJobImpl on
   // current thread. In the future it will request access token here.
   void TrySyncSessionJob();
   void TrySyncSessionJobImpl();
 
+  // Post-processing according to session result.
+  void SyncSessionPostProcessing(sessions::SyncSession* session);
+
   // Transitions out of the THROTTLED WaitInterval then calls TryCanaryJob().
   void Unthrottle();
 
   // Called when a per-type throttling interval expires.
   void TypeUnthrottle(base::TimeTicks unthrottle_time);
 
   // Runs a normal nudge job when the scheduled timer expires.
   void PerformDelayedNudge();
 
   // Attempts to exit EXPONENTIAL_BACKOFF by calling TryCanaryJob().
   void ExponentialBackoffRetry();
 
   // Called when the root cause of the current connection error is fixed.
   void OnServerConnectionErrorFixed();
 
   // Creates a session for a poll and performs the sync.
   void PollTimerCallback();
 
+  // Creates a session for a retry and performs the sync.
+  void RetryTimerCallback();
+
   // Returns the set of types that are enabled and not currently throttled.
   ModelTypeSet GetEnabledAndUnthrottledTypes();
 
   // Called as we are started to broadcast an initial session snapshot
   // containing data like initial_sync_ended.  Important when the client starts
   // up and does not need to perform an initial sync.
   void SendInitialSnapshot();
 
   // This is used for histogramming and analysis of ScheduleNudge* APIs.
   // SyncScheduler is the ultimate choke-point for all such invocations (with
@@ skipping 86 matching lines @@
   // after NETWORK_UNAVAILABLE error).
   // It is reset back to NORMAL_PRIORITY on every call to TrySyncSessionJobImpl.
   JobPriority next_sync_session_job_priority_;
 
   base::WeakPtrFactory<SyncSchedulerImpl> weak_ptr_factory_;
 
   // A second factory specially for weak_handle_this_, to allow the handle
   // to be const and alleviate threading concerns.
   base::WeakPtrFactory<SyncSchedulerImpl> weak_ptr_factory_for_weak_handle_;
 
+  // One-shot timer for scheduling GU retry according to delay set by server.
+  base::OneShotTimer<SyncSchedulerImpl> retry_timer_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncSchedulerImpl);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_SYNC_SCHEDULER_IMPL_H_