sync/engine/resolve_conflicts_command_unittest.cc - Issue 10690071: [Sync] Move model_type* from syncable/ to base/

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 10690071: [Sync] Move model_type* from syncable/ to base/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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 e5f3c44179c1be07a6b53eae3f92a3c3e7054112..85decbfa6c5f3f1e2babcea45659d21f6b975057 100644

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

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

@@ -5,7 +5,7 @@

#include "base/basictypes.h"

#include "base/memory/ref_counted.h"

#include "sync/engine/resolve_conflicts_command.h"

-#include "sync/internal_api/public/syncable/model_type.h"

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

#include "sync/sessions/sync_session.h"

#include "sync/syncable/syncable_id.h"

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