Merge Chromium at 10.0.621.0: Initial merge by git.

Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097

2 files changed, 11 insertions, 3 deletions

diff --git a/net/server/http_listen_socket.cc b/net/server/http_listen_socket.cc
index f35582b..a946bd9 100644
--- a/net/server/http_listen_socket.cc
+++ b/net/server/http_listen_socket.cc
@@ -310,6 +310,14 @@ bool HttpListenSocket::ParseHeaders(HttpServerRequestInfo* info) {
   return false;
 }
 
+void HttpListenSocket::Close() {
+  ListenSocket::Close();
+}
+
+void HttpListenSocket::Listen() {
+  ListenSocket::Listen();
+}
+
 void HttpListenSocket::DidAccept(ListenSocket* server,
                                  ListenSocket* connection) {
   connection->AddRef();
@@ -344,6 +352,6 @@ void HttpListenSocket::DidRead(ListenSocket*,
 }
 
 void HttpListenSocket::DidClose(ListenSocket* sock) {
-  sock->Release();
   delegate_->OnClose(this);
+  sock->Release();
 }
diff --git a/net/server/http_listen_socket.h b/net/server/http_listen_socket.h
index 2eae47d..8b0bbc2 100644
--- a/net/server/http_listen_socket.h
+++ b/net/server/http_listen_socket.h
@@ -44,8 +44,8 @@ class HttpListenSocket : public ListenSocket,
   void Send404();
   void Send500(const std::string& message);
 
-  void Close() { ListenSocket::Close(); }
-  void Listen() { ListenSocket::Listen(); }
+  virtual void Close();
+  virtual void Listen();
 
   // ListenSocketDelegate
   virtual void DidAccept(ListenSocket* server, ListenSocket* connection);