summaryrefslogtreecommitdiffstats
path: root/base/values_unittest.cc
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 13:33:04 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 13:33:04 +0000
commitd814a88597a01bf8249e36983f55a5f880154642 (patch)
treeb38b92bb3f3dd40285f1a5d652f3c8c6609e4279 /base/values_unittest.cc
parentbc00c1d1ae16e1cd82430320d89daaaaea5ded67 (diff)
downloadchromium_src-d814a88597a01bf8249e36983f55a5f880154642.zip
chromium_src-d814a88597a01bf8249e36983f55a5f880154642.tar.gz
chromium_src-d814a88597a01bf8249e36983f55a5f880154642.tar.bz2
Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.
TBR=pneubeck@chromium.org,scottbyer@chromium.org BUG=263894 Review URL: https://chromiumcodereview.appspot.com/21030009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/values_unittest.cc')
-rw-r--r--base/values_unittest.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 8776c10..733c485 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -203,7 +203,7 @@ TEST(ValuesTest, ListDeletion) {
TEST(ValuesTest, ListRemoval) {
bool deletion_flag = true;
- Value* removed_item = NULL;
+ scoped_ptr<Value> removed_item;
{
ListValue list;
@@ -218,8 +218,7 @@ TEST(ValuesTest, ListRemoval) {
EXPECT_EQ(0U, list.GetSize());
}
EXPECT_FALSE(deletion_flag);
- delete removed_item;
- removed_item = NULL;
+ removed_item.reset();
EXPECT_TRUE(deletion_flag);
{
@@ -275,7 +274,7 @@ TEST(ValuesTest, DictionaryDeletion) {
TEST(ValuesTest, DictionaryRemoval) {
std::string key = "test";
bool deletion_flag = true;
- Value* removed_item = NULL;
+ scoped_ptr<Value> removed_item;
{
DictionaryValue dict;
@@ -288,8 +287,7 @@ TEST(ValuesTest, DictionaryRemoval) {
ASSERT_TRUE(removed_item);
}
EXPECT_FALSE(deletion_flag);
- delete removed_item;
- removed_item = NULL;
+ removed_item.reset();
EXPECT_TRUE(deletion_flag);
{