Client-side changes to support retry GU.

sync/engine/syncer.cc

Index: sync/engine/syncer.cc
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc
index 13e1f7926184994fc9e573b90c916207969c3496..61e6a8f65799600e1a25957ded0e65cd74d5c6ff 100644
--- a/sync/engine/syncer.cc
+++ b/sync/engine/syncer.cc
@@ -102,13 +102,29 @@ bool Syncer::PollSyncShare(ModelTypeSet request_types,
   DownloadAndApplyUpdates(
       request_types,
       session,
-      base::Bind(&download::BuildDownloadUpdatesForPoll,
+      base::Bind(&download::BuildSupplementDownloadUpdates,
                  session,
                  kCreateMobileBookmarksFolder,
-                 request_types));
+                 request_types,
+                 sync_pb::SyncEnums::PERIODIC));
   return HandleCycleEnd(session, sync_pb::GetUpdatesCallerInfo::PERIODIC);
 }
 
+bool Syncer::RetrySyncShare(ModelTypeSet request_types,
+                           SyncSession* session) {
+  HandleCycleBegin(session);
+  VLOG(1) << "Retry types " << ModelTypeSetToString(request_types);
+  DownloadAndApplyUpdates(
+      request_types,
+      session,
+      base::Bind(&download::BuildSupplementDownloadUpdates,
+                 session,
+                 kCreateMobileBookmarksFolder,
+                 request_types,
+                 sync_pb::SyncEnums::RETRY));
+  return HandleCycleEnd(session, sync_pb::GetUpdatesCallerInfo::RETRY);
+}
+
 void Syncer::ApplyUpdates(SyncSession* session) {
   TRACE_EVENT0("sync", "ApplyUpdates");