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

Unified Diff: chrome_frame/test/test_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
Download patch
Index: chrome_frame/test/test_server.cc
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc
index db5be8d891de50e45f6c97f5fe26340af0467af6..bf48bd40748360e9d3de317babfad905863e9a09 100644
--- a/chrome_frame/test/test_server.cc
+++ b/chrome_frame/test/test_server.cc
@@ -14,6 +14,7 @@
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "chrome_frame/test/test_server.h"
+#include "net/base/tcp_listen_socket.h"
#include "net/base/winsock_init.h"
#include "net/http/http_util.h"
@@ -132,7 +133,7 @@ SimpleWebServer::SimpleWebServer(int port) {
CHECK(MessageLoop::current()) << "SimpleWebServer requires a message loop";
net::EnsureWinsockInit();
AddResponse(&quit_);
- server_ = net::ListenSocket::Listen("127.0.0.1", port, this);
+ server_ = net::TCPListenSocket::CreateAndListen("127.0.0.1", port, this);
DCHECK(server_.get() != NULL);
}
@@ -236,7 +237,8 @@ HTTPTestServer::HTTPTestServer(int port, const std::wstring& address,
FilePath root_dir)
: port_(port), address_(address), root_dir_(root_dir) {
net::EnsureWinsockInit();
- server_ = net::ListenSocket::Listen(WideToUTF8(address), port, this);
+ server_ =
+ net::TCPListenSocket::CreateAndListen(WideToUTF8(address), port, this);
}
HTTPTestServer::~HTTPTestServer() {

Powered by Google App Engine
This is Rietveld 408576698