Update to Chromium version 86.0.4240.68

This commit is contained in:
Marshall Greenblatt
2020-10-01 23:59:23 -04:00
parent d77d73050c
commit d33ff7fe6a
14 changed files with 43 additions and 41 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index 313975f42c0d..ee7f27dab6b7 100644
index 3e8b70c47bd2..185f98eceb6c 100644
--- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc
@@ -27,6 +27,7 @@
@@ -19,7 +19,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
#if defined(OS_WIN)
// Reach out to chrome_elf for the truth on the user data directory.
// Note that in tests, this links to chrome_elf_test_stubs.
@@ -624,7 +627,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
@@ -630,7 +633,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
}
#if defined(OS_WIN)
@@ -29,7 +29,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
base::sequence_manager::internal::ThreadControllerPowerMonitor::
InitializeOnMainThread();
#endif
@@ -906,6 +911,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -912,6 +917,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@@ -37,7 +37,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
crash_reporter::InitializeCrashKeys();
#if defined(OS_POSIX)
@@ -916,6 +922,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -922,6 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitMacCrashReporter(command_line, process_type);
SetUpInstallerPreferences(command_line);
#endif
@@ -45,7 +45,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
#if defined(OS_WIN)
child_process_logging::Init();
@@ -1040,6 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1046,6 +1053,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
@@ -53,7 +53,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
#if defined(OS_POSIX) && !defined(OS_MAC)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != service_manager::switches::kZygoteProcess) {
@@ -1072,6 +1080,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1078,6 +1086,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
crash_keys::SetCrashKeysFromCommandLine(command_line);
@@ -61,7 +61,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
#if BUILDFLAG(ENABLE_PDF)
MaybeInitializeGDI();
@@ -1170,6 +1179,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1176,6 +1185,7 @@ void ChromeMainDelegate::ZygoteForked() {
SetUpProfilingShutdownHandler();
}
@@ -69,7 +69,7 @@ index 313975f42c0d..ee7f27dab6b7 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 =
@@ -1186,6 +1196,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1192,6 +1202,7 @@ void ChromeMainDelegate::ZygoteForked() {
// Reset the command line for the newly spawned process.
crash_keys::SetCrashKeysFromCommandLine(*command_line);