Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(527)

Unified Diff: remoting/protocol/jingle_messages.cc

Issue 1534193004: Use std::move() instead of scoped_ptr<>::Pass(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
Index: remoting/protocol/jingle_messages.cc
diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc
index e0ec4b54fca75fcb1b555e450b4a15ba352f6636..959c6a5a6d151184f5a0b55ca258b56e5eca4cf2 100644
--- a/remoting/protocol/jingle_messages.cc
+++ b/remoting/protocol/jingle_messages.cc
@@ -306,7 +306,7 @@ scoped_ptr<buzz::XmlElement> JingleMessage::ToXml() const {
if (action == SESSION_INFO) {
if (info.get())
jingle_tag->AddElement(new XmlElement(*info.get()));
- return root.Pass();
+ return root;
}
if (action == SESSION_INITIATE)
@@ -339,7 +339,7 @@ scoped_ptr<buzz::XmlElement> JingleMessage::ToXml() const {
content_tag->AddElement(new XmlElement(*transport_info));
}
- return root.Pass();
+ return root;
}
JingleMessageReply::JingleMessageReply()
@@ -372,7 +372,7 @@ scoped_ptr<buzz::XmlElement> JingleMessageReply::ToXml(
if (type == REPLY_RESULT) {
iq->SetAttr(QName(kEmptyNamespace, "type"), "result");
- return iq.Pass();
+ return iq;
}
DCHECK_EQ(type, REPLY_ERROR);
@@ -440,7 +440,7 @@ scoped_ptr<buzz::XmlElement> JingleMessageReply::ToXml(
error->AddElement(text_elem);
}
- return iq.Pass();
+ return iq;
}
IceTransportInfo::IceTransportInfo() {}
@@ -485,7 +485,7 @@ scoped_ptr<buzz::XmlElement> IceTransportInfo::ToXml() const {
for (const NamedCandidate& candidate : candidates) {
result->AddElement(FormatIceCandidate(candidate));
}
- return result.Pass();
+ return result;
}
} // namespace protocol

Powered by Google App Engine
This is Rietveld 408576698