diff options
| author | estade <estade@chromium.org> | 2015-05-12 11:11:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-12 18:12:00 +0000 |
| commit | a68b0442058dc2c5e61177b88697d8a461667328 (patch) | |
| tree | c78360424be712d325ff8f8ea428c2703d655899 /base/values_unittest.cc | |
| parent | 90e34895f20edf97693c14ac0ec6faf64dbdcd91 (diff) | |
| download | chromium_src-a68b0442058dc2c5e61177b88697d8a461667328.zip chromium_src-a68b0442058dc2c5e61177b88697d8a461667328.tar.gz chromium_src-a68b0442058dc2c5e61177b88697d8a461667328.tar.bz2 | |
More base::Values-related bare pointer -> scoped_ptr conversions
main change: Value::CreateNullValue returns a scoped_ptr
BUG=none
Review URL: https://codereview.chromium.org/1129083003
Cr-Commit-Position: refs/heads/master@{#329443}
Diffstat (limited to 'base/values_unittest.cc')
| -rw-r--r-- | base/values_unittest.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/base/values_unittest.cc b/base/values_unittest.cc index b365a22..6466a96 100644 --- a/base/values_unittest.cc +++ b/base/values_unittest.cc @@ -320,9 +320,8 @@ TEST(ValuesTest, DictionaryRemoval) { TEST(ValuesTest, DictionaryWithoutPathExpansion) { DictionaryValue dict; - dict.Set("this.is.expanded", make_scoped_ptr(Value::CreateNullValue())); - dict.SetWithoutPathExpansion("this.isnt.expanded", - make_scoped_ptr(Value::CreateNullValue())); + dict.Set("this.is.expanded", Value::CreateNullValue()); + dict.SetWithoutPathExpansion("this.isnt.expanded", Value::CreateNullValue()); EXPECT_FALSE(dict.HasKey("this.is.expanded")); EXPECT_TRUE(dict.HasKey("this")); @@ -392,7 +391,7 @@ TEST(ValuesTest, DictionaryRemovePath) { TEST(ValuesTest, DeepCopy) { DictionaryValue original_dict; - scoped_ptr<Value> scoped_null(Value::CreateNullValue()); + scoped_ptr<Value> scoped_null = Value::CreateNullValue(); Value* original_null = scoped_null.get(); original_dict.Set("null", scoped_null.Pass()); scoped_ptr<FundamentalValue> scoped_bool(new FundamentalValue(true)); @@ -549,8 +548,8 @@ TEST(ValuesTest, Equals) { EXPECT_NE(null1.get(), null2.get()); EXPECT_TRUE(null1->Equals(null2.get())); - scoped_ptr<Value> boolean(new FundamentalValue(false)); - EXPECT_FALSE(null1->Equals(boolean.get())); + FundamentalValue boolean(false); + EXPECT_FALSE(null1->Equals(&boolean)); DictionaryValue dv; dv.SetBoolean("a", false); @@ -558,14 +557,14 @@ TEST(ValuesTest, Equals) { dv.SetDouble("c", 2.5); dv.SetString("d1", "string"); dv.SetString("d2", ASCIIToUTF16("http://google.com")); - dv.Set("e", make_scoped_ptr(Value::CreateNullValue())); + dv.Set("e", Value::CreateNullValue()); scoped_ptr<DictionaryValue> copy = dv.CreateDeepCopy(); EXPECT_TRUE(dv.Equals(copy.get())); scoped_ptr<ListValue> list(new ListValue); ListValue* original_list = list.get(); - list->Append(make_scoped_ptr(Value::CreateNullValue())); + list->Append(Value::CreateNullValue()); list->Append(make_scoped_ptr(new DictionaryValue)); scoped_ptr<Value> list_copy(list->CreateDeepCopy()); |