sync/engine/process_updates_command_unittest.cc - Issue 11314008: sync: Follow-up to conflict resolution refactor

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

Issue 11314008: sync: Follow-up to conflict resolution refactor (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:

Index: sync/engine/process_updates_command_unittest.cc

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

index fc543fb3858aee0786073cee278aea69d0dd8af1..f4cc583dc29c38ccf8f9eb82c5db6c505c16e888 100644

--- a/sync/engine/process_updates_command_unittest.cc

+++ b/sync/engine/process_updates_command_unittest.cc

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

#include "base/basictypes.h"

#include "sync/engine/process_updates_command.h"

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

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

#include "sync/sessions/sync_session.h"

#include "sync/syncable/mutable_entry.h"

#include "sync/syncable/syncable_id.h"