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

Unified Diff: sync/internal_api/sync_manager_impl_unittest.cc

Issue 805633004: Enable Null Syncable ID which is different than Root ID. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed CR feedback Created 6 years 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 | « sync/internal_api/base_node.cc ('k') | sync/internal_api/sync_rollback_manager_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/sync_manager_impl_unittest.cc
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index 0f58bb93ecea86c94bc9f28c0975f6fce7727d12..7bac38da59d3e9c447dd50e69720fd868c19ab68 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -155,7 +155,10 @@ int64 MakeServerNodeForType(UserShare* share,
entry.PutBaseVersion(1);
entry.PutServerVersion(1);
entry.PutIsUnappliedUpdate(false);
- entry.PutServerParentId(syncable::GetNullId());
+ // TODO(stanisc): setting parent ID might be unnecessary once
+ // empty parent ID is supported.
+ entry.PutParentId(syncable::Id::GetRoot());
+ entry.PutServerParentId(syncable::Id::GetRoot());
entry.PutServerIsDir(true);
entry.PutIsDir(true);
entry.PutServerSpecifics(specifics);
« no previous file with comments | « sync/internal_api/base_node.cc ('k') | sync/internal_api/sync_rollback_manager_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698