Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1093)

Unified Diff: content/browser/renderer_host/p2p/socket_host_tcp_server.h

Issue 2249473002: Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/p2p/socket_host_tcp_server.h
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.h b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
index 21a0b2fd7a489b4fd4710f7ae72acee58ade0153..e0212b3415d59b567c02e2981fdb3c17ad021fec 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.h
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
@@ -29,8 +29,6 @@ namespace content {
class CONTENT_EXPORT P2PSocketHostTcpServer : public P2PSocketHost {
public:
- typedef std::map<net::IPEndPoint, net::StreamSocket*> AcceptedSocketsMap;
-
P2PSocketHostTcpServer(IPC::Sender* message_sender,
int socket_id,
P2PSocketType client_type);
@@ -45,7 +43,7 @@ class CONTENT_EXPORT P2PSocketHostTcpServer : public P2PSocketHost {
const std::vector<char>& data,
const rtc::PacketOptions& options,
uint64_t packet_id) override;
- P2PSocketHost* AcceptIncomingTcpConnection(
+ std::unique_ptr<P2PSocketHost> AcceptIncomingTcpConnection(
const net::IPEndPoint& remote_address,
int id) override;
bool SetOption(P2PSocketOption option, int value) override;
@@ -66,7 +64,8 @@ class CONTENT_EXPORT P2PSocketHostTcpServer : public P2PSocketHost {
net::IPEndPoint local_address_;
std::unique_ptr<net::StreamSocket> accept_socket_;
- AcceptedSocketsMap accepted_sockets_;
+ std::map<net::IPEndPoint, std::unique_ptr<net::StreamSocket>>
+ accepted_sockets_;
net::CompletionCallback accept_callback_;
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_tcp.cc ('k') | content/browser/renderer_host/p2p/socket_host_tcp_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698