diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /net/socket/tcp_client_socket_pool.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'net/socket/tcp_client_socket_pool.cc')
| -rw-r--r-- | net/socket/tcp_client_socket_pool.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket/tcp_client_socket_pool.cc b/net/socket/tcp_client_socket_pool.cc index 5f1f43f..8ec9cac 100644 --- a/net/socket/tcp_client_socket_pool.cc +++ b/net/socket/tcp_client_socket_pool.cc @@ -222,9 +222,9 @@ int TCPClientSocketPool::RequestSocket( // TODO(eroman): Split out the host and port parameters. net_log.AddEvent( NetLog::TYPE_TCP_CLIENT_SOCKET_POOL_REQUESTED_SOCKET, - new NetLogStringParameter( + make_scoped_refptr(new NetLogStringParameter( "host_and_port", - casted_params->get()->destination().host_port_pair().ToString())); + casted_params->get()->destination().host_port_pair().ToString()))); } return base_.RequestSocket(group_name, *casted_params, priority, handle, @@ -243,9 +243,9 @@ void TCPClientSocketPool::RequestSockets( // TODO(eroman): Split out the host and port parameters. net_log.AddEvent( NetLog::TYPE_TCP_CLIENT_SOCKET_POOL_REQUESTED_SOCKETS, - new NetLogStringParameter( + make_scoped_refptr(new NetLogStringParameter( "host_and_port", - casted_params->get()->destination().host_port_pair().ToString())); + casted_params->get()->destination().host_port_pair().ToString()))); } base_.RequestSockets(group_name, *casted_params, num_sockets, net_log); |