sync/api/sync_merge_result.cc - Issue 15701022: [Sync] Add support for sync Persistence Errors

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/api/sync_merge_result.cc

Issue 15701022: [Sync] Add support for sync Persistence Errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update tests Created 7 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/api/sync_merge_result.cc

diff --git a/sync/api/sync_merge_result.cc b/sync/api/sync_merge_result.cc

index 0caf57b9421fe94eeb818d439e57898408e59c63..cc324acceaa12bc05281f58d6683a2dd6eae2ac9 100644

--- a/sync/api/sync_merge_result.cc

+++ b/sync/api/sync_merge_result.cc

@@ -20,7 +20,7 @@ SyncMergeResult::~SyncMergeResult() {

// Setters.

void SyncMergeResult::set_error(SyncError error) {

- DCHECK(!error.IsSet() || model_type_ == error.type());

+ DCHECK(!error.IsSet() || model_type_ == error.model_type());

error_ = error;

}

« sync/api/sync_error.h ('K') | « sync/api/sync_error_unittest.cc ('k') | no next file » | no next file with comments »