Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

content/browser/renderer_host/p2p/socket_host_tcp.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/p2p/socket_host_tcp.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/location.h"
@@ skipping 49 matching lines @@
       url_context_(url_context) {
 }
 
 P2PSocketHostTcpBase::~P2PSocketHostTcpBase() {
   if (state_ == STATE_OPEN) {
     DCHECK(socket_.get());
     socket_.reset();
   }
 }
 
-bool P2PSocketHostTcpBase::InitAccepted(const net::IPEndPoint& remote_address,
-                                        net::StreamSocket* socket) {
-  DCHECK(socket);
+bool P2PSocketHostTcpBase::InitAccepted(
+    const net::IPEndPoint& remote_address,
+    std::unique_ptr<net::StreamSocket> socket) {
+  DCHECK(socket.get());

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

nit: don't need .get() here

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

Done.

   DCHECK_EQ(state_, STATE_UNINITIALIZED);
 
   remote_address_.ip_address = remote_address;
   // TODO(ronghuawu): Add FakeSSLServerSocket.
-  socket_.reset(socket);
+  socket_ = std::move(socket);
   state_ = STATE_OPEN;
   DoRead();
   return state_ != STATE_ERROR;
 }
 
 bool P2PSocketHostTcpBase::Init(const net::IPEndPoint& local_address,
                                 uint16_t min_port,
                                 uint16_t max_port,
                                 const P2PHostAndIPEndPoint& remote_address) {
   DCHECK_EQ(state_, STATE_UNINITIALIZED);
@@ skipping 349 matching lines @@
   } else if (result == net::ERR_IO_PENDING) {
     write_pending_ = true;
   } else {
     ReportSocketError(result, "WebRTC.ICE.TcpSocketWriteErrorCode");
 
     LOG(ERROR) << "Error when sending data in TCP socket: " << result;
     OnError();
   }
 }
 
-P2PSocketHost* P2PSocketHostTcpBase::AcceptIncomingTcpConnection(
-    const net::IPEndPoint& remote_address, int id) {
+std::unique_ptr<P2PSocketHost>
+P2PSocketHostTcpBase::AcceptIncomingTcpConnection(
+    const net::IPEndPoint& remote_address,
+    int id) {
   NOTREACHED();
   OnError();
   return NULL;
 }
 
 void P2PSocketHostTcpBase::DidCompleteRead(int result) {
   DCHECK_EQ(state_, STATE_OPEN);
 
   if (result == net::ERR_IO_PENDING) {
     return;
@@ skipping 183 matching lines @@
   } else {
     packet_size += kTurnChannelDataHeaderSize;
     // Calculate any padding if present.
     if (packet_size % 4)
       *pad_bytes = 4 - packet_size % 4;
   }
   return packet_size;
 }
 
 }  // namespace content