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

Unified Diff: remoting/protocol/jingle_messages.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 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
« no previous file with comments | « remoting/protocol/jingle_messages.h ('k') | remoting/protocol/jingle_messages_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_messages.cc
diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc
index 45bc3b598c9391df0e8672d63d482c3ae84a0947..bc8846a0e3833bef62fa6f3fd8ec1b554d4f1577 100644
--- a/remoting/protocol/jingle_messages.cc
+++ b/remoting/protocol/jingle_messages.cc
@@ -285,8 +285,8 @@ bool JingleMessage::ParseXml(const buzz::XmlElement* stanza,
return true;
}
-scoped_ptr<buzz::XmlElement> JingleMessage::ToXml() const {
- scoped_ptr<XmlElement> root(
+std::unique_ptr<buzz::XmlElement> JingleMessage::ToXml() const {
+ std::unique_ptr<XmlElement> root(
new XmlElement(QName("jabber:client", "iq"), true));
DCHECK(!to.empty());
@@ -367,9 +367,9 @@ JingleMessageReply::JingleMessageReply(ErrorType error,
JingleMessageReply::~JingleMessageReply() { }
-scoped_ptr<buzz::XmlElement> JingleMessageReply::ToXml(
+std::unique_ptr<buzz::XmlElement> JingleMessageReply::ToXml(
const buzz::XmlElement* request_stanza) const {
- scoped_ptr<XmlElement> iq(
+ std::unique_ptr<XmlElement> iq(
new XmlElement(QName(kJabberNamespace, "iq"), true));
iq->SetAttr(QName(kEmptyNamespace, "to"),
request_stanza->Attr(QName(kEmptyNamespace, "from")));
@@ -482,8 +482,8 @@ bool IceTransportInfo::ParseXml(
return true;
}
-scoped_ptr<buzz::XmlElement> IceTransportInfo::ToXml() const {
- scoped_ptr<buzz::XmlElement> result(
+std::unique_ptr<buzz::XmlElement> IceTransportInfo::ToXml() const {
+ std::unique_ptr<buzz::XmlElement> result(
new XmlElement(QName(kIceTransportNamespace, "transport"), true));
for (const IceCredentials& credentials : ice_credentials) {
result->AddElement(FormatIceCredentials(credentials));
« no previous file with comments | « remoting/protocol/jingle_messages.h ('k') | remoting/protocol/jingle_messages_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698