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

Unified Diff: chrome/browser/sync/glue/bookmark_model_associator.cc

Issue 1207483006: Sync: Report unmatched unassociated node during optimistic bookmark association. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/bookmark_model_associator.cc
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 6caa161824457bfb0c7629fbca9d3ce01748dce2..6719e0d7ae61d9762f92f350845f00141d3a7a6a 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -863,6 +863,22 @@ syncer::SyncError BookmarkModelAssociator::BuildAssociationsOptimistic(
context->IncrementSyncItemsDeleted(num);
continue;
}
+ } else {
+ // Existing sync node isn't associated. This is unexpected during
+ // optimistic association unless there the previous association failed
+ // to
+ // persist extern IDs (that might be the case because persisting
+ // external
+ // IDs is delayed).
+ // Report this error only once per session.
+ static bool g_unmatched_unassociated_node_reported = false;
+ if (!g_unmatched_unassociated_node_reported) {
+ g_unmatched_unassociated_node_reported = true;
+ unrecoverable_error_handler_->CreateAndUploadError(
+ FROM_HERE,
+ "Unassociated sync node detected during optimistic association",
+ model_type());
+ }
}
syncer::SyncError error;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698