sync: Merge GU retry logic into normal GU

sync/engine/syncer.cc

Index: sync/engine/syncer.cc
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc
index 240332c5a9448b76d1f7c7c4fc3629cf24aa30f2..c75251028ef20131a650a6c16cd4a5f2f2157013 100644
--- a/sync/engine/syncer.cc
+++ b/sync/engine/syncer.cc
@@ -70,7 +70,7 @@ bool Syncer::NormalSyncShare(ModelTypeSet request_types,
             session,
             &get_updates_processor,
             kCreateMobileBookmarksFolder)) {
-      return HandleCycleEnd(session, nudge_tracker.updates_source());
+      return HandleCycleEnd(session, nudge_tracker.GetLegacySource());
     }
   }
 
@@ -81,7 +81,7 @@ bool Syncer::NormalSyncShare(ModelTypeSet request_types,
       BuildAndPostCommits(request_types, session, &commit_processor);
   session->mutable_status_controller()->set_commit_result(commit_result);
 
-  return HandleCycleEnd(session, nudge_tracker.updates_source());
+  return HandleCycleEnd(session, nudge_tracker.GetLegacySource());
 }
 
 bool Syncer::ConfigureSyncShare(
@@ -118,22 +118,6 @@ bool Syncer::PollSyncShare(ModelTypeSet request_types,
   return HandleCycleEnd(session, sync_pb::GetUpdatesCallerInfo::PERIODIC);
 }
 
-bool Syncer::RetrySyncShare(ModelTypeSet request_types,
-                            SyncSession* session) {
-  VLOG(1) << "Retrying types " << ModelTypeSetToString(request_types);
-  HandleCycleBegin(session);
-  RetryGetUpdatesDelegate retry_delegate;
-  GetUpdatesProcessor get_updates_processor(
-      session->context()->model_type_registry()->update_handler_map(),
-      retry_delegate);
-  DownloadAndApplyUpdates(
-      request_types,
-      session,
-      &get_updates_processor,
-      kCreateMobileBookmarksFolder);
-  return HandleCycleEnd(session, sync_pb::GetUpdatesCallerInfo::RETRY);
-}
-
 bool Syncer::DownloadAndApplyUpdates(
     ModelTypeSet request_types,
     SyncSession* session,