mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: fix FirstPartySetsHandler initialization (#33971)

Browse source
This commit is contained in:
Keeley Hammond 2022-04-28 22:17:19 -07:00 committed by GitHub
parent fb534c927a
commit 015185ad5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/net/system_network_context_manager.cc
View file

@ -20,6 +20,7 @@
#include "components/os_crypt/os_crypt.h" #include "components/os_crypt/os_crypt.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/first_party_sets_handler.h"
#include "content/public/browser/network_service_instance.h" #include "content/public/browser/network_service_instance.h"
#include "content/public/common/content_features.h" #include "content/public/common/content_features.h"
#include "content/public/common/network_service_util.h" #include "content/public/common/network_service_util.h"
@ -288,6 +289,11 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
base::FeatureList::IsEnabled(features::kAsyncDns), base::FeatureList::IsEnabled(features::kAsyncDns),
default_secure_dns_mode, doh_config, additional_dns_query_types_enabled); default_secure_dns_mode, doh_config, additional_dns_query_types_enabled);
// Initializes first party sets component
// CL: https://chromium-review.googlesource.com/c/chromium/src/+/3449280
content::FirstPartySetsHandler::GetInstance()->SetPublicFirstPartySets(
base::File());
std::string app_name = electron::Browser::Get()->GetName(); std::string app_name = electron::Browser::Get()->GetName();
#if BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_MAC)
KeychainPassword::GetServiceName() = app_name + " Safe Storage"; KeychainPassword::GetServiceName() = app_name + " Safe Storage";