Index: net/server/http_server.cc |
diff --git a/net/server/http_server.cc b/net/server/http_server.cc |
index 3abd44df9d691aede81ecdd2a46f346053f9c6c1..f3560e8cabd02660da9dd6e10eafece6fa7c6503 100644 |
--- a/net/server/http_server.cc |
+++ b/net/server/http_server.cc |
@@ -236,11 +236,8 @@ int HttpServer::HandleReadResult(HttpConnection* connection, int rv) { |
connection->socket()->GetPeerAddress(&request.peer); |
if (request.HasHeaderValue("connection", "upgrade")) { |
- scoped_ptr<WebSocket> websocket = |
- WebSocket::CreateWebSocket(this, connection, request); |
- if (!websocket) // Not enough data was received. |
- break; |
- connection->SetWebSocket(websocket.Pass()); |
+ connection->SetWebSocket( |
+ make_scoped_ptr(new WebSocket(this, connection))); |
read_buf->DidConsume(pos); |
delegate_->OnWebSocketRequest(connection->id(), request); |
if (HasClosedConnection(connection)) |