Commit 8c3cd622 authored by Mohamed Amir Yosef's avatar Mohamed Amir Yosef Committed by Commit Bot

[Sync::USS] Rename syncPositioningScheme in ModelTypeWorker

Change-Id: I04dcc33b375f552a8e4e6dbc8b5ae75869ddfa08
Reviewed-on: https://chromium-review.googlesource.com/c/1329783Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606893}
parent f2fef567
...@@ -252,11 +252,11 @@ ModelTypeWorker::DecryptionStatus ModelTypeWorker::PopulateUpdateResponseData( ...@@ -252,11 +252,11 @@ ModelTypeWorker::DecryptionStatus ModelTypeWorker::PopulateUpdateResponseData(
// Handle deprecated positioning fields. Relevant only for bookmarks. // Handle deprecated positioning fields. Relevant only for bookmarks.
bool has_position_scheme = false; bool has_position_scheme = false;
SyncPositioningScheme syncPositioningScheme; SyncPositioningScheme sync_positioning_scheme;
if (update_entity.has_unique_position()) { if (update_entity.has_unique_position()) {
data.unique_position = update_entity.unique_position(); data.unique_position = update_entity.unique_position();
has_position_scheme = true; has_position_scheme = true;
syncPositioningScheme = SyncPositioningScheme::UNIQUE_POSITION; sync_positioning_scheme = SyncPositioningScheme::UNIQUE_POSITION;
} else if (update_entity.has_position_in_parent() || } else if (update_entity.has_position_in_parent() ||
update_entity.has_insert_after_item_id()) { update_entity.has_insert_after_item_id()) {
bool missing_originator_fields = false; bool missing_originator_fields = false;
...@@ -279,23 +279,23 @@ ModelTypeWorker::DecryptionStatus ModelTypeWorker::PopulateUpdateResponseData( ...@@ -279,23 +279,23 @@ ModelTypeWorker::DecryptionStatus ModelTypeWorker::PopulateUpdateResponseData(
UniquePosition::FromInt64(update_entity.position_in_parent(), suffix) UniquePosition::FromInt64(update_entity.position_in_parent(), suffix)
.ToProto(); .ToProto();
has_position_scheme = true; has_position_scheme = true;
syncPositioningScheme = SyncPositioningScheme::POSITION_IN_PARENT; sync_positioning_scheme = SyncPositioningScheme::POSITION_IN_PARENT;
} else { } else {
// If update_entity has insert_after_item_id, use 0 index. // If update_entity has insert_after_item_id, use 0 index.
DCHECK(update_entity.has_insert_after_item_id()); DCHECK(update_entity.has_insert_after_item_id());
data.unique_position = UniquePosition::FromInt64(0, suffix).ToProto(); data.unique_position = UniquePosition::FromInt64(0, suffix).ToProto();
has_position_scheme = true; has_position_scheme = true;
syncPositioningScheme = SyncPositioningScheme::INSERT_AFTER_ITEM_ID; sync_positioning_scheme = SyncPositioningScheme::INSERT_AFTER_ITEM_ID;
} }
} else if (SyncerProtoUtil::ShouldMaintainPosition(update_entity) && } else if (SyncerProtoUtil::ShouldMaintainPosition(update_entity) &&
!update_entity.deleted()) { !update_entity.deleted()) {
DLOG(ERROR) << "Missing required position information in update."; DLOG(ERROR) << "Missing required position information in update.";
has_position_scheme = true; has_position_scheme = true;
syncPositioningScheme = SyncPositioningScheme::MISSING; sync_positioning_scheme = SyncPositioningScheme::MISSING;
} }
if (has_position_scheme) { if (has_position_scheme) {
UMA_HISTOGRAM_ENUMERATION("Sync.Entities.PositioningScheme", UMA_HISTOGRAM_ENUMERATION("Sync.Entities.PositioningScheme",
syncPositioningScheme); sync_positioning_scheme);
} }
// Populate |originator_cache_guid| and |originator_client_item_id|. This is // Populate |originator_cache_guid| and |originator_client_item_id|. This is
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment