Index: chrome/browser/sync/glue/bookmark_change_processor.cc |
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc |
index 8554833e43172aab31791bcb89d6a5dea2298a89..47396e51ea239d6d38ffa05d17d1f003db1f547c 100644 |
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc |
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc |
@@ -191,7 +191,8 @@ void BookmarkChangeProcessor::BookmarkNodeChanged(BookmarkModel* model, |
const BookmarkNode* node) { |
DCHECK(running()); |
// We shouldn't see changes to the top-level nodes. |
- if (node == model->GetBookmarkBarNode() || node == model->other_node()) { |
+ if (node == model->GetBookmarkBarNode() || node == model->other_node() || |
+ node == model->synced_node()) { |
NOTREACHED() << "Saw update to permanent node!"; |
return; |
} |
@@ -225,7 +226,8 @@ void BookmarkChangeProcessor::BookmarkNodeMoved(BookmarkModel* model, |
DCHECK(running()); |
const BookmarkNode* child = new_parent->GetChild(new_index); |
// We shouldn't see changes to the top-level nodes. |
- if (child == model->GetBookmarkBarNode() || child == model->other_node()) { |
+ if (child == model->GetBookmarkBarNode() || child == model->other_node() || |
+ child == model->synced_node()) { |
NOTREACHED() << "Saw update to permanent node!"; |
return; |
} |
@@ -384,7 +386,8 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel( |
model_associator_->GetChromeNodeFromSyncId(changes[i].id); |
// Ignore changes to the permanent top-level nodes. We only care about |
// their children. |
- if ((dst == model->GetBookmarkBarNode()) || (dst == model->other_node())) |
+ if ((dst == model->GetBookmarkBarNode()) || (dst==model->other_node()) || |
+ (dst == model->synced_node())) |
continue; |
if (changes[i].action == |
sync_api::SyncManager::ChangeRecord::ACTION_DELETE) { |