diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 00:13:44 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 00:13:44 +0000 |
| commit | 18ccfdb7574c4868e37f53386454277e3e63bbe8 (patch) | |
| tree | f1e177773e0b1cdc80deb3d755a8d7baf1233df6 /net/ftp | |
| parent | 582a8575e5259762d5cb7b517b928ed7fc75ca11 (diff) | |
| download | chromium_src-18ccfdb7574c4868e37f53386454277e3e63bbe8.zip chromium_src-18ccfdb7574c4868e37f53386454277e3e63bbe8.tar.gz chromium_src-18ccfdb7574c4868e37f53386454277e3e63bbe8.tar.bz2 | |
[net] Use scoped_ptr<> consistently in ClientSocketFactory and related code
This will make it easier to modify ClientSocketFactory et al. to support
reprioritization. This also fixes a few latent memory leaks in tests.
Make SocketStream use a ClientSocketHandle instead of
just a StreamSocket.
Rename {set,release}_socket() to {Set,Pass}Socket().
BUG=166689
TBR=eroman@chromium.org, rsleevi@chromium.org, sergeyu@chromium.org
Review URL: https://codereview.chromium.org/22995002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp')
| -rw-r--r-- | net/ftp/ftp_network_transaction.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc index ccd6e2e..f9f7b82 100644 --- a/net/ftp/ftp_network_transaction.cc +++ b/net/ftp/ftp_network_transaction.cc @@ -663,8 +663,8 @@ int FtpNetworkTransaction::DoCtrlResolveHostComplete(int result) { int FtpNetworkTransaction::DoCtrlConnect() { next_state_ = STATE_CTRL_CONNECT_COMPLETE; - ctrl_socket_.reset(socket_factory_->CreateTransportClientSocket( - addresses_, net_log_.net_log(), net_log_.source())); + ctrl_socket_ = socket_factory_->CreateTransportClientSocket( + addresses_, net_log_.net_log(), net_log_.source()); net_log_.AddEvent( NetLog::TYPE_FTP_CONTROL_CONNECTION, ctrl_socket_->NetLog().source().ToEventParametersCallback()); @@ -1249,8 +1249,8 @@ int FtpNetworkTransaction::DoDataConnect() { return Stop(rv); data_address = AddressList::CreateFromIPAddress( ip_endpoint.address(), data_connection_port_); - data_socket_.reset(socket_factory_->CreateTransportClientSocket( - data_address, net_log_.net_log(), net_log_.source())); + data_socket_ = socket_factory_->CreateTransportClientSocket( + data_address, net_log_.net_log(), net_log_.source()); net_log_.AddEvent( NetLog::TYPE_FTP_DATA_CONNECTION, data_socket_->NetLog().source().ToEventParametersCallback()); |