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; |