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

Unified Diff: webrtc/libjingle/xmpp/chatroommoduleimpl.cc

Issue 1935893002: Replace scoped_ptr with unique_ptr in webrtc/libjingle/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 | « webrtc/libjingle/xmllite/xmlnsstack.h ('k') | webrtc/libjingle/xmpp/discoitemsquerytask.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/libjingle/xmpp/chatroommoduleimpl.cc
diff --git a/webrtc/libjingle/xmpp/chatroommoduleimpl.cc b/webrtc/libjingle/xmpp/chatroommoduleimpl.cc
index 52fba4cbae55877b19c2c3d62c06b1aedc4279e9..4feb5bc9b8c9141822e62a0beba64c121cd1725d 100644
--- a/webrtc/libjingle/xmpp/chatroommoduleimpl.cc
+++ b/webrtc/libjingle/xmpp/chatroommoduleimpl.cc
@@ -11,6 +11,7 @@
#include <algorithm>
#include <iostream>
#include <map>
+#include <memory>
#include <sstream>
#include <string>
#include <vector>
@@ -105,7 +106,7 @@ public:
const XmppPresence* presence() const;
private:
- rtc::scoped_ptr<XmppPresence> presence_;
+ std::unique_ptr<XmppPresence> presence_;
};
class XmppChatroomMemberEnumeratorImpl :
@@ -430,7 +431,7 @@ void
XmppChatroomModuleImpl::FireEnteredStatus(const XmlElement* presence,
XmppChatroomEnteredStatus status) {
if (chatroom_handler_) {
- rtc::scoped_ptr<XmppPresence> xmpp_presence(XmppPresence::Create());
+ std::unique_ptr<XmppPresence> xmpp_presence(XmppPresence::Create());
xmpp_presence->set_raw_xml(presence);
chatroom_handler_->ChatroomEnteredStatus(this, xmpp_presence.get(), status);
}
@@ -472,7 +473,7 @@ XmppReturnStatus
XmppChatroomModuleImpl::ServerChangedOtherPresence(const XmlElement&
presence_element) {
XmppReturnStatus xmpp_status = XMPP_RETURN_OK;
- rtc::scoped_ptr<XmppPresence> presence(XmppPresence::Create());
+ std::unique_ptr<XmppPresence> presence(XmppPresence::Create());
IFR(presence->set_raw_xml(&presence_element));
JidMemberMap::iterator pos = chatroom_jid_members_.find(presence->jid());
« no previous file with comments | « webrtc/libjingle/xmllite/xmlnsstack.h ('k') | webrtc/libjingle/xmpp/discoitemsquerytask.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698