Index: services/preferences/public/cpp/tests/pref_observer_store_unittest.cc |
diff --git a/services/preferences/public/cpp/tests/pref_observer_store_unittest.cc b/services/preferences/public/cpp/tests/pref_observer_store_unittest.cc |
index b1fcb0453fa207ccaa39e270c8df4fddc8b50454..6a4c9464671e44a32d70d6d7c424f7dbc4725e19 100644 |
--- a/services/preferences/public/cpp/tests/pref_observer_store_unittest.cc |
+++ b/services/preferences/public/cpp/tests/pref_observer_store_unittest.cc |
@@ -112,7 +112,7 @@ TEST_F(PrefObserverStoreTest, Initialization) { |
EXPECT_FALSE(observer()->initialized); |
const int kValue = 42; |
- base::FundamentalValue pref(kValue); |
+ base::Value pref(kValue); |
base::DictionaryValue prefs; |
prefs.Set(key, pref.CreateDeepCopy()); |
@@ -142,7 +142,7 @@ TEST_F(PrefObserverStoreTest, SetValueSilently) { |
store()->Init(keys); |
const int kValue = 42; |
- base::FundamentalValue pref(kValue); |
+ base::Value pref(kValue); |
store()->SetValueSilently(key, pref.CreateDeepCopy(), 0); |
base::RunLoop().RunUntilIdle(); |
EXPECT_TRUE(manager()->set_preferences_called()); |
@@ -158,7 +158,7 @@ TEST_F(PrefObserverStoreTest, ReportValueChanged) { |
store()->Init(keys); |
const int kValue = 42; |
- base::FundamentalValue pref(kValue); |
+ base::Value pref(kValue); |
base::DictionaryValue prefs; |
prefs.Set(key, pref.CreateDeepCopy()); |
OnPreferencesChanged(prefs); |
@@ -184,7 +184,7 @@ TEST_F(PrefObserverStoreTest, MultipleKeyInitialization) { |
EXPECT_FALSE(observer()->initialized); |
const int kValue = 42; |
- base::FundamentalValue pref1(kValue); |
+ base::Value pref1(kValue); |
const std::string kStringValue("look"); |
base::StringValue pref2(kStringValue); |
@@ -215,7 +215,7 @@ TEST_F(PrefObserverStoreTest, InvalidInitialization) { |
const std::string kInvalidKey("look"); |
const int kValue = 42; |
- base::FundamentalValue pref(kValue); |
+ base::Value pref(kValue); |
base::DictionaryValue prefs; |
prefs.Set(kInvalidKey, pref.CreateDeepCopy()); |
@@ -238,13 +238,13 @@ TEST_F(PrefObserverStoreTest, WriteToNestedPrefs) { |
const std::string sub_key1("look"); |
const int kValue1 = 42; |
- base::FundamentalValue pref1(kValue1); |
+ base::Value pref1(kValue1); |
base::DictionaryValue sub_dictionary1; |
sub_dictionary1.Set(sub_key1, pref1.CreateDeepCopy()); |
const std::string sub_key2("Watch out!\n"); |
const int kValue2 = 1337; |
- base::FundamentalValue pref2(kValue2); |
+ base::Value pref2(kValue2); |
base::DictionaryValue sub_dictionary2; |
sub_dictionary2.Set(sub_key2, pref2.CreateDeepCopy()); |
@@ -276,7 +276,7 @@ TEST_F(PrefObserverStoreTest, WriteToNestedPrefs) { |
const std::string sub_key3("????"); |
const int kValue3 = 9001; |
- base::FundamentalValue pref3(kValue3); |
+ base::Value pref3(kValue3); |
dictionary_result->Set(sub_key3, pref3.CreateDeepCopy()); |
observer()->changed_keys.clear(); |
@@ -299,13 +299,13 @@ TEST_F(PrefObserverStoreTest, UpdateOuterNestedPrefs) { |
const std::string sub_key1("look"); |
const int kValue1 = 42; |
- base::FundamentalValue pref1(kValue1); |
+ base::Value pref1(kValue1); |
base::DictionaryValue sub_dictionary1; |
sub_dictionary1.Set(sub_key1, pref1.CreateDeepCopy()); |
const std::string sub_key2("Watch out!\n"); |
const int kValue2 = 1337; |
- base::FundamentalValue pref2(kValue2); |
+ base::Value pref2(kValue2); |
base::DictionaryValue sub_dictionary2; |
sub_dictionary2.Set(sub_key2, pref2.CreateDeepCopy()); |
@@ -327,7 +327,7 @@ TEST_F(PrefObserverStoreTest, UpdateOuterNestedPrefs) { |
observer()->changed_keys.clear(); |
const int kValue3 = 9001; |
- base::FundamentalValue pref3(kValue3); |
+ base::Value pref3(kValue3); |
store()->SetValue(key1, pref3.CreateDeepCopy(), 0); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(1u, observer()->changed_keys.size()); |