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

fix: set macOS crypto keychain name earlier (#34683)

Browse source 
* fix: set macOS crypto keychain name earlier

* spec: ensure arm64 mac tests are cleaned up
This commit is contained in:
Samuel Attard 2022-09-23 12:32:10 -07:00 • committed by GitHub
parent 8a0b4fa338
commit 324db14969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,10 +42,6 @@
#include "shell/common/options_switches.h"
#include "url/gurl.h"
#if BUILDFLAG(IS_MAC)
#include "components/os_crypt/keychain_password_mac.h"
#endif
#if BUILDFLAG(IS_LINUX)
#include "components/os_crypt/key_storage_config_linux.h"
#endif
@ -288,12 +284,6 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
base::FeatureList::IsEnabled(features::kAsyncDns),
default_secure_dns_mode, doh_config, additional_dns_query_types_enabled);
std::string app_name = electron::Browser::Get()->GetName();
#if BUILDFLAG(IS_MAC)
KeychainPassword::GetServiceName() = app_name + " Safe Storage";
KeychainPassword::GetAccountName() = app_name;
#endif
// The OSCrypt keys are process bound, so if network service is out of
// process, send it the required key.
if (content::IsOutOfProcessNetworkService() &&