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

net/dns/dns_config_service.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/dns/dns_config_service.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "net/base/ip_endpoint.h"
@@ skipping 120 matching lines @@
   unhandled_options = d.unhandled_options;
   append_to_multi_label_name = d.append_to_multi_label_name;
   ndots = d.ndots;
   timeout = d.timeout;
   attempts = d.attempts;
   rotate = d.rotate;
   edns0 = d.edns0;
   use_local_ipv6 = d.use_local_ipv6;
 }
 
-base::Value* DnsConfig::ToValue() const {
-  base::DictionaryValue* dict = new base::DictionaryValue();
+scoped_ptr<base::Value> DnsConfig::ToValue() const {
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
-  base::ListValue* list = new base::ListValue();
+  scoped_ptr<base::ListValue> list(new base::ListValue());
   for (size_t i = 0; i < nameservers.size(); ++i)
     list->Append(new base::StringValue(nameservers[i].ToString()));
-  dict->Set("nameservers", list);
+  dict->Set("nameservers", list.Pass());
 
-  list = new base::ListValue();
+  list.reset(new base::ListValue());
   for (size_t i = 0; i < search.size(); ++i)
     list->Append(new base::StringValue(search[i]));
-  dict->Set("search", list);
+  dict->Set("search", list.Pass());
 
   dict->SetBoolean("unhandled_options", unhandled_options);
   dict->SetBoolean("append_to_multi_label_name", append_to_multi_label_name);
   dict->SetInteger("ndots", ndots);
   dict->SetDouble("timeout", timeout.InSecondsF());
   dict->SetInteger("attempts", attempts);
   dict->SetBoolean("rotate", rotate);
   dict->SetBoolean("edns0", edns0);
   dict->SetBoolean("use_local_ipv6", use_local_ipv6);
   dict->SetInteger("num_hosts", hosts.size());
 
-  return dict;
+  return dict.Pass();
 }
 
 
 DnsConfigService::DnsConfigService()
     : watch_failed_(false),
       have_config_(false),
       have_hosts_(false),
       need_update_(false),
       last_sent_empty_(true) {}
 
@@ skipping 136 matching lines @@
   if (watch_failed_) {
     // If a watch failed, the config may not be accurate, so report empty.
     callback_.Run(DnsConfig());
   } else {
     callback_.Run(dns_config_);
   }
 }
 
 }  // namespace net