| Index: remoting/protocol/chromium_socket_factory.cc
|
| diff --git a/remoting/protocol/chromium_socket_factory.cc b/remoting/protocol/chromium_socket_factory.cc
|
| index 22b59b477584f7da1679c15519437a21c37dc25e..e9bbd449675e652e990104f6c7c8f233d8d9281c 100644
|
| --- a/remoting/protocol/chromium_socket_factory.cc
|
| +++ b/remoting/protocol/chromium_socket_factory.cc
|
| @@ -6,10 +6,11 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "jingle/glue/utils.h"
|
| #include "net/base/io_buffer.h"
|
| @@ -81,7 +82,7 @@ class UdpPacketSocket : public rtc::AsyncPacketSocket {
|
| void OnReadCompleted(int result);
|
| void HandleReadResult(int result);
|
|
|
| - scoped_ptr<net::UDPServerSocket> socket_;
|
| + std::unique_ptr<net::UDPServerSocket> socket_;
|
|
|
| State state_;
|
| int error_;
|
| @@ -375,7 +376,7 @@ rtc::AsyncPacketSocket* ChromiumPacketSocketFactory::CreateUdpSocket(
|
| const rtc::SocketAddress& local_address,
|
| uint16_t min_port,
|
| uint16_t max_port) {
|
| - scoped_ptr<UdpPacketSocket> result(new UdpPacketSocket());
|
| + std::unique_ptr<UdpPacketSocket> result(new UdpPacketSocket());
|
| if (!result->Init(local_address, min_port, max_port))
|
| return nullptr;
|
| return result.release();
|
|
|