diff options
| author | estade <estade@chromium.org> | 2015-06-26 11:16:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-26 18:16:54 +0000 |
| commit | 0bd407f3979d07dad729c5edfbd6d9e2d399867f (patch) | |
| tree | 9361f23e5032ced375ca81233b55a9391dc40165 /net/sdch | |
| parent | 83d4d08f5cdbefec78f77d9b83c5406b92cdb9a0 (diff) | |
| download | chromium_src-0bd407f3979d07dad729c5edfbd6d9e2d399867f.zip chromium_src-0bd407f3979d07dad729c5edfbd6d9e2d399867f.tar.gz chromium_src-0bd407f3979d07dad729c5edfbd6d9e2d399867f.tar.bz2 | |
Convert some base/prefs/ methods to scoped_ptr instead of bare ptr
BUG=
Review URL: https://codereview.chromium.org/1160403002
Cr-Commit-Position: refs/heads/master@{#336412}
Diffstat (limited to 'net/sdch')
| -rw-r--r-- | net/sdch/sdch_owner.cc | 4 | ||||
| -rw-r--r-- | net/sdch/sdch_owner_unittest.cc | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/net/sdch/sdch_owner.cc b/net/sdch/sdch_owner.cc index b073af8..4004503 100644 --- a/net/sdch/sdch_owner.cc +++ b/net/sdch/sdch_owner.cc @@ -98,11 +98,11 @@ base::DictionaryValue* GetPersistentStoreDictionaryMap( // above schema, removing anything previously in the store under // kPreferenceName. void InitializePrefStore(WriteablePrefStore* store) { - base::DictionaryValue* empty_store(new base::DictionaryValue); + scoped_ptr<base::DictionaryValue> empty_store(new base::DictionaryValue); empty_store->SetInteger(kVersionKey, kVersion); empty_store->Set(kDictionariesKey, make_scoped_ptr(new base::DictionaryValue)); - store->SetValue(kPreferenceName, empty_store, + store->SetValue(kPreferenceName, empty_store.Pass(), WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); } diff --git a/net/sdch/sdch_owner_unittest.cc b/net/sdch/sdch_owner_unittest.cc index 345d5b5..149041f 100644 --- a/net/sdch/sdch_owner_unittest.cc +++ b/net/sdch/sdch_owner_unittest.cc @@ -777,7 +777,7 @@ TEST_F(SdchOwnerPersistenceTest, Empty) { // Test a persistence store with an empty dictionary. TEST_F(SdchOwnerPersistenceTest, Persistent_EmptyDict) { - pref_store_->SetValue("SDCH", new base::DictionaryValue(), + pref_store_->SetValue("SDCH", make_scoped_ptr(new base::DictionaryValue()), WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); ResetOwner(false); EXPECT_EQ(0, owner_->GetDictionaryCountForTesting()); @@ -785,9 +785,9 @@ TEST_F(SdchOwnerPersistenceTest, Persistent_EmptyDict) { // Test a persistence store with a bad version number. TEST_F(SdchOwnerPersistenceTest, Persistent_BadVersion) { - base::DictionaryValue* sdch_dict = new base::DictionaryValue(); + scoped_ptr<base::DictionaryValue> sdch_dict(new base::DictionaryValue()); sdch_dict->SetInteger("version", 2); - pref_store_->SetValue("SDCH", sdch_dict, + pref_store_->SetValue("SDCH", sdch_dict.Pass(), WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); ResetOwner(false); @@ -796,11 +796,11 @@ TEST_F(SdchOwnerPersistenceTest, Persistent_BadVersion) { // Test a persistence store with an empty dictionaries map. TEST_F(SdchOwnerPersistenceTest, Persistent_EmptyDictList) { - base::DictionaryValue* sdch_dict = new base::DictionaryValue(); + scoped_ptr<base::DictionaryValue> sdch_dict(new base::DictionaryValue()); scoped_ptr<base::DictionaryValue> dicts(new base::DictionaryValue()); sdch_dict->SetInteger("version", 1); sdch_dict->Set("dictionaries", dicts.Pass()); - pref_store_->SetValue("SDCH", sdch_dict, + pref_store_->SetValue("SDCH", sdch_dict.Pass(), WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); ResetOwner(false); |