Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/prefs/overlay_user_pref_store_unittest.cc

Issue 1907043002: Convert //components/prefs from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU fixes Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/prefs/overlay_user_pref_store.cc ('k') | components/prefs/pref_change_registrar_unittest.cc » ('j') | components/user_prefs/tracked/interceptable_pref_filter.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/prefs/overlay_user_pref_store_unittest.cc
diff --git a/components/prefs/overlay_user_pref_store_unittest.cc b/components/prefs/overlay_user_pref_store_unittest.cc
index 1ac185e930141f8634f2b05c3cb3ce195c43b100..1f8916a2c512f795323b53bff0d8761e5b0aa776 100644
--- a/components/prefs/overlay_user_pref_store_unittest.cc
+++ b/components/prefs/overlay_user_pref_store_unittest.cc
@@ -4,6 +4,7 @@
#include "components/prefs/overlay_user_pref_store.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "components/prefs/pref_store_observer_mock.h"
#include "components/prefs/testing_pref_store.h"
@@ -48,22 +49,22 @@ TEST_F(OverlayUserPrefStoreTest, Observer) {
overlay_->AddObserver(&obs);
// Check that underlay first value is reported.
- underlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(42)),
+ underlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(overlay_key);
// Check that underlay overwriting is reported.
- underlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(43)),
+ underlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(overlay_key);
// Check that overwriting change in overlay is reported.
- overlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(44)),
+ overlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(44)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(overlay_key);
// Check that hidden underlay change is not reported.
- underlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(45)),
+ underlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(45)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
@@ -79,16 +80,16 @@ TEST_F(OverlayUserPrefStoreTest, Observer) {
// Check respecting of silence.
overlay_->SetValueSilently(overlay_key,
- make_scoped_ptr(new FundamentalValue(46)),
+ base::WrapUnique(new FundamentalValue(46)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
overlay_->RemoveObserver(&obs);
// Check successful unsubscription.
- underlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(47)),
+ underlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(47)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(48)),
+ overlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(48)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
}
@@ -98,7 +99,7 @@ TEST_F(OverlayUserPrefStoreTest, GetAndSet) {
EXPECT_FALSE(overlay_->GetValue(overlay_key, &value));
EXPECT_FALSE(underlay_->GetValue(overlay_key, &value));
- underlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(42)),
+ underlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
// Value shines through:
@@ -108,7 +109,7 @@ TEST_F(OverlayUserPrefStoreTest, GetAndSet) {
EXPECT_TRUE(underlay_->GetValue(overlay_key, &value));
EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
- overlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(43)),
+ overlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(overlay_->GetValue(overlay_key, &value));
@@ -130,7 +131,7 @@ TEST_F(OverlayUserPrefStoreTest, GetAndSet) {
// Check that GetMutableValue does not return the dictionary of the underlay.
TEST_F(OverlayUserPrefStoreTest, ModifyDictionaries) {
- underlay_->SetValue(overlay_key, make_scoped_ptr(new DictionaryValue),
+ underlay_->SetValue(overlay_key, base::WrapUnique(new DictionaryValue),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
Value* modify = NULL;
@@ -160,12 +161,12 @@ TEST_F(OverlayUserPrefStoreTest, GlobalPref) {
const Value* value = NULL;
// Check that underlay first value is reported.
- underlay_->SetValue(regular_key, make_scoped_ptr(new FundamentalValue(42)),
+ underlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(regular_key);
// Check that underlay overwriting is reported.
- underlay_->SetValue(regular_key, make_scoped_ptr(new FundamentalValue(43)),
+ underlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(regular_key);
@@ -174,7 +175,7 @@ TEST_F(OverlayUserPrefStoreTest, GlobalPref) {
EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
// Check that overwriting change in overlay is reported.
- overlay_->SetValue(regular_key, make_scoped_ptr(new FundamentalValue(44)),
+ overlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(44)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(regular_key);
@@ -195,16 +196,16 @@ TEST_F(OverlayUserPrefStoreTest, GlobalPref) {
// Check respecting of silence.
overlay_->SetValueSilently(regular_key,
- make_scoped_ptr(new FundamentalValue(46)),
+ base::WrapUnique(new FundamentalValue(46)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
overlay_->RemoveObserver(&obs);
// Check successful unsubscription.
- underlay_->SetValue(regular_key, make_scoped_ptr(new FundamentalValue(47)),
+ underlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(47)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(regular_key, make_scoped_ptr(new FundamentalValue(48)),
+ overlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(48)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
}
@@ -219,13 +220,13 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check that if there is no override in the overlay, changing underlay value
// is reported as changing an overlay value.
underlay_->SetValue(mapped_underlay_key,
- make_scoped_ptr(new FundamentalValue(42)),
+ base::WrapUnique(new FundamentalValue(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(mapped_overlay_key);
// Check that underlay overwriting is reported.
underlay_->SetValue(mapped_underlay_key,
- make_scoped_ptr(new FundamentalValue(43)),
+ base::WrapUnique(new FundamentalValue(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(mapped_overlay_key);
@@ -238,7 +239,7 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check that overwriting change in overlay is reported.
overlay_->SetValue(mapped_overlay_key,
- make_scoped_ptr(new FundamentalValue(44)),
+ base::WrapUnique(new FundamentalValue(44)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(mapped_overlay_key);
@@ -253,7 +254,7 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check that hidden underlay change is not reported.
underlay_->SetValue(mapped_underlay_key,
- make_scoped_ptr(new FundamentalValue(45)),
+ base::WrapUnique(new FundamentalValue(45)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
@@ -273,7 +274,7 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check respecting of silence.
overlay_->SetValueSilently(mapped_overlay_key,
- make_scoped_ptr(new FundamentalValue(46)),
+ base::WrapUnique(new FundamentalValue(46)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
@@ -281,10 +282,10 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check successful unsubscription.
underlay_->SetValue(mapped_underlay_key,
- make_scoped_ptr(new FundamentalValue(47)),
+ base::WrapUnique(new FundamentalValue(47)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
overlay_->SetValue(mapped_overlay_key,
- make_scoped_ptr(new FundamentalValue(48)),
+ base::WrapUnique(new FundamentalValue(48)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
}
@@ -292,9 +293,9 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check that mutable values are removed correctly.
TEST_F(OverlayUserPrefStoreTest, ClearMutableValues) {
// Set in overlay and underlay the same preference.
- underlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(42)),
+ underlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(overlay_key, make_scoped_ptr(new FundamentalValue(43)),
+ overlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
const Value* value = nullptr;
« no previous file with comments | « components/prefs/overlay_user_pref_store.cc ('k') | components/prefs/pref_change_registrar_unittest.cc » ('j') | components/user_prefs/tracked/interceptable_pref_filter.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698