Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

content/browser/renderer_host/p2p/socket_host_tcp_server.cc

Index: content/browser/renderer_host/p2p/socket_host_tcp_server.cc
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
index f3c7bc2b0eee2242491e8d4c948e697ab5981a3d..3100cde303695d64ff2efaae39f7a6f2cf8817c2 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/stl_util.h"
 #include "content/browser/renderer_host/p2p/socket_host_tcp.h"
 #include "content/common/p2p_messages.h"
 #include "net/base/address_list.h"
@@ -30,9 +29,6 @@ P2PSocketHostTcpServer::P2PSocketHostTcpServer(IPC::Sender* message_sender,
 }
 
 P2PSocketHostTcpServer::~P2PSocketHostTcpServer() {
-  base::STLDeleteContainerPairSecondPointers(accepted_sockets_.begin(),
-                                             accepted_sockets_.end());
-
   if (state_ == STATE_OPEN) {
     DCHECK(socket_.get());
     socket_.reset();
@@ -104,11 +100,7 @@ void P2PSocketHostTcpServer::HandleAcceptResult(int result) {
     accept_socket_.reset();
     return;
   }
-  AcceptedSocketsMap::iterator it = accepted_sockets_.find(address);
-  if (it != accepted_sockets_.end())
-    delete it->second;
-
-  accepted_sockets_[address] = accept_socket_.release();
+  accepted_sockets_[address] = std::move(accept_socket_);
   message_sender_->Send(
       new P2PMsg_OnIncomingTcpConnection(id_, address));
 }
@@ -127,13 +119,15 @@ void P2PSocketHostTcpServer::Send(const net::IPEndPoint& to,
   OnError();
 }
 
-P2PSocketHost* P2PSocketHostTcpServer::AcceptIncomingTcpConnection(
-    const net::IPEndPoint& remote_address, int id) {
-  AcceptedSocketsMap::iterator it = accepted_sockets_.find(remote_address);
+std::unique_ptr<P2PSocketHost>
+P2PSocketHostTcpServer::AcceptIncomingTcpConnection(
+    const net::IPEndPoint& remote_address,
+    int id) {
+  auto it = accepted_sockets_.find(remote_address);
   if (it == accepted_sockets_.end())
     return NULL;
 
-  net::StreamSocket* socket = it->second;
+  std::unique_ptr<net::StreamSocket> socket = std::move(it->second);
   accepted_sockets_.erase(it);
 
   std::unique_ptr<P2PSocketHostTcpBase> result;
@@ -143,9 +137,9 @@ P2PSocketHost* P2PSocketHostTcpServer::AcceptIncomingTcpConnection(
     result.reset(
         new P2PSocketHostStunTcp(message_sender_, id, client_type_, NULL));
   }
-  if (!result->InitAccepted(remote_address, socket))
+  if (!result->InitAccepted(remote_address, std::move(socket)))
     return NULL;

[Sergey Ulanov, 2016/08/15 16:54:59]

nit: nullptr

[Avi (use Gerrit), 2016/08/15 18:10:29]

Done.

-  return result.release();
+  return std::move(result);
 }
 
 bool P2PSocketHostTcpServer::SetOption(P2PSocketOption option,