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

Unified Diff: net/http/http_proxy_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: Fixed failed net unit tests 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
« no previous file with comments | « net/http/http_proxy_client_socket_pool.h ('k') | net/socket/client_socket_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_proxy_client_socket_pool.cc
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index 6ea447c356906eb04f90e4a5062d2389addbb2ec..1a60c6ae5adfcc4b81da43e115ce4c85542dc364 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -511,11 +511,11 @@ LoadState HttpProxyClientSocketPool::GetLoadState(
return base_.GetLoadState(group_name, handle);
}
-base::DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue(
+scoped_ptr<base::DictionaryValue> HttpProxyClientSocketPool::GetInfoAsValue(
const std::string& name,
const std::string& type,
bool include_nested_pools) const {
- base::DictionaryValue* dict = base_.GetInfoAsValue(name, type);
+ scoped_ptr<base::DictionaryValue> dict(base_.GetInfoAsValue(name, type));
if (include_nested_pools) {
base::ListValue* list = new base::ListValue();
if (transport_pool_) {
@@ -530,7 +530,7 @@ base::DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue(
}
dict->Set("nested_pools", list);
}
- return dict;
+ return dict.Pass();
}
base::TimeDelta HttpProxyClientSocketPool::ConnectionTimeout() const {
« no previous file with comments | « net/http/http_proxy_client_socket_pool.h ('k') | net/socket/client_socket_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698