Skip to content

Commit

Permalink
[CodehHalth] Remove DictionaryValue::SetInteger
Browse files Browse the repository at this point in the history
This CL migrates from `DictionaryValue` and `SetInteger()` to
`base::Value::Dict` and `Set()`, or `Value::SetIntPath()` in
components/sync_preferences/pref_model_associator_unittest.cc

Bug: 1187026
Change-Id: Iab5ae213553b15b42c816096a65d5d76a3a0d001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4113185
Commit-Queue: Shunya Shishido <sisidovski@chromium.org>
Reviewed-by: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1084860}
  • Loading branch information
sisidovski authored and Chromium LUCI CQ committed Dec 19, 2022
1 parent 524c805 commit 3167b41
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion components/prefs/overlay_user_pref_store_unittest.cc
Expand Up @@ -139,7 +139,7 @@ TEST_F(OverlayUserPrefStoreTest, ModifyDictionaries) {
EXPECT_TRUE(overlay_->GetMutableValue(regular_key, &modify));
ASSERT_TRUE(modify);
ASSERT_TRUE(modify->is_dict());
static_cast<DictionaryValue*>(modify)->SetInteger(regular_key, 42);
modify->SetIntPath(regular_key, 42);

Value* original_in_underlay = nullptr;
EXPECT_TRUE(underlay_->GetMutableValue(regular_key, &original_in_underlay));
Expand Down
13 changes: 8 additions & 5 deletions components/sync_preferences/pref_model_associator_unittest.cc
Expand Up @@ -350,14 +350,17 @@ TEST_F(DictionaryPreferenceMergeTest, MergeConflicts) {
}

TEST_F(DictionaryPreferenceMergeTest, MergeValueToDictionary) {
base::DictionaryValue local_dict_value;
local_dict_value.SetInteger("key", 0);
base::Value::Dict local_dict_value;
local_dict_value.Set("key", 0);

base::DictionaryValue server_dict_value;
server_dict_value.SetInteger("key.subkey", 0);
base::Value::Dict server_dict_value;
server_dict_value.SetByDottedPath("key.subkey", 0);

// TODO(https://crbug.com/1187026): Migrate MergePreference() to
// take a base::Value::Dict.
base::Value merged_value(pref_sync_service_->MergePreference(
kDictionaryPrefName, local_dict_value, server_dict_value));
kDictionaryPrefName, base::Value(local_dict_value.Clone()),
base::Value(server_dict_value.Clone())));

EXPECT_EQ(merged_value, server_dict_value);
}
Expand Down

0 comments on commit 3167b41

Please sign in to comment.