Fix some uses of scoped_ptr.release() in net/ such that the return value is not ignored.

net/socket/client_socket_pool_base.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/client_socket_pool_base.h"
 
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
@@ skipping 157 matching lines @@
   pending_requests->erase(it);
   return req;
 }
 
 int ClientSocketPoolBaseHelper::RequestSocket(
     const std::string& group_name,
     const Request* request) {
   request->net_log().BeginEvent(NetLog::TYPE_SOCKET_POOL, NULL);
   Group& group = group_map_[group_name];
   int rv = RequestSocketInternal(group_name, request);
-  if (rv != ERR_IO_PENDING)
+  if (rv != ERR_IO_PENDING) {
     request->net_log().EndEvent(NetLog::TYPE_SOCKET_POOL, NULL);
-  else
+    delete request;
+  } else {
     InsertRequestIntoQueue(request, &group.pending_requests);
+  }
   return rv;
 }
 
 int ClientSocketPoolBaseHelper::RequestSocketInternal(
     const std::string& group_name,
     const Request* request) {
   DCHECK_GE(request->priority(), 0);
   CompletionCallback* const callback = request->callback();
   CHECK(callback);
   ClientSocketHandle* const handle = request->handle();
@@ skipping 455 matching lines @@
     // |group| may no longer be valid after this point.  Be careful not to
     // access it again.
   } else if (group->IsEmpty()) {
     // Delete |group| if no longer needed.  |group| will no longer be valid.
     group_map_.erase(group_name);
   }
 }
 
 void ClientSocketPoolBaseHelper::ProcessPendingRequest(
     const std::string& group_name, Group* group) {
-  scoped_ptr<const Request> r(*group->pending_requests.begin());
-  int rv = RequestSocketInternal(group_name, r.get());
+  int rv = RequestSocketInternal(group_name, *group->pending_requests.begin());
 
   if (rv != ERR_IO_PENDING) {
+    scoped_ptr<const Request> r(RemoveRequestFromQueue(
+          group->pending_requests.begin(), &group->pending_requests));
     r->net_log().EndEvent(NetLog::TYPE_SOCKET_POOL, NULL);
-    RemoveRequestFromQueue(group->pending_requests.begin(),
-                           &group->pending_requests);
     r->callback()->Run(rv);
     if (rv != OK) {
       // |group| may be invalid after the callback, we need to search
       // |group_map_| again.
       MaybeOnAvailableSocketSlot(group_name);
     }
-  } else {
-    r.release();
   }
 }
 
 void ClientSocketPoolBaseHelper::HandOutSocket(
     ClientSocket* socket,
     bool reused,
     ClientSocketHandle* handle,
     base::TimeDelta idle_time,
     Group* group,
     const BoundNetLog& net_log) {
@@ skipping 55 matching lines @@
   DCHECK_LE(total, max_sockets_);
   if (total < max_sockets_)
     return false;
   LOG(WARNING) << "ReachedMaxSocketsLimit: " << total << "/" << max_sockets_;
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace net