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

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

Issue 2002012: sync: Add location info to unrecoverable error. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Add error handler back to bookmark model associator Created 10 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
Index: chrome/browser/sync/glue/bookmark_change_processor.cc
===================================================================
--- chrome/browser/sync/glue/bookmark_change_processor.cc (revision 48898)
+++ chrome/browser/sync/glue/bookmark_change_processor.cc (working copy)
@@ -77,7 +77,7 @@
sync_api::WriteTransaction* trans, const BookmarkNode* node) {
sync_api::WriteNode sync_node(trans);
if (!model_associator_->InitSyncNodeFromChromeId(node->id(), &sync_node)) {
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE, std::string());
return;
}
// This node should have no children.
@@ -158,8 +158,8 @@
// Actually create the node with the appropriate initial position.
if (!PlaceSyncNode(CREATE, parent, index, trans, &sync_child, associator,
error_handler)) {
- LOG(WARNING) << "Sync node creation failed; recovery unlikely";
- error_handler->OnUnrecoverableError();
+ error_handler->OnUnrecoverableError(FROM_HERE,
+ "Sync node creation failed; recovery unlikely");
return sync_api::kInvalidId;
}
@@ -196,7 +196,7 @@
// Lookup the sync node that's associated with |node|.
sync_api::WriteNode sync_node(&trans);
if (!model_associator_->InitSyncNodeFromChromeId(node->id(), &sync_node)) {
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE, std::string());
return;
}
@@ -230,13 +230,13 @@
// Lookup the sync node that's associated with |child|.
sync_api::WriteNode sync_node(&trans);
if (!model_associator_->InitSyncNodeFromChromeId(child->id(), &sync_node)) {
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE, std::string());
return;
}
if (!PlaceSyncNode(MOVE, new_parent, new_index, &trans, &sync_node,
model_associator_, error_handler())) {
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE, std::string());
return;
}
}
@@ -259,7 +259,7 @@
sync_api::WriteNode sync_child(&trans);
if (!model_associator_->InitSyncNodeFromChromeId(node->GetChild(i)->id(),
&sync_child)) {
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE, std::string());
return;
}
DCHECK_EQ(sync_child.GetParentId(),
@@ -267,7 +267,7 @@
if (!PlaceSyncNode(MOVE, node, i, &trans, &sync_child,
model_associator_, error_handler())) {
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE, std::string());
return;
}
}
@@ -281,7 +281,7 @@
sync_api::ReadNode sync_parent(trans);
if (!associator->InitSyncNodeFromChromeId(parent->id(), &sync_parent)) {
LOG(WARNING) << "Parent lookup failed";
- error_handler->OnUnrecoverableError();
+ error_handler->OnUnrecoverableError(FROM_HERE, std::string());
return false;
}
@@ -412,8 +412,8 @@
sync_api::ReadNode src(trans);
if (!src.InitByIdLookup(changes[i].id)) {
- LOG(ERROR) << "ApplyModelChanges was passed a bad ID";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "ApplyModelChanges was passed a bad ID");
return;
}
« no previous file with comments | « chrome/browser/sync/glue/autofill_model_associator.cc ('k') | chrome/browser/sync/glue/bookmark_data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698