sync/engine/resolve_conflicts_command_unittest.cc - Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace

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/resolve_conflicts_command_unittest.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sort headers, update copyrights Created 8 years, 6 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: sync/engine/resolve_conflicts_command_unittest.cc

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

index 85decbfa6c5f3f1e2babcea45659d21f6b975057..b04e0ec185cb388388adbc6a576cb46e4f00c9e8 100644

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

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

@@ -26,8 +26,8 @@ class ResolveConflictsCommandTest : public SyncerCommandTest {

make_scoped_refptr(new FakeModelWorker(GROUP_UI)));

workers()->push_back(

make_scoped_refptr(new FakeModelWorker(GROUP_PASSWORD)));

- (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI;

- (*mutable_routing_info())[syncable::PASSWORDS] = GROUP_PASSWORD;

+ (*mutable_routing_info())[syncer::BOOKMARKS] = GROUP_UI;

+ (*mutable_routing_info())[syncer::PASSWORDS] = GROUP_PASSWORD;

SyncerCommandTest::SetUp();

}