diff options
| -rw-r--r-- | chrome/browser/sync/glue/generic_change_processor.cc | 23 | ||||
| -rw-r--r-- | sync/api/sync_change.cc | 4 | ||||
| -rw-r--r-- | sync/api/sync_change.h | 1 |
3 files changed, 20 insertions, 8 deletions
diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc index 6f8c7aab..4cdfb9e 100644 --- a/chrome/browser/sync/glue/generic_change_processor.cc +++ b/chrome/browser/sync/glue/generic_change_processor.cc @@ -208,7 +208,8 @@ syncer::SyncError AttemptDelete( if (tag.empty()) { syncer::SyncError error( FROM_HERE, - "Failed to delete " + type_str + " node. Local data, empty tag.", + "Failed to delete " + type_str + " node. Local data, empty tag. " + + change.location().ToString(), type); error_handler->OnSingleDatatypeUnrecoverableError(error.location(), error.message()); @@ -221,7 +222,8 @@ syncer::SyncError AttemptDelete( if (result != syncer::BaseNode::INIT_OK) { return LogLookupFailure( result, FROM_HERE, - "Failed to delete " + type_str + " node. Local data, ", + "Failed to delete " + type_str + " node. Local data. " + + change.location().ToString(), type, error_handler); } } else { @@ -230,7 +232,8 @@ syncer::SyncError AttemptDelete( if (result != syncer::BaseNode::INIT_OK) { return LogLookupFailure( result, FROM_HERE, - "Failed to delete " + type_str + " node. Non-local data, ", + "Failed to delete " + type_str + " node. Non-local data. " + + change.location().ToString(), type, error_handler); } } @@ -287,7 +290,8 @@ syncer::SyncError GenericChangeProcessor::ProcessSyncChanges( root_node, change.sync_data().GetTag()); if (result != syncer::WriteNode::INIT_SUCCESS) { - std::string error_prefix = "Failed to create " + type_str + " node: "; + std::string error_prefix = "Failed to create " + type_str + " node: " + + change.location().ToString() + ", "; switch (result) { case syncer::WriteNode::INIT_FAILED_EMPTY_TAG: { syncer::SyncError error; @@ -341,10 +345,12 @@ syncer::SyncError GenericChangeProcessor::ProcessSyncChanges( sync_node.InitByClientTagLookup(change.sync_data().GetDataType(), change.sync_data().GetTag()); if (result != syncer::BaseNode::INIT_OK) { + std::string error_prefix = "Failed to load " + type_str + " node. " + + change.location().ToString() + ", "; if (result == syncer::BaseNode::INIT_FAILED_PRECONDITION) { syncer::SyncError error; error.Reset(FROM_HERE, - "Failed to load entry w/empty tag for " + type_str + ".", + error_prefix + "empty tag", type); error_handler()->OnSingleDatatypeUnrecoverableError( FROM_HERE, error.message()); @@ -353,7 +359,7 @@ syncer::SyncError GenericChangeProcessor::ProcessSyncChanges( } else if (result == syncer::BaseNode::INIT_FAILED_ENTRY_NOT_GOOD) { syncer::SyncError error; error.Reset(FROM_HERE, - "Failed to load bad entry for " + type_str + ".", + error_prefix + "bad entry", type); error_handler()->OnSingleDatatypeUnrecoverableError( FROM_HERE, error.message()); @@ -362,7 +368,7 @@ syncer::SyncError GenericChangeProcessor::ProcessSyncChanges( } else if (result == syncer::BaseNode::INIT_FAILED_ENTRY_IS_DEL) { syncer::SyncError error; error.Reset(FROM_HERE, - "Failed to load deleted entry for " + type_str + ".", + error_prefix + "deleted entry", type); error_handler()->OnSingleDatatypeUnrecoverableError( FROM_HERE, error.message()); @@ -427,7 +433,8 @@ syncer::SyncError GenericChangeProcessor::ProcessSyncChanges( } else { syncer::SyncError error( FROM_HERE, - "Received unset syncer::SyncChange in the change processor.", + "Received unset SyncChange in the change processor, " + + change.location().ToString(), type); error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE, error.message()); diff --git a/sync/api/sync_change.cc b/sync/api/sync_change.cc index a9b9199..8dedd9c 100644 --- a/sync/api/sync_change.cc +++ b/sync/api/sync_change.cc @@ -52,6 +52,10 @@ SyncData SyncChange::sync_data() const { return sync_data_; } +tracked_objects::Location SyncChange::location() const { + return location_; +} + // static std::string SyncChange::ChangeTypeToString(SyncChangeType change_type) { switch (change_type) { diff --git a/sync/api/sync_change.h b/sync/api/sync_change.h index bf4675d..d519cfe 100644 --- a/sync/api/sync_change.h +++ b/sync/api/sync_change.h @@ -50,6 +50,7 @@ class SyncChange { // Getters. SyncChangeType change_type() const; SyncData sync_data() const; + tracked_objects::Location location() const; // Returns a string representation of |change_type|. static std::string ChangeTypeToString(SyncChangeType change_type); |