Remove stl_util's STLDeleteContainerPairSecondPointers from net/.

net/server/http_server.h

 // 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.
 
 #ifndef NET_SERVER_HTTP_SERVER_H_
 #define NET_SERVER_HTTP_SERVER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 64 matching lines @@
 
   void SetReceiveBufferSize(int connection_id, int32_t size);
   void SetSendBufferSize(int connection_id, int32_t size);
 
   // Copies the local address to |address|. Returns a network error code.
   int GetLocalAddress(IPEndPoint* address);
 
  private:
   friend class HttpServerTest;
 
-  typedef std::map<int, HttpConnection*> IdToConnectionMap;
-
   void DoAcceptLoop();
   void OnAcceptCompleted(int rv);
   int HandleAcceptResult(int rv);
 
   void DoReadLoop(HttpConnection* connection);
   void OnReadCompleted(int connection_id, int rv);
   int HandleReadResult(HttpConnection* connection, int rv);
 
   void DoWriteLoop(HttpConnection* connection);
   void OnWriteCompleted(int connection_id, int rv);
@@ skipping 10 matching lines @@
   HttpConnection* FindConnection(int connection_id);
 
   // Whether or not Close() has been called during delegate callback processing.
   bool HasClosedConnection(HttpConnection* connection);
 
   const std::unique_ptr<ServerSocket> server_socket_;
   std::unique_ptr<StreamSocket> accepted_socket_;
   HttpServer::Delegate* const delegate_;
 
   int last_id_;
-  IdToConnectionMap id_to_connection_;
+  std::map<int, std::unique_ptr<HttpConnection>> id_to_connection_;
 
   base::WeakPtrFactory<HttpServer> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpServer);
 };
 
 }  // namespace net
 
 #endif // NET_SERVER_HTTP_SERVER_H_