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

Unified Diff: sync/engine/syncer_util_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: Removed some dependencies on SERVER_PARENT_ID 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
Index: sync/engine/syncer_util_unittest.cc
diff --git a/sync/engine/syncer_util_unittest.cc b/sync/engine/syncer_util_unittest.cc
index 9fda35f6bf76b12c7107c215b78e90faebc16784..27a59e4d2cdecc08d0cbf79d02f73a10f06f0f9a 100644
--- a/sync/engine/syncer_util_unittest.cc
+++ b/sync/engine/syncer_util_unittest.cc
@@ -163,7 +163,7 @@ sync_pb::EntitySpecifics DefaultBookmarkSpecifics() {
TEST_F(GetUpdatePositionTest, UpdateServerFieldsFromUpdateTest) {
InitSuffixIngredients(); // Initialize update with valid data.
- std::string root_server_id = syncable::GetNullId().GetServerId();
+ std::string root_server_id = syncable::Id::GetRoot().GetServerId();
int64 handle = entry_factory()->CreateUnappliedNewBookmarkItemWithParent(
"I", DefaultBookmarkSpecifics(), root_server_id);
@@ -186,7 +186,7 @@ TEST_F(GetUpdatePositionTest, UpdateServerFieldsFromUpdateTest) {
TEST_F(GetUpdatePositionTest, UpdateServerFieldsFromInvalidUpdateTest) {
// Do not initialize data in update, update is invalid.
- std::string root_server_id = syncable::GetNullId().GetServerId();
+ std::string root_server_id = syncable::Id::GetRoot().GetServerId();
int64 handle = entry_factory()->CreateUnappliedNewBookmarkItemWithParent(
"I", DefaultBookmarkSpecifics(), root_server_id);

Powered by Google App Engine
This is Rietveld 408576698