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 ae3208159733d744661dd8e2f0419c40d15934bb..7f58bbd67c5786fa21cfd2e3a3e92bb36269e07d 100644 |
--- a/components/prefs/overlay_user_pref_store_unittest.cc |
+++ b/components/prefs/overlay_user_pref_store_unittest.cc |
@@ -49,22 +49,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()); |
@@ -80,16 +80,16 @@ TEST_F(OverlayUserPrefStoreTest, Observer) { |
// Check respecting of silence. |
overlay_->SetValueSilently(overlay_key, |
- base::MakeUnique<FundamentalValue>(46), |
+ 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()); |
} |
@@ -99,34 +99,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. |
@@ -161,29 +161,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, |
@@ -196,16 +196,16 @@ TEST_F(OverlayUserPrefStoreTest, GlobalPref) { |
// Check respecting of silence. |
overlay_->SetValueSilently(regular_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(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()); |
} |
@@ -220,41 +220,41 @@ 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)), |
+ 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)), |
+ 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)), |
+ 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)), |
+ base::WrapUnique(new Value(45)), |
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
EXPECT_TRUE(obs.changed_keys.empty()); |
@@ -274,7 +274,7 @@ 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()); |
@@ -282,10 +282,10 @@ TEST_F(OverlayUserPrefStoreTest, NamesMapping) { |
// Check successful unsubscription. |
underlay_->SetValue(mapped_underlay_key, |
- base::WrapUnique(new FundamentalValue(47)), |
+ base::WrapUnique(new Value(47)), |
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
overlay_->SetValue(mapped_overlay_key, |
- base::WrapUnique(new FundamentalValue(48)), |
+ base::WrapUnique(new Value(48)), |
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); |
EXPECT_TRUE(obs.changed_keys.empty()); |
} |
@@ -293,20 +293,20 @@ 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)); |
} |
} // namespace base |