diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-03-13 16:48:24 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-03-24 14:49:40 +0000 |
| commit | 8b8de6420db588260120e146130944157d6dff56 (patch) | |
| tree | afc40b46e0a5ddfbcba2d26b4a15e446d9bf20ca | |
| parent | 17d1d44b8909bfc8ef883a68aab48ab05bdcd163 (diff) | |
| download | qtwebengine-chromium-8b8de6420db588260120e146130944157d6dff56.tar.gz | |
FIXUP: Jumbo build
Change-Id: I3484899300d95132ac26f3aec7029112c3dc85f1
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/466451
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | chromium/content/browser/first_party_sets/first_party_set_parser.cc | 2 | ||||
| -rw-r--r-- | chromium/content/browser/first_party_sets/first_party_sets_handler_impl.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chromium/content/browser/first_party_sets/first_party_set_parser.cc b/chromium/content/browser/first_party_sets/first_party_set_parser.cc index c56be4e99da..807ae5e4408 100644 --- a/chromium/content/browser/first_party_sets/first_party_set_parser.cc +++ b/chromium/content/browser/first_party_sets/first_party_set_parser.cc @@ -304,7 +304,7 @@ base::expected<SetsAndAliases, ParseError> ParseSet( /*.field_name =*/ kFirstPartySetAssociatedSitesField, /*.site_type =*/ net::SiteType::kAssociated, /*.size_limit =*/ absl::make_optional( - features::kFirstPartySetsMaxAssociatedSites.Get()), + ::features::kFirstPartySetsMaxAssociatedSites.Get()), }, { /*.field_name =*/ kFirstPartySetServiceSitesField, diff --git a/chromium/content/browser/first_party_sets/first_party_sets_handler_impl.cc b/chromium/content/browser/first_party_sets/first_party_sets_handler_impl.cc index ee262ed1856..27ae2d0a190 100644 --- a/chromium/content/browser/first_party_sets/first_party_sets_handler_impl.cc +++ b/chromium/content/browser/first_party_sets/first_party_sets_handler_impl.cc @@ -301,7 +301,7 @@ absl::optional<net::FirstPartySetEntry> FirstPartySetsHandlerImpl::FindEntry( const net::SchemefulSite& site, const net::FirstPartySetsContextConfig& config) const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!base::FeatureList::IsEnabled(features::kFirstPartySets) || + if (!base::FeatureList::IsEnabled(::features::kFirstPartySets) || !global_sets_.has_value()) { return absl::nullopt; } @@ -322,7 +322,7 @@ void FirstPartySetsHandlerImpl::ClearSiteDataOnChangedSetsForContext( net::FirstPartySetsCacheFilter)> callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!enabled_ || !features::kFirstPartySetsClearSiteDataOnChangedSets.Get()) { + if (!enabled_ || !::features::kFirstPartySetsClearSiteDataOnChangedSets.Get()) { std::move(callback).Run(std::move(context_config), net::FirstPartySetsCacheFilter()); return; @@ -351,7 +351,7 @@ void FirstPartySetsHandlerImpl::ClearSiteDataOnChangedSetsForContextInternal( DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(global_sets_.has_value()); DCHECK(!browser_context_id.empty()); - DCHECK(enabled_ && features::kFirstPartySetsClearSiteDataOnChangedSets.Get()); + DCHECK(enabled_ && ::features::kFirstPartySetsClearSiteDataOnChangedSets.Get()); if (db_helper_.is_null()) { VLOG(1) << "Invalid First-Party Sets database. Failed to clear site data " |