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

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.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/extensions/api/declarative_webrequest/webrequest_condition_attribute.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
@@ skipping 330 matching lines @@
     const std::vector<const std::string*>& array) {
   const size_t length = array.size();
   CHECK(length % 2 == 0);
 
   scoped_ptr<DictionaryValue> dictionary(new DictionaryValue);
   for (size_t i = 0; i < length; i += 2) {
     const std::string* name = array[i];
     const std::string* value = array[i+1];
     if (dictionary->HasKey(*name)) {
       Value* entry = NULL;
+      scoped_ptr<Value> entry_owned;
       ListValue* list = NULL;
       if (!dictionary->GetWithoutPathExpansion(*name, &entry))
         return scoped_ptr<DictionaryValue>();
       switch (entry->GetType()) {
         case Value::TYPE_STRING:  // Replace the present string with a list.
           list = new ListValue;
           // Ignoring return value, we already verified the entry is there.
-          dictionary->RemoveWithoutPathExpansion(*name, &entry);
-          list->Append(entry);
+          dictionary->RemoveWithoutPathExpansion(*name, &entry_owned);
+          list->Append(entry_owned.release());
           list->Append(Value::CreateStringValue(*value));
           dictionary->SetWithoutPathExpansion(*name, list);
           break;
         case Value::TYPE_LIST:  // Just append to the list.
           CHECK(entry->GetAsList(&list));
           list->Append(Value::CreateStringValue(*value));
           break;
         default:
           NOTREACHED();  // We never put other Values here.
           return scoped_ptr<DictionaryValue>();
@@ skipping 293 matching lines @@
     keys::kValueEqualsKey, "valueB"
   };
   const size_t kExistingSize[] = { arraysize(kExisting) };
   GetArrayAsVector(kExisting, kExistingSize, 1u, &tests);
   MatchAndCheck(
       tests, keys::kExcludeResponseHeadersKey, stage, &url_request, &result);
   EXPECT_FALSE(result);
 }
 
 }  // namespace extensions