| Index: components/user_prefs/tracked/pref_hash_filter_unittest.cc
|
| diff --git a/components/user_prefs/tracked/pref_hash_filter_unittest.cc b/components/user_prefs/tracked/pref_hash_filter_unittest.cc
|
| index 1d3afd4b9fc3af307a2f3f7b1cf0015f417b55eb..42ea4f5092a70a5f75140b5f3b80dacccab6313c 100644
|
| --- a/components/user_prefs/tracked/pref_hash_filter_unittest.cc
|
| +++ b/components/user_prefs/tracked/pref_hash_filter_unittest.cc
|
| @@ -802,12 +802,12 @@ TEST_P(PrefHashFilterTest, FilterUntrackedPrefUpdate) {
|
| TEST_P(PrefHashFilterTest, MultiplePrefsFilterSerializeData) {
|
| base::DictionaryValue root_dict;
|
| // Ownership of the following values is transfered to |root_dict|.
|
| - base::Value* int_value1 = new base::FundamentalValue(1);
|
| - base::Value* int_value2 = new base::FundamentalValue(2);
|
| - base::Value* int_value3 = new base::FundamentalValue(3);
|
| - base::Value* int_value4 = new base::FundamentalValue(4);
|
| + base::Value* int_value1 = new base::Value(1);
|
| + base::Value* int_value2 = new base::Value(2);
|
| + base::Value* int_value3 = new base::Value(3);
|
| + base::Value* int_value4 = new base::Value(4);
|
| base::DictionaryValue* dict_value = new base::DictionaryValue;
|
| - dict_value->Set("a", new base::FundamentalValue(true));
|
| + dict_value->Set("a", new base::Value(true));
|
| root_dict.Set(kAtomicPref, int_value1);
|
| root_dict.Set(kAtomicPref2, int_value2);
|
| root_dict.Set(kAtomicPref3, int_value3);
|
| @@ -821,7 +821,7 @@ TEST_P(PrefHashFilterTest, MultiplePrefsFilterSerializeData) {
|
| ASSERT_EQ(0u, mock_pref_hash_store_->stored_paths_count());
|
|
|
| // Update kAtomicPref3 again, nothing should be stored still.
|
| - base::Value* int_value5 = new base::FundamentalValue(5);
|
| + base::Value* int_value5 = new base::Value(5);
|
| root_dict.Set(kAtomicPref3, int_value5);
|
| ASSERT_EQ(0u, mock_pref_hash_store_->stored_paths_count());
|
|
|
| @@ -1014,7 +1014,7 @@ TEST_P(PrefHashFilterTest, InitialValueTrustedUnknown) {
|
|
|
| TEST_P(PrefHashFilterTest, InitialValueChanged) {
|
| // Ownership of this value is transfered to |pref_store_contents_|.
|
| - base::Value* int_value = new base::FundamentalValue(1234);
|
| + base::Value* int_value = new base::Value(1234);
|
| pref_store_contents_->Set(kAtomicPref, int_value);
|
|
|
| base::DictionaryValue* dict_value = new base::DictionaryValue;
|
| @@ -1187,9 +1187,9 @@ TEST_P(PrefHashFilterTest, InitialValueUnchangedLegacyId) {
|
|
|
| TEST_P(PrefHashFilterTest, DontResetReportOnly) {
|
| // Ownership of these values is transfered to |pref_store_contents_|.
|
| - base::Value* int_value1 = new base::FundamentalValue(1);
|
| - base::Value* int_value2 = new base::FundamentalValue(2);
|
| - base::Value* report_only_val = new base::FundamentalValue(3);
|
| + base::Value* int_value1 = new base::Value(1);
|
| + base::Value* int_value2 = new base::Value(2);
|
| + base::Value* report_only_val = new base::Value(3);
|
| base::DictionaryValue* report_only_split_val = new base::DictionaryValue;
|
| report_only_split_val->SetInteger("a", 1234);
|
| pref_store_contents_->Set(kAtomicPref, int_value1);
|
| @@ -1264,10 +1264,10 @@ TEST_P(PrefHashFilterTest, DontResetReportOnly) {
|
| TEST_P(PrefHashFilterTest, CallFilterSerializeDataCallbacks) {
|
| base::DictionaryValue root_dict;
|
| // Ownership of the following values is transfered to |root_dict|.
|
| - base::Value* int_value1 = new base::FundamentalValue(1);
|
| - base::Value* int_value2 = new base::FundamentalValue(2);
|
| + base::Value* int_value1 = new base::Value(1);
|
| + base::Value* int_value2 = new base::Value(2);
|
| base::DictionaryValue* dict_value = new base::DictionaryValue;
|
| - dict_value->Set("a", new base::FundamentalValue(true));
|
| + dict_value->Set("a", new base::Value(true));
|
| root_dict.Set(kAtomicPref, int_value1);
|
| root_dict.Set(kAtomicPref2, int_value2);
|
| root_dict.Set(kSplitPref, dict_value);
|
| @@ -1313,7 +1313,7 @@ TEST_P(PrefHashFilterTest, CallFilterSerializeDataCallbacks) {
|
| TEST_P(PrefHashFilterTest, CallFilterSerializeDataCallbacksWithFailure) {
|
| base::DictionaryValue root_dict;
|
| // Ownership of the following values is transfered to |root_dict|.
|
| - base::Value* int_value1 = new base::FundamentalValue(1);
|
| + base::Value* int_value1 = new base::Value(1);
|
| root_dict.Set(kAtomicPref, int_value1);
|
|
|
| // Only update kAtomicPref.
|
| @@ -1341,7 +1341,7 @@ TEST_P(PrefHashFilterTest, CallFilterSerializeDataCallbacksWithFailure) {
|
|
|
| TEST_P(PrefHashFilterTest, ExternalValidationValueChanged) {
|
| // Ownership of this value is transfered to |pref_store_contents_|.
|
| - base::Value* int_value = new base::FundamentalValue(1234);
|
| + base::Value* int_value = new base::Value(1234);
|
| pref_store_contents_->Set(kAtomicPref, int_value);
|
|
|
| base::DictionaryValue* dict_value = new base::DictionaryValue;
|
|
|