diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/prefs/pref_member.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/prefs/pref_member.cc')
| -rw-r--r-- | chromium/components/prefs/pref_member.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chromium/components/prefs/pref_member.cc b/chromium/components/prefs/pref_member.cc index 4051e5cbb24..a53394f6ff8 100644 --- a/chromium/components/prefs/pref_member.cc +++ b/chromium/components/prefs/pref_member.cc @@ -10,7 +10,7 @@ #include "base/callback_helpers.h" #include "base/location.h" #include "base/threading/sequenced_task_runner_handle.h" -#include "base/value_conversions.h" +#include "base/util/values/values_util.h" #include "components/prefs/pref_service.h" using base::SequencedTaskRunner; @@ -200,7 +200,11 @@ template <> bool PrefMember<base::FilePath>::Internal::UpdateValueInternal( const base::Value& value) const { - return base::GetValueAsFilePath(value, &value_); + base::Optional<base::FilePath> path = util::ValueToFilePath(value); + if (!path) + return false; + value_ = *path; + return true; } template <> |