sync/engine/process_updates_command_unittest.cc - Issue 11185064: FYI: Move conflict resolve + clean up afterwards

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: sync/engine/process_updates_command_unittest.cc

Issue 11185064: FYI: Move conflict resolve + clean up afterwards (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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 | « sync/engine/nudge_source.cc ('k') | sync/engine/resolve_conflicts_command.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "sync/engine/process_updates_command.h"	6 #include "sync/engine/process_updates_command.h"

7 #include "sync/internal_api/public/base/model_type.h"	7 #include "sync/internal_api/public/base/model_type.h"

8 #include "sync/sessions/session_state.h"

9 #include "sync/sessions/sync_session.h"	8 #include "sync/sessions/sync_session.h"

10 #include "sync/syncable/mutable_entry.h"	9 #include "sync/syncable/mutable_entry.h"

11 #include "sync/syncable/syncable_id.h"	10 #include "sync/syncable/syncable_id.h"

12 #include "sync/test/engine/fake_model_worker.h"	11 #include "sync/test/engine/fake_model_worker.h"

13 #include "sync/test/engine/syncer_command_test.h"	12 #include "sync/test/engine/syncer_command_test.h"

14 #include "testing/gtest/include/gtest/gtest.h"	13 #include "testing/gtest/include/gtest/gtest.h"

15	14

16 namespace syncer {	15 namespace syncer {

17	16

18 using syncable::Id;	17 using syncable::Id;

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 AddUpdate(updates, "a1", root, AUTOFILL);	90 AddUpdate(updates, "a1", root, AUTOFILL);

92	91

93 ExpectGroupsToChange(command_, GROUP_UI, GROUP_DB);	92 ExpectGroupsToChange(command_, GROUP_UI, GROUP_DB);

94	93

95 command_.ExecuteImpl(session());	94 command_.ExecuteImpl(session());

96 }	95 }

97	96

98 } // namespace	97 } // namespace

99	98

100 } // namespace syncer	99 } // namespace syncer

OLD	NEW