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

net/base/address_list.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/base/address_list.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"
 
 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());
 
   for (AddressList::const_iterator it = address_list->begin();
        it != address_list->end(); ++it) {
     list->Append(new base::StringValue(it->ToString()));
   }
 
   dict->Set("address_list", list.Pass());
-  return dict.release();
+  return dict.Pass();
 }
 
 }  // namespace
 
 AddressList::AddressList() {}
 
 AddressList::~AddressList() {}
 
 AddressList::AddressList(const IPEndPoint& endpoint) {
   push_back(endpoint);
@@ skipping 43 matching lines @@
     out.push_back(IPEndPoint(list[i].address(), port));
   return out;
 }
 
 void AddressList::SetDefaultCanonicalName() {
   DCHECK(!empty());
   set_canonical_name(front().ToStringWithoutPort());
 }
 
 NetLog::ParametersCallback AddressList::CreateNetLogCallback() const {
-  return base::Bind(&NetLogAddressListCallback, this);
+  return base::Bind(NetLogAddressListCallback, this);
 }
 
 }  // namespace net