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

refactor: CertVerifier is not in the network namespace anymore

Browse source 
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805
This commit is contained in:
Samuel Attard 2021-03-05 15:08:38 -08:00
parent e900271bea
commit eccfa516c5
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/electron_browser_client.cc
View file

@ -1068,7 +1068,7 @@ void ElectronBrowserClient::ConfigureNetworkContextParams(
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
network::mojom::NetworkContextParams* network_context_params, network::mojom::NetworkContextParams* network_context_params,
network::mojom::CertVerifierCreationParams* cert_verifier_creation_params) { cert_verifier::mojom::CertVerifierCreationParams* cert_verifier_creation_params) {
DCHECK(browser_context); DCHECK(browser_context);
return NetworkContextServiceFactory::GetForContext(browser_context) return NetworkContextServiceFactory::GetForContext(browser_context)
->ConfigureNetworkContextParams(network_context_params, ->ConfigureNetworkContextParams(network_context_params,

2
shell/browser/electron_browser_client.h
View file

@ -163,7 +163,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
network::mojom::NetworkContextParams* network_context_params, network::mojom::NetworkContextParams* network_context_params,
network::mojom::CertVerifierCreationParams* cert_verifier_creation_params) cert_verifier::mojom::CertVerifierCreationParams* cert_verifier_creation_params)
override; override;
network::mojom::NetworkContext* GetSystemNetworkContext() override; network::mojom::NetworkContext* GetSystemNetworkContext() override;
content::MediaObserver* GetMediaObserver() override; content::MediaObserver* GetMediaObserver() override;

2
shell/browser/net/network_context_service.cc
View file

@ -26,7 +26,7 @@ NetworkContextService::~NetworkContextService() = default;
void NetworkContextService::ConfigureNetworkContextParams( void NetworkContextService::ConfigureNetworkContextParams(
network::mojom::NetworkContextParams* network_context_params, network::mojom::NetworkContextParams* network_context_params,
network::mojom::CertVerifierCreationParams* cert_verifier_creation_params) { cert_verifier::mojom::CertVerifierCreationParams* cert_verifier_creation_params) {
bool in_memory = browser_context_->IsOffTheRecord(); bool in_memory = browser_context_->IsOffTheRecord();
const base::FilePath& path = browser_context_->GetPath(); const base::FilePath& path = browser_context_->GetPath();

3
shell/browser/net/network_context_service.h
View file

@ -9,6 +9,7 @@
#include "chrome/browser/net/proxy_config_monitor.h" #include "chrome/browser/net/proxy_config_monitor.h"
#include "components/keyed_service/core/keyed_service.h" #include "components/keyed_service/core/keyed_service.h"
#include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/remote.h"
#include "services/cert_verifier/public/mojom/cert_verifier_service_factory.mojom.h"
#include "services/network/public/mojom/network_context.mojom.h" #include "services/network/public/mojom/network_context.mojom.h"
#include "shell/browser/electron_browser_context.h" #include "shell/browser/electron_browser_context.h"
@ -26,7 +27,7 @@ class NetworkContextService : public KeyedService {
void ConfigureNetworkContextParams( void ConfigureNetworkContextParams(
network::mojom::NetworkContextParams* network_context_params, network::mojom::NetworkContextParams* network_context_params,
network::mojom::CertVerifierCreationParams* cert_verifier::mojom::CertVerifierCreationParams*
cert_verifier_creation_params); cert_verifier_creation_params);
private: private:

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

@ -15,6 +15,7 @@
#include "content/public/common/content_features.h" #include "content/public/common/content_features.h"
#include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "net/net_buildflags.h" #include "net/net_buildflags.h"
#include "services/cert_verifier/public/mojom/cert_verifier_service_factory.mojom.h"
#include "services/network/network_service.h" #include "services/network/network_service.h"
#include "services/network/public/cpp/cross_thread_pending_shared_url_loader_factory.h" #include "services/network/public/cpp/cross_thread_pending_shared_url_loader_factory.h"
#include "services/network/public/cpp/features.h" #include "services/network/public/cpp/features.h"
@ -157,8 +158,8 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() {
ConfigureDefaultNetworkContextParams(network_context_params.get()); ConfigureDefaultNetworkContextParams(network_context_params.get());
network::mojom::CertVerifierCreationParamsPtr cert_verifier_creation_params = cert_verifier::mojom::CertVerifierCreationParamsPtr cert_verifier_creation_params =
network::mojom::CertVerifierCreationParams::New(); cert_verifier::mojom::CertVerifierCreationParams::New();
network_context_params->cert_verifier_params = network_context_params->cert_verifier_params =
content::GetCertVerifierParams(std::move(cert_verifier_creation_params)); content::GetCertVerifierParams(std::move(cert_verifier_creation_params));
return network_context_params; return network_context_params;