sync/engine/syncer_unittest.cc - Issue 805633004: Enable Null Syncable ID which is different than Root ID.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/engine/syncer_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_unittest.cc

diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc

index f8682a67cd2d74cc4d229fb981c9aca570a661c9..85ceaeabe1d6f65cb34228c0e60ea396b87ed387 100644

--- a/sync/engine/syncer_unittest.cc

+++ b/sync/engine/syncer_unittest.cc

@@ -4679,7 +4679,7 @@ TEST_F(SyncerBookmarksTest, LocalDeleteRemoteChangeConflict) {

// Trigger a getupdates that modifies the bookmark. The update should be

// clobbered by the local delete.

- mock_server_->AddUpdateBookmark(GetServerId(), Id(), "dummy", 10, 10,

+ mock_server_->AddUpdateBookmark(GetServerId(), Id::GetRoot(), "dummy", 10, 10,

local_cache_guid(), local_id_.GetServerId());

SyncShareNudge();

« sync/engine/directory_update_handler_unittest.cc ('K') | « sync/engine/get_commit_ids.cc ('k') | sync/engine/syncer_util.cc » ('j') | sync/syncable/syncable_id.h » ('J')