Index: mojo/spy/websocket_server.cc |
diff --git a/mojo/spy/websocket_server.cc b/mojo/spy/websocket_server.cc |
index 649a135c13e81fb363db3b878ad8833343ce515c..a7a582c6e160ca6ee44642f3210b9299203e0934 100644 |
--- a/mojo/spy/websocket_server.cc |
+++ b/mojo/spy/websocket_server.cc |
@@ -8,9 +8,9 @@ |
#include "base/strings/stringprintf.h" |
#include "net/base/ip_endpoint.h" |
#include "net/base/net_errors.h" |
+#include "net/base/net_util.h" |
#include "net/server/http_server_request_info.h" |
#include "net/server/http_server_response_info.h" |
-#include "net/socket/tcp_listen_socket.h" |
namespace spy { |
@@ -24,8 +24,10 @@ WebSocketServer::~WebSocketServer() { |
} |
bool WebSocketServer::Start() { |
- net::TCPListenSocketFactory factory("0.0.0.0", port_); |
- server_ = new net::HttpServer(factory, this); |
+ server_.reset(net::HttpServer::Create("0.0.0.0", 0, this)); |
+ if (!server_) { |
+ return false; |
+ } |
net::IPEndPoint address; |
int error = server_->GetLocalAddress(&address); |
port_ = address.port(); |
@@ -45,7 +47,8 @@ void WebSocketServer::OnWebSocketRequest( |
// Reject connection since we already have our client. |
base::MessageLoop::current()->PostTask( |
FROM_HERE, |
- base::Bind(&net::HttpServer::Close, server_, connection_id)); |
+ base::Bind(&net::HttpServer::Close, server_->AsWeakPtr(), |
+ connection_id)); |
return; |
} |
// Accept the connection. |