Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Unified Diff: net/server/http_server.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/server/http_connection.cc ('k') | net/socket/buffered_write_stream_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « net/server/http_connection.cc ('k') | net/socket/buffered_write_stream_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698