sync: Merge GU retry logic into normal GU

sync/engine/get_updates_delegate.h

 // Copyright 2014 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_GET_UPDATES_DELEGATE_H_
 #define SYNC_ENGINE_GET_UPDATES_DELEGATE_H_
 
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/model_type_registry.h"
 #include "sync/sessions/nudge_tracker.h"
@@ skipping 36 matching lines @@
   virtual void ApplyUpdates(
       sessions::StatusController* status,
       UpdateHandlerMap* update_handler_map) const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NormalGetUpdatesDelegate);
 
   const sessions::NudgeTracker& nudge_tracker_;
 };
 
-// Functionality specific to the retry GetUpdate request.
-class SYNC_EXPORT_PRIVATE RetryGetUpdatesDelegate : public GetUpdatesDelegate {
- public:
-  RetryGetUpdatesDelegate();
-  virtual ~RetryGetUpdatesDelegate();
-
-  virtual void HelpPopulateGuMessage(
-      sync_pb::GetUpdatesMessage* get_updates) const OVERRIDE;
-
-  virtual void ApplyUpdates(
-      sessions::StatusController* status,
-      UpdateHandlerMap* update_handler_map) const OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(RetryGetUpdatesDelegate);
-};
-
 // Functionality specific to the configure GetUpdate request.
 class SYNC_EXPORT_PRIVATE ConfigureGetUpdatesDelegate
     : public GetUpdatesDelegate {
  public:
   ConfigureGetUpdatesDelegate(
       sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source);
   virtual ~ConfigureGetUpdatesDelegate();
 
   // Sets the 'source' and 'origin' fields for this request.
   virtual void HelpPopulateGuMessage(
@@ skipping 31 matching lines @@
       sessions::StatusController* status,
       UpdateHandlerMap* update_handler_map) const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PollGetUpdatesDelegate);
 };
 
 }  // namespace syncer
 
 #endif   // SYNC_ENGINE_GET_UPDATES_DELEGATE_H_