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

Unified Diff: chrome/browser/sync/glue/password_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/password_change_processor.cc
===================================================================
--- chrome/browser/sync/glue/password_change_processor.cc (revision 48898)
+++ chrome/browser/sync/glue/password_change_processor.cc (working copy)
@@ -55,9 +55,9 @@
sync_api::ReadNode password_root(&trans);
if (!password_root.InitByTagLookup(kPasswordTag)) {
- error_handler()->OnUnrecoverableError();
- LOG(ERROR) << "Server did not create the top-level password node. "
- << "We might be running against an out-of-date server.";
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Server did not create the top-level password node. "
+ "We might be running against an out-of-date server.");
return;
}
@@ -71,8 +71,8 @@
sync_api::WriteNode sync_node(&trans);
if (!sync_node.InitUniqueByCreation(syncable::PASSWORD,
password_root, tag)) {
- LOG(ERROR) << "Failed to create password sync node.";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Failed to create password sync node.");
return;
}
@@ -84,13 +84,13 @@
sync_api::WriteNode sync_node(&trans);
int64 sync_id = model_associator_->GetSyncIdFromChromeId(tag);
if (sync_api::kInvalidId == sync_id) {
- LOG(ERROR) << "Unexpected notification for: " << tag;
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Unexpected notification for: ");
return;
} else {
if (!sync_node.InitByIdLookup(sync_id)) {
- LOG(ERROR) << "Password node lookup failed.";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Password node lookup failed.");
return;
}
}
@@ -102,13 +102,13 @@
sync_api::WriteNode sync_node(&trans);
int64 sync_id = model_associator_->GetSyncIdFromChromeId(tag);
if (sync_api::kInvalidId == sync_id) {
- LOG(ERROR) << "Unexpected notification";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Unexpected notification");
return;
} else {
if (!sync_node.InitByIdLookup(sync_id)) {
- LOG(ERROR) << "Password node lookup failed.";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Password node lookup failed.");
return;
}
model_associator_->Disassociate(sync_node.GetId());
@@ -131,8 +131,8 @@
sync_api::ReadNode password_root(trans);
if (!password_root.InitByTagLookup(kPasswordTag)) {
- LOG(ERROR) << "Password root node lookup failed.";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Password root node lookup failed.");
return;
}
@@ -144,8 +144,8 @@
sync_api::ReadNode sync_node(trans);
if (!sync_node.InitByIdLookup(changes[i].id)) {
- LOG(ERROR) << "Password node lookup failed.";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Password node lookup failed.");
return;
}
@@ -155,8 +155,8 @@
sync_pb::PasswordSpecificsData password_data;
if (!sync_node.GetPasswordSpecifics(&password_data)) {
- LOG(ERROR) << "Could not read password specifics";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Could not read password specifics");
return;
}
webkit_glue::PasswordForm password;
@@ -177,8 +177,7 @@
if (!model_associator_->WriteToPasswordStore(&new_passwords,
&updated_passwords,
&deleted_passwords)) {
- LOG(ERROR) << "Error writing passwords";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE, "Error writing passwords");
return;
}
« no previous file with comments | « chrome/browser/sync/glue/history_model_worker.cc ('k') | chrome/browser/sync/glue/password_data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698