diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/components/sync_preferences | |
parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/components/sync_preferences')
-rw-r--r-- | chromium/components/sync_preferences/pref_model_associator_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/components/sync_preferences/pref_model_associator_unittest.cc b/chromium/components/sync_preferences/pref_model_associator_unittest.cc index 22577e0b5af..eac90d7f527 100644 --- a/chromium/components/sync_preferences/pref_model_associator_unittest.cc +++ b/chromium/components/sync_preferences/pref_model_associator_unittest.cc @@ -71,8 +71,8 @@ class AbstractPreferenceMergeTest : public testing::Test { expression_dict = new base::DictionaryValue; patterns_dict->SetWithoutPathExpansion(expression, expression_dict); } - expression_dict->SetWithoutPathExpansion( - "setting", new base::FundamentalValue(setting)); + expression_dict->SetWithoutPathExpansion("setting", + new base::Value(setting)); } void SetPrefToEmpty(const std::string& pref_name) { |