chrome/browser/sync/engine/conflict_resolver.cc - Issue 7822008: [Sync] Remove static initializers

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: chrome/browser/sync/engine/conflict_resolver.cc

Issue 7822008: [Sync] Remove static initializers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sync to head Created 9 years, 4 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: chrome/browser/sync/engine/conflict_resolver.cc

diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc

index 97596ef10d201bc0ac65c734db19fdf5dd58cdd0..f8c83a4d15ff9b343f7884e0832d969f5454400c 100644

--- a/chrome/browser/sync/engine/conflict_resolver.cc

+++ b/chrome/browser/sync/engine/conflict_resolver.cc

@@ -288,7 +288,7 @@ bool AttemptToFixUpdateEntryInDeletedLocalTree(WriteTransaction* trans,

Id id = parent_id;

// As we will be crawling the path of deleted entries there's a chance we'll

// end up having to reparent an item as there will be an invalid parent.

- Id reroot_id = syncable::kNullId;

+ Id reroot_id = syncable::GetNullId();

// Similarly crawling deleted items means we risk loops.

int loop_detection = conflict_set->size();

while (!id.IsRoot() && --loop_detection >= 0) {