Update to Chromium 124.0.6367.118

chromium_version.txt

@@ -1 +1 @@
-124.0.6367.91
+124.0.6367.118

patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch

@@ -1870,7 +1870,7 @@
  #include "chrome/browser/new_tab_page/modules/v2/tab_resumption/tab_resumption_page_handler.h"
  #include "chrome/browser/new_tab_page/promos/promo_service.h"
  #include "chrome/browser/policy/developer_tools_policy_handler.h"
-@@ -1908,7 +1907,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -1915,7 +1914,6 @@ void RegisterProfilePrefs(user_prefs::Pr
    media_router::RegisterProfilePrefs(registry);
    NewTabPageHandler::RegisterProfilePrefs(registry);
    NewTabPageUI::RegisterProfilePrefs(registry);
@@ -2183,7 +2183,7 @@
  #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_element_identifiers.h"
-@@ -165,63 +164,16 @@ void DownloadBubbleContentsView::Process
+@@ -165,66 +164,16 @@ void DownloadBubbleContentsView::Process
      const ContentId& id,
      DownloadItemWarningData::DeepScanTrigger trigger,
      base::optional_ref<const std::string> password) {
@@ -2199,6 +2199,7 @@
      const offline_items_collection::ContentId& id,
      base::optional_ref<const std::string> password) {
 -  if (DownloadUIModel* model = GetDownloadModel(id); model) {
+-    LogLocalDecryptionEvent(safe_browsing::DeepScanEvent::kPromptAccepted);
 -    safe_browsing::DownloadProtectionService::CheckDownloadWithLocalDecryption(
 -        model->GetDownloadItem(), password);
 -  }
@@ -2235,10 +2236,12 @@
 -  DCHECK(delegate);
 -
 -  if (command == DownloadCommands::CANCEL) {
+-    LogLocalDecryptionEvent(safe_browsing::DeepScanEvent::kScanCanceled);
 -    delegate->CheckClientDownloadDone(
 -        item->GetId(),
 -        safe_browsing::DownloadCheckResult::PROMPT_FOR_LOCAL_PASSWORD_SCANNING);
 -  } else if (command == DownloadCommands::BYPASS_DEEP_SCANNING) {
+-    LogLocalDecryptionEvent(safe_browsing::DeepScanEvent::kPromptBypassed);
 -    delegate->CheckClientDownloadDone(
 -        item->GetId(), safe_browsing::DownloadCheckResult::UNKNOWN);
 -  } else {

patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch

@@ -1188,15 +1188,15 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "components/site_engagement/content/site_engagement_service.h"
  #include "components/subresource_filter/content/browser/ruleset_service.h"
-@@ -1502,7 +1500,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1509,7 +1507,6 @@ void RegisterLocalState(PrefRegistrySimp
    PushMessagingServiceImpl::RegisterPrefs(registry);
  #endif
    RegisterScreenshotPrefs(registry);
 -  safe_browsing::RegisterLocalStatePrefs(registry);
    secure_origin_allowlist::RegisterPrefs(registry);
    segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs(
        registry);
-@@ -1791,8 +1788,6 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -1798,8 +1795,6 @@ void RegisterProfilePrefs(user_prefs::Pr
    QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
    RegisterBrowserUserPrefs(registry);
    RegisterPrefersDefaultScrollbarStylesPrefs(registry);
@@ -1205,7 +1205,7 @@
    SearchPrefetchService::RegisterProfilePrefs(registry);
    blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(
        registry);
-@@ -2333,20 +2328,6 @@ void MigrateObsoleteProfilePrefs(PrefSer
+@@ -2340,20 +2335,6 @@ void MigrateObsoleteProfilePrefs(PrefSer
    chrome_browser_net::secure_dns::MigrateProbesSettingToOrFromBackup(
        profile_prefs);
 
@@ -1226,7 +1226,7 @@
 
    // TODO(326079444): After experiment is over, update the deprecated date and
    // allow this to be cleaned up.
-@@ -2605,9 +2586,6 @@ void MigrateObsoleteProfilePrefs(PrefSer
+@@ -2612,9 +2593,6 @@ void MigrateObsoleteProfilePrefs(PrefSer
    // If the sync (old) pref still exists, copy it to signin (new),
    // and clear the sync part of the pref.
    if (profile_prefs->HasPrefPath(kSync_ExplicitBrowserSignin)) {
@@ -1236,16 +1236,16 @@
      profile_prefs->ClearPref(kSync_ExplicitBrowserSignin);
    }
 
-@@ -2699,10 +2677,6 @@ void MigrateObsoleteProfilePrefs(PrefSer
+@@ -2706,10 +2684,6 @@ void MigrateObsoleteProfilePrefs(PrefSer
    // Added 03/2024.
    profile_prefs->ClearPref(kDefaultSearchProviderChoicePendingDeprecated);
 
 -  // Added 02/2024, but DO NOT REMOVE after the usual year!
 -  // TODO(crbug.com/40282890): Remove ~one year after full launch.
 -  browser_sync::MaybeMigrateSyncingUserToSignedIn(profile_path, profile_prefs);
 -
-   // Please don't delete the following line. It is used by PRESUBMIT.py.
-   // END_MIGRATE_OBSOLETE_PROFILE_PREFS
+   // Added 04/2024.
+   profile_prefs->ClearPref(kOmniboxInstantKeywordUsed);
 
 --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
 +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc

patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch

@@ -328,7 +328,7 @@
  }  // namespace blink
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1789,6 +1789,12 @@
+@@ -1781,6 +1781,12 @@
        status: "experimental",
      },
      {

patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch

@@ -322,7 +322,7 @@ approach to change color components.
    // Methods overridden by all sub-classes
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1795,6 +1795,9 @@
+@@ -1787,6 +1787,9 @@
        name: "FingerprintingCanvasMeasureTextNoise",
      },
      {

utils/clone.py

@@ -62,6 +62,8 @@ def clone(args): # pylint: disable=too-many-branches, too-many-statements
     environ['PYTHONDONTWRITEBYTECODE'] = '1'
     # Allow usage of system python
     environ['VPYTHON_BYPASS'] = 'manually managed python not supported by chrome operations'
+    # Google has some regex strings that aren't escaped properly or set as raw
+    environ["PYTHONWARNINGS"] = "ignore::SyntaxWarning"
 
     # depth=2 since generating LASTCHANGE and gpu_lists_version.h require at least two commits
     get_logger().info('Cloning chromium source: %s', chromium_version)

utils/depot_tools.patch

@@ -3,9 +3,10 @@
 #   skip cipd binary downloads
 #   replace 'src' in checkout paths with the output directory
 #   ensure shallow fetches
+#   utilize a newer version of gsutil to support later versions of python
 --- a/gclient.py
 +++ b/gclient.py
-@@ -126,8 +126,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
+@@ -125,8 +125,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
  # one, e.g. if a spec explicitly says `cache_dir = None`.)
  UNSET_CACHE_DIR = object()
 
@@ -16,23 +17,23 @@
 
  PREVIOUS_SYNC_COMMITS = 'GCLIENT_PREVIOUS_SYNC_COMMITS'
 
-@@ -422,6 +422,7 @@ class Dependency(gclient_utils.WorkItem,
+@@ -421,6 +421,7 @@ class Dependency(gclient_utils.WorkItem,
                   protocol='https',
                   git_dependencies_state=gclient_eval.DEPS,
                   print_outbuf=False):
 +        if name and name[0:3] == "src": name = r"UC_OUT"+name[3:]
          gclient_utils.WorkItem.__init__(self, name)
          DependencySettings.__init__(self, parent, url, managed, custom_deps,
                                      custom_vars, custom_hooks, deps_file,
-@@ -730,6 +731,7 @@ class Dependency(gclient_utils.WorkItem,
+@@ -729,6 +730,7 @@ class Dependency(gclient_utils.WorkItem,
 
              condition = dep_value.get('condition')
              dep_type = dep_value.get('dep_type')
 +            if dep_type == 'cipd': continue
 
              if condition and not self._get_option('process_all_deps', False):
                  if condition not in cached_conditions:
-@@ -846,6 +848,8 @@ class Dependency(gclient_utils.WorkItem,
+@@ -845,6 +847,8 @@ class Dependency(gclient_utils.WorkItem,
 
          self._gn_args_from = local_scope.get('gclient_gn_args_from')
          self._gn_args_file = local_scope.get('gclient_gn_args_file')
@@ -80,3 +81,14 @@
          self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
 
      def _SetFetchConfig(self, options):
+--- a/gsutil.py
++++ b/gsutil.py
+@@ -27,7 +27,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR,
+
+ IS_WINDOWS = os.name == 'nt'
+
+-VERSION = '4.68'
++VERSION = '5.28'
+
+ # Google OAuth Context required by gsutil.
+ LUCI_AUTH_SCOPES = [