Rename HttpConnection to ClientSocketHandle, and rename HttpConnectionManager to ClientSocketPool.

The max number of sockets per group is now a constructor argument to ClientSocketPool.

I also changed the API on the pool to take ClientSocketHandle pointers.  The former SocketHandle typedef is now a private ClientSocketPtr typedef for use within the implementation of ClientSocketPool.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@471 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 64 insertions, 0 deletions

diff --git a/net/base/client_socket_handle.cc b/net/base/client_socket_handle.cc
new file mode 100644
index 0000000..a7b668e
--- /dev/null
+++ b/net/base/client_socket_handle.cc
@@ -0,0 +1,64 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "net/base/client_socket_handle.h"
+
+#include "net/base/client_socket.h"
+#include "net/base/client_socket_pool.h"
+
+namespace net {
+
+ClientSocketHandle::ClientSocketHandle(ClientSocketPool* pool)
+    : pool_(pool), socket_(NULL) {
+}
+
+ClientSocketHandle::~ClientSocketHandle() {
+  Reset();
+}
+
+int ClientSocketHandle::Init(const std::string& group_name,
+                             CompletionCallback* callback) {
+  Reset();
+  group_name_ = group_name;
+  return pool_->RequestSocket(this, callback);
+}
+
+void ClientSocketHandle::Reset() {
+  if (group_name_.empty())  // Was Init called?
+    return;
+  if (socket_) {
+    pool_->ReleaseSocket(this);
+    socket_ = NULL;
+  } else {
+    pool_->CancelRequest(this);
+  }
+  group_name_.clear();
+}
+
+}  // namespace net