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); |
}; |