Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value…

net/socket/socket_net_log_params.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/socket_net_log_params.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
 
 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