sync: Merge GU retry logic into normal GU

sync/engine/syncer.cc

 // Copyright (c) 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.
 
 #include "sync/engine/syncer.h"
 
 #include "base/debug/trace_event.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 52 matching lines @@
     VLOG(1) << "Downloading types " << ModelTypeSetToString(request_types);
     NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
     GetUpdatesProcessor get_updates_processor(
         session->context()->model_type_registry()->update_handler_map(),
         normal_delegate);
     if (!DownloadAndApplyUpdates(
             request_types,
             session,
             &get_updates_processor,
             kCreateMobileBookmarksFolder)) {
-      return HandleCycleEnd(session, nudge_tracker.updates_source());
+      return HandleCycleEnd(session, nudge_tracker.GetLegacySource());
     }
   }
 
   VLOG(1) << "Committing from types " << ModelTypeSetToString(request_types);
   CommitProcessor commit_processor(
       session->context()->model_type_registry()->commit_contributor_map());
   SyncerError commit_result =
       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(
     ModelTypeSet request_types,
     sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
     SyncSession* session) {
   VLOG(1) << "Configuring types " << ModelTypeSetToString(request_types);
   HandleCycleBegin(session);
   ConfigureGetUpdatesDelegate configure_delegate(source);
   GetUpdatesProcessor get_updates_processor(
@@ skipping 16 matching lines @@
       session->context()->model_type_registry()->update_handler_map(),
       poll_delegate);
   DownloadAndApplyUpdates(
       request_types,
       session,
       &get_updates_processor,
       kCreateMobileBookmarksFolder);
   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,
     GetUpdatesProcessor* get_updates_processor,
     bool create_mobile_bookmarks_folder) {
   SyncerError download_result = UNSET;
   do {
     download_result = get_updates_processor->DownloadUpdates(
         request_types,
         session,
@@ skipping 70 matching lines @@
     sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source) {
   if (!ExitRequested()) {
     session->SendSyncCycleEndEventNotification(source);
     return true;
   } else {
     return false;
   }
 }
 
 }  // namespace syncer