| Index: mojo/spy/websocket_server.cc
|
| diff --git a/mojo/spy/websocket_server.cc b/mojo/spy/websocket_server.cc
|
| index 20e2da6db6fa4f1deee4662fb674c8f92a8dfce0..bf4c96a298b2987f3bf3fe912ee493915a06dc53 100644
|
| --- a/mojo/spy/websocket_server.cc
|
| +++ b/mojo/spy/websocket_server.cc
|
| @@ -14,7 +14,7 @@
|
| #include "net/base/net_errors.h"
|
| #include "net/server/http_server_request_info.h"
|
| #include "net/server/http_server_response_info.h"
|
| -#include "net/socket/tcp_server_socket.h"
|
| +#include "net/socket/tcp_listen_socket.h"
|
| #include "url/gurl.h"
|
|
|
| namespace mojo {
|
| @@ -42,10 +42,8 @@
|
| }
|
|
|
| bool WebSocketServer::Start() {
|
| - scoped_ptr<net::ServerSocket> server_socket(
|
| - new net::TCPServerSocket(NULL, net::NetLog::Source()));
|
| - server_socket->ListenWithAddressAndPort("0.0.0.0", port_, 1);
|
| - web_server_.reset(new net::HttpServer(server_socket.Pass(), this));
|
| + net::TCPListenSocketFactory factory("0.0.0.0", port_);
|
| + web_server_ = new net::HttpServer(factory, this);
|
| net::IPEndPoint address;
|
| int error = web_server_->GetLocalAddress(&address);
|
| port_ = address.port();
|
| @@ -93,7 +91,9 @@
|
| const net::HttpServerRequestInfo& info) {
|
| if (connection_id_ != kNotConnected) {
|
| // Reject connection since we already have our client.
|
| - web_server_->Close(connection_id);
|
| + base::MessageLoop::current()->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&net::HttpServer::Close, web_server_, connection_id));
|
| return;
|
| }
|
| // Accept the connection.
|
| @@ -157,3 +157,4 @@
|
| }
|
|
|
| } // namespace mojo
|
| +
|
|
|