Make ConnectJob::ReleaseSocket() return NULL on connection error.

net/socket/client_socket_pool_base.cc

 // Copyright (c) 2006-2008 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/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/time.h"
@@ skipping 285 matching lines @@
 
   RequestMap* request_map = &group.connecting_requests;
 
   RequestMap::iterator it = request_map->find(job->key_handle());
   CHECK(it != request_map->end());
   ClientSocketHandle* const handle = it->second.handle;
   CompletionCallback* const callback = it->second.callback;
   request_map->erase(it);
   DCHECK_EQ(handle, job->key_handle());
 
   scoped_ptr<ClientSocket> socket(job->ReleaseSocket());

[eroman, 2009/07/02 05:01:13]

I guess this no longer needs to be scoped_ptr.
But fine either way.

   RemoveConnectJob(job->key_handle());
 
   if (result != OK) {
+    DCHECK(!socket.get());
     callback->Run(result);  // |group| is not necessarily valid after this.
     // |group| may be invalid after the callback, we need to search
     // |group_map_| again.
     MaybeOnAvailableSocketSlot(group_name);
   } else {
     HandOutSocket(socket.release(), false /* not reused */, handle, &group);
     callback->Run(result);
   }
 }
 
@@ skipping 50 matching lines @@
     bool reused,
     ClientSocketHandle* handle,
     Group* group) {
   DCHECK(socket);
   handle->set_socket(socket);
   handle->set_is_reused(reused);
   group->active_socket_count++;
 }
 
 }  // namespace net