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

Unified Diff: net/base/address_list.cc

Issue 1135373002: Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value… 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/base/address_list.cc
diff --git a/net/base/address_list.cc b/net/base/address_list.cc
index 9f63ebf60d6cbcb900e84d3c93267807c1603329..78982554dcd2251d7417a99b2dacd50aa57372b9 100644
--- a/net/base/address_list.cc
+++ b/net/base/address_list.cc
@@ -14,8 +14,9 @@ namespace net {
namespace {
-base::Value* NetLogAddressListCallback(const AddressList* address_list,
- NetLogCaptureMode capture_mode) {
+scoped_ptr<base::Value> NetLogAddressListCallback(
+ const AddressList* address_list,
+ NetLogCaptureMode capture_mode) {
scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
scoped_ptr<base::ListValue> list(new base::ListValue());
@@ -25,7 +26,7 @@ base::Value* NetLogAddressListCallback(const AddressList* address_list,
}
dict->Set("address_list", list.Pass());
- return dict.release();
+ return dict.Pass();
}
} // namespace
@@ -89,7 +90,7 @@ void AddressList::SetDefaultCanonicalName() {
}
NetLog::ParametersCallback AddressList::CreateNetLogCallback() const {
- return base::Bind(&NetLogAddressListCallback, this);
+ return base::Bind(NetLogAddressListCallback, this);
}
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698