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 bc0cd154e1ae167977d2d2c44790a569f977d87b..ebf6c8de313c04ec9846d8246be11a81570fc776 100644 |
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc |
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc |
@@ -459,7 +459,7 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel( |
passed_deletes = true; |
sync_api::ReadNode src(trans); |
- if (!src.InitByIdLookup(it->id)) { |
+ if (src.InitByIdLookup(it->id) != sync_api::BaseNode::INIT_OK) { |
error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE, |
"ApplyModelChanges was passed a bad ID"); |
return; |
@@ -474,7 +474,8 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel( |
// fail). Therefore, we add special logic here just to detect the |
// Synced Bookmarks folder. |
sync_api::ReadNode synced_bookmarks(trans); |
- if (synced_bookmarks.InitByTagLookup(kMobileBookmarksTag) && |
+ if (synced_bookmarks.InitByTagLookup(kMobileBookmarksTag) == |
+ sync_api::BaseNode::INIT_OK && |
synced_bookmarks.GetId() == it->id) { |
// This is a newly created Synced Bookmarks node. Associate it. |
model_associator_->Associate(model->mobile_node(), it->id); |