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/services/preferences | |
| 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/services/preferences')
| -rw-r--r-- | chromium/services/preferences/tracked/pref_hash_filter_unittest.cc | 2 | ||||
| -rw-r--r-- | chromium/services/preferences/tracked/registry_hash_store_contents_win.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chromium/services/preferences/tracked/pref_hash_filter_unittest.cc b/chromium/services/preferences/tracked/pref_hash_filter_unittest.cc index 5dadce21f92..ecdbe6dfd9e 100644 --- a/chromium/services/preferences/tracked/pref_hash_filter_unittest.cc +++ b/chromium/services/preferences/tracked/pref_hash_filter_unittest.cc @@ -542,7 +542,7 @@ class PrefHashFilterTest : public testing::TestWithParam<EnforcementLevel>, public prefs::mojom::ResetOnLoadObserver { public: PrefHashFilterTest() - : mock_pref_hash_store_(NULL), + : mock_pref_hash_store_(nullptr), pref_store_contents_(new base::DictionaryValue), mock_validation_delegate_record_(new MockValidationDelegateRecord), mock_validation_delegate_(mock_validation_delegate_record_), diff --git a/chromium/services/preferences/tracked/registry_hash_store_contents_win.cc b/chromium/services/preferences/tracked/registry_hash_store_contents_win.cc index 9aee82ae4e9..8b28d3560ff 100644 --- a/chromium/services/preferences/tracked/registry_hash_store_contents_win.cc +++ b/chromium/services/preferences/tracked/registry_hash_store_contents_win.cc @@ -7,6 +7,7 @@ #include <windows.h> #include "base/check_op.h" +#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/numerics/safe_conversions.h" |