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 36811d4d966d232ff9634cd3e2d350b67ffd2710..f181bb43da36e000d552c69b4c85f66872fbb72c 100644 |
--- a/chrome/browser/sync/glue/generic_change_processor.cc |
+++ b/chrome/browser/sync/glue/generic_change_processor.cc |
@@ -291,7 +291,7 @@ syncer::SyncError AttemptDelete( |
DataTypeErrorHandler* error_handler) { |
DCHECK_EQ(change.change_type(), syncer::SyncChange::ACTION_DELETE); |
if (change.sync_data().IsLocal()) { |
- const std::string& tag = change.sync_data().GetTag(); |
+ const std::string& tag = change.sync_data().local().GetTag(); |
if (tag.empty()) { |
syncer::SyncError error( |
FROM_HERE, |
@@ -316,7 +316,7 @@ syncer::SyncError AttemptDelete( |
} |
} else { |
syncer::BaseNode::InitByLookupResult result = |
- node->InitByIdLookup(change.sync_data().GetRemoteId()); |
+ node->InitByIdLookup(change.sync_data().remote().GetRemoteId()); |
if (result != syncer::BaseNode::INIT_OK) { |
return LogLookupFailure( |
result, FROM_HERE, |
@@ -417,7 +417,7 @@ syncer::SyncError GenericChangeProcessor::HandleActionAdd( |
syncer::WriteNode::InitUniqueByCreationResult result = |
sync_node->InitUniqueByCreation(change.sync_data().GetDataType(), |
root_node, |
- change.sync_data().GetTag()); |
+ change.sync_data().local().GetTag()); |
if (result != syncer::WriteNode::INIT_SUCCESS) { |
std::string error_prefix = "Failed to create " + type_str + " node: " + |
change.location().ToString() + ", "; |
@@ -486,7 +486,7 @@ syncer::SyncError GenericChangeProcessor::HandleActionUpdate( |
// TODO(zea): consider having this logic for all possible changes? |
syncer::BaseNode::InitByLookupResult result = |
sync_node->InitByClientTagLookup(change.sync_data().GetDataType(), |
- change.sync_data().GetTag()); |
+ change.sync_data().local().GetTag()); |
if (result != syncer::BaseNode::INIT_OK) { |
std::string error_prefix = "Failed to load " + type_str + " node. " + |
change.location().ToString() + ", "; |