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

Unified Diff: webrtc/libjingle/xmpp/xmppengineimpl.h

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/xmpp/xmppengine_unittest.cc ('k') | webrtc/libjingle/xmpp/xmpplogintask.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/libjingle/xmpp/xmppengineimpl.h
diff --git a/webrtc/libjingle/xmpp/xmppengineimpl.h b/webrtc/libjingle/xmpp/xmppengineimpl.h
index c322596c46f173031ad3fe4b7d5c783fb7eb767b..e1f3061f90d265cf0a9db1d8f42154ff8478ab8f 100644
--- a/webrtc/libjingle/xmpp/xmppengineimpl.h
+++ b/webrtc/libjingle/xmpp/xmppengineimpl.h
@@ -11,8 +11,10 @@
#ifndef WEBRTC_LIBJINGLE_XMPP_XMPPENGINEIMPL_H_
#define WEBRTC_LIBJINGLE_XMPP_XMPPENGINEIMPL_H_
+#include <memory>
#include <sstream>
#include <vector>
+
#include "webrtc/libjingle/xmpp/xmppengine.h"
#include "webrtc/libjingle/xmpp/xmppstanzaparser.h"
@@ -233,7 +235,7 @@ class XmppEngineImpl : public XmppEngine {
TlsOptions tls_option_;
std::string tls_server_hostname_;
std::string tls_server_domain_;
- rtc::scoped_ptr<XmppLoginTask> login_task_;
+ std::unique_ptr<XmppLoginTask> login_task_;
std::string lang_;
int next_id_;
@@ -242,7 +244,7 @@ class XmppEngineImpl : public XmppEngine {
bool encrypted_;
Error error_code_;
int subcode_;
- rtc::scoped_ptr<XmlElement> stream_error_;
+ std::unique_ptr<XmlElement> stream_error_;
bool raised_reset_;
XmppOutputHandler* output_handler_;
XmppSessionHandler* session_handler_;
@@ -250,14 +252,14 @@ class XmppEngineImpl : public XmppEngine {
XmlnsStack xmlns_stack_;
typedef std::vector<XmppStanzaHandler*> StanzaHandlerVector;
- rtc::scoped_ptr<StanzaHandlerVector> stanza_handlers_[HL_COUNT];
+ std::unique_ptr<StanzaHandlerVector> stanza_handlers_[HL_COUNT];
typedef std::vector<XmppIqEntry*> IqEntryVector;
- rtc::scoped_ptr<IqEntryVector> iq_entries_;
+ std::unique_ptr<IqEntryVector> iq_entries_;
- rtc::scoped_ptr<SaslHandler> sasl_handler_;
+ std::unique_ptr<SaslHandler> sasl_handler_;
- rtc::scoped_ptr<std::stringstream> output_;
+ std::unique_ptr<std::stringstream> output_;
};
} // namespace buzz
« no previous file with comments | « webrtc/libjingle/xmpp/xmppengine_unittest.cc ('k') | webrtc/libjingle/xmpp/xmpplogintask.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698