sync/sessions/sync_session_context.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/sessions/sync_session_context.cc

Issue 11314008: sync: Follow-up to conflict resolution refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tests 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/sessions/sync_session_context.cc

diff --git a/sync/sessions/sync_session_context.cc b/sync/sessions/sync_session_context.cc

index fa946d0bebfdfdda3f69a06d8c6b74fba8e408c1..f4f625bd16c34f1ad17abfbde5cebbe4f4b19e18 100644

--- a/sync/sessions/sync_session_context.cc

+++ b/sync/sessions/sync_session_context.cc

@@ -24,8 +24,7 @@ SyncSessionContext::SyncSessionContext(

DebugInfoGetter* debug_info_getter,

TrafficRecorder* traffic_recorder,

bool keystore_encryption_enabled)

- : resolver_(NULL),

- connection_manager_(connection_manager),

+ : connection_manager_(connection_manager),

directory_(directory),

workers_(workers),

extensions_activity_monitor_(extensions_activity_monitor),

« no previous file with comments | « sync/sessions/sync_session_context.h ('k') | sync/sessions/sync_session_unittest.cc » ('j') | no next file with comments »