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

Unified Diff: chrome/browser/sync/glue/preference_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/preference_change_processor.cc
===================================================================
--- chrome/browser/sync/glue/preference_change_processor.cc (revision 48898)
+++ chrome/browser/sync/glue/preference_change_processor.cc (working copy)
@@ -61,20 +61,20 @@
int64 sync_id = model_associator_->GetSyncIdFromChromeId(*name);
if (sync_api::kInvalidId == sync_id) {
- LOG(ERROR) << "Unexpected notification for: " << *name;
- error_handler()->OnUnrecoverableError();
+ std::wstring err = L"Unexpected notification for: " + *name;
+ error_handler()->OnUnrecoverableError(FROM_HERE, WideToUTF8(err));
return;
} else {
if (!node.InitByIdLookup(sync_id)) {
- LOG(ERROR) << "Preference node lookup failed.";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Preference node lookup failed.");
return;
}
}
if (!WritePreference(&node, *name, preference->GetValue())) {
- LOG(ERROR) << "Failed to update preference node.";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Failed to update preference node.");
return;
}
}
@@ -102,8 +102,8 @@
}
if (!node.InitByIdLookup(changes[i].id)) {
- LOG(ERROR) << "Preference node lookup failed.";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Preference node lookup failed.");
return;
}
DCHECK(syncable::PREFERENCES == node.GetModelType());
@@ -154,8 +154,8 @@
std::string serialized;
JSONStringValueSerializer json(&serialized);
if (!json.Serialize(*value)) {
- LOG(ERROR) << "Failed to serialize preference value.";
- error_handler()->OnUnrecoverableError();
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Failed to serialize preference value.");
return false;
}
@@ -175,9 +175,9 @@
base::JSONReader reader;
scoped_ptr<Value> value(reader.JsonToValue(preference.value(), false, false));
if (!value.get()) {
- LOG(ERROR) << "Failed to deserialize preference value: "
- << reader.GetErrorMessage();
- error_handler()->OnUnrecoverableError();
+ std::string err = "Failed to deserialize preference value: " +
+ reader.GetErrorMessage();
+ error_handler()->OnUnrecoverableError(FROM_HERE, err);
return NULL;
}
*name = UTF8ToWide(preference.name());
« no previous file with comments | « chrome/browser/sync/glue/preference_change_processor.h ('k') | chrome/browser/sync/glue/preference_data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698