diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-26 13:57:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-11-02 11:31:01 +0000 |
| commit | 1943b3c2a1dcee36c233724fc4ee7613d71b9cf6 (patch) | |
| tree | 8c1b5f12357025c197da5427ae02cfdc2f3570d6 /chromium/components/google | |
| parent | 21ba0c5d4bf8fba15dddd97cd693bad2358b77fd (diff) | |
| download | qtwebengine-chromium-1943b3c2a1dcee36c233724fc4ee7613d71b9cf6.tar.gz | |
BASELINE: Update Chromium to 94.0.4606.111
Change-Id: I924781584def20fc800bedf6ff41fdb96c438193
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/google')
| -rw-r--r-- | chromium/components/google/core/common/google_util.cc | 4 | ||||
| -rw-r--r-- | chromium/components/google/core/common/google_util_unittest.cc | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/chromium/components/google/core/common/google_util.cc b/chromium/components/google/core/common/google_util.cc index f0df49dd17a..eafa39f9afe 100644 --- a/chromium/components/google/core/common/google_util.cc +++ b/chromium/components/google/core/common/google_util.cc @@ -11,9 +11,9 @@ #include "base/command_line.h" #include "base/containers/flat_set.h" +#include "base/cxx17_backports.h" #include "base/macros.h" #include "base/no_destructor.h" -#include "base/stl_util.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" @@ -116,6 +116,8 @@ bool IsCanonicalHostYoutubeHostname(base::StringPiece canonical_host, youtube_tlds( std::initializer_list<base::StringPiece>({YOUTUBE_TLD_LIST})); return IsValidHostName(canonical_host, "youtube", subdomain_permission, + *youtube_tlds) || + IsValidHostName(canonical_host, "youtubekids", subdomain_permission, *youtube_tlds); } diff --git a/chromium/components/google/core/common/google_util_unittest.cc b/chromium/components/google/core/common/google_util_unittest.cc index 4e1079ab339..4d7ed00df48 100644 --- a/chromium/components/google/core/common/google_util_unittest.cc +++ b/chromium/components/google/core/common/google_util_unittest.cc @@ -402,6 +402,11 @@ TEST(GoogleUtilTest, YoutubeDomains) { google_util::ALLOW_SUBDOMAIN, google_util::DISALLOW_NON_STANDARD_PORTS)); + // YouTube Kids + EXPECT_TRUE(IsYoutubeDomainUrl(GURL("http://www.youtubekids.com"), + google_util::ALLOW_SUBDOMAIN, + google_util::DISALLOW_NON_STANDARD_PORTS)); + // TLD checks. EXPECT_TRUE(IsYoutubeDomainUrl(GURL("http://www.youtube.ca"), google_util::ALLOW_SUBDOMAIN, |