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

base/values_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 <limits>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 185 matching lines @@
     ListValue list;
     list.Append(new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
     EXPECT_TRUE(list.Set(0, Value::CreateNullValue()));
     EXPECT_TRUE(deletion_flag);
   }
 }
 
 TEST(ValuesTest, ListRemoval) {
   bool deletion_flag = true;
-  Value* removed_item = NULL;
+  scoped_ptr<Value> removed_item;
 
   {
     ListValue list;
     list.Append(new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
     EXPECT_EQ(1U, list.GetSize());
     EXPECT_FALSE(list.Remove(std::numeric_limits<size_t>::max(),
                              &removed_item));
     EXPECT_FALSE(list.Remove(1, &removed_item));
     EXPECT_TRUE(list.Remove(0, &removed_item));
     ASSERT_TRUE(removed_item);
     EXPECT_EQ(0U, list.GetSize());
   }
   EXPECT_FALSE(deletion_flag);
-  delete removed_item;
-  removed_item = NULL;
+  removed_item.reset();
   EXPECT_TRUE(deletion_flag);
 
   {
     ListValue list;
     list.Append(new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
     EXPECT_TRUE(list.Remove(0, NULL));
     EXPECT_TRUE(deletion_flag);
     EXPECT_EQ(0U, list.GetSize());
   }
@@ skipping 35 matching lines @@
     dict.Set(key, new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
     dict.Set(key, Value::CreateNullValue());
     EXPECT_TRUE(deletion_flag);
   }
 }
 
 TEST(ValuesTest, DictionaryRemoval) {
   std::string key = "test";
   bool deletion_flag = true;
-  Value* removed_item = NULL;
+  scoped_ptr<Value> removed_item;
 
   {
     DictionaryValue dict;
     dict.Set(key, new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
     EXPECT_TRUE(dict.HasKey(key));
     EXPECT_FALSE(dict.Remove("absent key", &removed_item));
     EXPECT_TRUE(dict.Remove(key, &removed_item));
     EXPECT_FALSE(dict.HasKey(key));
     ASSERT_TRUE(removed_item);
   }
   EXPECT_FALSE(deletion_flag);
-  delete removed_item;
-  removed_item = NULL;
+  removed_item.reset();
   EXPECT_TRUE(deletion_flag);
 
   {
     DictionaryValue dict;
     dict.Set(key, new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
     EXPECT_TRUE(dict.HasKey(key));
     EXPECT_TRUE(dict.Remove(key, NULL));
     EXPECT_TRUE(deletion_flag);
     EXPECT_FALSE(dict.HasKey(key));
@@ skipping 466 matching lines @@
       seen2 = true;
     } else {
       ADD_FAILURE();
     }
   }
   EXPECT_TRUE(seen1);
   EXPECT_TRUE(seen2);
 }
 
 }  // namespace base