sync/engine/non_blocking_type_commit_contribution.cc - Issue 1609923002: Fix remaining incompatibilities between scoped_ptr and unique_ptr.

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

Issue 1609923002: Fix remaining incompatibilities between scoped_ptr and unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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:

View side-by-side diff with in-line comments

Download patch

« media/base/bind_to_current_loop_unittest.cc ('K') | « storage/browser/blob/blob_storage_context.cc ('k') | sync/internal_api/public/util/proto_value_ptr_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/engine/non_blocking_type_commit_contribution.cc

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

index 5216ed08add0e47d47558407b0101052a77da773..d4506b33e3b5dfc8829184eeed45f22d1dc27388 100644

--- a/sync/engine/non_blocking_type_commit_contribution.cc

+++ b/sync/engine/non_blocking_type_commit_contribution.cc

@@ -62,13 +62,13 @@ syncer::SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse(

case sync_pb::CommitResponse::INVALID_MESSAGE:

LOG(ERROR) << "Server reports commit message is invalid.";

DLOG(ERROR) << "Message was: "

- << syncer::SyncEntityToValue(entities_.Get(i), false);

+ << syncer::SyncEntityToValue(entities_.Get(i), false).get();

dcheng 2016/01/19 23:50:55 This seems pretty silly: we log out a pointer valu

unknown_error = true;

break;

case sync_pb::CommitResponse::CONFLICT:

DVLOG(1) << "Server reports conflict for commit message.";

DVLOG(1) << "Message was: "

- << syncer::SyncEntityToValue(entities_.Get(i), false);

+ << syncer::SyncEntityToValue(entities_.Get(i), false).get();

commit_conflict = true;

break;

case sync_pb::CommitResponse::SUCCESS: {