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

Unified Diff: components/user_prefs/tracked/segregated_pref_store_unittest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
Index: components/user_prefs/tracked/segregated_pref_store_unittest.cc
diff --git a/components/user_prefs/tracked/segregated_pref_store_unittest.cc b/components/user_prefs/tracked/segregated_pref_store_unittest.cc
index a4b40b1577868749bb905721f95a41f7c6cdc4c1..49199bc66950e174d3cb884b45136e33d7663a4f 100644
--- a/components/user_prefs/tracked/segregated_pref_store_unittest.cc
+++ b/components/user_prefs/tracked/segregated_pref_store_unittest.cc
@@ -106,10 +106,10 @@ TEST_F(SegregatedPrefStoreTest, StoreValues) {
// Properly stores new values.
segregated_store_->SetValue(kSelectedPref,
- base::MakeUnique<base::StringValue>(kValue1),
+ base::MakeUnique<base::Value>(kValue1),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
segregated_store_->SetValue(kUnselectedPref,
- base::MakeUnique<base::StringValue>(kValue2),
+ base::MakeUnique<base::Value>(kValue2),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
ASSERT_TRUE(selected_store_->GetValue(kSelectedPref, NULL));
@@ -131,10 +131,10 @@ TEST_F(SegregatedPrefStoreTest, StoreValues) {
TEST_F(SegregatedPrefStoreTest, ReadValues) {
selected_store_->SetValue(kSelectedPref,
- base::MakeUnique<base::StringValue>(kValue1),
+ base::MakeUnique<base::Value>(kValue1),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
default_store_->SetValue(kUnselectedPref,
- base::MakeUnique<base::StringValue>(kValue2),
+ base::MakeUnique<base::Value>(kValue2),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
// Works properly with values that are already there.
@@ -159,11 +159,11 @@ TEST_F(SegregatedPrefStoreTest, Observer) {
EXPECT_TRUE(observer_.initialization_success);
EXPECT_TRUE(observer_.changed_keys.empty());
segregated_store_->SetValue(kSelectedPref,
- base::MakeUnique<base::StringValue>(kValue1),
+ base::MakeUnique<base::Value>(kValue1),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
observer_.VerifyAndResetChangedKey(kSelectedPref);
segregated_store_->SetValue(kUnselectedPref,
- base::MakeUnique<base::StringValue>(kValue2),
+ base::MakeUnique<base::Value>(kValue2),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
observer_.VerifyAndResetChangedKey(kUnselectedPref);
}
@@ -281,13 +281,12 @@ TEST_F(SegregatedPrefStoreTest, GetValues) {
// To check merge behavior, create selected and default stores so each has a
// key the other doesn't have and they have one key in common.
selected_store_->SetValue(kSelectedPref,
- base::MakeUnique<base::StringValue>(kValue1),
+ base::MakeUnique<base::Value>(kValue1),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
default_store_->SetValue(kUnselectedPref,
- base::MakeUnique<base::StringValue>(kValue2),
+ base::MakeUnique<base::Value>(kValue2),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
- selected_store_->SetValue(kSharedPref,
- base::MakeUnique<base::StringValue>(kValue1),
+ selected_store_->SetValue(kSharedPref, base::MakeUnique<base::Value>(kValue1),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
auto values = segregated_store_->GetValues();

Powered by Google App Engine
This is Rietveld 408576698