diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 00:39:50 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 00:39:50 +0000 |
| commit | 90499486eb26f12da3456f01bd28abc4a6191ea4 (patch) | |
| tree | aa97aa55048b94b328a11621f0dc73a2622c06e8 /net/server/http_server.cc | |
| parent | a9030b828efc3b1312264875c1f76b35708eb000 (diff) | |
| download | chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.zip chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.gz chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.bz2 | |
Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/15829004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server/http_server.cc')
| -rw-r--r-- | net/server/http_server.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/server/http_server.cc b/net/server/http_server.cc index f518358..d4055d2 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; } |