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

Unified Diff: sync/engine/commit.cc

Issue 891123003: Revert of Sync commit errors should temporarily re-enable trigger pre-commit getupdates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « sync/engine/commit.h ('k') | sync/engine/sync_scheduler_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/commit.cc
diff --git a/sync/engine/commit.cc b/sync/engine/commit.cc
index 0561e9b58367d284a7b4470f782c0598dab8f5c4..509e08d9d32443d8c28aea8260236a8d1a1a0765 100644
--- a/sync/engine/commit.cc
+++ b/sync/engine/commit.cc
@@ -83,7 +83,6 @@
}
SyncerError Commit::PostAndProcessResponse(
- sessions::NudgeTracker* nudge_tracker,
sessions::SyncSession* session,
sessions::StatusController* status,
ExtensionsActivity* extensions_activity) {
@@ -154,9 +153,6 @@
"type", ModelTypeToString(it->first));
SyncerError type_result =
it->second->ProcessCommitResponse(response_, status);
- if (type_result == SERVER_RETURN_CONFLICT) {
- nudge_tracker->RecordCommitConflict(it->first);
- }
if (processing_result == SYNCER_OK && type_result != SYNCER_OK) {
processing_result = type_result;
}
« no previous file with comments | « sync/engine/commit.h ('k') | sync/engine/sync_scheduler_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698