| Index: net/server/http_server.cc
|
| diff --git a/net/server/http_server.cc b/net/server/http_server.cc
|
| index f518358b5ba92eb87ce8be5fe31f9f6743de77d9..d4055d20c78941ed6c7d2b5ea913a3b990f15e30 100644
|
| --- a/net/server/http_server.cc
|
| +++ b/net/server/http_server.cc
|
| @@ -22,7 +22,7 @@ HttpServer::HttpServer(const StreamListenSocketFactory& factory,
|
| HttpServer::Delegate* delegate)
|
| : delegate_(delegate),
|
| server_(factory.CreateAndListen(this)) {
|
| - DCHECK(server_);
|
| + DCHECK(server_.get());
|
| }
|
|
|
| void HttpServer::AcceptWebSocket(
|
| @@ -76,7 +76,7 @@ void HttpServer::Close(int connection_id) {
|
|
|
| // Initiating close from server-side does not lead to the DidClose call.
|
| // Do it manually here.
|
| - DidClose(connection->socket_);
|
| + DidClose(connection->socket_.get());
|
| }
|
|
|
| int HttpServer::GetLocalAddress(IPEndPoint* address) {
|
| @@ -142,7 +142,7 @@ void HttpServer::DidClose(StreamListenSocket* socket) {
|
| HttpConnection* connection = FindConnection(socket);
|
| DCHECK(connection != NULL);
|
| id_to_connection_.erase(connection->id());
|
| - socket_to_connection_.erase(connection->socket_);
|
| + socket_to_connection_.erase(connection->socket_.get());
|
| delete connection;
|
| }
|
|
|
|
|