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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/prefs/overlay_user_pref_store_unittest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 10 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/json_pref_store_unittest.cc ('k') | components/prefs/pref_change_registrar_unittest.cc » ('j') | no next file with comments »
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 20cdb1730fb3fdd74143d4442f54bdb75ef09577..5dded13ca04e0a4c898575d4ebad9e021c654681 100644
--- a/components/prefs/overlay_user_pref_store_unittest.cc
+++ b/components/prefs/overlay_user_pref_store_unittest.cc
@@ -52,22 +52,22 @@ TEST_F(OverlayUserPrefStoreTest, Observer) {
overlay_->AddObserver(&obs);
// Check that underlay first value is reported.
- underlay_->SetValue(overlay_key, base::MakeUnique<FundamentalValue>(42),
+ underlay_->SetValue(overlay_key, base::MakeUnique<Value>(42),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(overlay_key);
// Check that underlay overwriting is reported.
- underlay_->SetValue(overlay_key, base::MakeUnique<FundamentalValue>(43),
+ underlay_->SetValue(overlay_key, base::MakeUnique<Value>(43),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(overlay_key);
// Check that overwriting change in overlay is reported.
- overlay_->SetValue(overlay_key, base::MakeUnique<FundamentalValue>(44),
+ overlay_->SetValue(overlay_key, base::MakeUnique<Value>(44),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(overlay_key);
// Check that hidden underlay change is not reported.
- underlay_->SetValue(overlay_key, base::MakeUnique<FundamentalValue>(45),
+ underlay_->SetValue(overlay_key, base::MakeUnique<Value>(45),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
@@ -82,17 +82,16 @@ TEST_F(OverlayUserPrefStoreTest, Observer) {
obs.VerifyAndResetChangedKey(overlay_key);
// Check respecting of silence.
- overlay_->SetValueSilently(overlay_key,
- base::MakeUnique<FundamentalValue>(46),
+ overlay_->SetValueSilently(overlay_key, base::MakeUnique<Value>(46),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
overlay_->RemoveObserver(&obs);
// Check successful unsubscription.
- underlay_->SetValue(overlay_key, base::MakeUnique<FundamentalValue>(47),
+ underlay_->SetValue(overlay_key, base::MakeUnique<Value>(47),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(overlay_key, base::MakeUnique<FundamentalValue>(48),
+ overlay_->SetValue(overlay_key, base::MakeUnique<Value>(48),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
}
@@ -102,34 +101,34 @@ TEST_F(OverlayUserPrefStoreTest, GetAndSet) {
EXPECT_FALSE(overlay_->GetValue(overlay_key, &value));
EXPECT_FALSE(underlay_->GetValue(overlay_key, &value));
- underlay_->SetValue(overlay_key, base::MakeUnique<FundamentalValue>(42),
+ underlay_->SetValue(overlay_key, base::MakeUnique<Value>(42),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
// Value shines through:
EXPECT_TRUE(overlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
+ EXPECT_TRUE(base::Value(42).Equals(value));
EXPECT_TRUE(underlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
+ EXPECT_TRUE(base::Value(42).Equals(value));
- overlay_->SetValue(overlay_key, base::MakeUnique<FundamentalValue>(43),
+ overlay_->SetValue(overlay_key, base::MakeUnique<Value>(43),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(overlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
EXPECT_TRUE(underlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
+ EXPECT_TRUE(base::Value(42).Equals(value));
overlay_->RemoveValue(overlay_key,
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
// Value shines through:
EXPECT_TRUE(overlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
+ EXPECT_TRUE(base::Value(42).Equals(value));
EXPECT_TRUE(underlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
+ EXPECT_TRUE(base::Value(42).Equals(value));
}
// Check that GetMutableValue does not return the dictionary of the underlay.
@@ -164,29 +163,29 @@ TEST_F(OverlayUserPrefStoreTest, GlobalPref) {
const Value* value = NULL;
// Check that underlay first value is reported.
- underlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(42)),
+ underlay_->SetValue(regular_key, base::WrapUnique(new Value(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(regular_key);
// Check that underlay overwriting is reported.
- underlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(43)),
+ underlay_->SetValue(regular_key, base::WrapUnique(new Value(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(regular_key);
// Check that we get this value from the overlay
EXPECT_TRUE(overlay_->GetValue(regular_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
// Check that overwriting change in overlay is reported.
- overlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(44)),
+ overlay_->SetValue(regular_key, base::WrapUnique(new Value(44)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(regular_key);
// Check that we get this value from the overlay and the underlay.
EXPECT_TRUE(overlay_->GetValue(regular_key, &value));
- EXPECT_TRUE(base::FundamentalValue(44).Equals(value));
+ EXPECT_TRUE(base::Value(44).Equals(value));
EXPECT_TRUE(underlay_->GetValue(regular_key, &value));
- EXPECT_TRUE(base::FundamentalValue(44).Equals(value));
+ EXPECT_TRUE(base::Value(44).Equals(value));
// Check that overlay remove is reported.
overlay_->RemoveValue(regular_key,
@@ -198,17 +197,16 @@ TEST_F(OverlayUserPrefStoreTest, GlobalPref) {
EXPECT_FALSE(underlay_->GetValue(regular_key, &value));
// Check respecting of silence.
- overlay_->SetValueSilently(regular_key,
- base::WrapUnique(new FundamentalValue(46)),
+ overlay_->SetValueSilently(regular_key, base::WrapUnique(new Value(46)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
overlay_->RemoveObserver(&obs);
// Check successful unsubscription.
- underlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(47)),
+ underlay_->SetValue(regular_key, base::WrapUnique(new Value(47)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(48)),
+ overlay_->SetValue(regular_key, base::WrapUnique(new Value(48)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
}
@@ -222,42 +220,38 @@ 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,
- base::WrapUnique(new FundamentalValue(42)),
+ underlay_->SetValue(mapped_underlay_key, base::WrapUnique(new Value(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(mapped_overlay_key);
// Check that underlay overwriting is reported.
- underlay_->SetValue(mapped_underlay_key,
- base::WrapUnique(new FundamentalValue(43)),
+ underlay_->SetValue(mapped_underlay_key, base::WrapUnique(new Value(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(mapped_overlay_key);
// Check that we get this value from the overlay with both keys
EXPECT_TRUE(overlay_->GetValue(mapped_overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
// In this case, overlay reads directly from the underlay.
EXPECT_TRUE(overlay_->GetValue(mapped_underlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
// Check that overwriting change in overlay is reported.
- overlay_->SetValue(mapped_overlay_key,
- base::WrapUnique(new FundamentalValue(44)),
+ overlay_->SetValue(mapped_overlay_key, base::WrapUnique(new Value(44)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
obs.VerifyAndResetChangedKey(mapped_overlay_key);
// Check that we get an overriden value from overlay, while reading the
// value from underlay still holds an old value.
EXPECT_TRUE(overlay_->GetValue(mapped_overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(44).Equals(value));
+ EXPECT_TRUE(base::Value(44).Equals(value));
EXPECT_TRUE(overlay_->GetValue(mapped_underlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
EXPECT_TRUE(underlay_->GetValue(mapped_underlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
// Check that hidden underlay change is not reported.
- underlay_->SetValue(mapped_underlay_key,
- base::WrapUnique(new FundamentalValue(45)),
+ underlay_->SetValue(mapped_underlay_key, base::WrapUnique(new Value(45)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
@@ -277,18 +271,16 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
// Check respecting of silence.
overlay_->SetValueSilently(mapped_overlay_key,
- base::WrapUnique(new FundamentalValue(46)),
+ base::WrapUnique(new Value(46)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
overlay_->RemoveObserver(&obs);
// Check successful unsubscription.
- underlay_->SetValue(mapped_underlay_key,
- base::WrapUnique(new FundamentalValue(47)),
+ underlay_->SetValue(mapped_underlay_key, base::WrapUnique(new Value(47)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(mapped_overlay_key,
- base::WrapUnique(new FundamentalValue(48)),
+ overlay_->SetValue(mapped_overlay_key, base::WrapUnique(new Value(48)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
EXPECT_TRUE(obs.changed_keys.empty());
}
@@ -296,57 +288,55 @@ 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, base::WrapUnique(new FundamentalValue(42)),
+ underlay_->SetValue(overlay_key, base::WrapUnique(new Value(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(43)),
+ overlay_->SetValue(overlay_key, base::WrapUnique(new Value(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
const Value* value = nullptr;
// Check that an overlay preference is returned.
EXPECT_TRUE(overlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
overlay_->ClearMutableValues();
// Check that an underlay preference is returned.
EXPECT_TRUE(overlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
+ EXPECT_TRUE(base::Value(42).Equals(value));
}
TEST_F(OverlayUserPrefStoreTest, GetValues) {
// To check merge behavior, create underlay and overlay so each has a key the
// other doesn't have and they have one key in common.
- underlay_->SetValue(regular_key, base::WrapUnique(new FundamentalValue(42)),
+ underlay_->SetValue(regular_key, base::WrapUnique(new Value(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(overlay_key, base::WrapUnique(new FundamentalValue(43)),
+ overlay_->SetValue(overlay_key, base::WrapUnique(new Value(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- underlay_->SetValue(shared_key, base::WrapUnique(new FundamentalValue(42)),
+ underlay_->SetValue(shared_key, base::WrapUnique(new Value(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(shared_key, base::WrapUnique(new FundamentalValue(43)),
+ overlay_->SetValue(shared_key, base::WrapUnique(new Value(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- underlay_->SetValue(mapped_underlay_key,
- base::WrapUnique(new FundamentalValue(42)),
+ underlay_->SetValue(mapped_underlay_key, base::WrapUnique(new Value(42)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- overlay_->SetValue(mapped_overlay_key,
- base::WrapUnique(new FundamentalValue(43)),
+ overlay_->SetValue(mapped_overlay_key, base::WrapUnique(new Value(43)),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
auto values = overlay_->GetValues();
const Value* value = nullptr;
// Check that an overlay preference is returned.
ASSERT_TRUE(values->Get(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
// Check that an underlay preference is returned.
ASSERT_TRUE(values->Get(regular_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
+ EXPECT_TRUE(base::Value(42).Equals(value));
// Check that the overlay is preferred.
ASSERT_TRUE(values->Get(shared_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
// Check that mapping works.
ASSERT_TRUE(values->Get(mapped_overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
+ EXPECT_TRUE(base::Value(43).Equals(value));
EXPECT_FALSE(values->Get(mapped_underlay_key, &value));
}
« no previous file with comments | « components/prefs/json_pref_store_unittest.cc ('k') | components/prefs/pref_change_registrar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698