Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.

chrome/browser/policy/config_dir_policy_loader.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 "chrome/browser/policy/config_dir_policy_loader.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
@@ skipping 141 matching lines @@
     }
     base::DictionaryValue* dictionary_value = NULL;
     if (!value->GetAsDictionary(&dictionary_value)) {
       LOG(WARNING) << "Expected JSON dictionary in configuration file "
                    << config_file_iter->value();
       status.Add(POLICY_LOAD_STATUS_PARSE_ERROR);
       continue;
     }
 
     // Detach the "3rdparty" node.
-    base::Value* third_party = NULL;
-    if (dictionary_value->Remove("3rdparty", &third_party)) {
-      Merge3rdPartyPolicy(third_party, level, bundle);
-      delete third_party;
-    }
+    scoped_ptr<base::Value> third_party;
+    if (dictionary_value->Remove("3rdparty", &third_party))
+      Merge3rdPartyPolicy(third_party.get(), level, bundle);
 
     // Add chrome policy.
     PolicyMap policy_map;
     policy_map.LoadFrom(dictionary_value, level, scope_);
     bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
         .MergeFrom(policy_map);
   }
 }
 
 void ConfigDirPolicyLoader::Merge3rdPartyPolicy(
@@ skipping 47 matching lines @@
   }
 }
 
 void ConfigDirPolicyLoader::OnFileUpdated(const base::FilePath& path,
                                           bool error) {
   if (!error)
     Reload(false);
 }
 
 }  // namespace policy