diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 23:30:17 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 23:30:17 +0000 |
| commit | e7e993263d1994d2aae4394e2eb220a8ce2b68e3 (patch) | |
| tree | 2fa80cc8d3c19ef3be1c37be0f58ba17c2475056 /net/socket/socks_client_socket_pool_unittest.cc | |
| parent | 0a7da815724b3d3431c900d595aad1aad30f8cd7 (diff) | |
| download | chromium_src-e7e993263d1994d2aae4394e2eb220a8ce2b68e3.zip chromium_src-e7e993263d1994d2aae4394e2eb220a8ce2b68e3.tar.gz chromium_src-e7e993263d1994d2aae4394e2eb220a8ce2b68e3.tar.bz2 | |
Fix some uses of scoped_ptr.release() in net/ such that the return value is not ignored.
client_socket_pool_base.cc change contributed by vandebo@chromium
BUG=42904
TEST=existing net tests/
Review URL: http://codereview.chromium.org/1756019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket_pool_unittest.cc')
| -rw-r--r-- | net/socket/socks_client_socket_pool_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc index 89530f6..6072ad3 100644 --- a/net/socket/socks_client_socket_pool_unittest.cc +++ b/net/socket/socks_client_socket_pool_unittest.cc @@ -49,7 +49,7 @@ class MockTCPClientSocketPool : public TCPClientSocketPool { bool CancelHandle(const ClientSocketHandle* handle) { if (handle != handle_) return false; - socket_.reset(NULL); + socket_.reset(); handle_ = NULL; user_callback_ = NULL; return true; @@ -60,11 +60,10 @@ class MockTCPClientSocketPool : public TCPClientSocketPool { if (!socket_.get()) return; if (rv == OK) - handle_->set_socket(socket_.get()); + handle_->set_socket(socket_.release()); else - socket_.reset(NULL); + socket_.reset(); - socket_.release(); handle_ = NULL; if (user_callback_) { |