www/iridium: update to 2020.04.81

PR:		245959
Submitted by:	Matthias Wolf
MFH:		2020Q3
Security:	any Chromium vulnerability between 73 and 81

1 files changed, 16 insertions, 22 deletions

diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
index 95d001b3ae64..51bb283f651b 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,24 +1,27 @@
---- chrome/browser/chrome_browser_main.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2020-03-16 18:40:29 UTC
 +++ chrome/browser/chrome_browser_main.cc
-@@ -217,7 +217,7 @@
- #include "chromeos/settings/cros_settings_names.h"
+@@ -224,9 +224,9 @@
+ #include "components/arc/metrics/stability_metrics_manager.h"
  #endif  // defined(OS_CHROMEOS)
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  #include "chrome/browser/first_run/upgrade_util_linux.h"
- #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  
-@@ -257,7 +257,7 @@
+ #if defined(OS_LINUX)
+ #include "components/crash/content/app/breakpad_linux.h"
+@@ -265,7 +265,7 @@
  #endif  // defined(OS_WIN)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
 -    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 +    (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
+ #include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
  #endif
- 
-@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1068,7 +1068,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
        AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
      }
  
@@ -27,7 +30,7 @@
      // Create directory for user-level Native Messaging manifest files. This
      // makes it less likely that the directory will be created by third-party
      // software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1052,14 +1052,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1077,7 +1077,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
                                   &user_native_messaging_dir));
      if (!base::PathExists(user_native_messaging_dir))
        base::CreateDirectory(user_native_messaging_dir);
@@ -36,33 +39,24 @@
    }
  #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
  
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX)
-   // Set the product channel for crash reports.
-   breakpad::SetChannelCrashKey(chrome::GetChannelName());
--#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
-+#endif  // defined(OS_LINUX)
- 
- #if defined(OS_MACOSX)
-   // Get the Keychain API to register for distributed notifications on the main
-@@ -1087,7 +1087,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1116,7 +1116,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
    }
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
 -    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 +    (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
    metrics::DesktopSessionDurationTracker::Initialize();
+   ProfileActivityMetricsRecorder::Initialize();
  #endif
-   metrics::RendererUptimeTracker::Initialize();
-@@ -1267,6 +1267,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1269,6 +1269,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
        base::TimeDelta::FromMinutes(1));
  
  #if !defined(OS_ANDROID)
 +#if !defined(OS_BSD)
    if (base::FeatureList::IsEnabled(features::kWebUsb)) {
      web_usb_detector_.reset(new WebUsbDetector());
-     BrowserThread::PostAfterStartupTask(
-@@ -1275,6 +1276,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+     base::PostTask(
+@@ -1277,6 +1278,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
          base::BindOnce(&WebUsbDetector::Initialize,
                         base::Unretained(web_usb_detector_.get())));
    }