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/url/url_idna_icu.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/url/url_idna_icu.cc')
| -rw-r--r-- | chromium/url/url_idna_icu.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/url/url_idna_icu.cc b/chromium/url/url_idna_icu.cc index 0b0ffd72798..8f858394603 100644 --- a/chromium/url/url_idna_icu.cc +++ b/chromium/url/url_idna_icu.cc @@ -8,6 +8,8 @@ #include <stdlib.h> #include <string.h> +#include <ostream> + #include "base/check_op.h" #include "base/no_destructor.h" #include "third_party/icu/source/common/unicode/uidna.h" @@ -52,7 +54,7 @@ struct UIDNAWrapper { << ". If you see this error message in a test environment " << "your test environment likely lacks the required data " << "tables for libicu. See https://crbug.com/778929."; - value = NULL; + value = nullptr; } } @@ -84,7 +86,7 @@ bool IDNToASCII(const base::char16* src, int src_len, CanonOutputW* output) { DCHECK(output->length() == 0); // Output buffer is assumed empty. UIDNA* uidna = GetUIDNA(); - DCHECK(uidna != NULL); + DCHECK(uidna != nullptr); while (true) { UErrorCode err = U_ZERO_ERROR; UIDNAInfo info = UIDNA_INFO_INITIALIZER; |