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

Unified Diff: webrtc/base/proxyserver.h

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased 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/base/proxydetect.cc ('k') | webrtc/base/rate_statistics.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/proxyserver.h
diff --git a/webrtc/base/proxyserver.h b/webrtc/base/proxyserver.h
index adb26ae9d046f8befe3a88fdb2a627d5849e6fff..5dfa37ceb62fe4aa96569531ea64aa4cec1948c3 100644
--- a/webrtc/base/proxyserver.h
+++ b/webrtc/base/proxyserver.h
@@ -12,6 +12,7 @@
#define WEBRTC_BASE_PROXYSERVER_H_
#include <list>
+#include <memory>
#include "webrtc/base/asyncsocket.h"
#include "webrtc/base/socketadapters.h"
#include "webrtc/base/socketaddress.h"
@@ -50,8 +51,8 @@ class ProxyBinding : public sigslot::has_slots<> {
void Destroy();
static const int kBufferSize = 4096;
- scoped_ptr<AsyncProxyServerSocket> int_socket_;
- scoped_ptr<AsyncSocket> ext_socket_;
+ std::unique_ptr<AsyncProxyServerSocket> int_socket_;
+ std::unique_ptr<AsyncSocket> ext_socket_;
bool connected_;
FifoBuffer out_buffer_;
FifoBuffer in_buffer_;
@@ -76,7 +77,7 @@ class ProxyServer : public sigslot::has_slots<> {
typedef std::list<ProxyBinding*> BindingList;
SocketFactory* ext_factory_;
SocketAddress ext_ip_;
- scoped_ptr<AsyncSocket> server_socket_;
+ std::unique_ptr<AsyncSocket> server_socket_;
BindingList bindings_;
RTC_DISALLOW_COPY_AND_ASSIGN(ProxyServer);
};
« no previous file with comments | « webrtc/base/proxydetect.cc ('k') | webrtc/base/rate_statistics.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698