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

Unified Diff: net/socket/socks_client_socket_pool_unittest.cc

Issue 1756019: Fix some uses of scoped_ptr.release() in net/ such that the return value is not ignored. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: add back the change that got lost in the void Created 10 years, 8 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
« no previous file with comments | « net/socket/client_socket_pool_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_) {
« no previous file with comments | « net/socket/client_socket_pool_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698