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

Unified Diff: webrtc/libjingle/xmpp/xmppclient.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/xmpp/xmppclient.h ('k') | webrtc/libjingle/xmpp/xmppengine_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/libjingle/xmpp/xmppclient.cc
diff --git a/webrtc/libjingle/xmpp/xmppclient.cc b/webrtc/libjingle/xmpp/xmppclient.cc
index f7e88c39278610f446460c8ca3a56a3df673d06c..a87659824bbb5d472ab6e61c9c60ffee15c969f4 100644
--- a/webrtc/libjingle/xmpp/xmppclient.cc
+++ b/webrtc/libjingle/xmpp/xmppclient.cc
@@ -15,7 +15,6 @@
#include "webrtc/libjingle/xmpp/prexmppauth.h"
#include "webrtc/libjingle/xmpp/saslplainmechanism.h"
#include "webrtc/base/logging.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/stringutils.h"
#include "xmpptask.h"
@@ -48,9 +47,9 @@ public:
XmppClient* const client_;
// the two main objects
- rtc::scoped_ptr<AsyncSocket> socket_;
- rtc::scoped_ptr<XmppEngine> engine_;
- rtc::scoped_ptr<PreXmppAuth> pre_auth_;
+ std::unique_ptr<AsyncSocket> socket_;
+ std::unique_ptr<XmppEngine> engine_;
+ std::unique_ptr<PreXmppAuth> pre_auth_;
rtc::CryptString pass_;
std::string auth_mechanism_;
std::string auth_token_;
« no previous file with comments | « webrtc/libjingle/xmpp/xmppclient.h ('k') | webrtc/libjingle/xmpp/xmppengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698