| Index: net/socket/socks_client_socket_pool_unittest.cc
|
| diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc
|
| index 89530f667c6751feae30027ff82b4d7e91d6d25e..6072ad32a43816569f940689cc1d5c990c270167 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_) {
|
|
|