net/socket/websocket_transport_client_socket_pool.cc - Issue 1149763005: Change NetLog::ParametersCallback to return a scoped_ptr.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/websocket_transport_client_socket_pool.cc

Issue 1149763005: Change NetLog::ParametersCallback to return a scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comments on ownership removed 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 ce4336800385f20349de982ec31d4312fe8270a1..224d010ef43eba3b9950081e3c57c20b9d933c65 100644

--- a/net/socket/websocket_transport_client_socket_pool.cc

+++ b/net/socket/websocket_transport_client_socket_pool.cc

@@ -436,7 +436,7 @@ base::DictionaryValue* WebSocketTransportClientSocketPool::GetInfoAsValue(

const std::string& name,

const std::string& type,

bool include_nested_pools) const {

- base::DictionaryValue* dict = new base::DictionaryValue();

+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());

dict->SetString("name", name);

dict->SetString("type", type);

dict->SetInteger("handed_out_socket_count", handed_out_socket_count_);

@@ -445,7 +445,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;

+ return dict.release();

}

TimeDelta WebSocketTransportClientSocketPool::ConnectionTimeout() const {

« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/spdy/spdy_header_block.h » ('j') | no next file with comments »