[Recommit]

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 39 matching lines @@
 
 bool Syncer::ExitRequested() {
   return cancelation_signal_->IsSignalled();
 }
 
 bool Syncer::NormalSyncShare(ModelTypeSet request_types,
                              const NudgeTracker& nudge_tracker,
                              SyncSession* session) {
   HandleCycleBegin(session);
   VLOG(1) << "Downloading types " << ModelTypeSetToString(request_types);
-  if (nudge_tracker.IsGetUpdatesRequired() ||
+  if (nudge_tracker.IsGetUpdatesRequired(base::TimeTicks::Now()) ||
       session->context()->ShouldFetchUpdatesBeforeCommit()) {
     if (!DownloadAndApplyUpdates(
             request_types,
             session,
             base::Bind(&download::BuildNormalDownloadUpdates,
                        session,
                        kCreateMobileBookmarksFolder,
                        request_types,
                        base::ConstRef(nudge_tracker)))) {
       return HandleCycleEnd(session, nudge_tracker.updates_source());
@@ skipping 31 matching lines @@
   DownloadAndApplyUpdates(
       request_types,
       session,
       base::Bind(&download::BuildDownloadUpdatesForPoll,
                  session,
                  kCreateMobileBookmarksFolder,
                  request_types));
   return HandleCycleEnd(session, sync_pb::GetUpdatesCallerInfo::PERIODIC);
 }
 
+bool Syncer::RetrySyncShare(ModelTypeSet request_types,
+                            SyncSession* session) {
+  HandleCycleBegin(session);
+  VLOG(1) << "Retrying types " << ModelTypeSetToString(request_types);
+  DownloadAndApplyUpdates(
+      request_types,
+      session,
+      base::Bind(&download::BuildDownloadUpdatesForRetry,
+                 session,
+                 kCreateMobileBookmarksFolder,
+                 request_types));
+  return HandleCycleEnd(session, sync_pb::GetUpdatesCallerInfo::RETRY);
+}
+
 void Syncer::ApplyUpdates(SyncSession* session) {
   TRACE_EVENT0("sync", "ApplyUpdates");
 
   ApplyControlDataUpdates(session->context()->directory());
 
   UpdateHandlerMap* handler_map = session->context()->update_handler_map();
   for (UpdateHandlerMap::iterator it = handler_map->begin();
        it != handler_map->end(); ++it) {
     it->second->ApplyUpdates(session->mutable_status_controller());
   }
@@ skipping 72 matching lines @@
     sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source) {
   if (!ExitRequested()) {
     session->SendSyncCycleEndEventNotification(source);
     return true;
   } else {
     return false;
   }
 }
 
 }  // namespace syncer