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

Unified Diff: components/sync/model/fake_model_type_sync_bridge.cc

Issue 2630613002: [Sync] USS: Filter out tombstones for initial sync. (Closed)
Patch Set: Fix TestEntryFactory for realz. Created 3 years, 11 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: components/sync/model/fake_model_type_sync_bridge.cc
diff --git a/components/sync/model/fake_model_type_sync_bridge.cc b/components/sync/model/fake_model_type_sync_bridge.cc
index 94c5cc39b7738c9c2c4ce57597474b5bb40a6b73..1c6e6f9bbd72b4d99560db72efd656537b243d7a 100644
--- a/components/sync/model/fake_model_type_sync_bridge.cc
+++ b/components/sync/model/fake_model_type_sync_bridge.cc
@@ -216,6 +216,7 @@ base::Optional<ModelError> FakeModelTypeSyncBridge::MergeSyncData(
}
// Store any new remote entities.
for (const auto& kv : data_map) {
+ EXPECT_FALSE(kv.second->is_deleted());
db_->PutData(kv.first, kv.second.value());
}
ApplyMetadataChangeList(std::move(metadata_changes));
« no previous file with comments | « components/sync/engine_impl/uss_migrator_unittest.cc ('k') | components/sync/model_impl/shared_model_type_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698