Index: net/socket/socket_net_log_params.cc |
diff --git a/net/socket/socket_net_log_params.cc b/net/socket/socket_net_log_params.cc |
index 3dd6595525d60cb7efc45d6264d83be78655a4b1..ece00d9a0f554d0fea41106e58f04f403bf28aa4 100644 |
--- a/net/socket/socket_net_log_params.cc |
+++ b/net/socket/socket_net_log_params.cc |
@@ -14,59 +14,63 @@ namespace net { |
namespace { |
-base::Value* NetLogSocketErrorCallback(int net_error, |
- int os_error, |
- NetLogCaptureMode /* capture_mode */) { |
- base::DictionaryValue* dict = new base::DictionaryValue(); |
+scoped_ptr<base::Value> NetLogSocketErrorCallback( |
+ int net_error, |
+ int os_error, |
+ NetLogCaptureMode /* capture_mode */) { |
+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
dict->SetInteger("net_error", net_error); |
dict->SetInteger("os_error", os_error); |
- return dict; |
+ return dict.Pass(); |
} |
-base::Value* NetLogHostPortPairCallback(const HostPortPair* host_and_port, |
- NetLogCaptureMode /* capture_mode */) { |
- base::DictionaryValue* dict = new base::DictionaryValue(); |
+scoped_ptr<base::Value> NetLogHostPortPairCallback( |
+ const HostPortPair* host_and_port, |
+ NetLogCaptureMode /* capture_mode */) { |
+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
dict->SetString("host_and_port", host_and_port->ToString()); |
- return dict; |
+ return dict.Pass(); |
} |
-base::Value* NetLogIPEndPointCallback(const IPEndPoint* address, |
- NetLogCaptureMode /* capture_mode */) { |
- base::DictionaryValue* dict = new base::DictionaryValue(); |
+scoped_ptr<base::Value> NetLogIPEndPointCallback( |
+ const IPEndPoint* address, |
+ NetLogCaptureMode /* capture_mode */) { |
+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
dict->SetString("address", address->ToString()); |
- return dict; |
+ return dict.Pass(); |
} |
-base::Value* NetLogSourceAddressCallback(const struct sockaddr* net_address, |
- socklen_t address_len, |
- NetLogCaptureMode /* capture_mode */) { |
- base::DictionaryValue* dict = new base::DictionaryValue(); |
+scoped_ptr<base::Value> NetLogSourceAddressCallback( |
+ const struct sockaddr* net_address, |
+ socklen_t address_len, |
+ NetLogCaptureMode /* capture_mode */) { |
+ scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
dict->SetString("source_address", |
NetAddressToStringWithPort(net_address, address_len)); |
- return dict; |
+ return dict.Pass(); |
} |
} // namespace |
NetLog::ParametersCallback CreateNetLogSocketErrorCallback(int net_error, |
int os_error) { |
- return base::Bind(&NetLogSocketErrorCallback, net_error, os_error); |
+ return base::Bind(NetLogSocketErrorCallback, net_error, os_error); |
} |
NetLog::ParametersCallback CreateNetLogHostPortPairCallback( |
const HostPortPair* host_and_port) { |
- return base::Bind(&NetLogHostPortPairCallback, host_and_port); |
+ return base::Bind(NetLogHostPortPairCallback, host_and_port); |
} |
NetLog::ParametersCallback CreateNetLogIPEndPointCallback( |
const IPEndPoint* address) { |
- return base::Bind(&NetLogIPEndPointCallback, address); |
+ return base::Bind(NetLogIPEndPointCallback, address); |
} |
NetLog::ParametersCallback CreateNetLogSourceAddressCallback( |
const struct sockaddr* net_address, |
socklen_t address_len) { |
- return base::Bind(&NetLogSourceAddressCallback, net_address, address_len); |
+ return base::Bind(NetLogSourceAddressCallback, net_address, address_len); |
} |
} // namespace net |