| Index: net/udp/udp_net_log_parameters.cc
|
| diff --git a/net/udp/udp_net_log_parameters.cc b/net/udp/udp_net_log_parameters.cc
|
| index fb25b4c70a967c47125fc54421f18cfcf3114202..a9e5a9737fe7f842eb771c926b6b20072ec9ec8b 100644
|
| --- a/net/udp/udp_net_log_parameters.cc
|
| +++ b/net/udp/udp_net_log_parameters.cc
|
| @@ -13,24 +13,26 @@ namespace net {
|
|
|
| namespace {
|
|
|
| -base::Value* NetLogUDPDataTranferCallback(int byte_count,
|
| - const char* bytes,
|
| - const IPEndPoint* address,
|
| - NetLogCaptureMode capture_mode) {
|
| - base::DictionaryValue* dict = new base::DictionaryValue();
|
| +scoped_ptr<base::Value> NetLogUDPDataTranferCallback(
|
| + int byte_count,
|
| + const char* bytes,
|
| + const IPEndPoint* address,
|
| + NetLogCaptureMode capture_mode) {
|
| + scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| dict->SetInteger("byte_count", byte_count);
|
| if (capture_mode.include_socket_bytes())
|
| dict->SetString("hex_encoded_bytes", base::HexEncode(bytes, byte_count));
|
| if (address)
|
| dict->SetString("address", address->ToString());
|
| - return dict;
|
| + return dict.Pass();
|
| }
|
|
|
| -base::Value* NetLogUDPConnectCallback(const IPEndPoint* address,
|
| - NetLogCaptureMode /* capture_mode */) {
|
| - base::DictionaryValue* dict = new base::DictionaryValue();
|
| +scoped_ptr<base::Value> NetLogUDPConnectCallback(
|
| + const IPEndPoint* address,
|
| + NetLogCaptureMode /* capture_mode */) {
|
| + scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| dict->SetString("address", address->ToString());
|
| - return dict;
|
| + return dict.Pass();
|
| }
|
|
|
| } // namespace
|
| @@ -40,13 +42,13 @@ NetLog::ParametersCallback CreateNetLogUDPDataTranferCallback(
|
| const char* bytes,
|
| const IPEndPoint* address) {
|
| DCHECK(bytes);
|
| - return base::Bind(&NetLogUDPDataTranferCallback, byte_count, bytes, address);
|
| + return base::Bind(NetLogUDPDataTranferCallback, byte_count, bytes, address);
|
| }
|
|
|
| NetLog::ParametersCallback CreateNetLogUDPConnectCallback(
|
| const IPEndPoint* address) {
|
| DCHECK(address);
|
| - return base::Bind(&NetLogUDPConnectCallback, address);
|
| + return base::Bind(NetLogUDPConnectCallback, address);
|
| }
|
|
|
| } // namespace net
|
|
|