Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: trunk/src/sync/engine/syncer.cc

Issue 135923002: Revert 244381 "Support GU retry command in sync engine. The comm..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/sync/engine/syncer.h ('k') | trunk/src/sync/engine/syncer_proto_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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");
« no previous file with comments | « trunk/src/sync/engine/syncer.h ('k') | trunk/src/sync/engine/syncer_proto_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698