net/server/http_server.cc - Issue 10108015: Upstream changes making ListenSocket an abstract class. - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(716)

My Issues | Starred Open | Closed | All

Unified Diff: net/server/http_server.cc

Issue 10108015: Upstream changes making ListenSocket an abstract class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Matt's comments Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« net/base/listen_socket.h ('K') | « net/net.gyp ('k') | net/socket/transport_client_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/server/http_server.cc

diff --git a/net/server/http_server.cc b/net/server/http_server.cc

index f56ff96d9d80c1abcc21755ced46b7d2c52cc58e..a65224391e6e1c57d399117d8d75752f03a81ca6 100644

--- a/net/server/http_server.cc

+++ b/net/server/http_server.cc

@@ -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() {

« net/base/listen_socket.h ('K') | « net/net.gyp ('k') | net/socket/transport_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698