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

Unified Diff: components/sync/device_info/device_info_sync_bridge.cc

Issue 2536043002: [Sync] Stop updating local device info time stamp on merge. (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « no previous file | components/sync/device_info/device_info_sync_bridge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/device_info/device_info_sync_bridge.cc
diff --git a/components/sync/device_info/device_info_sync_bridge.cc b/components/sync/device_info/device_info_sync_bridge.cc
index 394fbd6eb2e27174d7010f59d23e956b136c862a..c762c909a3d6d0b96e4505b34fa15cb8861ce57c 100644
--- a/components/sync/device_info/device_info_sync_bridge.cc
+++ b/components/sync/device_info/device_info_sync_bridge.cc
@@ -142,11 +142,6 @@ SyncError DeviceInfoSyncBridge::MergeSyncData(
// Don't Put local data if it's the same as the remote copy.
if (local_info->Equals(*SpecificsToModel(specifics))) {
local_guids_to_put.erase(local_guid);
- } else {
- // This device is valid right now and this entry is about to be
- // committed, use this as an opportunity to refresh the timestamp.
- all_data_[local_guid]->set_last_updated_timestamp(
- TimeToProtoTime(Time::Now()));
}
} else {
// Remote data wins conflicts.
« no previous file with comments | « no previous file | components/sync/device_info/device_info_sync_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698