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

chrome/browser/policy/cloud/component_cloud_policy_store.cc

 // Copyright (c) 2013 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/cloud/component_cloud_policy_store.h"
 
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/sha1.h"
@@ skipping 304 matching lines @@
   // Each top-level key maps a policy name to its description.
   //
   // Each description is an object that contains the policy value under the
   // "Value" key. The optional "Level" key is either "Mandatory" (default) or
   // "Recommended".
   for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     base::DictionaryValue* description = NULL;
     if (!dict->GetDictionaryWithoutPathExpansion(it.key(), &description))
       return false;
 
-    base::Value* value = NULL;
+    scoped_ptr<base::Value> value;
     if (!description->RemoveWithoutPathExpansion(kValue, &value))
       return false;
 
     PolicyLevel level = POLICY_LEVEL_MANDATORY;
     std::string level_string;
     if (description->GetStringWithoutPathExpansion(kLevel, &level_string) &&
         level_string == kRecommended) {
       level = POLICY_LEVEL_RECOMMENDED;
     }
 
     // If policy for components is ever used for device-level settings then
     // this must support a configurable scope; assuming POLICY_SCOPE_USER is
     // fine for now.
-    policy->Set(it.key(), level, POLICY_SCOPE_USER, value, NULL);
+    policy->Set(it.key(), level, POLICY_SCOPE_USER, value.release(), NULL);
   }
 
   return true;
 }
 
 }  // namespace policy