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

chrome/browser/value_store/testing_value_store.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/value_store/testing_value_store.h"
 
 #include "base/logging.h"
 
 namespace {
 
@@ skipping 107 matching lines @@
   return Remove(CreateVector(key));
 }
 
 ValueStore::WriteResult TestingValueStore::Remove(
     const std::vector<std::string>& keys) {
   write_count_++;
   if (fail_all_requests_) {
     return WriteResultError();
   }
 
-  scoped_ptr<ValueStoreChangeList> changes(
-      new ValueStoreChangeList());
+  scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
   for (std::vector<std::string>::const_iterator it = keys.begin();
       it != keys.end(); ++it) {
-    Value* old_value = NULL;
+    scoped_ptr<Value> old_value;
     if (storage_.RemoveWithoutPathExpansion(*it, &old_value)) {
-      changes->push_back(ValueStoreChange(*it, old_value, NULL));
+      changes->push_back(ValueStoreChange(*it, old_value.release(), NULL));
     }
   }
   return MakeWriteResult(changes.release());
 }
 
 ValueStore::WriteResult TestingValueStore::Clear() {
   std::vector<std::string> keys;
   for (DictionaryValue::Iterator it(storage_); !it.IsAtEnd(); it.Advance()) {
     keys.push_back(it.key());
   }
   return Remove(keys);
 }