chrome/browser/sync/engine/resolve_conflicts_command_unittest.cc - Issue 9305001: sync: Remove the remaining conflict sets code

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: chrome/browser/sync/engine/resolve_conflicts_command_unittest.cc

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove failing assertion. Created 8 years, 10 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:

Index: chrome/browser/sync/engine/resolve_conflicts_command_unittest.cc

diff --git a/chrome/browser/sync/engine/resolve_conflicts_command_unittest.cc b/chrome/browser/sync/engine/resolve_conflicts_command_unittest.cc

index a36d5e291d11bf83fb77767a37f5706a44e41f15..adc9ad33ddf963d7d7409dfb8eeb87efec0102d7 100644

--- a/chrome/browser/sync/engine/resolve_conflicts_command_unittest.cc

+++ b/chrome/browser/sync/engine/resolve_conflicts_command_unittest.cc

@@ -42,7 +42,7 @@ TEST_F(ResolveConflictsCommandTest, GetGroupsToChange) {

// Put GROUP_PASSWORD in conflict.

session()->mutable_status_controller()->

GetUnrestrictedMutableConflictProgressForTest(GROUP_PASSWORD)->

- AddConflictingItemById(syncable::Id());

+ AddSimpleConflictingItemById(syncable::Id());

ExpectGroupToChange(command_, GROUP_PASSWORD);

}