From 87fc877fe14dc19cb662a7f5ff41e4ab9cb7e5e9 Mon Sep 17 00:00:00 2001 From: t57ser Date: Thu, 6 Feb 2020 20:02:39 +0100 Subject: [PATCH 1/3] fix: flash plugin Fixes https://github.com/electron/electron/issues/20744 --- shell/browser/net/system_network_context_manager.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc index 92333a24ec16b..10869d411e561 100644 --- a/shell/browser/net/system_network_context_manager.cc +++ b/shell/browser/net/system_network_context_manager.cc @@ -10,7 +10,9 @@ #include "base/command_line.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h" +#include "components/variations/net/variations_http_headers.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/cors_exempt_headers.h" #include "content/public/browser/network_service_instance.h" #include "content/public/common/content_features.h" #include "content/public/common/service_names.mojom.h" @@ -154,6 +156,9 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() { network::mojom::NetworkContextParamsPtr network_context_params = network::mojom::NetworkContextParams::New(); + content::UpdateCorsExemptHeader(network_context_params.get()); + variations::UpdateCorsExemptHeaderForVariations(network_context_params.get()); + network_context_params->enable_brotli = true; network_context_params->enable_referrers = true; From a1fcb49584d52b048c741e1c095fed0b14f7963c Mon Sep 17 00:00:00 2001 From: srogotzki Date: Sat, 8 Feb 2020 10:07:44 +0100 Subject: [PATCH 2/3] cleanup --- shell/browser/net/system_network_context_manager.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc index 10869d411e561..f6bc8257c86b3 100644 --- a/shell/browser/net/system_network_context_manager.cc +++ b/shell/browser/net/system_network_context_manager.cc @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h" -#include "components/variations/net/variations_http_headers.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/cors_exempt_headers.h" #include "content/public/browser/network_service_instance.h" @@ -156,8 +155,8 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() { network::mojom::NetworkContextParamsPtr network_context_params = network::mojom::NetworkContextParams::New(); + //This is required to avoid blocking X-Requested-With headers sent by PPAPI plugins, more info crbug.com/940331 content::UpdateCorsExemptHeader(network_context_params.get()); - variations::UpdateCorsExemptHeaderForVariations(network_context_params.get()); network_context_params->enable_brotli = true; From 6c7573eaf7868a2aa6c7fd38f48a1c8537afd611 Mon Sep 17 00:00:00 2001 From: srogotzki Date: Sat, 8 Feb 2020 10:12:29 +0100 Subject: [PATCH 3/3] fix linting issue --- shell/browser/net/system_network_context_manager.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc index f6bc8257c86b3..62fae42b9ea47 100644 --- a/shell/browser/net/system_network_context_manager.cc +++ b/shell/browser/net/system_network_context_manager.cc @@ -155,7 +155,8 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() { network::mojom::NetworkContextParamsPtr network_context_params = network::mojom::NetworkContextParams::New(); - //This is required to avoid blocking X-Requested-With headers sent by PPAPI plugins, more info crbug.com/940331 + // This is required to avoid blocking X-Requested-With headers sent by PPAPI + // plugins, more info crbug.com/940331 content::UpdateCorsExemptHeader(network_context_params.get()); network_context_params->enable_brotli = true;