Update to Chromium version 125.0.6422.26

This commit is contained in:
Marshall Greenblatt
2024-05-03 13:53:32 +00:00
committed by Marshall Greenblatt
parent 0f68a0d7a3
commit 39993d8c0c
6 changed files with 42 additions and 42 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index 33c74865672bd..1640fe7378666 100644
index 363f485ce3564..0afa082daf7e7 100644
--- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc
@@ -37,6 +37,7 @@
@@ -20,7 +20,7 @@ index 33c74865672bd..1640fe7378666 100644
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// In debug builds of Lacros, we keep track of when the user data dir
// is initialized, to ensure the cryptohome is not accessed before login
@@ -854,6 +858,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
@@ -845,6 +849,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
ChromeMainDelegate::~ChromeMainDelegate() = default;
#endif // !BUILDFLAG(IS_ANDROID)
@@ -31,7 +31,7 @@ index 33c74865672bd..1640fe7378666 100644
std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
InvokedIn invoked_in) {
DUMP_WILL_BE_CHECK(base::ThreadPoolInstance::Get());
@@ -879,7 +887,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
@@ -870,7 +878,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
// future session's metrics.
DeferBrowserMetrics(user_data_dir);
@@ -40,7 +40,7 @@ index 33c74865672bd..1640fe7378666 100644
// In the case the process is not the singleton process, the uninstall tasks
// need to be executed here. A window will be displayed asking to close all
// running instances.
@@ -1061,7 +1069,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
@@ -1062,7 +1070,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
if (base::FeatureList::IsEnabled(
features::kWriteBasicSystemProfileToPersistentHistogramsFile)) {
@@ -50,7 +50,7 @@ index 33c74865672bd..1640fe7378666 100644
#if BUILDFLAG(IS_ANDROID)
record =
base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions);
@@ -1506,6 +1515,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1507,6 +1516,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@@ -58,7 +58,7 @@ index 33c74865672bd..1640fe7378666 100644
crash_reporter::InitializeCrashKeys();
#if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -1524,6 +1534,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1525,6 +1535,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitMacCrashReporter(command_line, process_type);
SetUpInstallerPreferences(command_line);
#endif
@@ -66,7 +66,7 @@ index 33c74865672bd..1640fe7378666 100644
#if BUILDFLAG(IS_WIN)
child_process_logging::Init();
@@ -1734,6 +1745,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1735,6 +1746,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@@ -74,7 +74,7 @@ index 33c74865672bd..1640fe7378666 100644
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
@@ -1769,6 +1781,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1770,6 +1782,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
crash_keys::SetCrashKeysFromCommandLine(command_line);
@@ -82,7 +82,7 @@ index 33c74865672bd..1640fe7378666 100644
#if BUILDFLAG(ENABLE_PDF)
MaybePatchGdiGetFontData();
@@ -1894,6 +1907,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1895,6 +1908,7 @@ void ChromeMainDelegate::ZygoteForked() {
SetUpProfilingShutdownHandler();
}
@@ -90,7 +90,7 @@ index 33c74865672bd..1640fe7378666 100644
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
// this up for the browser process in a different manner.
const base::CommandLine* command_line =
@@ -1906,6 +1920,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1907,6 +1921,7 @@ void ChromeMainDelegate::ZygoteForked() {
// Reset the command line for the newly spawned process.
crash_keys::SetCrashKeysFromCommandLine(*command_line);
@@ -98,7 +98,7 @@ index 33c74865672bd..1640fe7378666 100644
}
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -2002,6 +2017,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
@@ -2003,6 +2018,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
const bool is_browser_process = process_type.empty();
const bool gwp_asan_boost_sampling = is_browser_process || IsCanaryDev();
@@ -106,7 +106,7 @@ index 33c74865672bd..1640fe7378666 100644
memory_system::Initializer()
.SetGwpAsanParameters(gwp_asan_boost_sampling, process_type)
.SetProfilingClientParameters(chrome::GetChannel(),
@@ -2011,5 +2027,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
@@ -2012,5 +2028,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
memory_system::DispatcherParameters::
AllocationTraceRecorderInclusion::kDynamic,
process_type)