aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2022-03-29 20:42:38 +0000
committerRene Ladan <rene@FreeBSD.org>2022-03-29 20:44:59 +0000
commit1e683edf9a258d43c95b485ad96f5c39860770cb (patch)
tree0a7fbd0d7c8ce4cc3a87f4bd35de427374a8f45f /www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
parent884d2c502102da1eb803a5d178e7c7189e657340 (diff)
downloadports-1e683edf9a258d43c95b485ad96f5c39860770cb.tar.gz
ports-1e683edf9a258d43c95b485ad96f5c39860770cb.zip
www/chromium: update to 100.0.4896.60
Enable some more unit tests. Security: ab2d7f62-af9d-11ec-a0b8-3065ec8fd3ec
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc51
1 files changed, 37 insertions, 14 deletions
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index e7e35569e08c..39e734ef53d2 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2022-03-25 21:59:56 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -373,7 +373,7 @@
+@@ -374,7 +374,7 @@
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "storage/browser/file_system/external_mount_points.h"
#include "third_party/cros_system_api/switches/chrome_switches.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
-@@ -442,17 +442,17 @@
+@@ -444,17 +444,17 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -30,7 +30,13 @@
#if !BUILDFLAG(IS_ANDROID)
#include "base/debug/leak_annotations.h"
#include "components/crash/core/app/breakpad_linux.h"
-@@ -461,7 +461,7 @@
+@@ -462,12 +462,12 @@
+ #include "components/crash/content/browser/crash_handler_host_linux.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h"
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -39,7 +45,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -483,11 +483,11 @@
+@@ -489,11 +489,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -53,7 +59,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -870,7 +870,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
+@@ -880,7 +880,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
int GetCrashSignalFD(const base::CommandLine& command_line) {
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
}
@@ -62,7 +68,7 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
-@@ -1370,7 +1370,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1376,7 +1376,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
std::move(parameters), &startup_data_);
@@ -71,7 +77,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
std::move(parameters), &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
-@@ -1404,7 +1404,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1410,7 +1410,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -80,7 +86,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
-@@ -1421,7 +1421,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1427,7 +1427,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@@ -89,7 +95,16 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -2161,6 +2161,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2101,7 +2101,7 @@ bool ChromeContentBrowserClient::AreDirectSocketsAllow
+ Profile* profile = Profile::FromBrowserContext(context);
+ return profile && profile->GetPrefs()->GetBoolean(
+ policy::policy_prefs::kEnableDirectSockets);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // There are currently no reliable way to determine managed status on Linux.
+ return false;
+ #elif BUILDFLAG(IS_MAC)
+@@ -2190,6 +2190,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@@ -98,7 +113,7 @@
#else
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2474,7 +2476,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2498,7 +2500,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@@ -107,7 +122,7 @@
// Processes may only query perf_event_open with the BPF sandbox disabled.
if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) {
-@@ -3846,7 +3848,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3880,7 +3882,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -116,16 +131,24 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -4258,7 +4260,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4292,14 +4294,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+ &throttles);
}
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ MaybeAddThrottle(
+ WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
+ &throttles);
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -4291,7 +4293,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4332,7 +4334,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.