Index: chrome/browser/sync/glue/typed_url_change_processor.cc |
diff --git a/chrome/browser/sync/glue/typed_url_change_processor.cc b/chrome/browser/sync/glue/typed_url_change_processor.cc |
index 9c853f797603efe8a32d69ff5d43f687ec019984..05cd86c31566b701e86ef1de9668be2f6aba85e5 100644 |
--- a/chrome/browser/sync/glue/typed_url_change_processor.cc |
+++ b/chrome/browser/sync/glue/typed_url_change_processor.cc |
@@ -108,7 +108,8 @@ bool TypedUrlChangeProcessor::CreateOrUpdateSyncNode( |
} |
sync_api::ReadNode typed_url_root(trans); |
- if (!typed_url_root.InitByTagLookup(kTypedUrlTag)) { |
+ if (typed_url_root.InitByTagLookup(kTypedUrlTag) != |
+ sync_api::BaseNode::INIT_OK) { |
error_handler()->OnUnrecoverableError(FROM_HERE, |
"Server did not create the top-level typed_url node. We " |
"might be running against an out-of-date server."); |
@@ -123,7 +124,8 @@ bool TypedUrlChangeProcessor::CreateOrUpdateSyncNode( |
DCHECK(!visit_vector.empty()); |
sync_api::WriteNode update_node(trans); |
- if (update_node.InitByClientTagLookup(syncable::TYPED_URLS, tag)) { |
+ if (update_node.InitByClientTagLookup(syncable::TYPED_URLS, tag) == |
+ sync_api::BaseNode::INIT_OK) { |
model_associator_->WriteToSyncNode(url, visit_vector, &update_node); |
} else { |
sync_api::WriteNode create_node(trans); |
@@ -157,8 +159,10 @@ void TypedUrlChangeProcessor::HandleURLsDeleted( |
// The deleted URL could have been non-typed, so it might not be found |
// in the sync DB. |
if (sync_node.InitByClientTagLookup(syncable::TYPED_URLS, |
- row->url().spec())) |
+ row->url().spec()) == |
+ sync_api::BaseNode::INIT_OK) { |
sync_node.Remove(); |
+ } |
} |
} |
} |
@@ -199,7 +203,8 @@ void TypedUrlChangeProcessor::ApplyChangesFromSyncModel( |
return; |
sync_api::ReadNode typed_url_root(trans); |
- if (!typed_url_root.InitByTagLookup(kTypedUrlTag)) { |
+ if (typed_url_root.InitByTagLookup(kTypedUrlTag) != |
+ sync_api::BaseNode::INIT_OK) { |
error_handler()->OnUnrecoverableError(FROM_HERE, |
"TypedUrl root node lookup failed."); |
return; |
@@ -221,7 +226,7 @@ void TypedUrlChangeProcessor::ApplyChangesFromSyncModel( |
} |
sync_api::ReadNode sync_node(trans); |
- if (!sync_node.InitByIdLookup(it->id)) { |
+ if (sync_node.InitByIdLookup(it->id) != sync_api::BaseNode::INIT_OK) { |
error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE, |
"TypedUrl node lookup failed."); |
return; |