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
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h
index ce2546312c..91289d8 100644
--- a/net/socket/client_socket_pool_base.h
+++ b/net/socket/client_socket_pool_base.h
@@ -176,8 +176,8 @@
NetworkChangeNotifier* network_change_notifier);
// See ClientSocketPool::RequestSocket for documentation on this function.
- // Note that |request| must be heap allocated. If ERR_IO_PENDING is returned,
- // then ClientSocketPoolBaseHelper takes ownership of |request|.
+ // ClientSocketPoolBaseHelper takes ownership of |request|, which must be
+ // heap allocated.
int RequestSocket(const std::string& group_name, const Request* request);
// See ClientSocketPool::CancelRequest for documentation on this function.
@@ -526,12 +526,8 @@
ClientSocketHandle* handle,
CompletionCallback* callback,
const BoundNetLog& net_log) {
- scoped_ptr<Request> request(
- new Request(handle, callback, priority, params, net_log));
- int rv = helper_->RequestSocket(group_name, request.get());
- if (rv == ERR_IO_PENDING)
- request.release();
- return rv;
+ Request* request = new Request(handle, callback, priority, params, net_log);
+ return helper_->RequestSocket(group_name, request);
}
void CancelRequest(const std::string& group_name,
