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

Unified Diff: net/socket/websocket_transport_client_socket_pool.cc

Issue 1158193006: Converted bare pointer to scoped_ptr<> in net/socket and net/http (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: net/socket/websocket_transport_client_socket_pool.cc
diff --git a/net/socket/websocket_transport_client_socket_pool.cc b/net/socket/websocket_transport_client_socket_pool.cc
index 224d010ef43eba3b9950081e3c57c20b9d933c65..9cbda205d834f089121e8c207b6d6346beb50990 100644
--- a/net/socket/websocket_transport_client_socket_pool.cc
+++ b/net/socket/websocket_transport_client_socket_pool.cc
@@ -432,7 +432,8 @@ LoadState WebSocketTransportClientSocketPool::GetLoadState(
return LookupConnectJob(handle)->GetLoadState();
}
-base::DictionaryValue* WebSocketTransportClientSocketPool::GetInfoAsValue(
+scoped_ptr<base::DictionaryValue>
+ WebSocketTransportClientSocketPool::GetInfoAsValue(
const std::string& name,
const std::string& type,
bool include_nested_pools) const {
@@ -445,7 +446,7 @@ base::DictionaryValue* WebSocketTransportClientSocketPool::GetInfoAsValue(
dict->SetInteger("max_socket_count", max_sockets_);
dict->SetInteger("max_sockets_per_group", max_sockets_);
dict->SetInteger("pool_generation_number", 0);
- return dict.release();
+ return dict.Pass();
}
TimeDelta WebSocketTransportClientSocketPool::ConnectionTimeout() const {

Powered by Google App Engine
This is Rietveld 408576698