| Index: content/renderer/p2p/ipc_socket_factory.cc
|
| diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
|
| index 20fa056aca91e54e1bb927b317f5f4aa0f039f77..e0d93d343ba0157db53cdf56e4e46a2d97396c58 100644
|
| --- a/content/renderer/p2p/ipc_socket_factory.cc
|
| +++ b/content/renderer/p2p/ipc_socket_factory.cc
|
| @@ -583,7 +583,7 @@ void IpcPacketSocket::OnIncomingTcpConnection(
|
| P2PSocketClient* client) {
|
| DCHECK_EQ(base::MessageLoop::current(), message_loop_);
|
|
|
| - scoped_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
|
| + std::unique_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
|
|
|
| rtc::SocketAddress remote_address;
|
| if (!jingle_glue::IPEndPointToSocketAddress(address, &remote_address)) {
|
| @@ -746,7 +746,7 @@ rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateUdpSocket(
|
| rtc::SocketAddress crome_address;
|
| P2PSocketClientImpl* socket_client =
|
| new P2PSocketClientImpl(socket_dispatcher_);
|
| - scoped_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
|
| + std::unique_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
|
| // TODO(sergeyu): Respect local_address and port limits here (need
|
| // to pass them over IPC channel to the browser).
|
| if (!socket->Init(P2P_SOCKET_UDP, socket_client,
|
| @@ -769,7 +769,7 @@ rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateServerTcpSocket(
|
| P2P_SOCKET_STUN_TCP_SERVER : P2P_SOCKET_TCP_SERVER;
|
| P2PSocketClientImpl* socket_client =
|
| new P2PSocketClientImpl(socket_dispatcher_);
|
| - scoped_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
|
| + std::unique_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
|
| if (!socket->Init(type, socket_client, local_address,
|
| rtc::SocketAddress())) {
|
| return NULL;
|
| @@ -795,7 +795,7 @@ rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateClientTcpSocket(
|
| }
|
| P2PSocketClientImpl* socket_client =
|
| new P2PSocketClientImpl(socket_dispatcher_);
|
| - scoped_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
|
| + std::unique_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
|
| if (!socket->Init(type, socket_client, local_address, remote_address))
|
| return NULL;
|
| return socket.release();
|
| @@ -803,8 +803,8 @@ rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateClientTcpSocket(
|
|
|
| rtc::AsyncResolverInterface*
|
| IpcPacketSocketFactory::CreateAsyncResolver() {
|
| - scoped_ptr<AsyncAddressResolverImpl> resolver(
|
| - new AsyncAddressResolverImpl(socket_dispatcher_));
|
| + std::unique_ptr<AsyncAddressResolverImpl> resolver(
|
| + new AsyncAddressResolverImpl(socket_dispatcher_));
|
| return resolver.release();
|
| }
|
|
|
|
|