sync/engine/syncer_proto_util_unittest.cc - Issue 11192071: sync: Merge apply updates and resolve conflicts

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

Issue 11192071: sync: Merge apply updates and resolve conflicts (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/syncer_proto_util_unittest.cc

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

index 8e031a1160ef7837f86e2893cdcab466f7b1e833..9418876fecef37953e2f57621e3bbbeab1472b26 100644

--- a/sync/engine/syncer_proto_util_unittest.cc

+++ b/sync/engine/syncer_proto_util_unittest.cc

@@ -16,7 +16,6 @@

#include "sync/protocol/password_specifics.pb.h"

#include "sync/protocol/sync.pb.h"

#include "sync/protocol/sync_enums.pb.h"

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

#include "sync/sessions/sync_session_context.h"

#include "sync/syncable/blob.h"

#include "sync/syncable/directory.h"