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

Unified Diff: net/socket/client_socket_pool_base.h

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/client_socket_pool_base.h
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h
index 7686715597afa88ab31f41eed79dd11d905f0bcd..3835a87959cc8380877f961607023877c44445bd 100644
--- a/net/socket/client_socket_pool_base.h
+++ b/net/socket/client_socket_pool_base.h
@@ -326,7 +326,7 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper
bool CloseOneIdleConnectionInHigherLayeredPool();
// See ClientSocketPool::GetInfoAsValue for documentation on this function.
- base::DictionaryValue* GetInfoAsValue(const std::string& name,
+ scoped_ptr<base::DictionaryValue> GetInfoAsValue(const std::string& name,
const std::string& type) const;
eroman 2015/06/01 17:07:23 Have you re-run "git cl format" ?
base::TimeDelta ConnectionTimeout() const {
@@ -827,9 +827,9 @@ class ClientSocketPoolBase {
return helper_.CleanupIdleSockets(force);
}
- base::DictionaryValue* GetInfoAsValue(const std::string& name,
+ scoped_ptr<base::DictionaryValue> GetInfoAsValue(const std::string& name,
const std::string& type) const {
- return helper_.GetInfoAsValue(name, type);
+ return helper_.GetInfoAsValue(name, type).Pass();
eroman 2015/06/01 17:07:23 Pass() is unnecessary
}
base::TimeDelta ConnectionTimeout() const {

Powered by Google App Engine
This is Rietveld 408576698