remoting/signaling/iq_sender.cc - Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11

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: remoting/signaling/iq_sender.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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: remoting/signaling/iq_sender.cc

diff --git a/remoting/signaling/iq_sender.cc b/remoting/signaling/iq_sender.cc

index bb0430349fe08de3cafe395f37563a9150c871bd..c7af21301ed3ff2b0110dd765597d4564d9fd8ff 100644

--- a/remoting/signaling/iq_sender.cc

+++ b/remoting/signaling/iq_sender.cc

@@ -46,7 +46,7 @@ scoped_ptr<IqRequest> IqSender::SendIq(scoped_ptr<buzz::XmlElement> stanza,

std::string id = signal_strategy_->GetNextId();

stanza->AddAttr(buzz::QN_ID, id);

if (!signal_strategy_->SendStanza(stanza.Pass())) {

- return scoped_ptr<IqRequest>();

+ return nullptr;

}

DCHECK(requests_.find(id) == requests_.end());

scoped_ptr<IqRequest> request(new IqRequest(this, callback, addressee));