Change NetLog::ParametersCallback to return a scoped_ptr.

net/proxy/proxy_config.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/proxy/proxy_config.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/values.h"
@@ skipping 214 matching lines @@
 bool ProxyConfig::HasAutomaticSettings() const {
   return auto_detect_ || has_pac_url();
 }
 
 void ProxyConfig::ClearAutomaticSettings() {
   auto_detect_ = false;
   pac_url_ = GURL();
 }
 
 base::DictionaryValue* ProxyConfig::ToValue() const {
-  base::DictionaryValue* dict = new base::DictionaryValue();
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   // Output the automatic settings.
   if (auto_detect_)
     dict->SetBoolean("auto_detect", auto_detect_);
   if (has_pac_url()) {
     dict->SetString("pac_url", pac_url_.possibly_invalid_spec());
     if (pac_mandatory_)
       dict->SetBoolean("pac_mandatory", pac_mandatory_);
   }
 
   // Output the manual settings.
   if (proxy_rules_.type != ProxyRules::TYPE_NO_RULES) {
     switch (proxy_rules_.type) {
       case ProxyRules::TYPE_SINGLE_PROXY:
-        AddProxyListToValue("single_proxy",
-                            proxy_rules_.single_proxies, dict);
+        AddProxyListToValue("single_proxy", proxy_rules_.single_proxies,
+                            dict.get());
         break;
       case ProxyRules::TYPE_PROXY_PER_SCHEME: {
-        base::DictionaryValue* dict2 = new base::DictionaryValue();
-        AddProxyListToValue("http", proxy_rules_.proxies_for_http, dict2);
-        AddProxyListToValue("https", proxy_rules_.proxies_for_https, dict2);
-        AddProxyListToValue("ftp", proxy_rules_.proxies_for_ftp, dict2);
-        AddProxyListToValue("fallback", proxy_rules_.fallback_proxies, dict2);
-        dict->Set("proxy_per_scheme", dict2);
+        scoped_ptr<base::DictionaryValue> dict2(new base::DictionaryValue());
+        AddProxyListToValue("http", proxy_rules_.proxies_for_http, dict2.get());
+        AddProxyListToValue("https", proxy_rules_.proxies_for_https,
+                            dict2.get());
+        AddProxyListToValue("ftp", proxy_rules_.proxies_for_ftp, dict2.get());
+        AddProxyListToValue("fallback", proxy_rules_.fallback_proxies,
+                            dict2.get());
+        dict->Set("proxy_per_scheme", dict2.Pass());
         break;
       }
       default:
         NOTREACHED();
     }
 
     // Output the bypass rules.
     const ProxyBypassRules& bypass = proxy_rules_.bypass_rules;
     if (!bypass.rules().empty()) {
       if (proxy_rules_.reverse_bypass)
         dict->SetBoolean("reverse_bypass", true);
 
       base::ListValue* list = new base::ListValue();
 
       for (ProxyBypassRules::RuleList::const_iterator it =
               bypass.rules().begin();
            it != bypass.rules().end(); ++it) {
         list->Append(new base::StringValue((*it)->ToString()));
       }
 
       dict->Set("bypass_list", list);
     }
   }
 
   // Output the source.
   dict->SetString("source", ProxyConfigSourceToString(source_));
 
-  return dict;
+  return dict.release();
 }
 
 }  // namespace net