| Index: trunk/src/sync/engine/syncer.cc
|
| ===================================================================
|
| --- trunk/src/sync/engine/syncer.cc (revision 244437)
|
| +++ trunk/src/sync/engine/syncer.cc (working copy)
|
| @@ -57,7 +57,7 @@
|
| SyncSession* session) {
|
| HandleCycleBegin(session);
|
| VLOG(1) << "Downloading types " << ModelTypeSetToString(request_types);
|
| - if (nudge_tracker.IsGetUpdatesRequired(base::TimeTicks::Now()) ||
|
| + if (nudge_tracker.IsGetUpdatesRequired() ||
|
| session->context()->ShouldFetchUpdatesBeforeCommit()) {
|
| if (!DownloadAndApplyUpdates(
|
| request_types,
|
| @@ -109,20 +109,6 @@
|
| 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");
|
|
|
|
|