www/chromium: update to 88.0.4324.96

Submitted by:	Matthias Wolf (via github)
MFH:		2021Q1
Security:	https://www.vuxml.org/freebsd/4ed0e43c-5cef-11eb-bafd-3065ec8fd3ec.html

1 files changed, 22 insertions, 22 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 eca704213545..f326832f6045 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	2020-11-13 06:36:36 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2021-01-18 21:28:49 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -424,7 +424,7 @@
+@@ -432,7 +432,7 @@
  #include "components/user_manager/user.h"
  #include "components/user_manager/user_manager.h"
  #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/chrome_browser_main_linux.h"
  #elif defined(OS_ANDROID)
  #include "base/android/application_status_listener.h"
-@@ -482,7 +482,7 @@
+@@ -490,7 +490,7 @@
  #endif  //  !defined(OS_ANDROID)
  
  #if defined(OS_WIN) || defined(OS_MAC) || \
@@ -18,7 +18,7 @@
  #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
  #endif
  
-@@ -514,7 +514,7 @@
+@@ -522,7 +522,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -27,7 +27,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #endif
  
-@@ -833,11 +833,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
+@@ -849,11 +849,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
  }
  
  int GetCrashSignalFD(const base::CommandLine& command_line) {
@@ -41,25 +41,25 @@
  
    // Extensions have the same process type as renderers.
    if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) {
-@@ -1354,7 +1356,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1378,7 +1380,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
  #elif defined(OS_CHROMEOS)
    main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>(
-       parameters, startup_data_);
+       parameters, &startup_data_);
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    main_parts =
-       std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_);
+       std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_);
  #elif defined(OS_ANDROID)
-@@ -1380,7 +1382,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
-     // Construct additional browser parts. Stages are called in the order in
-     // which they are added.
- #if defined(TOOLKIT_VIEWS)
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+@@ -1407,7 +1409,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+ #if BUILDFLAG(IS_LACROS)
+   main_parts->AddParts(
+       std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    main_parts->AddParts(
        std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
  #else
-@@ -2134,7 +2136,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2168,7 +2170,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -68,7 +68,7 @@
  #if defined(OS_ANDROID)
    bool enable_crash_reporter = true;
  #else
-@@ -3728,7 +3730,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3725,7 +3727,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -77,7 +77,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -3763,7 +3765,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
+@@ -3760,7 +3762,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
      mappings->Share(kCrashDumpSignal, crash_signal_fd);
    }
  }
@@ -86,16 +86,16 @@
  
  #if defined(OS_WIN)
  base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
-@@ -3852,7 +3854,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri
+@@ -3848,7 +3850,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri
  
  void ChromeContentBrowserClient::WillStartServiceManager() {
  #if defined(OS_WIN) || defined(OS_MAC) || \
 -    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 +    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   if (startup_data_) {
-     auto* chrome_feature_list_creator =
-         startup_data_->chrome_feature_list_creator();
-@@ -4094,7 +4096,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+   auto* chrome_feature_list_creator =
+       startup_data_.chrome_feature_list_creator();
+   // This has to run very early before ServiceManagerContext is created.
+@@ -4083,7 +4085,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
    }
  
  #if defined(OS_WIN) || defined(OS_MAC) || \