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

Unified Diff: remoting/protocol/jingle_messages.h

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_info_request.cc ('k') | remoting/protocol/jingle_messages.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_messages.h
diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h
index 96a0f4886f7c1d7f4c871488a835a01f732a2d8c..e81d86237cca6cb624df75b76280721df78c646a 100644
--- a/remoting/protocol/jingle_messages.h
+++ b/remoting/protocol/jingle_messages.h
@@ -6,9 +6,9 @@
#define REMOTING_PROTOCOL_JINGLE_MESSAGES_H_
#include <list>
+#include <memory>
#include <string>
-#include "base/memory/scoped_ptr.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/webrtc/p2p/base/candidate.h"
@@ -53,7 +53,7 @@ struct JingleMessage {
// message when parsing fails.
bool ParseXml(const buzz::XmlElement* stanza, std::string* error);
- scoped_ptr<buzz::XmlElement> ToXml() const;
+ std::unique_ptr<buzz::XmlElement> ToXml() const;
std::string from;
std::string to;
@@ -62,12 +62,12 @@ struct JingleMessage {
std::string initiator;
- scoped_ptr<ContentDescription> description;
+ std::unique_ptr<ContentDescription> description;
- scoped_ptr<buzz::XmlElement> transport_info;
+ std::unique_ptr<buzz::XmlElement> transport_info;
// Content of session-info messages.
- scoped_ptr<buzz::XmlElement> info;
+ std::unique_ptr<buzz::XmlElement> info;
// Value from the <reason> tag if it is present in the
// message. Useful mainly for session-terminate messages, but Jingle
@@ -97,7 +97,7 @@ struct JingleMessageReply {
// Formats reply stanza for the specified |request_stanza|. Id and
// recepient as well as other information needed to generate a valid
// reply are taken from |request_stanza|.
- scoped_ptr<buzz::XmlElement> ToXml(
+ std::unique_ptr<buzz::XmlElement> ToXml(
const buzz::XmlElement* request_stanza) const;
ReplyType type;
@@ -131,7 +131,7 @@ struct IceTransportInfo {
// Caller keeps ownership of |stanza|. |error| is set to debug error
// message when parsing fails.
bool ParseXml(const buzz::XmlElement* stanza);
- scoped_ptr<buzz::XmlElement> ToXml() const;
+ std::unique_ptr<buzz::XmlElement> ToXml() const;
std::list<IceCredentials> ice_credentials;
std::list<NamedCandidate> candidates;
« no previous file with comments | « remoting/protocol/jingle_info_request.cc ('k') | remoting/protocol/jingle_messages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698