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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/sync/engine/process_commit_response_command.cc ('k') | chrome/browser/sync/engine/syncer.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/basictypes.h"	5 #include "base/basictypes.h"

6 #include "base/memory/ref_counted.h"	6 #include "base/memory/ref_counted.h"

7 #include "chrome/browser/sync/engine/resolve_conflicts_command.h"	7 #include "chrome/browser/sync/engine/resolve_conflicts_command.h"

8 #include "chrome/browser/sync/sessions/sync_session.h"	8 #include "chrome/browser/sync/sessions/sync_session.h"

9 #include "chrome/browser/sync/syncable/model_type.h"	9 #include "chrome/browser/sync/syncable/model_type.h"

10 #include "chrome/browser/sync/syncable/syncable_id.h"	10 #include "chrome/browser/sync/syncable/syncable_id.h"

(...skipping 24 matching lines...) Expand all Loading...
35	35

36 private:	36 private:

37 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommandTest);	37 DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommandTest);

38 };	38 };

39	39

40 TEST_F(ResolveConflictsCommandTest, GetGroupsToChange) {	40 TEST_F(ResolveConflictsCommandTest, GetGroupsToChange) {

41 ExpectNoGroupsToChange(command_);	41 ExpectNoGroupsToChange(command_);

42 // Put GROUP_PASSWORD in conflict.	42 // Put GROUP_PASSWORD in conflict.

43 session()->mutable_status_controller()->	43 session()->mutable_status_controller()->

44 GetUnrestrictedMutableConflictProgressForTest(GROUP_PASSWORD)->	44 GetUnrestrictedMutableConflictProgressForTest(GROUP_PASSWORD)->

45 AddConflictingItemById(syncable::Id());	45 AddSimpleConflictingItemById(syncable::Id());

46 ExpectGroupToChange(command_, GROUP_PASSWORD);	46 ExpectGroupToChange(command_, GROUP_PASSWORD);

47 }	47 }

48	48

49 } // namespace	49 } // namespace

50	50

51 } // namespace browser_sync	51 } // namespace browser_sync

OLD	NEW