summaryrefslogtreecommitdiffstats
path: root/net/server/http_connection.cc
diff options
context:
space:
mode:
authorpliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 09:22:30 +0000
committerpliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 09:22:30 +0000
commit36633f403b4ba6c5f592bc65d387869aa5403fc1 (patch)
tree6a2f7fef89c837ed5d390aa878439761e948085b /net/server/http_connection.cc
parentead613da9d4731a38b583b2fc141ccc10bfb9e77 (diff)
downloadchromium_src-36633f403b4ba6c5f592bc65d387869aa5403fc1.zip
chromium_src-36633f403b4ba6c5f592bc65d387869aa5403fc1.tar.gz
chromium_src-36633f403b4ba6c5f592bc65d387869aa5403fc1.tar.bz2
Refactor TCPListenSocket.
This is part of Chrome for Android upstreaming. This CL adds a common base class, StreamListenSocket, providing a default implementation inherited by TCPListenSocket and the upcoming UnixDomainSocket. That lets us share the common code used by both TCPListenSocket and UnixDomainSocket. This also removes the recently introduced ListenSocket class which is unnecessary now we have StreamListenSocket. TEST=net_unittests Review URL: https://chromiumcodereview.appspot.com/10161005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server/http_connection.cc')
-rw-r--r--net/server/http_connection.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/server/http_connection.cc b/net/server/http_connection.cc
index 3404c68..d601f34 100644
--- a/net/server/http_connection.cc
+++ b/net/server/http_connection.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -6,7 +6,7 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "net/base/listen_socket.h"
+#include "net/base/stream_listen_socket.h"
#include "net/server/http_server.h"
#include "net/server/web_socket.h"
@@ -62,7 +62,7 @@ void HttpConnection::Send500(const std::string& message) {
message.c_str()));
}
-HttpConnection::HttpConnection(HttpServer* server, ListenSocket* sock)
+HttpConnection::HttpConnection(HttpServer* server, StreamListenSocket* sock)
: server_(server),
socket_(sock) {
id_ = last_id_++;