Replace StreamListenSocket with StreamSocket in HttpServer.

mojo/spy/websocket_server.cc

 // Copyright 2014 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.
 
 #include "mojo/spy/websocket_server.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/public/cpp/bindings/message.h"
 #include "net/base/ip_endpoint.h"
 #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_listen_socket.h"
+#include "net/socket/tcp_server_socket.h"
 #include "url/gurl.h"
 
 namespace mojo {
 
 const int kNotConnected = -1;
 
 #define MOJO_DEBUGGER_MESSAGE_FORMAT "\"url: %s\n," \
                                      "time: %02d:%02d:%02d\n,"\
                                      "bytes: %u\n,"\
                                      "fields: %u\n,"\
                                      "name: %u\n,"\
                                      "requestId: %llu\n,"\
                                      "type: %s\n,"\
                                      "end:\n\""
 
 WebSocketServer::WebSocketServer(int port,
                                  mojo::ScopedMessagePipeHandle server_pipe)
     : port_(port),
       connection_id_(kNotConnected),
       spy_server_(MakeProxy<spy_api::SpyServer>(server_pipe.Pass())) {
   spy_server_.set_client(this);
 }
 
 WebSocketServer::~WebSocketServer() {
 }
 
 bool WebSocketServer::Start() {
-  net::TCPListenSocketFactory factory("0.0.0.0", port_);
-  web_server_ = new net::HttpServer(factory, this);
+  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::IPEndPoint address;
   int error = web_server_->GetLocalAddress(&address);
   port_ = address.port();
   return (error == net::OK);
 }
 
 void WebSocketServer::LogMessageInfo(
     const mojo::MojoRequestHeader& message_header,
     const GURL& url,
     const base::Time& message_time) {
@@ skipping 26 matching lines @@
 void WebSocketServer::OnHttpRequest(
     int connection_id,
     const net::HttpServerRequestInfo& info) {
   web_server_->Send500(connection_id, "websockets protocol only");
 }
 
 void WebSocketServer::OnWebSocketRequest(
     int connection_id,
     const net::HttpServerRequestInfo& info) {
   if (connection_id_ != kNotConnected) {
-    // Reject connection since we already have our client.
-    base::MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(&net::HttpServer::Close, web_server_, connection_id));
+    web_server_->Close(connection_id);
     return;
   }
   // Accept the connection.
   web_server_->AcceptWebSocket(connection_id, info);
   connection_id_ = connection_id;
 }
 
 void WebSocketServer::OnWebSocketMessage(
     int connection_id,
     const std::string& data) {
@@ skipping 43 matching lines @@
 
 void WebSocketServer::OnStartSession(spy_api::Result, mojo::String) {
   web_server_->SendOverWebSocket(connection_id_, "\"ok start\"");
 }
 
 bool WebSocketServer::Connected() const {
   return connection_id_ !=  kNotConnected;
 }
 
 }  // namespace mojo
-