diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 18:23:26 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 18:23:26 +0000 |
| commit | 83088b2c3cf332a53d866c92b8106c26fb2395a3 (patch) | |
| tree | bd025d079b6c380dfb8731abe7fe3b19b6b0f16f /net/server | |
| parent | 2cd6eac027ab13ee08800130d5738ca4950d5079 (diff) | |
| download | chromium_src-83088b2c3cf332a53d866c92b8106c26fb2395a3.zip chromium_src-83088b2c3cf332a53d866c92b8106c26fb2395a3.tar.gz chromium_src-83088b2c3cf332a53d866c92b8106c26fb2395a3.tar.bz2 | |
Upstream changes making ListenSocket an abstract class.
This is part of Chrome for Android upstreaming.
This CL makes ListenSocket an abstract class instead of a concrete class
implementing a TCP Listen Socket. This abstraction will be used later to make
HttpServer seamlessly operate on TCP sockets and Unix domain sockets (will be
upstreamed in a separate CL).
The TCP Listen socket implementation, previously in listen_socket.{cc,h}, is
now in tcp_listen_socket.{cc,h}.
TEST=net_unittests
Review URL: http://codereview.chromium.org/10108015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server')
| -rw-r--r-- | net/server/http_server.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/server/http_server.cc b/net/server/http_server.cc index f56ff96..ad1fa6e 100644 --- a/net/server/http_server.cc +++ b/net/server/http_server.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. @@ -10,6 +10,7 @@ #include "base/stringprintf.h" #include "base/sys_byteorder.h" #include "build/build_config.h" +#include "net/base/tcp_listen_socket.h" #include "net/server/http_connection.h" #include "net/server/http_server_request_info.h" #include "net/server/web_socket.h" @@ -20,7 +21,7 @@ HttpServer::HttpServer(const std::string& host, int port, HttpServer::Delegate* del) : delegate_(del) { - server_ = ListenSocket::Listen(host, port, this); + server_ = TCPListenSocket::CreateAndListen(host, port, this); } HttpServer::~HttpServer() { |