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

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

Issue 10553042: sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 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/generic_change_processor.cc
diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc
index 45615e0b6fa5eca5a79fd2325a53803017326be2..ec9974b84ea3740733db7e4b08c70f916fce31f8 100644
--- a/chrome/browser/sync/glue/generic_change_processor.cc
+++ b/chrome/browser/sync/glue/generic_change_processor.cc
@@ -57,7 +57,7 @@ void GenericChangeProcessor::ApplyChangesFromSyncModel(
// Need to load specifics from node.
sync_api::ReadNode read_node(trans);
if (read_node.InitByIdLookup(it->id) != sync_api::BaseNode::INIT_OK) {
- error_handler()->OnUnrecoverableError(
+ error_handler()->OnSingleDatatypeUnrecoverableError(
FROM_HERE,
"Failed to look up data for received change with id " +
base::Int64ToString(it->id));
@@ -80,7 +80,8 @@ void GenericChangeProcessor::CommitChangesFromSyncModel() {
if (!local_service_) {
syncable::ModelType type = syncer_changes_[0].sync_data().GetDataType();
SyncError error(FROM_HERE, "Local service destroyed.", type);
- error_handler()->OnUnrecoverableError(error.location(), error.message());
+ error_handler()->OnSingleDatatypeUnrecoverableError(error.location(),
+ error.message());
return;
}
SyncError error = local_service_->ProcessSyncChanges(FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698