pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

chromium: merge chromium-next



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Tue May 13 15:02:07 2025 +0200
Changeset:	1025a717b525c1ef082a165655ba822a7295717f

Modified Files:
	chromium/Makefile
	chromium/PLIST
	chromium/distinfo
	chromium/options.mk
	chromium/patches/patch-BUILD.gn
	chromium/patches/patch-apps_ui_views_app__window__frame__view.cc
	chromium/patches/patch-ash_display_mirror__window__controller.cc
	chromium/patches/patch-base_BUILD.gn
	chromium/patches/patch-base_allocator_dispatcher_tls.h
	chromium/patches/patch-base_allocator_partition__allocator_partition__alloc.gni
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
	chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
	chromium/patches/patch-base_atomicops.h
	chromium/patches/patch-base_base__paths__posix.cc
	chromium/patches/patch-base_compiler__specific.h
	chromium/patches/patch-base_debug_debugger__posix.cc
	chromium/patches/patch-base_debug_elf__reader.cc
	chromium/patches/patch-base_debug_proc__maps__linux.cc
	chromium/patches/patch-base_debug_stack__trace.cc
	chromium/patches/patch-base_debug_stack__trace__posix.cc
	chromium/patches/patch-base_files_dir__reader__linux.h
	chromium/patches/patch-base_files_dir__reader__posix.h
	chromium/patches/patch-base_files_drive__info.h
	chromium/patches/patch-base_files_drive__info__posix.cc
	chromium/patches/patch-base_files_file__path__watcher.h
	chromium/patches/patch-base_files_file__path__watcher__bsd.cc
	chromium/patches/patch-base_files_file__path__watcher__kqueue.h
	chromium/patches/patch-base_files_file__path__watcher__unittest.cc
	chromium/patches/patch-base_files_file__util__posix.cc
	chromium/patches/patch-base_files_file__util__unittest.cc
	chromium/patches/patch-base_files_important__file__writer__cleaner.cc
	chromium/patches/patch-base_files_scoped__file.cc
	chromium/patches/patch-base_functional_unretained__traits.h
	chromium/patches/patch-base_i18n_icu__util.cc
	chromium/patches/patch-base_linux__util.cc
	chromium/patches/patch-base_logging__unittest.cc
	chromium/patches/patch-base_memory_discardable__memory.cc
	chromium/patches/patch-base_memory_discardable__memory__internal.h
	chromium/patches/patch-base_memory_madv__free__discardable__memory__posix.cc
	chromium/patches/patch-base_memory_platform__shared__memory__region.h
	chromium/patches/patch-base_memory_platform__shared__memory__region__posix.cc
	chromium/patches/patch-base_memory_protected__memory.h
	chromium/patches/patch-base_memory_protected__memory__posix.cc
	chromium/patches/patch-base_message__loop_message__pump__epoll.cc
	chromium/patches/patch-base_message__loop_message__pump__epoll.h
	chromium/patches/patch-base_message__loop_message__pump__glib.cc
	chromium/patches/patch-base_native__library__posix.cc
	chromium/patches/patch-base_native__library__unittest.cc
	chromium/patches/patch-base_posix_can__lower__nice__to.cc
	chromium/patches/patch-base_posix_file__descriptor__shuffle.h
	chromium/patches/patch-base_posix_sysctl.cc
	chromium/patches/patch-base_posix_unix__domain__socket.cc
	chromium/patches/patch-base_posix_unix__domain__socket__unittest.cc
	chromium/patches/patch-base_process_internal__linux.h
	chromium/patches/patch-base_process_kill.h
	chromium/patches/patch-base_process_kill__posix.cc
	chromium/patches/patch-base_process_launch.h
	chromium/patches/patch-base_process_launch__posix.cc
	chromium/patches/patch-base_process_memory__linux.cc
	chromium/patches/patch-base_process_process__handle.cc
	chromium/patches/patch-base_process_process__handle.h
	chromium/patches/patch-base_process_process__handle__freebsd.cc
	chromium/patches/patch-base_process_process__handle__netbsd.cc
	chromium/patches/patch-base_process_process__handle__openbsd.cc
	chromium/patches/patch-base_process_process__iterator.h
	chromium/patches/patch-base_process_process__iterator__freebsd.cc
	chromium/patches/patch-base_process_process__iterator__netbsd.cc
	chromium/patches/patch-base_process_process__iterator__openbsd.cc
	chromium/patches/patch-base_process_process__metrics.cc
	chromium/patches/patch-base_process_process__metrics.h
	chromium/patches/patch-base_process_process__metrics__freebsd.cc
	chromium/patches/patch-base_process_process__metrics__netbsd.cc
	chromium/patches/patch-base_process_process__metrics__openbsd.cc
	chromium/patches/patch-base_process_process__metrics__posix.cc
	chromium/patches/patch-base_process_process__metrics__unittest.cc
	chromium/patches/patch-base_process_process__posix.cc
	chromium/patches/patch-base_process_process__unittest.cc
	chromium/patches/patch-base_profiler_module__cache.cc
	chromium/patches/patch-base_profiler_sampling__profiler__thread__token.cc
	chromium/patches/patch-base_profiler_sampling__profiler__thread__token.h
	chromium/patches/patch-base_profiler_stack__base__address__posix.cc
	chromium/patches/patch-base_profiler_stack__sampling__profiler__test__util.cc
	chromium/patches/patch-base_profiler_stack__sampling__profiler__unittest.cc
	chromium/patches/patch-base_profiler_thread__delegate__posix.cc
	chromium/patches/patch-base_rand__util.h
	chromium/patches/patch-base_rand__util__posix.cc
	chromium/patches/patch-base_strings_safe__sprintf__unittest.cc
	chromium/patches/patch-base_synchronization_lock__impl.h
	chromium/patches/patch-base_syslog__logging.cc
	chromium/patches/patch-base_system_sys__info.cc
	chromium/patches/patch-base_system_sys__info.h
	chromium/patches/patch-base_system_sys__info__freebsd.cc
	chromium/patches/patch-base_system_sys__info__netbsd.cc
	chromium/patches/patch-base_system_sys__info__openbsd.cc
	chromium/patches/patch-base_system_sys__info__posix.cc
	chromium/patches/patch-base_system_sys__info__unittest.cc
	chromium/patches/patch-base_task_thread__pool_environment__config__unittest.cc
	chromium/patches/patch-base_test_launcher_test__launcher.cc
	chromium/patches/patch-base_test_test__file__util__linux.cc
	chromium/patches/patch-base_test_test__file__util__posix.cc
	chromium/patches/patch-base_threading_platform__thread.h
	chromium/patches/patch-base_threading_platform__thread__bsd.cc
	chromium/patches/patch-base_threading_platform__thread__internal__posix.cc
	chromium/patches/patch-base_threading_platform__thread__posix.cc
	chromium/patches/patch-base_threading_platform__thread__unittest.cc
	chromium/patches/patch-base_trace__event_malloc__dump__provider.cc
	chromium/patches/patch-base_trace__event_memory__dump__manager.cc
	chromium/patches/patch-base_trace__event_process__memory__dump.cc
	chromium/patches/patch-base_tracing_trace__time.cc
	chromium/patches/patch-base_tracing_trace__time.h
	chromium/patches/patch-base_version__info_version__info.h
	chromium/patches/patch-build_config_BUILD.gn
	chromium/patches/patch-build_config_BUILDCONFIG.gn
	chromium/patches/patch-build_config_clang_BUILD.gn
	chromium/patches/patch-build_config_compiler_BUILD.gn
	chromium/patches/patch-build_config_linux_BUILD.gn
	chromium/patches/patch-build_config_linux_pkg-config.py
	chromium/patches/patch-build_config_ozone.gni
	chromium/patches/patch-build_config_rust.gni
	chromium/patches/patch-build_config_v8__target__cpu.gni
	chromium/patches/patch-build_detect__host__arch.py
	chromium/patches/patch-build_gn__run__binary.py
	chromium/patches/patch-build_linux_chrome.map
	chromium/patches/patch-build_linux_strip__binary.py
	chromium/patches/patch-build_linux_unbundle_icu.gn
	chromium/patches/patch-build_linux_unbundle_libusb.gn
	chromium/patches/patch-build_rust_rust__bindgen.gni
	chromium/patches/patch-build_rust_std_BUILD.gn
	chromium/patches/patch-build_toolchain_freebsd_BUILD.gn
	chromium/patches/patch-build_toolchain_gcc__solink__wrapper.py
	chromium/patches/patch-build_toolchain_gcc__toolchain.gni
	chromium/patches/patch-build_toolchain_netbsd_BUILD.gn
	chromium/patches/patch-build_toolchain_openbsd_BUILD.gn
	chromium/patches/patch-build_toolchain_toolchain.gni
	chromium/patches/patch-cc_base_features.cc
	chromium/patches/patch-chrome_app_chrome__command__ids.h
	chromium/patches/patch-chrome_app_chrome__main.cc
	chromium/patches/patch-chrome_app_chrome__main__delegate.cc
	chromium/patches/patch-chrome_browser_BUILD.gn
	chromium/patches/patch-chrome_browser_about__flags.cc
	chromium/patches/patch-chrome_browser_accessibility_page__colors.cc
	chromium/patches/patch-chrome_browser_after__startup__task__utils.cc
	chromium/patches/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
	chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
	chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
	chromium/patches/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
	chromium/patches/patch-chrome_browser_browser__features.cc
	chromium/patches/patch-chrome_browser_browser__features.h
	chromium/patches/patch-chrome_browser_browser__process__impl.cc
	chromium/patches/patch-chrome_browser_browser__process__impl.h
	chromium/patches/patch-chrome_browser_chrome__browser__field__trials.cc
	chromium/patches/patch-chrome_browser_chrome__browser__field__trials.h
	chromium/patches/patch-chrome_browser_chrome__browser__interface__binders.cc
	chromium/patches/patch-chrome_browser_chrome__browser__main.cc
	chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
	chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
	chromium/patches/patch-chrome_browser_chrome__browser__main__linux.cc
	chromium/patches/patch-chrome_browser_chrome__browser__main__linux.h
	chromium/patches/patch-chrome_browser_chrome__browser__main__posix.cc
	chromium/patches/patch-chrome_browser_chrome__content__browser__client.cc
	chromium/patches/patch-chrome_browser_chrome__content__browser__client.h
	chromium/patches/patch-chrome_browser_component__updater_registration.cc
	chromium/patches/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
	chromium/patches/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
	chromium/patches/patch-chrome_browser_defaults.cc
	chromium/patches/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
	chromium/patches/patch-chrome_browser_diagnostics_diagnostics__writer.h
	chromium/patches/patch-chrome_browser_download_chrome__download__manager__delegate.cc
	chromium/patches/patch-chrome_browser_download_download__commands.cc
	chromium/patches/patch-chrome_browser_download_download__commands.h
	chromium/patches/patch-chrome_browser_download_download__file__picker.cc
	chromium/patches/patch-chrome_browser_download_download__item__model.cc
	chromium/patches/patch-chrome_browser_download_download__prefs.cc
	chromium/patches/patch-chrome_browser_download_download__prefs.h
	chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_common.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_connectors__service.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
	chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
	chromium/patches/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
	chromium/patches/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
	chromium/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
	chromium/patches/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
	chromium/patches/patch-chrome_browser_extensions_BUILD.gn
	chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
	chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
	chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
	chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
	chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
	chromium/patches/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
	chromium/patches/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
	chromium/patches/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
	chromium/patches/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
	chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
	chromium/patches/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
	chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
	chromium/patches/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
	chromium/patches/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
	chromium/patches/patch-chrome_browser_extensions_external__provider__impl.cc
	chromium/patches/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
	chromium/patches/patch-chrome_browser_first__run_first__run__dialog.h
	chromium/patches/patch-chrome_browser_first__run_first__run__internal.h
	chromium/patches/patch-chrome_browser_flag__descriptions.cc
	chromium/patches/patch-chrome_browser_flag__descriptions.h
	chromium/patches/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
	chromium/patches/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
	chromium/patches/patch-chrome_browser_global__features.cc
	chromium/patches/patch-chrome_browser_global__features.h
	chromium/patches/patch-chrome_browser_headless_headless__mode__util.cc
	chromium/patches/patch-chrome_browser_intranet__redirect__detector.h
	chromium/patches/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
	chromium/patches/patch-chrome_browser_media__galleries_media__file__system__registry.cc
	chromium/patches/patch-chrome_browser_media_audio__service__util.cc
	chromium/patches/patch-chrome_browser_media_router_discovery_BUILD.gn
	chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
	chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
	chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
	chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
	chromium/patches/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
	chromium/patches/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
	chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
	chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
	chromium/patches/patch-chrome_browser_memory__details.cc
	chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
	chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
	chromium/patches/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
	chromium/patches/patch-chrome_browser_metrics_perf_cpu__identity.cc
	chromium/patches/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
	chromium/patches/patch-chrome_browser_metrics_power_process__monitor.cc
	chromium/patches/patch-chrome_browser_metrics_power_process__monitor.h
	chromium/patches/patch-chrome_browser_net_profile__network__context__service.cc
	chromium/patches/patch-chrome_browser_net_system__network__context__manager.cc
	chromium/patches/patch-chrome_browser_net_system__network__context__manager.h
	chromium/patches/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
	chromium/patches/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
	chromium/patches/patch-chrome_browser_notifications_notification__display__service__impl.cc
	chromium/patches/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
	chromium/patches/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
	chromium/patches/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
	chromium/patches/patch-chrome_browser_platform__util__linux.cc
	chromium/patches/patch-chrome_browser_policy_browser__signin__policy__handler.cc
	chromium/patches/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
	chromium/patches/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
	chromium/patches/patch-chrome_browser_policy_device__management__service__configuration.cc
	chromium/patches/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
	chromium/patches/patch-chrome_browser_prefs_browser__prefs.cc
	chromium/patches/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
	chromium/patches/patch-chrome_browser_printing_print__backend__service__manager.cc
	chromium/patches/patch-chrome_browser_printing_printer__query.cc
	chromium/patches/patch-chrome_browser_process__singleton__posix.cc
	chromium/patches/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
	chromium/patches/patch-chrome_browser_profiles_profile__impl.cc
	chromium/patches/patch-chrome_browser_profiles_profiles__state.cc
	chromium/patches/patch-chrome_browser_renderer__preferences__util.cc
	chromium/patches/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
	chromium/patches/patch-chrome_browser_resources_signin_signin__shared.css
	chromium/patches/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
	chromium/patches/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
	chromium/patches/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
	chromium/patches/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
	chromium/patches/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
	chromium/patches/patch-chrome_browser_sessions_session__restore.cc
	chromium/patches/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
	chromium/patches/patch-chrome_browser_shortcuts_icon__badging.cc
	chromium/patches/patch-chrome_browser_signin_signin__util.cc
	chromium/patches/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
	chromium/patches/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
	chromium/patches/patch-chrome_browser_sync_device__info__sync__client__impl.cc
	chromium/patches/patch-chrome_browser_sync_sync__service__factory.cc
	chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.cc
	chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.h
	chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
	chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
	chromium/patches/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
	chromium/patches/patch-chrome_browser_task__manager_task__manager__observer.h
	chromium/patches/patch-chrome_browser_themes_theme__helper.cc
	chromium/patches/patch-chrome_browser_themes_theme__service.cc
	chromium/patches/patch-chrome_browser_themes_theme__service__aura__linux.cc
	chromium/patches/patch-chrome_browser_themes_theme__service__factory.cc
	chromium/patches/patch-chrome_browser_ui_actions_chrome__action__id.h
	chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
	chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
	chromium/patches/patch-chrome_browser_ui_browser.h
	chromium/patches/patch-chrome_browser_ui_browser__command__controller.cc
	chromium/patches/patch-chrome_browser_ui_browser__commands.cc
	chromium/patches/patch-chrome_browser_ui_browser__ui__prefs.cc
	chromium/patches/patch-chrome_browser_ui_browser__view__prefs.cc
	chromium/patches/patch-chrome_browser_ui_chrome__pages.cc
	chromium/patches/patch-chrome_browser_ui_chrome__pages.h
	chromium/patches/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
	chromium/patches/patch-chrome_browser_ui_managed__ui.cc
	chromium/patches/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
	chromium/patches/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
	chromium/patches/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
	chromium/patches/patch-chrome_browser_ui_sad__tab.cc
	chromium/patches/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
	chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller.cc
	chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
	chromium/patches/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
	chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator.cc
	chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
	chromium/patches/patch-chrome_browser_ui_startup_startup__tab__provider.cc
	chromium/patches/patch-chrome_browser_ui_tab__helpers.cc
	chromium/patches/patch-chrome_browser_ui_tabs_features.cc
	chromium/patches/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
	chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
	chromium/patches/patch-chrome_browser_ui_test_popup__browsertest.cc
	chromium/patches/patch-chrome_browser_ui_test_test__browser__ui.cc
	chromium/patches/patch-chrome_browser_ui_ui__features.cc
	chromium/patches/patch-chrome_browser_ui_ui__features.h
	chromium/patches/patch-chrome_browser_ui_views_accelerator__table.cc
	chromium/patches/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
	chromium/patches/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
	chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate.h
	chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
	chromium/patches/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.h
	chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
	chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
	chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
	chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
	chromium/patches/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
	chromium/patches/patch-chrome_browser_ui_views_hung__renderer__view.cc
	chromium/patches/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
	chromium/patches/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
	chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
	chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
	chromium/patches/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
	chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
	chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
	chromium/patches/patch-chrome_browser_ui_views_tabs_tab.cc
	chromium/patches/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
	chromium/patches/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
	chromium/patches/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
	chromium/patches/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
	chromium/patches/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
	chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
	chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
	chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.cc
	chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.h
	chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
	chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
	chromium/patches/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
	chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
	chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
	chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
	chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
	chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
	chromium/patches/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
	chromium/patches/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
	chromium/patches/patch-chrome_browser_ui_webui_management_management__ui.cc
	chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
	chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.h
	chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
	chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.h
	chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
	chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
	chromium/patches/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
	chromium/patches/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
	chromium/patches/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
	chromium/patches/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
	chromium/patches/patch-chrome_browser_ui_window__sizer_window__sizer.cc
	chromium/patches/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
	chromium/patches/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
	chromium/patches/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
	chromium/patches/patch-chrome_browser_web__applications_extension__status__utils.h
	chromium/patches/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
	chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
	chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
	chromium/patches/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
	chromium/patches/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
	chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
	chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
	chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
	chromium/patches/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
	chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
	chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
	chromium/patches/patch-chrome_browser_web__applications_web__app__helpers.cc
	chromium/patches/patch-chrome_browser_web__applications_web__app__install__info.h
	chromium/patches/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
	chromium/patches/patch-chrome_browser_webauthn_enclave__manager.cc
	chromium/patches/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
	chromium/patches/patch-chrome_browser_webauthn_unexportable__key__utils.cc
	chromium/patches/patch-chrome_common_channel__info.h
	chromium/patches/patch-chrome_common_channel__info__posix.cc
	chromium/patches/patch-chrome_common_chrome__features.cc
	chromium/patches/patch-chrome_common_chrome__features.h
	chromium/patches/patch-chrome_common_chrome__paths.cc
	chromium/patches/patch-chrome_common_chrome__paths.h
	chromium/patches/patch-chrome_common_chrome__paths__internal.h
	chromium/patches/patch-chrome_common_chrome__switches.cc
	chromium/patches/patch-chrome_common_chrome__switches.h
	chromium/patches/patch-chrome_common_crash__keys.cc
	chromium/patches/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
	chromium/patches/patch-chrome_common_media_cdm__host__file__path.cc
	chromium/patches/patch-chrome_common_media_cdm__registration.cc
	chromium/patches/patch-chrome_common_media_cdm__registration.h
	chromium/patches/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
	chromium/patches/patch-chrome_common_pref__names.h
	chromium/patches/patch-chrome_common_url__constants.h
	chromium/patches/patch-chrome_common_webui__url__constants.cc
	chromium/patches/patch-chrome_common_webui__url__constants.h
	chromium/patches/patch-chrome_enterprise__companion_enterprise__companion__client.cc
	chromium/patches/patch-chrome_enterprise__companion_lock.cc
	chromium/patches/patch-chrome_services_printing_print__backend__service__impl.cc
	chromium/patches/patch-chrome_services_speech_audio__source__fetcher__impl.cc
	chromium/patches/patch-chrome_test_base_scoped__channel__override__posix.cc
	chromium/patches/patch-chrome_test_chromedriver_chrome__launcher.cc
	chromium/patches/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
	chromium/patches/patch-chrome_test_chromedriver_key__converter__unittest.cc
	chromium/patches/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
	chromium/patches/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
	chromium/patches/patch-chrome_updater_app_app__uninstall.cc
	chromium/patches/patch-chrome_updater_configurator.cc
	chromium/patches/patch-chrome_updater_lock.cc
	chromium/patches/patch-chrome_updater_util_posix__util.cc
	chromium/patches/patch-chrome_utility_services.cc
	chromium/patches/patch-chromecast_browser_cast__browser__main__parts.cc
	chromium/patches/patch-chromecast_browser_cast__content__browser__client.cc
	chromium/patches/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
	chromium/patches/patch-chromecast_media_base_default__monotonic__clock.cc
	chromium/patches/patch-components_autofill_core_common_autofill__payments__features.cc
	chromium/patches/patch-components_autofill_core_common_autofill__prefs.cc
	chromium/patches/patch-components_autofill_core_common_autofill__prefs.h
	chromium/patches/patch-components_commerce_core_commerce__feature__list.cc
	chromium/patches/patch-components_constrained__window_constrained__window__views.cc
	chromium/patches/patch-components_content__settings_core_browser_website__settings__registry.cc
	chromium/patches/patch-components_cookie__config_cookie__store__util.cc
	chromium/patches/patch-components_crash_core_app_BUILD.gn
	chromium/patches/patch-components_crash_core_app_chrome__crashpad__handler.cc
	chromium/patches/patch-components_crash_core_app_crashpad__handler__main.cc
	chromium/patches/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
	chromium/patches/patch-components_crash_core_common_BUILD.gn
	chromium/patches/patch-components_device__signals_core_browser_mock__signals__aggregator.h
	chromium/patches/patch-components_device__signals_core_browser_signals__aggregator.h
	chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
	chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.h
	chromium/patches/patch-components_device__signals_core_browser_user__permission__service.h
	chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.cc
	chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.h
	chromium/patches/patch-components_device__signals_core_common_signals__features.cc
	chromium/patches/patch-components_device__signals_core_common_signals__features.h
	chromium/patches/patch-components_device__signals_core_system__signals_platform__delegate.cc
	chromium/patches/patch-components_device__signals_test_signals__contract.cc
	chromium/patches/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
	chromium/patches/patch-components_embedder__support_user__agent__utils.cc
	chromium/patches/patch-components_embedder__support_user__agent__utils__unittest.cc
	chromium/patches/patch-components_enterprise_watermarking_watermark.cc
	chromium/patches/patch-components_eye__dropper_eye__dropper__view.cc
	chromium/patches/patch-components_feature__engagement_public_event__constants.cc
	chromium/patches/patch-components_feature__engagement_public_event__constants.h
	chromium/patches/patch-components_feature__engagement_public_feature__configurations.cc
	chromium/patches/patch-components_feature__engagement_public_feature__constants.cc
	chromium/patches/patch-components_feature__engagement_public_feature__constants.h
	chromium/patches/patch-components_feature__engagement_public_feature__list.cc
	chromium/patches/patch-components_feature__engagement_public_feature__list.h
	chromium/patches/patch-components_feed_core_proto_v2_wire_version.proto
	chromium/patches/patch-components_feed_core_v2_feed__network__impl__unittest.cc
	chromium/patches/patch-components_feed_core_v2_proto__util.cc
	chromium/patches/patch-components_feed_core_v2_proto__util__unittest.cc
	chromium/patches/patch-components_feed_core_v2_test_proto__printer.cc
	chromium/patches/patch-components_gwp__asan_BUILD.gn
	chromium/patches/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
	chromium/patches/patch-components_gwp__asan_client_gwp__asan.cc
	chromium/patches/patch-components_gwp__asan_client_gwp__asan__features.cc
	chromium/patches/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
	chromium/patches/patch-components_live__caption_caption__util.cc
	chromium/patches/patch-components_live__caption_caption__util.h
	chromium/patches/patch-components_media__router_common_media__source.cc
	chromium/patches/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
	chromium/patches/patch-components_media__router_common_providers_cast_channel_enum__table.h
	chromium/patches/patch-components_metrics_dwa_dwa__service.cc
	chromium/patches/patch-components_metrics_metrics__log.cc
	chromium/patches/patch-components_metrics_motherboard.cc
	chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h
	chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
	chromium/patches/patch-components_named__system__lock_lock.h
	chromium/patches/patch-components_optimization__guide_core_optimization__guide__features.cc
	chromium/patches/patch-components_optimization__guide_core_optimization__guide__util.cc
	chromium/patches/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
	chromium/patches/patch-components_os__crypt_sync_libsecret__util__linux.cc
	chromium/patches/patch-components_os__crypt_sync_os__crypt.h
	chromium/patches/patch-components_paint__preview_browser_paint__preview__client.cc
	chromium/patches/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
	chromium/patches/patch-components_paint__preview_common_proto_paint__preview.proto
	chromium/patches/patch-components_paint__preview_player_player__compositor__delegate.cc
	chromium/patches/patch-components_password__manager_core_browser_features_password__features.cc
	chromium/patches/patch-components_password__manager_core_browser_features_password__features.h
	chromium/patches/patch-components_password__manager_core_browser_password__form__manager.cc
	chromium/patches/patch-components_password__manager_core_browser_password__manager.cc
	chromium/patches/patch-components_password__manager_core_browser_password__manager__client.h
	chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.cc
	chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.h
	chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
	chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
	chromium/patches/patch-components_password__manager_core_browser_password__store__factory__util.cc
	chromium/patches/patch-components_password__manager_core_browser_password__store_login__database.cc
	chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
	chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
	chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.cc
	chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.h
	chromium/patches/patch-components_password__manager_core_common_password__manager__pref__names.h
	chromium/patches/patch-components_performance__manager_decorators_process__metrics__decorator.cc
	chromium/patches/patch-components_performance__manager_public_features.h
	chromium/patches/patch-components_permissions_prediction__service_prediction__common.cc
	chromium/patches/patch-components_policy_core_browser_policy__pref__mapping__test.cc
	chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__client.cc
	chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
	chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__util.cc
	chromium/patches/patch-components_policy_core_common_policy__loader__common.cc
	chromium/patches/patch-components_policy_core_common_policy__paths.cc
	chromium/patches/patch-components_policy_core_common_policy__utils.cc
	chromium/patches/patch-components_policy_tools_generate__policy__source.py
	chromium/patches/patch-components_power__metrics_BUILD.gn
	chromium/patches/patch-components_power__metrics_energy__metrics__provider.cc
	chromium/patches/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
	chromium/patches/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
	chromium/patches/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
	chromium/patches/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
	chromium/patches/patch-components_search__engines_template__url__service.cc
	chromium/patches/patch-components_security__interstitials_content_utils.cc
	chromium/patches/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
	chromium/patches/patch-components_services_on__device__translation_sandbox__hook.cc
	chromium/patches/patch-components_services_on__device__translation_sandbox__hook.h
	chromium/patches/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
	chromium/patches/patch-components_soda_soda__util.cc
	chromium/patches/patch-components_startup__metric__utils_common_startup__metric__utils.cc
	chromium/patches/patch-components_storage__monitor_BUILD.gn
	chromium/patches/patch-components_storage__monitor_removable__device__constants.cc
	chromium/patches/patch-components_storage__monitor_removable__device__constants.h
	chromium/patches/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
	chromium/patches/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
	chromium/patches/patch-components_supervised__user_core_common_features.cc
	chromium/patches/patch-components_supervised__user_core_common_features.h
	chromium/patches/patch-components_supervised__user_core_common_pref__names.h
	chromium/patches/patch-components_sync__device__info_local__device__info__util.cc
	chromium/patches/patch-components_sync__device__info_local__device__info__util__linux.cc
	chromium/patches/patch-components_sync_base_sync__util.cc
	chromium/patches/patch-components_system__cpu_cpu__probe.cc
	chromium/patches/patch-components_translate_core_common_translate__util.cc
	chromium/patches/patch-components_trusted__vault_trusted__vault__connection__impl.cc
	chromium/patches/patch-components_update__client_update__query__params.cc
	chromium/patches/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
	chromium/patches/patch-components_user__education_views_help__bubble__view.cc
	chromium/patches/patch-components_variations_service_variations__service.cc
	chromium/patches/patch-components_visited__url__ranking_public_url__visit__util.cc
	chromium/patches/patch-components_viz_host_host__display__client.cc
	chromium/patches/patch-components_viz_host_host__display__client.h
	chromium/patches/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
	chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.cc
	chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.h
	chromium/patches/patch-components_viz_service_display_skia__renderer.cc
	chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
	chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
	chromium/patches/patch-components_viz_test_fake__display__client.cc
	chromium/patches/patch-components_viz_test_fake__display__client.h
	chromium/patches/patch-components_viz_test_mock__display__client.h
	chromium/patches/patch-content_app_BUILD.gn
	chromium/patches/patch-content_app_content__main.cc
	chromium/patches/patch-content_app_content__main__runner__impl.cc
	chromium/patches/patch-content_browser_BUILD.gn
	chromium/patches/patch-content_browser_audio_audio__service.cc
	chromium/patches/patch-content_browser_browser__child__process__host__impl.cc
	chromium/patches/patch-content_browser_browser__child__process__host__impl.h
	chromium/patches/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
	chromium/patches/patch-content_browser_browser__main__loop.cc
	chromium/patches/patch-content_browser_child__process__launcher__helper.h
	chromium/patches/patch-content_browser_child__process__launcher__helper__linux.cc
	chromium/patches/patch-content_browser_child__thread__type__switcher__linux.cc
	chromium/patches/patch-content_browser_compositor_viz__process__transport__factory.cc
	chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.cc
	chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.h
	chromium/patches/patch-content_browser_devtools_protocol_system__info__handler.cc
	chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
	chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
	chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
	chromium/patches/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
	chromium/patches/patch-content_browser_font__access_font__enumeration__data__source.cc
	chromium/patches/patch-content_browser_gpu_compositor__util.cc
	chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.cc
	chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.h
	chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
	chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.h
	chromium/patches/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
	chromium/patches/patch-content_browser_gpu_gpu__process__host.cc
	chromium/patches/patch-content_browser_media_frameless__media__interface__proxy.h
	chromium/patches/patch-content_browser_media_media__keys__listener__manager__impl.cc
	chromium/patches/patch-content_browser_network__service__instance__impl.cc
	chromium/patches/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
	chromium/patches/patch-content_browser_renderer__host_delegated__frame__host.cc
	chromium/patches/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
	chromium/patches/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
	chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
	chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.h
	chromium/patches/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
	chromium/patches/patch-content_browser_renderer__host_render__view__host__impl.cc
	chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
	chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.h
	chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
	chromium/patches/patch-content_browser_sandbox__host__linux.cc
	chromium/patches/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
	chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
	chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.h
	chromium/patches/patch-content_browser_v8__snapshot__files.cc
	chromium/patches/patch-content_browser_web__contents_slow__web__preference__cache.cc
	chromium/patches/patch-content_browser_web__contents_web__contents__view__aura.cc
	chromium/patches/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
	chromium/patches/patch-content_browser_webui_web__ui__main__frame__observer.cc
	chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
	chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.h
	chromium/patches/patch-content_child_BUILD.gn
	chromium/patches/patch-content_child_child__process.cc
	chromium/patches/patch-content_child_child__process.h
	chromium/patches/patch-content_common_BUILD.gn
	chromium/patches/patch-content_common_features.cc
	chromium/patches/patch-content_common_features.h
	chromium/patches/patch-content_common_font__list__unittest.cc
	chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
	chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.h
	chromium/patches/patch-content_common_gpu__pre__sandbox__hook__linux.h
	chromium/patches/patch-content_gpu_gpu__child__thread.cc
	chromium/patches/patch-content_gpu_gpu__main.cc
	chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
	chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
	chromium/patches/patch-content_ppapi__plugin_ppapi__plugin__main.cc
	chromium/patches/patch-content_public_browser_content__browser__client.cc
	chromium/patches/patch-content_public_browser_zygote__host_zygote__host__linux.h
	chromium/patches/patch-content_public_common_content__features.cc
	chromium/patches/patch-content_public_common_content__switches.cc
	chromium/patches/patch-content_public_common_content__switches.h
	chromium/patches/patch-content_public_common_zygote_features.gni
	chromium/patches/patch-content_renderer_render__thread__impl.cc
	chromium/patches/patch-content_renderer_renderer__blink__platform__impl.cc
	chromium/patches/patch-content_renderer_renderer__blink__platform__impl.h
	chromium/patches/patch-content_renderer_renderer__main__platform__delegate__linux.cc
	chromium/patches/patch-content_shell_BUILD.gn
	chromium/patches/patch-content_shell_app_shell__main__delegate.cc
	chromium/patches/patch-content_shell_browser_shell__browser__main__parts.cc
	chromium/patches/patch-content_shell_browser_shell__paths.cc
	chromium/patches/patch-content_shell_renderer_shell__content__renderer__client.cc
	chromium/patches/patch-content_shell_utility_shell__content__utility__client.cc
	chromium/patches/patch-content_test_BUILD.gn
	chromium/patches/patch-content_utility_services.cc
	chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
	chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
	chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
	chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
	chromium/patches/patch-content_utility_utility__main.cc
	chromium/patches/patch-content_utility_utility__thread__impl.cc
	chromium/patches/patch-content_zygote_BUILD.gn
	chromium/patches/patch-content_zygote_zygote__linux.cc
	chromium/patches/patch-content_zygote_zygote__main__linux.cc
	chromium/patches/patch-device_bluetooth_bluetooth__adapter.cc
	chromium/patches/patch-device_bluetooth_cast__bluetooth.gni
	chromium/patches/patch-device_gamepad_BUILD.gn
	chromium/patches/patch-device_gamepad_gamepad__provider.cc
	chromium/patches/patch-device_gamepad_hid__writer__linux.cc
	chromium/patches/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
	chromium/patches/patch-extensions_browser_api_management_management__api.cc
	chromium/patches/patch-extensions_browser_api_messaging_message__service.cc
	chromium/patches/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
	chromium/patches/patch-extensions_common_api___permission__features.json
	chromium/patches/patch-extensions_common_api_runtime.json
	chromium/patches/patch-extensions_common_command.cc
	chromium/patches/patch-extensions_common_features_feature.cc
	chromium/patches/patch-extensions_renderer_bindings_api__binding__util.cc
	chromium/patches/patch-extensions_renderer_bindings_argument__spec.cc
	chromium/patches/patch-extensions_shell_app_shell__main__delegate.cc
	chromium/patches/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
	chromium/patches/patch-extensions_shell_browser_shell__browser__main__parts.cc
	chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.cc
	chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.h
	chromium/patches/patch-google__apis_gcm_engine_heartbeat__manager.cc
	chromium/patches/patch-gpu_command__buffer_service_dawn__context__provider.cc
	chromium/patches/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
	chromium/patches/patch-gpu_command__buffer_service_shared__context__state.cc
	chromium/patches/patch-gpu_command__buffer_service_shared__context__state.h
	chromium/patches/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
	chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
	chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
	chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
	chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
	chromium/patches/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
	chromium/patches/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
	chromium/patches/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
	chromium/patches/patch-gpu_config_gpu__control__list.cc
	chromium/patches/patch-gpu_config_gpu__finch__features.cc
	chromium/patches/patch-gpu_config_gpu__info__collector.cc
	chromium/patches/patch-gpu_config_gpu__test__config.cc
	chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
	chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.h
	chromium/patches/patch-gpu_ipc_service_gpu__init.cc
	chromium/patches/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
	chromium/patches/patch-gpu_ipc_service_x__util.h
	chromium/patches/patch-gpu_vulkan_generate__bindings.py
	chromium/patches/patch-gpu_vulkan_semaphore__handle.cc
	chromium/patches/patch-gpu_vulkan_vulkan__device__queue.cc
	chromium/patches/patch-gpu_vulkan_vulkan__device__queue.h
	chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.cc
	chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.h
	chromium/patches/patch-gpu_vulkan_vulkan__image.h
	chromium/patches/patch-gpu_vulkan_vulkan__util.cc
	chromium/patches/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
	chromium/patches/patch-headless_lib_browser_headless__content__browser__client.cc
	chromium/patches/patch-headless_lib_browser_headless__content__browser__client.h
	chromium/patches/patch-headless_lib_browser_headless__web__contents__impl.cc
	chromium/patches/patch-headless_lib_headless__content__main__delegate.cc
	chromium/patches/patch-ipc_ipc__channel.h
	chromium/patches/patch-ipc_ipc__channel__common.cc
	chromium/patches/patch-ipc_ipc__channel__mojo.cc
	chromium/patches/patch-ipc_ipc__message__utils.cc
	chromium/patches/patch-ipc_ipc__message__utils.h
	chromium/patches/patch-media_BUILD.gn
	chromium/patches/patch-media_audio_BUILD.gn
	chromium/patches/patch-media_audio_alsa_audio__manager__alsa.cc
	chromium/patches/patch-media_audio_audio__input__device.cc
	chromium/patches/patch-media_audio_audio__output__proxy__unittest.cc
	chromium/patches/patch-media_audio_pulse_pulse__util.cc
	chromium/patches/patch-media_audio_sndio_audio__manager__sndio.cc
	chromium/patches/patch-media_audio_sndio_audio__manager__sndio.h
	chromium/patches/patch-media_audio_sndio_sndio__input.cc
	chromium/patches/patch-media_audio_sndio_sndio__input.h
	chromium/patches/patch-media_audio_sndio_sndio__output.cc
	chromium/patches/patch-media_audio_sndio_sndio__output.h
	chromium/patches/patch-media_base_audio__latency.cc
	chromium/patches/patch-media_base_libaom__thread__wrapper.cc
	chromium/patches/patch-media_base_libvpx__thread__wrapper.cc
	chromium/patches/patch-media_base_media__switches.cc
	chromium/patches/patch-media_base_media__switches.h
	chromium/patches/patch-media_base_video__frame.cc
	chromium/patches/patch-media_base_video__frame.h
	chromium/patches/patch-media_capture_video_create__video__capture__device__factory.cc
	chromium/patches/patch-media_capture_video_fake__video__capture__device__factory.cc
	chromium/patches/patch-media_capture_video_file__video__capture__device__factory.cc
	chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.cc
	chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.h
	chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.cc
	chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.h
	chromium/patches/patch-media_capture_video_linux_v4l2__capture__device.h
	chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
	chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.h
	chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
	chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
	chromium/patches/patch-media_capture_video_linux_video__capture__device__linux.cc
	chromium/patches/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
	chromium/patches/patch-media_capture_video_video__capture__device__client.cc
	chromium/patches/patch-media_cdm_cdm__paths__unittest.cc
	chromium/patches/patch-media_cdm_library__cdm_cdm__paths.gni
	chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py
	chromium/patches/patch-media_ffmpeg_scripts_robo__lib_config.py
	chromium/patches/patch-media_gpu_chromeos_gl__image__processor__backend.cc
	chromium/patches/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
	chromium/patches/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
	chromium/patches/patch-media_gpu_chromeos_platform__video__frame__utils.cc
	chromium/patches/patch-media_gpu_chromeos_video__decoder__pipeline.cc
	chromium/patches/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
	chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
	chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
	chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
	chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
	chromium/patches/patch-media_gpu_test_raw__video.cc
	chromium/patches/patch-media_gpu_test_video__frame__file__writer.cc
	chromium/patches/patch-media_gpu_test_video__frame__helpers.cc
	chromium/patches/patch-media_gpu_test_video__frame__validator.cc
	chromium/patches/patch-media_gpu_vaapi_vaapi__video__decoder.cc
	chromium/patches/patch-media_gpu_vaapi_vaapi__wrapper.cc
	chromium/patches/patch-media_media__options.gni
	chromium/patches/patch-media_mojo_mojom_video__frame__mojom__traits.cc
	chromium/patches/patch-media_video_fake__gpu__memory__buffer.cc
	chromium/patches/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
	chromium/patches/patch-media_video_video__encode__accelerator__adapter.cc
	chromium/patches/patch-media_video_video__encode__accelerator__adapter__test.cc
	chromium/patches/patch-media_webrtc_audio__processor.cc
	chromium/patches/patch-media_webrtc_helpers.cc
	chromium/patches/patch-media_webrtc_helpers__unittests.cc
	chromium/patches/patch-mojo_core_BUILD.gn
	chromium/patches/patch-mojo_core_channel.cc
	chromium/patches/patch-mojo_core_embedder_features.h
	chromium/patches/patch-mojo_public_cpp_platform_socket__utils__posix.cc
	chromium/patches/patch-mojo_public_tools_bindings_mojom.gni
	chromium/patches/patch-net_BUILD.gn
	chromium/patches/patch-net_base_features.cc
	chromium/patches/patch-net_base_network__change__notifier.cc
	chromium/patches/patch-net_base_network__change__notifier.h
	chromium/patches/patch-net_base_network__change__notifier__passive.cc
	chromium/patches/patch-net_base_network__interfaces__posix.h
	chromium/patches/patch-net_base_sockaddr__util__posix.cc
	chromium/patches/patch-net_base_sockaddr__util__posix__unittest.cc
	chromium/patches/patch-net_cert_cert__verify__proc.h
	chromium/patches/patch-net_disk__cache_backend__experiment.h
	chromium/patches/patch-net_disk__cache_simple_simple__file__tracker.cc
	chromium/patches/patch-net_dns_BUILD.gn
	chromium/patches/patch-net_dns_address__info.cc
	chromium/patches/patch-net_dns_address__sorter__posix.cc
	chromium/patches/patch-net_dns_dns__config__service__posix.cc
	chromium/patches/patch-net_dns_dns__reloader.cc
	chromium/patches/patch-net_dns_dns__util.cc
	chromium/patches/patch-net_dns_host__resolver__proc.cc
	chromium/patches/patch-net_dns_public_BUILD.gn
	chromium/patches/patch-net_dns_public_resolv__reader.cc
	chromium/patches/patch-net_dns_public_resolv__reader.h
	chromium/patches/patch-net_dns_public_scoped__res__state.cc
	chromium/patches/patch-net_dns_public_scoped__res__state.h
	chromium/patches/patch-net_filter_zstd__source__stream.cc
	chromium/patches/patch-net_http_http__auth__gssapi__posix.cc
	chromium/patches/patch-net_http_http__auth__gssapi__posix.h
	chromium/patches/patch-net_http_http__auth__handler__negotiate.cc
	chromium/patches/patch-net_http_http__auth__preferences.cc
	chromium/patches/patch-net_http_http__auth__preferences.h
	chromium/patches/patch-net_http_http__network__session.cc
	chromium/patches/patch-net_proxy__resolution_proxy__config__service.cc
	chromium/patches/patch-net_proxy__resolution_proxy__config__service__linux.cc
	chromium/patches/patch-net_socket_socks5__client__socket.cc
	chromium/patches/patch-net_socket_tcp__socket__posix.cc
	chromium/patches/patch-net_socket_udp__socket__posix.cc
	chromium/patches/patch-net_socket_udp__socket__unittest.cc
	chromium/patches/patch-net_third__party_quiche_BUILD.gn
	chromium/patches/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
	chromium/patches/patch-net_tools_net__watcher_net__watcher.cc
	chromium/patches/patch-net_traffic__annotation_network__traffic__annotation.h
	chromium/patches/patch-net_url__request_url__request__context.cc
	chromium/patches/patch-net_url__request_url__request__context.h
	chromium/patches/patch-net_url__request_url__request__context__builder.cc
	chromium/patches/patch-pdf_pdfium_pdfium__engine.cc
	chromium/patches/patch-ppapi_tests_test__utils.h
	chromium/patches/patch-printing_backend_cups__ipp__helper.cc
	chromium/patches/patch-printing_backend_print__backend__cups.cc
	chromium/patches/patch-printing_mojom_printing__context__mojom__traits.cc
	chromium/patches/patch-printing_mojom_printing__context__mojom__traits.h
	chromium/patches/patch-printing_print__settings.cc
	chromium/patches/patch-printing_print__settings.h
	chromium/patches/patch-printing_print__settings__conversion.cc
	chromium/patches/patch-printing_printing__context__linux.cc
	chromium/patches/patch-printing_printing__features.cc
	chromium/patches/patch-printing_printing__features.h
	chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
	chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
	chromium/patches/patch-remoting_base_chromoting__event.cc
	chromium/patches/patch-remoting_base_host__settings.cc
	chromium/patches/patch-remoting_codec_webrtc__video__encoder__vpx.cc
	chromium/patches/patch-remoting_host_base_desktop__environment__options.cc
	chromium/patches/patch-remoting_host_base_switches.cc
	chromium/patches/patch-remoting_host_base_switches.h
	chromium/patches/patch-remoting_host_chromoting__host.cc
	chromium/patches/patch-remoting_host_chromoting__host.h
	chromium/patches/patch-remoting_host_chromoting__host__context.cc
	chromium/patches/patch-remoting_host_chromoting__host__services__client.cc
	chromium/patches/patch-remoting_host_client__session.cc
	chromium/patches/patch-remoting_host_crash_crash__file__uploader.cc
	chromium/patches/patch-remoting_host_evaluate__capability.cc
	chromium/patches/patch-remoting_host_host__attributes.cc
	chromium/patches/patch-remoting_host_host__details.cc
	chromium/patches/patch-remoting_host_host__main.cc
	chromium/patches/patch-remoting_host_ipc__constants.cc
	chromium/patches/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
	chromium/patches/patch-remoting_host_me2me__desktop__environment.cc
	chromium/patches/patch-remoting_host_mojo__caller__security__checker.cc
	chromium/patches/patch-remoting_host_policy__watcher.cc
	chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__client.cc
	chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__util.cc
	chromium/patches/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
	chromium/patches/patch-remoting_host_remoting__me2me__host.cc
	chromium/patches/patch-remoting_host_setup_start__host__main.cc
	chromium/patches/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
	chromium/patches/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
	chromium/patches/patch-remoting_protocol_webrtc__video__stream.cc
	chromium/patches/patch-sandbox_BUILD.gn
	chromium/patches/patch-sandbox_features.gni
	chromium/patches/patch-sandbox_linux_BUILD.gn
	chromium/patches/patch-sandbox_linux_services_init__process__reaper.cc
	chromium/patches/patch-sandbox_linux_services_libc__interceptor.cc
	chromium/patches/patch-sandbox_policy_BUILD.gn
	chromium/patches/patch-sandbox_policy_features.cc
	chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
	chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.h
	chromium/patches/patch-sandbox_policy_mojom_sandbox.mojom
	chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.cc
	chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.h
	chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
	chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.h
	chromium/patches/patch-sandbox_policy_sandbox.cc
	chromium/patches/patch-sandbox_policy_sandbox.h
	chromium/patches/patch-sandbox_policy_sandbox__type.cc
	chromium/patches/patch-sandbox_policy_switches.cc
	chromium/patches/patch-sandbox_policy_switches.h
	chromium/patches/patch-services_audio_audio__sandbox__hook__linux.cc
	chromium/patches/patch-services_audio_audio__sandbox__hook__linux.h
	chromium/patches/patch-services_device_BUILD.gn
	chromium/patches/patch-services_device_geolocation_location__provider__manager.cc
	chromium/patches/patch-services_device_hid_BUILD.gn
	chromium/patches/patch-services_device_hid_hid__connection__fido.cc
	chromium/patches/patch-services_device_hid_hid__connection__fido.h
	chromium/patches/patch-services_device_hid_hid__connection__freebsd.cc
	chromium/patches/patch-services_device_hid_hid__connection__freebsd.h
	chromium/patches/patch-services_device_hid_hid__service.cc
	chromium/patches/patch-services_device_hid_hid__service__fido.cc
	chromium/patches/patch-services_device_hid_hid__service__fido.h
	chromium/patches/patch-services_device_hid_hid__service__freebsd.cc
	chromium/patches/patch-services_device_hid_hid__service__freebsd.h
	chromium/patches/patch-services_device_hid_hid__service__netbsd.cc
	chromium/patches/patch-services_device_hid_hid__service__netbsd.h
	chromium/patches/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
	chromium/patches/patch-services_device_public_mojom_BUILD.gn
	chromium/patches/patch-services_device_serial_BUILD.gn
	chromium/patches/patch-services_device_serial_serial__device__enumerator.cc
	chromium/patches/patch-services_device_serial_serial__io__handler__posix.cc
	chromium/patches/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
	chromium/patches/patch-services_device_usb_BUILD.gn
	chromium/patches/patch-services_device_usb_usb__service.cc
	chromium/patches/patch-services_device_usb_usb__service__fake.cc
	chromium/patches/patch-services_device_usb_usb__service__fake.h
	chromium/patches/patch-services_network_BUILD.gn
	chromium/patches/patch-services_network_network__context.cc
	chromium/patches/patch-services_network_network__context.h
	chromium/patches/patch-services_network_network__sandbox__hook__linux.cc
	chromium/patches/patch-services_network_network__sandbox__hook__linux.h
	chromium/patches/patch-services_network_network__service.cc
	chromium/patches/patch-services_network_network__service.h
	chromium/patches/patch-services_network_public_cpp_BUILD.gn
	chromium/patches/patch-services_network_public_cpp_features.cc
	chromium/patches/patch-services_network_public_mojom_BUILD.gn
	chromium/patches/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
	chromium/patches/patch-services_on__device__model_on__device__model__service.h
	chromium/patches/patch-services_on__device__model_pre__sandbox__init.cc
	chromium/patches/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
	chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
	chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
	chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
	chromium/patches/patch-services_screen__ai_public_cpp_utilities.cc
	chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
	chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
	chromium/patches/patch-services_service__manager_BUILD.gn
	chromium/patches/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
	chromium/patches/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
	chromium/patches/patch-services_video__capture_public_mojom_video__capture__service.mojom
	chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
	chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.h
	chromium/patches/patch-skia_ext_SkMemory__new__handler.cpp
	chromium/patches/patch-skia_ext_font__utils.cc
	chromium/patches/patch-skia_ext_skcolorspace__trfn.cc
	chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h
	chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc
	chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
	chromium/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
	chromium/patches/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc
	chromium/patches/patch-third__party_afl_src_afl-fuzz.c
	chromium/patches/patch-third__party_angle_BUILD.gn
	chromium/patches/patch-third__party_angle_src_common_platform.h
	chromium/patches/patch-third__party_angle_src_common_platform__helpers.h
	chromium/patches/patch-third__party_angle_src_common_system__utils.cpp
	chromium/patches/patch-third__party_angle_src_common_system__utils__linux.cpp
	chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
	chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
	chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
	chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
	chromium/patches/patch-third__party_angle_src_libANGLE_Display.cpp
	chromium/patches/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
	chromium/patches/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
	chromium/patches/patch-third__party_angle_util_BUILD.gn
	chromium/patches/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
	chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
	chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
	chromium/patches/patch-third__party_blink_public_platform_platform.h
	chromium/patches/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
	chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
	chromium/patches/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
	chromium/patches/patch-third__party_blink_renderer_controller_blink__initializer.cc
	chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
	chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
	chromium/patches/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
	chromium/patches/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
	chromium/patches/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
	chromium/patches/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
	chromium/patches/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
	chromium/patches/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
	chromium/patches/patch-third__party_blink_renderer_core_layout_layout__view.cc
	chromium/patches/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
	chromium/patches/patch-third__party_blink_renderer_core_paint_paint__layer.cc
	chromium/patches/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
	chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor.h
	chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
	chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
	chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
	chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
	chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
	chromium/patches/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
	chromium/patches/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
	chromium/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
	chromium/patches/patch-third__party_blink_renderer_platform_BUILD.gn
	chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
	chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.h
	chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__description.cc
	chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
	chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
	chromium/patches/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
	chromium/patches/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
	chromium/patches/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
	chromium/patches/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
	chromium/patches/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
	chromium/patches/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
	chromium/patches/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
	chromium/patches/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
	chromium/patches/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
	chromium/patches/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
	chromium/patches/patch-third__party_blink_renderer_platform_wtf_math__extras.h
	chromium/patches/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
	chromium/patches/patch-third__party_brotli_common_platform.h
	chromium/patches/patch-third__party_cpuinfo_cpuinfo.gni
	chromium/patches/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
	chromium/patches/patch-third__party_crashpad_crashpad_client_BUILD.gn
	chromium/patches/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
	chromium/patches/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
	chromium/patches/patch-third__party_crashpad_crashpad_util_misc_address__types.h
	chromium/patches/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
	chromium/patches/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
	chromium/patches/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
	chromium/patches/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
	chromium/patches/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
	chromium/patches/patch-third__party_crashpad_crashpad_util_posix_signals.cc
	chromium/patches/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
	chromium/patches/patch-third__party_crc32c_BUILD.gn
	chromium/patches/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
	chromium/patches/patch-third__party_dawn_src_dawn_common_Platform.h
	chromium/patches/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
	chromium/patches/patch-third__party_ffmpeg_BUILD.gn
	chromium/patches/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
	chromium/patches/patch-third__party_ffmpeg_libavutil_cpu.c
	chromium/patches/patch-third__party_ffmpeg_libavutil_mem.c
	chromium/patches/patch-third__party_ffmpeg_libavutil_random__seed.c
	chromium/patches/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
	chromium/patches/patch-third__party_fontconfig_include_config.h
	chromium/patches/patch-third__party_fontconfig_src_src_fccompat.c
	chromium/patches/patch-third__party_ipcz_src_reference__drivers_random.cc
	chromium/patches/patch-third__party_ipcz_src_standalone_base_logging.cc
	chromium/patches/patch-third__party_leveldatabase_env__chromium.cc
	chromium/patches/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
	chromium/patches/patch-third__party_libc++_src_src_chrono.cpp
	chromium/patches/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
	chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
	chromium/patches/patch-third__party_libdrm_src_xf86drmMode.c
	chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
	chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
	chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
	chromium/patches/patch-third__party_libsync_src_include_sync_sync.h
	chromium/patches/patch-third__party_libsync_src_sync.c
	chromium/patches/patch-third__party_libusb_BUILD.gn
	chromium/patches/patch-third__party_libusb_src_libusb_core.c
	chromium/patches/patch-third__party_libusb_src_libusb_os_threads__posix.c
	chromium/patches/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
	chromium/patches/patch-third__party_lzma__sdk_C_CpuArch.c
	chromium/patches/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
	chromium/patches/patch-third__party_nasm_BUILD.gn
	chromium/patches/patch-third__party_nasm_config_config-linux.h
	chromium/patches/patch-third__party_node_node.gni
	chromium/patches/patch-third__party_node_node.py
	chromium/patches/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
	chromium/patches/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
	chromium/patches/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
	chromium/patches/patch-third__party_pdfium_pdfium.gni
	chromium/patches/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
	chromium/patches/patch-third__party_perfetto_include_perfetto_base_build__config.h
	chromium/patches/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
	chromium/patches/patch-third__party_perfetto_include_perfetto_base_time.h
	chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
	chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
	chromium/patches/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
	chromium/patches/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
	chromium/patches/patch-third__party_perfetto_src_base_clock__snapshots.cc
	chromium/patches/patch-third__party_perfetto_src_base_event__fd.cc
	chromium/patches/patch-third__party_perfetto_src_base_periodic__task.cc
	chromium/patches/patch-third__party_perfetto_src_base_string__utils.cc
	chromium/patches/patch-third__party_perfetto_src_base_subprocess__posix.cc
	chromium/patches/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
	chromium/patches/patch-third__party_perfetto_src_base_thread__task__runner.cc
	chromium/patches/patch-third__party_perfetto_src_base_unix__socket.cc
	chromium/patches/patch-third__party_perfetto_src_base_utils.cc
	chromium/patches/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
	chromium/patches/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
	chromium/patches/patch-third__party_perfetto_src_tracing_platform__posix.cc
	chromium/patches/patch-third__party_perfetto_src_tracing_track.cc
	chromium/patches/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
	chromium/patches/patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h
	chromium/patches/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
	chromium/patches/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
	chromium/patches/patch-third__party_speech-dispatcher_libspeechd__version.h
	chromium/patches/patch-third__party_speech-dispatcher_speechd__types.h
	chromium/patches/patch-third__party_sqlite_BUILD.gn
	chromium/patches/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
	chromium/patches/patch-third__party_sqlite_src_amalgamation_sqlite3.c
	chromium/patches/patch-third__party_swiftshader_src_Reactor_Debug.cpp
	chromium/patches/patch-third__party_swiftshader_src_System_Configurator.cpp
	chromium/patches/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
	chromium/patches/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
	chromium/patches/patch-third__party_swiftshader_src_WSI_libXCB.cpp
	chromium/patches/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
	chromium/patches/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
	chromium/patches/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
	chromium/patches/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
	chromium/patches/patch-third__party_test__fonts_fontconfig_BUILD.gn
	chromium/patches/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
	chromium/patches/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
	chromium/patches/patch-third__party_tflite_features.gni
	chromium/patches/patch-third__party_unrar_src_crypt.cpp
	chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
	chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp
	chromium/patches/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
	chromium/patches/patch-third__party_wayland_BUILD.gn
	chromium/patches/patch-third__party_wayland_include_config.h
	chromium/patches/patch-third__party_webrtc_BUILD.gn
	chromium/patches/patch-third__party_webrtc_modules_audio__device_BUILD.gn
	chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
	chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
	chromium/patches/patch-third__party_webrtc_rtc__base_byte__order.h
	chromium/patches/patch-third__party_webrtc_rtc__base_ip__address.cc
	chromium/patches/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
	chromium/patches/patch-third__party_webrtc_rtc__base_network.cc
	chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
	chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.h
	chromium/patches/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
	chromium/patches/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
	chromium/patches/patch-third__party_webrtc_system__wrappers_BUILD.gn
	chromium/patches/patch-third__party_widevine_cdm_widevine.gni
	chromium/patches/patch-third__party_zlib_BUILD.gn
	chromium/patches/patch-third__party_zlib_cpu__features.c
	chromium/patches/patch-tools_generate__shim__headers_generate__shim__headers.py
	chromium/patches/patch-tools_generate__stubs_rules.gni
	chromium/patches/patch-tools_gn_build_build__linux.ninja.template
	chromium/patches/patch-tools_gn_build_gen.py
	chromium/patches/patch-tools_gn_src_base_files_file__posix.cc
	chromium/patches/patch-tools_gn_src_gn_version.h
	chromium/patches/patch-tools_gn_src_util_exe__path.cc
	chromium/patches/patch-tools_grit_grit_node_base.py
	chromium/patches/patch-tools_json__schema__compiler_cpp__bundle__generator.py
	chromium/patches/patch-tools_json__schema__compiler_feature__compiler.py
	chromium/patches/patch-tools_memory_partition__allocator_inspect__utils.h
	chromium/patches/patch-tools_perf_chrome__telemetry__build_BUILD.gn
	chromium/patches/patch-tools_protoc__wrapper_protoc__wrapper.py
	chromium/patches/patch-tools_v8__context__snapshot_BUILD.gn
	chromium/patches/patch-tools_variations_fieldtrial__to__struct.py
	chromium/patches/patch-ui_aura_client_drag__drop__client.h
	chromium/patches/patch-ui_aura_screen__ozone.cc
	chromium/patches/patch-ui_aura_screen__ozone.h
	chromium/patches/patch-ui_base_clipboard_clipboard__constants.cc
	chromium/patches/patch-ui_base_clipboard_clipboard__constants.h
	chromium/patches/patch-ui_base_clipboard_clipboard__non__backed.cc
	chromium/patches/patch-ui_base_cursor_cursor__factory.cc
	chromium/patches/patch-ui_base_cursor_cursor__factory.h
	chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
	chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
	chromium/patches/patch-ui_base_ime_dummy__text__input__client.cc
	chromium/patches/patch-ui_base_ime_dummy__text__input__client.h
	chromium/patches/patch-ui_base_ime_fake__text__input__client.cc
	chromium/patches/patch-ui_base_ime_fake__text__input__client.h
	chromium/patches/patch-ui_base_ime_init_input__method__initializer.cc
	chromium/patches/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
	chromium/patches/patch-ui_base_ime_text__input__client.h
	chromium/patches/patch-ui_base_resource_resource__bundle.cc
	chromium/patches/patch-ui_base_test_skia__gold__pixel__diff.cc
	chromium/patches/patch-ui_base_test_ui__controls.h
	chromium/patches/patch-ui_base_ui__base__features.cc
	chromium/patches/patch-ui_base_ui__base__features.h
	chromium/patches/patch-ui_base_ui__base__switches.cc
	chromium/patches/patch-ui_base_ui__base__switches.h
	chromium/patches/patch-ui_base_webui_web__ui__util.cc
	chromium/patches/patch-ui_base_x_x11__cursor__factory.cc
	chromium/patches/patch-ui_base_x_x11__cursor__factory.h
	chromium/patches/patch-ui_base_x_x11__cursor__loader.cc
	chromium/patches/patch-ui_base_x_x11__display__manager.cc
	chromium/patches/patch-ui_base_x_x11__shm__image__pool.cc
	chromium/patches/patch-ui_color_color__id.h
	chromium/patches/patch-ui_color_color__provider__utils.cc
	chromium/patches/patch-ui_color_system__theme.h
	chromium/patches/patch-ui_compositor_compositor.cc
	chromium/patches/patch-ui_compositor_compositor.h
	chromium/patches/patch-ui_compositor_compositor__observer.h
	chromium/patches/patch-ui_display_screen.cc
	chromium/patches/patch-ui_display_screen.h
	chromium/patches/patch-ui_events_devices_x11_device__data__manager__x11.cc
	chromium/patches/patch-ui_events_event.cc
	chromium/patches/patch-ui_events_event__switches.cc
	chromium/patches/patch-ui_events_event__switches.h
	chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.cc
	chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.h
	chromium/patches/patch-ui_gfx_BUILD.gn
	chromium/patches/patch-ui_gfx_canvas__skia.cc
	chromium/patches/patch-ui_gfx_font__fallback__linux.cc
	chromium/patches/patch-ui_gfx_font__render__params.h
	chromium/patches/patch-ui_gfx_font__render__params__linux.cc
	chromium/patches/patch-ui_gfx_font__util.cc
	chromium/patches/patch-ui_gfx_gpu__memory__buffer.cc
	chromium/patches/patch-ui_gfx_gpu__memory__buffer.h
	chromium/patches/patch-ui_gfx_linux_dmabuf__uapi.h
	chromium/patches/patch-ui_gfx_linux_gbm__wrapper.cc
	chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
	chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
	chromium/patches/patch-ui_gfx_native__pixmap__handle.cc
	chromium/patches/patch-ui_gfx_native__pixmap__handle.h
	chromium/patches/patch-ui_gfx_native__widget__types.h
	chromium/patches/patch-ui_gfx_platform__font__skia.cc
	chromium/patches/patch-ui_gfx_render__text__api__fuzzer.cc
	chromium/patches/patch-ui_gfx_render__text__fuzzer.cc
	chromium/patches/patch-ui_gfx_switches.cc
	chromium/patches/patch-ui_gfx_switches.h
	chromium/patches/patch-ui_gfx_x_generated__protos_dri3.cc
	chromium/patches/patch-ui_gfx_x_generated__protos_shm.cc
	chromium/patches/patch-ui_gfx_x_xlib__support.cc
	chromium/patches/patch-ui_gl_BUILD.gn
	chromium/patches/patch-ui_gl_gl__context.cc
	chromium/patches/patch-ui_gl_gl__fence.cc
	chromium/patches/patch-ui_gl_gl__implementation.cc
	chromium/patches/patch-ui_gl_gl__switches.cc
	chromium/patches/patch-ui_gl_sync__control__vsync__provider.cc
	chromium/patches/patch-ui_gl_sync__control__vsync__provider.h
	chromium/patches/patch-ui_gtk_gtk__compat.cc
	chromium/patches/patch-ui_gtk_printing_print__dialog__gtk.cc
	chromium/patches/patch-ui_message__center_views_message__popup__view.cc
	chromium/patches/patch-ui_native__theme_native__theme.h
	chromium/patches/patch-ui_native__theme_native__theme__base.cc
	chromium/patches/patch-ui_ozone_common_egl__util.cc
	chromium/patches/patch-ui_ozone_platform_headless_headless__surface__factory.cc
	chromium/patches/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
	chromium/patches/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
	chromium/patches/patch-ui_ozone_platform_wayland_common_wayland__util.cc
	chromium/patches/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
	chromium/patches/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
	chromium/patches/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
	chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
	chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.h
	chromium/patches/patch-ui_ozone_platform_x11_x11__window.cc
	chromium/patches/patch-ui_ozone_test_mock__platform__window__delegate.h
	chromium/patches/patch-ui_platform__window_platform__window__delegate.cc
	chromium/patches/patch-ui_platform__window_platform__window__delegate.h
	chromium/patches/patch-ui_platform__window_platform__window__init__properties.h
	chromium/patches/patch-ui_qt_BUILD.gn
	chromium/patches/patch-ui_strings_translations_app__locale__settings__bn.xtb
	chromium/patches/patch-ui_strings_translations_app__locale__settings__ja.xtb
	chromium/patches/patch-ui_strings_translations_app__locale__settings__ko.xtb
	chromium/patches/patch-ui_strings_translations_app__locale__settings__ml.xtb
	chromium/patches/patch-ui_strings_translations_app__locale__settings__th.xtb
	chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
	chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
	chromium/patches/patch-ui_views_controls_prefix__selector.cc
	chromium/patches/patch-ui_views_controls_prefix__selector.h
	chromium/patches/patch-ui_views_controls_textfield_textfield.cc
	chromium/patches/patch-ui_views_controls_textfield_textfield.h
	chromium/patches/patch-ui_views_corewm_tooltip__aura.cc
	chromium/patches/patch-ui_views_examples_widget__example.cc
	chromium/patches/patch-ui_views_focus_focus__manager.cc
	chromium/patches/patch-ui_views_style_platform__style.cc
	chromium/patches/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
	chromium/patches/patch-ui_views_views__delegate.cc
	chromium/patches/patch-ui_views_views__delegate.h
	chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
	chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
	chromium/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
	chromium/patches/patch-ui_views_widget_root__view.cc
	chromium/patches/patch-ui_views_widget_widget.cc
	chromium/patches/patch-ui_views_window_custom__frame__view.cc
	chromium/patches/patch-ui_views_window_dialog__delegate.cc
	chromium/patches/patch-ui_views_window_frame__background.cc
	chromium/patches/patch-v8_BUILD.gn
	chromium/patches/patch-v8_include_v8-internal.h
	chromium/patches/patch-v8_include_v8config.h
	chromium/patches/patch-v8_src_api_api.cc
	chromium/patches/patch-v8_src_base_atomicops.h
	chromium/patches/patch-v8_src_base_platform_memory.h
	chromium/patches/patch-v8_src_base_platform_platform-freebsd.cc
	chromium/patches/patch-v8_src_base_platform_platform-openbsd.cc
	chromium/patches/patch-v8_src_base_platform_platform-posix.cc
	chromium/patches/patch-v8_src_base_strings.h
	chromium/patches/patch-v8_src_base_sys-info.cc
	chromium/patches/patch-v8_src_base_utils_random-number-generator.cc
	chromium/patches/patch-v8_src_diagnostics_perf-jit.cc
	chromium/patches/patch-v8_src_diagnostics_perf-jit.h
	chromium/patches/patch-v8_src_execution_isolate.cc
	chromium/patches/patch-v8_src_flags_flags.cc
	chromium/patches/patch-v8_src_sandbox_sandbox.cc
	chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
	chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
	chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
	chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.cc
	chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.h
	chromium/patches/patch-v8_src_trap-handler_trap-handler.h
	chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
	chromium/patches/patch-v8_tools_run-paxctl.py
	chromium/patches/patch-v8_tools_run.py
	chromium/tests.mk
Added Files:
	chromium/COMMIT_MSG
	chromium/TODO
	chromium/patches/patch-base_synchronization_cancelable__event.h
	chromium/patches/patch-base_time_time__now__posix.cc
	chromium/patches/patch-build_config_gcc_BUILD.gn
	chromium/patches/patch-build_config_linux_libdrm_BUILD.gn
	chromium/patches/patch-build_nocompile.gni
	chromium/patches/patch-build_rust_rust__bindgen__generator.gni
	chromium/patches/patch-chrome_browser_background_extensions_background__mode__manager.cc
	chromium/patches/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
	chromium/patches/patch-chrome_browser_background_glic_glic__status__icon.cc
	chromium/patches/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
	chromium/patches/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
	chromium/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
	chromium/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h
	chromium/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
	chromium/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
	chromium/patches/patch-chrome_browser_devtools_features.cc
	chromium/patches/patch-chrome_browser_devtools_features.h
	chromium/patches/patch-chrome_browser_devtools_remote__debugging__server.cc
	chromium/patches/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
	chromium/patches/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
	chromium/patches/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
	chromium/patches/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc
	chromium/patches/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
	chromium/patches/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
	chromium/patches/patch-chrome_browser_net_profile__network__context__service__factory.cc
	chromium/patches/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
	chromium/patches/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc
	chromium/patches/patch-chrome_browser_signin_accounts__policy__manager.cc
	chromium/patches/patch-chrome_browser_signin_accounts__policy__manager.h
	chromium/patches/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
	chromium/patches/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc
	chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.h
	chromium/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc
	chromium/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h
	chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc
	chromium/patches/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
	chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
	chromium/patches/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc
	chromium/patches/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
	chromium/patches/patch-chrome_browser_upgrade__detector_version__history__client.cc
	chromium/patches/patch-chrome_browser_webauthn_password__credential__controller.cc
	chromium/patches/patch-chrome_common_extensions_extension__constants.cc
	chromium/patches/patch-chrome_common_extensions_extension__constants.h
	chromium/patches/patch-chrome_enterprise__companion_event__logger.cc
	chromium/patches/patch-components_BUILD.gn
	chromium/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
	chromium/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
	chromium/patches/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc
	chromium/patches/patch-components_autofill_core_browser_payments_bnpl__manager.cc
	chromium/patches/patch-components_device__signals_core_browser_browser__utils.h
	chromium/patches/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
	chromium/patches/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc
	chromium/patches/patch-components_error__page_common_localized__error.cc
	chromium/patches/patch-components_gcm__driver_gcm__desktop__utils.cc
	chromium/patches/patch-components_gwp__asan_buildflags_buildflags.gni
	chromium/patches/patch-components_metrics_drive__metrics__provider.cc
	chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
	chromium/patches/patch-components_named__system__lock_BUILD.gn
	chromium/patches/patch-components_named__system__lock_lock__unittest.cc
	chromium/patches/patch-components_regional__capabilities_regional__capabilities__service.cc
	chromium/patches/patch-components_regional__capabilities_regional__capabilities__switches.cc
	chromium/patches/patch-components_regional__capabilities_regional__capabilities__switches.h
	chromium/patches/patch-components_signin_public_base_signin__switches.cc
	chromium/patches/patch-components_signin_public_base_signin__switches.h
	chromium/patches/patch-components_supervised__user_core_browser_list__family__members__service.h
	chromium/patches/patch-components_sync__preferences_common__syncable__prefs__database.cc
	chromium/patches/patch-components_user__education_views_help__bubble__view.h
	chromium/patches/patch-components_viz_host_gpu__host__impl.cc
	chromium/patches/patch-components_webui_flags_flags__state.cc
	chromium/patches/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
	chromium/patches/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
	chromium/patches/patch-content_browser_child__thread__type__switcher__linux.h
	chromium/patches/patch-content_browser_service__host_utility__process__host.cc
	chromium/patches/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc
	chromium/patches/patch-content_browser_service__host_utility__sandbox__delegate.cc
	chromium/patches/patch-content_common_thread__type__switcher.mojom
	chromium/patches/patch-content_shell_browser_shell__platform__delegate__views.cc
	chromium/patches/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc
	chromium/patches/patch-headless_BUILD.gn
	chromium/patches/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
	chromium/patches/patch-media_mojo_mojom_BUILD.gn
	chromium/patches/patch-media_mojo_mojom_video__frame__mojom__traits.h
	chromium/patches/patch-media_video_fake__gpu__memory__buffer.h
	chromium/patches/patch-net_quic_quic__network__transaction__unittest.cc
	chromium/patches/patch-net_websockets_websocket__basic__stream__adapters__test.cc
	chromium/patches/patch-printing_mojom_printing__context__mojom__traits__unittest.cc
	chromium/patches/patch-remoting_host_session__policies__from__dict.cc
	chromium/patches/patch-remoting_signaling_ftl__host__device__id__provider.cc
	chromium/patches/patch-services_device_public_cpp_device__features.cc
	chromium/patches/patch-services_device_public_cpp_device__features.h
	chromium/patches/patch-services_device_usb_usb__device__handle__usbfs.cc
	chromium/patches/patch-services_device_usb_usb__device__handle__usbfs.h
	chromium/patches/patch-services_tracing_public_cpp_system__metrics__sampler.cc
	chromium/patches/patch-services_viz_public_mojom_BUILD.gn
	chromium/patches/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
	chromium/patches/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
	chromium/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
	chromium/patches/patch-third__party_ipcz_src_BUILD.gn
	chromium/patches/patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h
	chromium/patches/patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h
	chromium/patches/patch-tools_code__cache__generator_BUILD.gn
	chromium/patches/patch-ui_accessibility_accessibility__features.cc
	chromium/patches/patch-ui_accessibility_accessibility__features.h
	chromium/patches/patch-ui_accessibility_ax__node.cc
	chromium/patches/patch-ui_accessibility_ax__node.h
	chromium/patches/patch-ui_accessibility_ax__tree.cc
	chromium/patches/patch-ui_accessibility_ax__tree.h
	chromium/patches/patch-ui_base_accelerators_accelerator.cc
	chromium/patches/patch-ui_base_accelerators_command.cc
	chromium/patches/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc
	chromium/patches/patch-ui_gfx_x_atom__cache.cc
	chromium/patches/patch-ui_native__theme_features_native__theme__features.cc
	chromium/patches/patch-ui_ozone_public_ozone__ui__controls__test__helper.h
	chromium/patches/patch-ui_views_BUILD.gn
	chromium/patches/patch-ui_views_accessibility_view__accessibility.cc
	chromium/patches/patch-ui_views_style_platform__style.h
	chromium/patches/patch-ui_views_widget_widget.h
	chromium/patches/patch-v8_src_libsampler_sampler.cc
Removed Files:
	chromium-next/COMMIT_MSG
	chromium-next/DESCR
	chromium-next/Makefile
	chromium-next/PLIST
	chromium-next/TODO
	chromium-next/distinfo
	chromium-next/files/chromium-browser.desktop
	chromium-next/files/chromium.sh.in
	chromium-next/options.mk
	chromium-next/patches/patch-BUILD.gn
	chromium-next/patches/patch-apps_ui_views_app__window__frame__view.cc
	chromium-next/patches/patch-ash_display_mirror__window__controller.cc
	chromium-next/patches/patch-base_BUILD.gn
	chromium-next/patches/patch-base_allocator_dispatcher_tls.h
	chromium-next/patches/patch-base_allocator_partition__allocator_partition__alloc.gni
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
	chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
	chromium-next/patches/patch-base_atomicops.h
	chromium-next/patches/patch-base_base__paths__posix.cc
	chromium-next/patches/patch-base_compiler__specific.h
	chromium-next/patches/patch-base_debug_debugger__posix.cc
	chromium-next/patches/patch-base_debug_elf__reader.cc
	chromium-next/patches/patch-base_debug_proc__maps__linux.cc
	chromium-next/patches/patch-base_debug_stack__trace.cc
	chromium-next/patches/patch-base_debug_stack__trace__posix.cc
	chromium-next/patches/patch-base_files_dir__reader__linux.h
	chromium-next/patches/patch-base_files_dir__reader__posix.h
	chromium-next/patches/patch-base_files_drive__info.h
	chromium-next/patches/patch-base_files_drive__info__posix.cc
	chromium-next/patches/patch-base_files_file__path__watcher.h
	chromium-next/patches/patch-base_files_file__path__watcher__bsd.cc
	chromium-next/patches/patch-base_files_file__path__watcher__kqueue.h
	chromium-next/patches/patch-base_files_file__path__watcher__unittest.cc
	chromium-next/patches/patch-base_files_file__util__posix.cc
	chromium-next/patches/patch-base_files_file__util__unittest.cc
	chromium-next/patches/patch-base_files_important__file__writer__cleaner.cc
	chromium-next/patches/patch-base_files_scoped__file.cc
	chromium-next/patches/patch-base_functional_unretained__traits.h
	chromium-next/patches/patch-base_i18n_icu__util.cc
	chromium-next/patches/patch-base_linux__util.cc
	chromium-next/patches/patch-base_logging__unittest.cc
	chromium-next/patches/patch-base_memory_discardable__memory.cc
	chromium-next/patches/patch-base_memory_discardable__memory__internal.h
	chromium-next/patches/patch-base_memory_madv__free__discardable__memory__posix.cc
	chromium-next/patches/patch-base_memory_platform__shared__memory__region.h
	chromium-next/patches/patch-base_memory_platform__shared__memory__region__posix.cc
	chromium-next/patches/patch-base_memory_protected__memory.h
	chromium-next/patches/patch-base_memory_protected__memory__posix.cc
	chromium-next/patches/patch-base_message__loop_message__pump__epoll.cc
	chromium-next/patches/patch-base_message__loop_message__pump__epoll.h
	chromium-next/patches/patch-base_message__loop_message__pump__glib.cc
	chromium-next/patches/patch-base_native__library__posix.cc
	chromium-next/patches/patch-base_native__library__unittest.cc
	chromium-next/patches/patch-base_posix_can__lower__nice__to.cc
	chromium-next/patches/patch-base_posix_file__descriptor__shuffle.h
	chromium-next/patches/patch-base_posix_sysctl.cc
	chromium-next/patches/patch-base_posix_unix__domain__socket.cc
	chromium-next/patches/patch-base_posix_unix__domain__socket__unittest.cc
	chromium-next/patches/patch-base_process_internal__linux.h
	chromium-next/patches/patch-base_process_kill.h
	chromium-next/patches/patch-base_process_kill__posix.cc
	chromium-next/patches/patch-base_process_launch.h
	chromium-next/patches/patch-base_process_launch__posix.cc
	chromium-next/patches/patch-base_process_memory__linux.cc
	chromium-next/patches/patch-base_process_process__handle.cc
	chromium-next/patches/patch-base_process_process__handle.h
	chromium-next/patches/patch-base_process_process__handle__freebsd.cc
	chromium-next/patches/patch-base_process_process__handle__netbsd.cc
	chromium-next/patches/patch-base_process_process__handle__openbsd.cc
	chromium-next/patches/patch-base_process_process__iterator.h
	chromium-next/patches/patch-base_process_process__iterator__freebsd.cc
	chromium-next/patches/patch-base_process_process__iterator__netbsd.cc
	chromium-next/patches/patch-base_process_process__iterator__openbsd.cc
	chromium-next/patches/patch-base_process_process__metrics.cc
	chromium-next/patches/patch-base_process_process__metrics.h
	chromium-next/patches/patch-base_process_process__metrics__freebsd.cc
	chromium-next/patches/patch-base_process_process__metrics__netbsd.cc
	chromium-next/patches/patch-base_process_process__metrics__openbsd.cc
	chromium-next/patches/patch-base_process_process__metrics__posix.cc
	chromium-next/patches/patch-base_process_process__metrics__unittest.cc
	chromium-next/patches/patch-base_process_process__posix.cc
	chromium-next/patches/patch-base_process_process__unittest.cc
	chromium-next/patches/patch-base_profiler_module__cache.cc
	chromium-next/patches/patch-base_profiler_sampling__profiler__thread__token.cc
	chromium-next/patches/patch-base_profiler_sampling__profiler__thread__token.h
	chromium-next/patches/patch-base_profiler_stack__base__address__posix.cc
	chromium-next/patches/patch-base_profiler_stack__sampling__profiler__test__util.cc
	chromium-next/patches/patch-base_profiler_stack__sampling__profiler__unittest.cc
	chromium-next/patches/patch-base_profiler_thread__delegate__posix.cc
	chromium-next/patches/patch-base_rand__util.h
	chromium-next/patches/patch-base_rand__util__posix.cc
	chromium-next/patches/patch-base_strings_safe__sprintf__unittest.cc
	chromium-next/patches/patch-base_synchronization_cancelable__event.h
	chromium-next/patches/patch-base_synchronization_lock__impl.h
	chromium-next/patches/patch-base_syslog__logging.cc
	chromium-next/patches/patch-base_system_sys__info.cc
	chromium-next/patches/patch-base_system_sys__info.h
	chromium-next/patches/patch-base_system_sys__info__freebsd.cc
	chromium-next/patches/patch-base_system_sys__info__netbsd.cc
	chromium-next/patches/patch-base_system_sys__info__openbsd.cc
	chromium-next/patches/patch-base_system_sys__info__posix.cc
	chromium-next/patches/patch-base_system_sys__info__unittest.cc
	chromium-next/patches/patch-base_task_thread__pool_environment__config__unittest.cc
	chromium-next/patches/patch-base_test_launcher_test__launcher.cc
	chromium-next/patches/patch-base_test_test__file__util__linux.cc
	chromium-next/patches/patch-base_test_test__file__util__posix.cc
	chromium-next/patches/patch-base_threading_platform__thread.h
	chromium-next/patches/patch-base_threading_platform__thread__bsd.cc
	chromium-next/patches/patch-base_threading_platform__thread__internal__posix.cc
	chromium-next/patches/patch-base_threading_platform__thread__posix.cc
	chromium-next/patches/patch-base_threading_platform__thread__unittest.cc
	chromium-next/patches/patch-base_time_time__now__posix.cc
	chromium-next/patches/patch-base_trace__event_malloc__dump__provider.cc
	chromium-next/patches/patch-base_trace__event_memory__dump__manager.cc
	chromium-next/patches/patch-base_trace__event_process__memory__dump.cc
	chromium-next/patches/patch-base_tracing_trace__time.cc
	chromium-next/patches/patch-base_tracing_trace__time.h
	chromium-next/patches/patch-base_version__info_version__info.h
	chromium-next/patches/patch-build_config_BUILD.gn
	chromium-next/patches/patch-build_config_BUILDCONFIG.gn
	chromium-next/patches/patch-build_config_clang_BUILD.gn
	chromium-next/patches/patch-build_config_compiler_BUILD.gn
	chromium-next/patches/patch-build_config_gcc_BUILD.gn
	chromium-next/patches/patch-build_config_linux_BUILD.gn
	chromium-next/patches/patch-build_config_linux_libdrm_BUILD.gn
	chromium-next/patches/patch-build_config_linux_pkg-config.py
	chromium-next/patches/patch-build_config_ozone.gni
	chromium-next/patches/patch-build_config_rust.gni
	chromium-next/patches/patch-build_config_v8__target__cpu.gni
	chromium-next/patches/patch-build_detect__host__arch.py
	chromium-next/patches/patch-build_gn__run__binary.py
	chromium-next/patches/patch-build_linux_chrome.map
	chromium-next/patches/patch-build_linux_strip__binary.py
	chromium-next/patches/patch-build_linux_unbundle_icu.gn
	chromium-next/patches/patch-build_linux_unbundle_libusb.gn
	chromium-next/patches/patch-build_nocompile.gni
	chromium-next/patches/patch-build_rust_rust__bindgen.gni
	chromium-next/patches/patch-build_rust_rust__bindgen__generator.gni
	chromium-next/patches/patch-build_rust_std_BUILD.gn
	chromium-next/patches/patch-build_toolchain_freebsd_BUILD.gn
	chromium-next/patches/patch-build_toolchain_gcc__solink__wrapper.py
	chromium-next/patches/patch-build_toolchain_gcc__toolchain.gni
	chromium-next/patches/patch-build_toolchain_netbsd_BUILD.gn
	chromium-next/patches/patch-build_toolchain_openbsd_BUILD.gn
	chromium-next/patches/patch-build_toolchain_toolchain.gni
	chromium-next/patches/patch-cc_base_features.cc
	chromium-next/patches/patch-chrome_app_chrome__command__ids.h
	chromium-next/patches/patch-chrome_app_chrome__main.cc
	chromium-next/patches/patch-chrome_app_chrome__main__delegate.cc
	chromium-next/patches/patch-chrome_browser_BUILD.gn
	chromium-next/patches/patch-chrome_browser_about__flags.cc
	chromium-next/patches/patch-chrome_browser_accessibility_page__colors.cc
	chromium-next/patches/patch-chrome_browser_after__startup__task__utils.cc
	chromium-next/patches/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
	chromium-next/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
	chromium-next/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
	chromium-next/patches/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
	chromium-next/patches/patch-chrome_browser_background_extensions_background__mode__manager.cc
	chromium-next/patches/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
	chromium-next/patches/patch-chrome_browser_background_glic_glic__status__icon.cc
	chromium-next/patches/patch-chrome_browser_browser__features.cc
	chromium-next/patches/patch-chrome_browser_browser__features.h
	chromium-next/patches/patch-chrome_browser_browser__process__impl.cc
	chromium-next/patches/patch-chrome_browser_browser__process__impl.h
	chromium-next/patches/patch-chrome_browser_chrome__browser__field__trials.cc
	chromium-next/patches/patch-chrome_browser_chrome__browser__field__trials.h
	chromium-next/patches/patch-chrome_browser_chrome__browser__interface__binders.cc
	chromium-next/patches/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
	chromium-next/patches/patch-chrome_browser_chrome__browser__main.cc
	chromium-next/patches/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
	chromium-next/patches/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
	chromium-next/patches/patch-chrome_browser_chrome__browser__main__linux.cc
	chromium-next/patches/patch-chrome_browser_chrome__browser__main__linux.h
	chromium-next/patches/patch-chrome_browser_chrome__browser__main__posix.cc
	chromium-next/patches/patch-chrome_browser_chrome__content__browser__client.cc
	chromium-next/patches/patch-chrome_browser_chrome__content__browser__client.h
	chromium-next/patches/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
	chromium-next/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
	chromium-next/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h
	chromium-next/patches/patch-chrome_browser_component__updater_registration.cc
	chromium-next/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
	chromium-next/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
	chromium-next/patches/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
	chromium-next/patches/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
	chromium-next/patches/patch-chrome_browser_defaults.cc
	chromium-next/patches/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
	chromium-next/patches/patch-chrome_browser_devtools_features.cc
	chromium-next/patches/patch-chrome_browser_devtools_features.h
	chromium-next/patches/patch-chrome_browser_devtools_remote__debugging__server.cc
	chromium-next/patches/patch-chrome_browser_diagnostics_diagnostics__writer.h
	chromium-next/patches/patch-chrome_browser_download_chrome__download__manager__delegate.cc
	chromium-next/patches/patch-chrome_browser_download_download__commands.cc
	chromium-next/patches/patch-chrome_browser_download_download__commands.h
	chromium-next/patches/patch-chrome_browser_download_download__file__picker.cc
	chromium-next/patches/patch-chrome_browser_download_download__item__model.cc
	chromium-next/patches/patch-chrome_browser_download_download__prefs.cc
	chromium-next/patches/patch-chrome_browser_download_download__prefs.h
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_common.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_connectors__service.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
	chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
	chromium-next/patches/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
	chromium-next/patches/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
	chromium-next/patches/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
	chromium-next/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
	chromium-next/patches/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
	chromium-next/patches/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
	chromium-next/patches/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
	chromium-next/patches/patch-chrome_browser_extensions_BUILD.gn
	chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
	chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
	chromium-next/patches/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
	chromium-next/patches/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
	chromium-next/patches/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc
	chromium-next/patches/patch-chrome_browser_extensions_external__provider__impl.cc
	chromium-next/patches/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
	chromium-next/patches/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
	chromium-next/patches/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
	chromium-next/patches/patch-chrome_browser_first__run_first__run__dialog.h
	chromium-next/patches/patch-chrome_browser_first__run_first__run__internal.h
	chromium-next/patches/patch-chrome_browser_flag__descriptions.cc
	chromium-next/patches/patch-chrome_browser_flag__descriptions.h
	chromium-next/patches/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
	chromium-next/patches/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
	chromium-next/patches/patch-chrome_browser_global__features.cc
	chromium-next/patches/patch-chrome_browser_global__features.h
	chromium-next/patches/patch-chrome_browser_headless_headless__mode__util.cc
	chromium-next/patches/patch-chrome_browser_intranet__redirect__detector.h
	chromium-next/patches/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
	chromium-next/patches/patch-chrome_browser_media__galleries_media__file__system__registry.cc
	chromium-next/patches/patch-chrome_browser_media_audio__service__util.cc
	chromium-next/patches/patch-chrome_browser_media_router_discovery_BUILD.gn
	chromium-next/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
	chromium-next/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
	chromium-next/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
	chromium-next/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
	chromium-next/patches/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
	chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
	chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
	chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
	chromium-next/patches/patch-chrome_browser_memory__details.cc
	chromium-next/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
	chromium-next/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
	chromium-next/patches/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
	chromium-next/patches/patch-chrome_browser_metrics_perf_cpu__identity.cc
	chromium-next/patches/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
	chromium-next/patches/patch-chrome_browser_metrics_power_process__monitor.cc
	chromium-next/patches/patch-chrome_browser_metrics_power_process__monitor.h
	chromium-next/patches/patch-chrome_browser_net_profile__network__context__service.cc
	chromium-next/patches/patch-chrome_browser_net_profile__network__context__service__factory.cc
	chromium-next/patches/patch-chrome_browser_net_system__network__context__manager.cc
	chromium-next/patches/patch-chrome_browser_net_system__network__context__manager.h
	chromium-next/patches/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
	chromium-next/patches/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
	chromium-next/patches/patch-chrome_browser_notifications_notification__display__service__impl.cc
	chromium-next/patches/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
	chromium-next/patches/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
	chromium-next/patches/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
	chromium-next/patches/patch-chrome_browser_platform__util__linux.cc
	chromium-next/patches/patch-chrome_browser_policy_browser__signin__policy__handler.cc
	chromium-next/patches/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
	chromium-next/patches/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
	chromium-next/patches/patch-chrome_browser_policy_device__management__service__configuration.cc
	chromium-next/patches/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
	chromium-next/patches/patch-chrome_browser_prefs_browser__prefs.cc
	chromium-next/patches/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
	chromium-next/patches/patch-chrome_browser_printing_print__backend__service__manager.cc
	chromium-next/patches/patch-chrome_browser_printing_printer__query.cc
	chromium-next/patches/patch-chrome_browser_process__singleton__posix.cc
	chromium-next/patches/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
	chromium-next/patches/patch-chrome_browser_profiles_profile__impl.cc
	chromium-next/patches/patch-chrome_browser_profiles_profiles__state.cc
	chromium-next/patches/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
	chromium-next/patches/patch-chrome_browser_renderer__preferences__util.cc
	chromium-next/patches/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
	chromium-next/patches/patch-chrome_browser_resources_signin_signin__shared.css
	chromium-next/patches/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
	chromium-next/patches/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
	chromium-next/patches/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
	chromium-next/patches/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc
	chromium-next/patches/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
	chromium-next/patches/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
	chromium-next/patches/patch-chrome_browser_sessions_session__restore.cc
	chromium-next/patches/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
	chromium-next/patches/patch-chrome_browser_shortcuts_icon__badging.cc
	chromium-next/patches/patch-chrome_browser_signin_accounts__policy__manager.cc
	chromium-next/patches/patch-chrome_browser_signin_accounts__policy__manager.h
	chromium-next/patches/patch-chrome_browser_signin_signin__util.cc
	chromium-next/patches/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
	chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
	chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
	chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
	chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
	chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
	chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
	chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
	chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
	chromium-next/patches/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
	chromium-next/patches/patch-chrome_browser_sync_device__info__sync__client__impl.cc
	chromium-next/patches/patch-chrome_browser_sync_sync__service__factory.cc
	chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group.cc
	chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group.h
	chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
	chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
	chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
	chromium-next/patches/patch-chrome_browser_task__manager_task__manager__observer.h
	chromium-next/patches/patch-chrome_browser_themes_theme__helper.cc
	chromium-next/patches/patch-chrome_browser_themes_theme__service.cc
	chromium-next/patches/patch-chrome_browser_themes_theme__service__aura__linux.cc
	chromium-next/patches/patch-chrome_browser_themes_theme__service__factory.cc
	chromium-next/patches/patch-chrome_browser_ui_actions_chrome__action__id.h
	chromium-next/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
	chromium-next/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
	chromium-next/patches/patch-chrome_browser_ui_browser.h
	chromium-next/patches/patch-chrome_browser_ui_browser__command__controller.cc
	chromium-next/patches/patch-chrome_browser_ui_browser__commands.cc
	chromium-next/patches/patch-chrome_browser_ui_browser__ui__prefs.cc
	chromium-next/patches/patch-chrome_browser_ui_browser__view__prefs.cc
	chromium-next/patches/patch-chrome_browser_ui_chrome__pages.cc
	chromium-next/patches/patch-chrome_browser_ui_chrome__pages.h
	chromium-next/patches/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
	chromium-next/patches/patch-chrome_browser_ui_managed__ui.cc
	chromium-next/patches/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
	chromium-next/patches/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
	chromium-next/patches/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
	chromium-next/patches/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
	chromium-next/patches/patch-chrome_browser_ui_sad__tab.cc
	chromium-next/patches/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
	chromium-next/patches/patch-chrome_browser_ui_signin_signin__view__controller.cc
	chromium-next/patches/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
	chromium-next/patches/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
	chromium-next/patches/patch-chrome_browser_ui_startup_startup__browser__creator.cc
	chromium-next/patches/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
	chromium-next/patches/patch-chrome_browser_ui_startup_startup__tab__provider.cc
	chromium-next/patches/patch-chrome_browser_ui_tab__helpers.cc
	chromium-next/patches/patch-chrome_browser_ui_tabs_features.cc
	chromium-next/patches/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc
	chromium-next/patches/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
	chromium-next/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.h
	chromium-next/patches/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
	chromium-next/patches/patch-chrome_browser_ui_test_popup__browsertest.cc
	chromium-next/patches/patch-chrome_browser_ui_test_test__browser__ui.cc
	chromium-next/patches/patch-chrome_browser_ui_ui__features.cc
	chromium-next/patches/patch-chrome_browser_ui_ui__features.h
	chromium-next/patches/patch-chrome_browser_ui_views_accelerator__table.cc
	chromium-next/patches/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
	chromium-next/patches/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
	chromium-next/patches/patch-chrome_browser_ui_views_chrome__views__delegate.h
	chromium-next/patches/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
	chromium-next/patches/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame.h
	chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
	chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
	chromium-next/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
	chromium-next/patches/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
	chromium-next/patches/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_hung__renderer__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
	chromium-next/patches/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
	chromium-next/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc
	chromium-next/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h
	chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc
	chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
	chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
	chromium-next/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
	chromium-next/patches/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
	chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab.cc
	chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
	chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
	chromium-next/patches/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc
	chromium-next/patches/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
	chromium-next/patches/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
	chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
	chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
	chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
	chromium-next/patches/patch-chrome_browser_ui_webui_about_about__ui.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_about_about__ui.h
	chromium-next/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
	chromium-next/patches/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
	chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
	chromium-next/patches/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.h
	chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.h
	chromium-next/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
	chromium-next/patches/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
	chromium-next/patches/patch-chrome_browser_ui_window__sizer_window__sizer.cc
	chromium-next/patches/patch-chrome_browser_upgrade__detector_version__history__client.cc
	chromium-next/patches/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
	chromium-next/patches/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
	chromium-next/patches/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
	chromium-next/patches/patch-chrome_browser_web__applications_extension__status__utils.h
	chromium-next/patches/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
	chromium-next/patches/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
	chromium-next/patches/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
	chromium-next/patches/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
	chromium-next/patches/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
	chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
	chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
	chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
	chromium-next/patches/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
	chromium-next/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
	chromium-next/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
	chromium-next/patches/patch-chrome_browser_web__applications_web__app__helpers.cc
	chromium-next/patches/patch-chrome_browser_web__applications_web__app__install__info.h
	chromium-next/patches/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
	chromium-next/patches/patch-chrome_browser_webauthn_enclave__manager.cc
	chromium-next/patches/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
	chromium-next/patches/patch-chrome_browser_webauthn_password__credential__controller.cc
	chromium-next/patches/patch-chrome_browser_webauthn_unexportable__key__utils.cc
	chromium-next/patches/patch-chrome_common_channel__info.h
	chromium-next/patches/patch-chrome_common_channel__info__posix.cc
	chromium-next/patches/patch-chrome_common_chrome__features.cc
	chromium-next/patches/patch-chrome_common_chrome__features.h
	chromium-next/patches/patch-chrome_common_chrome__paths.cc
	chromium-next/patches/patch-chrome_common_chrome__paths.h
	chromium-next/patches/patch-chrome_common_chrome__paths__internal.h
	chromium-next/patches/patch-chrome_common_chrome__switches.cc
	chromium-next/patches/patch-chrome_common_chrome__switches.h
	chromium-next/patches/patch-chrome_common_crash__keys.cc
	chromium-next/patches/patch-chrome_common_extensions_extension__constants.cc
	chromium-next/patches/patch-chrome_common_extensions_extension__constants.h
	chromium-next/patches/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
	chromium-next/patches/patch-chrome_common_media_cdm__host__file__path.cc
	chromium-next/patches/patch-chrome_common_media_cdm__registration.cc
	chromium-next/patches/patch-chrome_common_media_cdm__registration.h
	chromium-next/patches/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
	chromium-next/patches/patch-chrome_common_pref__names.h
	chromium-next/patches/patch-chrome_common_url__constants.h
	chromium-next/patches/patch-chrome_common_webui__url__constants.cc
	chromium-next/patches/patch-chrome_common_webui__url__constants.h
	chromium-next/patches/patch-chrome_enterprise__companion_enterprise__companion__client.cc
	chromium-next/patches/patch-chrome_enterprise__companion_event__logger.cc
	chromium-next/patches/patch-chrome_enterprise__companion_lock.cc
	chromium-next/patches/patch-chrome_services_printing_print__backend__service__impl.cc
	chromium-next/patches/patch-chrome_services_speech_audio__source__fetcher__impl.cc
	chromium-next/patches/patch-chrome_test_base_scoped__channel__override__posix.cc
	chromium-next/patches/patch-chrome_test_chromedriver_chrome__launcher.cc
	chromium-next/patches/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
	chromium-next/patches/patch-chrome_test_chromedriver_key__converter__unittest.cc
	chromium-next/patches/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
	chromium-next/patches/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
	chromium-next/patches/patch-chrome_updater_app_app__uninstall.cc
	chromium-next/patches/patch-chrome_updater_configurator.cc
	chromium-next/patches/patch-chrome_updater_lock.cc
	chromium-next/patches/patch-chrome_updater_util_posix__util.cc
	chromium-next/patches/patch-chrome_utility_services.cc
	chromium-next/patches/patch-chromecast_browser_cast__browser__main__parts.cc
	chromium-next/patches/patch-chromecast_browser_cast__content__browser__client.cc
	chromium-next/patches/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
	chromium-next/patches/patch-chromecast_media_base_default__monotonic__clock.cc
	chromium-next/patches/patch-components_BUILD.gn
	chromium-next/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
	chromium-next/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
	chromium-next/patches/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc
	chromium-next/patches/patch-components_autofill_core_browser_payments_bnpl__manager.cc
	chromium-next/patches/patch-components_autofill_core_common_autofill__payments__features.cc
	chromium-next/patches/patch-components_autofill_core_common_autofill__prefs.cc
	chromium-next/patches/patch-components_autofill_core_common_autofill__prefs.h
	chromium-next/patches/patch-components_commerce_core_commerce__feature__list.cc
	chromium-next/patches/patch-components_constrained__window_constrained__window__views.cc
	chromium-next/patches/patch-components_content__settings_core_browser_website__settings__registry.cc
	chromium-next/patches/patch-components_cookie__config_cookie__store__util.cc
	chromium-next/patches/patch-components_crash_core_app_BUILD.gn
	chromium-next/patches/patch-components_crash_core_app_chrome__crashpad__handler.cc
	chromium-next/patches/patch-components_crash_core_app_crashpad__handler__main.cc
	chromium-next/patches/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
	chromium-next/patches/patch-components_crash_core_common_BUILD.gn
	chromium-next/patches/patch-components_device__signals_core_browser_browser__utils.h
	chromium-next/patches/patch-components_device__signals_core_browser_mock__signals__aggregator.h
	chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator.h
	chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
	chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.h
	chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service.h
	chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service__impl.cc
	chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service__impl.h
	chromium-next/patches/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
	chromium-next/patches/patch-components_device__signals_core_common_signals__features.cc
	chromium-next/patches/patch-components_device__signals_core_common_signals__features.h
	chromium-next/patches/patch-components_device__signals_core_system__signals_platform__delegate.cc
	chromium-next/patches/patch-components_device__signals_test_signals__contract.cc
	chromium-next/patches/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
	chromium-next/patches/patch-components_embedder__support_user__agent__utils.cc
	chromium-next/patches/patch-components_embedder__support_user__agent__utils__unittest.cc
	chromium-next/patches/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc
	chromium-next/patches/patch-components_enterprise_watermarking_watermark.cc
	chromium-next/patches/patch-components_error__page_common_localized__error.cc
	chromium-next/patches/patch-components_eye__dropper_eye__dropper__view.cc
	chromium-next/patches/patch-components_feature__engagement_public_event__constants.cc
	chromium-next/patches/patch-components_feature__engagement_public_event__constants.h
	chromium-next/patches/patch-components_feature__engagement_public_feature__configurations.cc
	chromium-next/patches/patch-components_feature__engagement_public_feature__constants.cc
	chromium-next/patches/patch-components_feature__engagement_public_feature__constants.h
	chromium-next/patches/patch-components_feature__engagement_public_feature__list.cc
	chromium-next/patches/patch-components_feature__engagement_public_feature__list.h
	chromium-next/patches/patch-components_feed_core_proto_v2_wire_version.proto
	chromium-next/patches/patch-components_feed_core_v2_feed__network__impl__unittest.cc
	chromium-next/patches/patch-components_feed_core_v2_proto__util.cc
	chromium-next/patches/patch-components_feed_core_v2_proto__util__unittest.cc
	chromium-next/patches/patch-components_feed_core_v2_test_proto__printer.cc
	chromium-next/patches/patch-components_gcm__driver_gcm__desktop__utils.cc
	chromium-next/patches/patch-components_gwp__asan_BUILD.gn
	chromium-next/patches/patch-components_gwp__asan_buildflags_buildflags.gni
	chromium-next/patches/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
	chromium-next/patches/patch-components_gwp__asan_client_gwp__asan.cc
	chromium-next/patches/patch-components_gwp__asan_client_gwp__asan__features.cc
	chromium-next/patches/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
	chromium-next/patches/patch-components_live__caption_caption__util.cc
	chromium-next/patches/patch-components_live__caption_caption__util.h
	chromium-next/patches/patch-components_media__router_common_media__source.cc
	chromium-next/patches/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
	chromium-next/patches/patch-components_media__router_common_providers_cast_channel_enum__table.h
	chromium-next/patches/patch-components_metrics_drive__metrics__provider.cc
	chromium-next/patches/patch-components_metrics_dwa_dwa__service.cc
	chromium-next/patches/patch-components_metrics_metrics__log.cc
	chromium-next/patches/patch-components_metrics_motherboard.cc
	chromium-next/patches/patch-components_named__mojo__ipc__server_connection__info.h
	chromium-next/patches/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
	chromium-next/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
	chromium-next/patches/patch-components_named__system__lock_BUILD.gn
	chromium-next/patches/patch-components_named__system__lock_lock.h
	chromium-next/patches/patch-components_named__system__lock_lock__unittest.cc
	chromium-next/patches/patch-components_optimization__guide_core_optimization__guide__features.cc
	chromium-next/patches/patch-components_optimization__guide_core_optimization__guide__util.cc
	chromium-next/patches/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
	chromium-next/patches/patch-components_os__crypt_sync_libsecret__util__linux.cc
	chromium-next/patches/patch-components_os__crypt_sync_os__crypt.h
	chromium-next/patches/patch-components_paint__preview_browser_paint__preview__client.cc
	chromium-next/patches/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
	chromium-next/patches/patch-components_paint__preview_common_proto_paint__preview.proto
	chromium-next/patches/patch-components_paint__preview_player_player__compositor__delegate.cc
	chromium-next/patches/patch-components_password__manager_core_browser_features_password__features.cc
	chromium-next/patches/patch-components_password__manager_core_browser_features_password__features.h
	chromium-next/patches/patch-components_password__manager_core_browser_password__form__manager.cc
	chromium-next/patches/patch-components_password__manager_core_browser_password__manager.cc
	chromium-next/patches/patch-components_password__manager_core_browser_password__manager__client.h
	chromium-next/patches/patch-components_password__manager_core_browser_password__manager__switches.cc
	chromium-next/patches/patch-components_password__manager_core_browser_password__manager__switches.h
	chromium-next/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
	chromium-next/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
	chromium-next/patches/patch-components_password__manager_core_browser_password__store__factory__util.cc
	chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database.cc
	chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
	chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
	chromium-next/patches/patch-components_password__manager_core_browser_stub__password__manager__client.cc
	chromium-next/patches/patch-components_password__manager_core_browser_stub__password__manager__client.h
	chromium-next/patches/patch-components_password__manager_core_common_password__manager__pref__names.h
	chromium-next/patches/patch-components_performance__manager_decorators_process__metrics__decorator.cc
	chromium-next/patches/patch-components_performance__manager_public_features.h
	chromium-next/patches/patch-components_permissions_prediction__service_prediction__common.cc
	chromium-next/patches/patch-components_policy_core_browser_policy__pref__mapping__test.cc
	chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__client.cc
	chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
	chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__util.cc
	chromium-next/patches/patch-components_policy_core_common_policy__loader__common.cc
	chromium-next/patches/patch-components_policy_core_common_policy__paths.cc
	chromium-next/patches/patch-components_policy_core_common_policy__utils.cc
	chromium-next/patches/patch-components_policy_tools_generate__policy__source.py
	chromium-next/patches/patch-components_power__metrics_BUILD.gn
	chromium-next/patches/patch-components_power__metrics_energy__metrics__provider.cc
	chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__service.cc
	chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__switches.cc
	chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__switches.h
	chromium-next/patches/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
	chromium-next/patches/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
	chromium-next/patches/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
	chromium-next/patches/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
	chromium-next/patches/patch-components_search__engines_template__url__service.cc
	chromium-next/patches/patch-components_security__interstitials_content_utils.cc
	chromium-next/patches/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
	chromium-next/patches/patch-components_services_on__device__translation_sandbox__hook.cc
	chromium-next/patches/patch-components_services_on__device__translation_sandbox__hook.h
	chromium-next/patches/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
	chromium-next/patches/patch-components_signin_public_base_signin__switches.cc
	chromium-next/patches/patch-components_signin_public_base_signin__switches.h
	chromium-next/patches/patch-components_soda_soda__util.cc
	chromium-next/patches/patch-components_startup__metric__utils_common_startup__metric__utils.cc
	chromium-next/patches/patch-components_storage__monitor_BUILD.gn
	chromium-next/patches/patch-components_storage__monitor_removable__device__constants.cc
	chromium-next/patches/patch-components_storage__monitor_removable__device__constants.h
	chromium-next/patches/patch-components_supervised__user_core_browser_list__family__members__service.h
	chromium-next/patches/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
	chromium-next/patches/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
	chromium-next/patches/patch-components_supervised__user_core_common_features.cc
	chromium-next/patches/patch-components_supervised__user_core_common_features.h
	chromium-next/patches/patch-components_supervised__user_core_common_pref__names.h
	chromium-next/patches/patch-components_sync__device__info_local__device__info__util.cc
	chromium-next/patches/patch-components_sync__device__info_local__device__info__util__linux.cc
	chromium-next/patches/patch-components_sync__preferences_common__syncable__prefs__database.cc
	chromium-next/patches/patch-components_sync_base_sync__util.cc
	chromium-next/patches/patch-components_system__cpu_cpu__probe.cc
	chromium-next/patches/patch-components_translate_core_common_translate__util.cc
	chromium-next/patches/patch-components_trusted__vault_trusted__vault__connection__impl.cc
	chromium-next/patches/patch-components_update__client_update__query__params.cc
	chromium-next/patches/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
	chromium-next/patches/patch-components_user__education_views_help__bubble__view.cc
	chromium-next/patches/patch-components_user__education_views_help__bubble__view.h
	chromium-next/patches/patch-components_variations_service_variations__service.cc
	chromium-next/patches/patch-components_visited__url__ranking_public_url__visit__util.cc
	chromium-next/patches/patch-components_viz_host_gpu__host__impl.cc
	chromium-next/patches/patch-components_viz_host_host__display__client.cc
	chromium-next/patches/patch-components_viz_host_host__display__client.h
	chromium-next/patches/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
	chromium-next/patches/patch-components_viz_service_display__embedder_software__output__surface.cc
	chromium-next/patches/patch-components_viz_service_display__embedder_software__output__surface.h
	chromium-next/patches/patch-components_viz_service_display_skia__renderer.cc
	chromium-next/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
	chromium-next/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
	chromium-next/patches/patch-components_viz_test_fake__display__client.cc
	chromium-next/patches/patch-components_viz_test_fake__display__client.h
	chromium-next/patches/patch-components_viz_test_mock__display__client.h
	chromium-next/patches/patch-components_webui_flags_flags__state.cc
	chromium-next/patches/patch-content_app_BUILD.gn
	chromium-next/patches/patch-content_app_content__main.cc
	chromium-next/patches/patch-content_app_content__main__runner__impl.cc
	chromium-next/patches/patch-content_browser_BUILD.gn
	chromium-next/patches/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
	chromium-next/patches/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
	chromium-next/patches/patch-content_browser_audio_audio__service.cc
	chromium-next/patches/patch-content_browser_browser__child__process__host__impl.cc
	chromium-next/patches/patch-content_browser_browser__child__process__host__impl.h
	chromium-next/patches/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
	chromium-next/patches/patch-content_browser_browser__main__loop.cc
	chromium-next/patches/patch-content_browser_child__process__launcher__helper.h
	chromium-next/patches/patch-content_browser_child__process__launcher__helper__linux.cc
	chromium-next/patches/patch-content_browser_child__thread__type__switcher__linux.cc
	chromium-next/patches/patch-content_browser_child__thread__type__switcher__linux.h
	chromium-next/patches/patch-content_browser_compositor_viz__process__transport__factory.cc
	chromium-next/patches/patch-content_browser_devtools_devtools__frontend__host__impl.cc
	chromium-next/patches/patch-content_browser_devtools_devtools__frontend__host__impl.h
	chromium-next/patches/patch-content_browser_devtools_protocol_system__info__handler.cc
	chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
	chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
	chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
	chromium-next/patches/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
	chromium-next/patches/patch-content_browser_font__access_font__enumeration__data__source.cc
	chromium-next/patches/patch-content_browser_gpu_compositor__util.cc
	chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl.cc
	chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl.h
	chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
	chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.h
	chromium-next/patches/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
	chromium-next/patches/patch-content_browser_gpu_gpu__process__host.cc
	chromium-next/patches/patch-content_browser_media_frameless__media__interface__proxy.h
	chromium-next/patches/patch-content_browser_media_media__keys__listener__manager__impl.cc
	chromium-next/patches/patch-content_browser_network__service__instance__impl.cc
	chromium-next/patches/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
	chromium-next/patches/patch-content_browser_renderer__host_delegated__frame__host.cc
	chromium-next/patches/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
	chromium-next/patches/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
	chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
	chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl.h
	chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
	chromium-next/patches/patch-content_browser_renderer__host_render__view__host__impl.cc
	chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
	chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.h
	chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
	chromium-next/patches/patch-content_browser_sandbox__host__linux.cc
	chromium-next/patches/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
	chromium-next/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
	chromium-next/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.h
	chromium-next/patches/patch-content_browser_service__host_utility__process__host.cc
	chromium-next/patches/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc
	chromium-next/patches/patch-content_browser_service__host_utility__sandbox__delegate.cc
	chromium-next/patches/patch-content_browser_v8__snapshot__files.cc
	chromium-next/patches/patch-content_browser_web__contents_slow__web__preference__cache.cc
	chromium-next/patches/patch-content_browser_web__contents_web__contents__view__aura.cc
	chromium-next/patches/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
	chromium-next/patches/patch-content_browser_webui_web__ui__main__frame__observer.cc
	chromium-next/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
	chromium-next/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.h
	chromium-next/patches/patch-content_child_BUILD.gn
	chromium-next/patches/patch-content_child_child__process.cc
	chromium-next/patches/patch-content_child_child__process.h
	chromium-next/patches/patch-content_common_BUILD.gn
	chromium-next/patches/patch-content_common_features.cc
	chromium-next/patches/patch-content_common_features.h
	chromium-next/patches/patch-content_common_font__list__unittest.cc
	chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
	chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.h
	chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__linux.h
	chromium-next/patches/patch-content_common_thread__type__switcher.mojom
	chromium-next/patches/patch-content_gpu_gpu__child__thread.cc
	chromium-next/patches/patch-content_gpu_gpu__main.cc
	chromium-next/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
	chromium-next/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
	chromium-next/patches/patch-content_ppapi__plugin_ppapi__plugin__main.cc
	chromium-next/patches/patch-content_public_browser_content__browser__client.cc
	chromium-next/patches/patch-content_public_browser_zygote__host_zygote__host__linux.h
	chromium-next/patches/patch-content_public_common_content__features.cc
	chromium-next/patches/patch-content_public_common_content__switches.cc
	chromium-next/patches/patch-content_public_common_content__switches.h
	chromium-next/patches/patch-content_public_common_zygote_features.gni
	chromium-next/patches/patch-content_renderer_render__thread__impl.cc
	chromium-next/patches/patch-content_renderer_renderer__blink__platform__impl.cc
	chromium-next/patches/patch-content_renderer_renderer__blink__platform__impl.h
	chromium-next/patches/patch-content_renderer_renderer__main__platform__delegate__linux.cc
	chromium-next/patches/patch-content_shell_BUILD.gn
	chromium-next/patches/patch-content_shell_app_shell__main__delegate.cc
	chromium-next/patches/patch-content_shell_browser_shell__browser__main__parts.cc
	chromium-next/patches/patch-content_shell_browser_shell__paths.cc
	chromium-next/patches/patch-content_shell_browser_shell__platform__delegate__views.cc
	chromium-next/patches/patch-content_shell_renderer_shell__content__renderer__client.cc
	chromium-next/patches/patch-content_shell_utility_shell__content__utility__client.cc
	chromium-next/patches/patch-content_test_BUILD.gn
	chromium-next/patches/patch-content_utility_services.cc
	chromium-next/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
	chromium-next/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
	chromium-next/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
	chromium-next/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
	chromium-next/patches/patch-content_utility_utility__main.cc
	chromium-next/patches/patch-content_utility_utility__thread__impl.cc
	chromium-next/patches/patch-content_zygote_BUILD.gn
	chromium-next/patches/patch-content_zygote_zygote__linux.cc
	chromium-next/patches/patch-content_zygote_zygote__main__linux.cc
	chromium-next/patches/patch-device_bluetooth_bluetooth__adapter.cc
	chromium-next/patches/patch-device_bluetooth_cast__bluetooth.gni
	chromium-next/patches/patch-device_gamepad_BUILD.gn
	chromium-next/patches/patch-device_gamepad_gamepad__provider.cc
	chromium-next/patches/patch-device_gamepad_hid__writer__linux.cc
	chromium-next/patches/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
	chromium-next/patches/patch-extensions_browser_api_management_management__api.cc
	chromium-next/patches/patch-extensions_browser_api_messaging_message__service.cc
	chromium-next/patches/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
	chromium-next/patches/patch-extensions_common_api___permission__features.json
	chromium-next/patches/patch-extensions_common_api_runtime.json
	chromium-next/patches/patch-extensions_common_command.cc
	chromium-next/patches/patch-extensions_common_features_feature.cc
	chromium-next/patches/patch-extensions_renderer_bindings_api__binding__util.cc
	chromium-next/patches/patch-extensions_renderer_bindings_argument__spec.cc
	chromium-next/patches/patch-extensions_shell_app_shell__main__delegate.cc
	chromium-next/patches/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
	chromium-next/patches/patch-extensions_shell_browser_shell__browser__main__parts.cc
	chromium-next/patches/patch-extensions_shell_browser_shell__extensions__api__client.cc
	chromium-next/patches/patch-extensions_shell_browser_shell__extensions__api__client.h
	chromium-next/patches/patch-google__apis_gcm_engine_heartbeat__manager.cc
	chromium-next/patches/patch-gpu_command__buffer_service_dawn__context__provider.cc
	chromium-next/patches/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
	chromium-next/patches/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc
	chromium-next/patches/patch-gpu_command__buffer_service_shared__context__state.cc
	chromium-next/patches/patch-gpu_command__buffer_service_shared__context__state.h
	chromium-next/patches/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
	chromium-next/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
	chromium-next/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
	chromium-next/patches/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
	chromium-next/patches/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
	chromium-next/patches/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
	chromium-next/patches/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
	chromium-next/patches/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
	chromium-next/patches/patch-gpu_config_gpu__control__list.cc
	chromium-next/patches/patch-gpu_config_gpu__finch__features.cc
	chromium-next/patches/patch-gpu_config_gpu__info__collector.cc
	chromium-next/patches/patch-gpu_config_gpu__test__config.cc
	chromium-next/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
	chromium-next/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.h
	chromium-next/patches/patch-gpu_ipc_service_gpu__init.cc
	chromium-next/patches/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
	chromium-next/patches/patch-gpu_ipc_service_x__util.h
	chromium-next/patches/patch-gpu_vulkan_generate__bindings.py
	chromium-next/patches/patch-gpu_vulkan_semaphore__handle.cc
	chromium-next/patches/patch-gpu_vulkan_vulkan__device__queue.cc
	chromium-next/patches/patch-gpu_vulkan_vulkan__device__queue.h
	chromium-next/patches/patch-gpu_vulkan_vulkan__function__pointers.cc
	chromium-next/patches/patch-gpu_vulkan_vulkan__function__pointers.h
	chromium-next/patches/patch-gpu_vulkan_vulkan__image.h
	chromium-next/patches/patch-gpu_vulkan_vulkan__util.cc
	chromium-next/patches/patch-headless_BUILD.gn
	chromium-next/patches/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
	chromium-next/patches/patch-headless_lib_browser_headless__content__browser__client.cc
	chromium-next/patches/patch-headless_lib_browser_headless__content__browser__client.h
	chromium-next/patches/patch-headless_lib_browser_headless__web__contents__impl.cc
	chromium-next/patches/patch-headless_lib_headless__content__main__delegate.cc
	chromium-next/patches/patch-ipc_ipc__channel.h
	chromium-next/patches/patch-ipc_ipc__channel__common.cc
	chromium-next/patches/patch-ipc_ipc__channel__mojo.cc
	chromium-next/patches/patch-ipc_ipc__message__utils.cc
	chromium-next/patches/patch-ipc_ipc__message__utils.h
	chromium-next/patches/patch-media_BUILD.gn
	chromium-next/patches/patch-media_audio_BUILD.gn
	chromium-next/patches/patch-media_audio_alsa_audio__manager__alsa.cc
	chromium-next/patches/patch-media_audio_audio__input__device.cc
	chromium-next/patches/patch-media_audio_audio__output__proxy__unittest.cc
	chromium-next/patches/patch-media_audio_pulse_pulse__util.cc
	chromium-next/patches/patch-media_audio_sndio_audio__manager__sndio.cc
	chromium-next/patches/patch-media_audio_sndio_audio__manager__sndio.h
	chromium-next/patches/patch-media_audio_sndio_sndio__input.cc
	chromium-next/patches/patch-media_audio_sndio_sndio__input.h
	chromium-next/patches/patch-media_audio_sndio_sndio__output.cc
	chromium-next/patches/patch-media_audio_sndio_sndio__output.h
	chromium-next/patches/patch-media_base_audio__latency.cc
	chromium-next/patches/patch-media_base_libaom__thread__wrapper.cc
	chromium-next/patches/patch-media_base_libvpx__thread__wrapper.cc
	chromium-next/patches/patch-media_base_media__switches.cc
	chromium-next/patches/patch-media_base_media__switches.h
	chromium-next/patches/patch-media_base_video__frame.cc
	chromium-next/patches/patch-media_base_video__frame.h
	chromium-next/patches/patch-media_capture_video_create__video__capture__device__factory.cc
	chromium-next/patches/patch-media_capture_video_fake__video__capture__device__factory.cc
	chromium-next/patches/patch-media_capture_video_file__video__capture__device__factory.cc
	chromium-next/patches/patch-media_capture_video_linux_fake__v4l2__impl.cc
	chromium-next/patches/patch-media_capture_video_linux_fake__v4l2__impl.h
	chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__delegate.cc
	chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__delegate.h
	chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device.h
	chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
	chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.h
	chromium-next/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
	chromium-next/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
	chromium-next/patches/patch-media_capture_video_linux_video__capture__device__linux.cc
	chromium-next/patches/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
	chromium-next/patches/patch-media_capture_video_video__capture__device__client.cc
	chromium-next/patches/patch-media_cdm_cdm__paths__unittest.cc
	chromium-next/patches/patch-media_cdm_library__cdm_cdm__paths.gni
	chromium-next/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py
	chromium-next/patches/patch-media_ffmpeg_scripts_robo__lib_config.py
	chromium-next/patches/patch-media_gpu_chromeos_gl__image__processor__backend.cc
	chromium-next/patches/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
	chromium-next/patches/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
	chromium-next/patches/patch-media_gpu_chromeos_platform__video__frame__utils.cc
	chromium-next/patches/patch-media_gpu_chromeos_video__decoder__pipeline.cc
	chromium-next/patches/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
	chromium-next/patches/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
	chromium-next/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
	chromium-next/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
	chromium-next/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
	chromium-next/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
	chromium-next/patches/patch-media_gpu_test_raw__video.cc
	chromium-next/patches/patch-media_gpu_test_video__frame__file__writer.cc
	chromium-next/patches/patch-media_gpu_test_video__frame__helpers.cc
	chromium-next/patches/patch-media_gpu_test_video__frame__validator.cc
	chromium-next/patches/patch-media_gpu_vaapi_vaapi__video__decoder.cc
	chromium-next/patches/patch-media_gpu_vaapi_vaapi__wrapper.cc
	chromium-next/patches/patch-media_media__options.gni
	chromium-next/patches/patch-media_mojo_mojom_BUILD.gn
	chromium-next/patches/patch-media_mojo_mojom_video__frame__mojom__traits.cc
	chromium-next/patches/patch-media_mojo_mojom_video__frame__mojom__traits.h
	chromium-next/patches/patch-media_video_fake__gpu__memory__buffer.cc
	chromium-next/patches/patch-media_video_fake__gpu__memory__buffer.h
	chromium-next/patches/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
	chromium-next/patches/patch-media_video_video__encode__accelerator__adapter.cc
	chromium-next/patches/patch-media_video_video__encode__accelerator__adapter__test.cc
	chromium-next/patches/patch-media_webrtc_audio__processor.cc
	chromium-next/patches/patch-media_webrtc_helpers.cc
	chromium-next/patches/patch-media_webrtc_helpers__unittests.cc
	chromium-next/patches/patch-mojo_core_BUILD.gn
	chromium-next/patches/patch-mojo_core_channel.cc
	chromium-next/patches/patch-mojo_core_embedder_features.h
	chromium-next/patches/patch-mojo_public_cpp_platform_socket__utils__posix.cc
	chromium-next/patches/patch-mojo_public_tools_bindings_mojom.gni
	chromium-next/patches/patch-net_BUILD.gn
	chromium-next/patches/patch-net_base_features.cc
	chromium-next/patches/patch-net_base_network__change__notifier.cc
	chromium-next/patches/patch-net_base_network__change__notifier.h
	chromium-next/patches/patch-net_base_network__change__notifier__passive.cc
	chromium-next/patches/patch-net_base_network__interfaces__posix.h
	chromium-next/patches/patch-net_base_sockaddr__util__posix.cc
	chromium-next/patches/patch-net_base_sockaddr__util__posix__unittest.cc
	chromium-next/patches/patch-net_cert_cert__verify__proc.h
	chromium-next/patches/patch-net_disk__cache_backend__experiment.h
	chromium-next/patches/patch-net_disk__cache_simple_simple__file__tracker.cc
	chromium-next/patches/patch-net_dns_BUILD.gn
	chromium-next/patches/patch-net_dns_address__info.cc
	chromium-next/patches/patch-net_dns_address__sorter__posix.cc
	chromium-next/patches/patch-net_dns_dns__config__service__posix.cc
	chromium-next/patches/patch-net_dns_dns__reloader.cc
	chromium-next/patches/patch-net_dns_dns__util.cc
	chromium-next/patches/patch-net_dns_host__resolver__proc.cc
	chromium-next/patches/patch-net_dns_public_BUILD.gn
	chromium-next/patches/patch-net_dns_public_resolv__reader.cc
	chromium-next/patches/patch-net_dns_public_resolv__reader.h
	chromium-next/patches/patch-net_dns_public_scoped__res__state.cc
	chromium-next/patches/patch-net_dns_public_scoped__res__state.h
	chromium-next/patches/patch-net_filter_zstd__source__stream.cc
	chromium-next/patches/patch-net_http_http__auth__gssapi__posix.cc
	chromium-next/patches/patch-net_http_http__auth__gssapi__posix.h
	chromium-next/patches/patch-net_http_http__auth__handler__negotiate.cc
	chromium-next/patches/patch-net_http_http__auth__preferences.cc
	chromium-next/patches/patch-net_http_http__auth__preferences.h
	chromium-next/patches/patch-net_http_http__network__session.cc
	chromium-next/patches/patch-net_proxy__resolution_proxy__config__service.cc
	chromium-next/patches/patch-net_proxy__resolution_proxy__config__service__linux.cc
	chromium-next/patches/patch-net_quic_quic__network__transaction__unittest.cc
	chromium-next/patches/patch-net_socket_socks5__client__socket.cc
	chromium-next/patches/patch-net_socket_tcp__socket__posix.cc
	chromium-next/patches/patch-net_socket_udp__socket__posix.cc
	chromium-next/patches/patch-net_socket_udp__socket__unittest.cc
	chromium-next/patches/patch-net_third__party_quiche_BUILD.gn
	chromium-next/patches/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
	chromium-next/patches/patch-net_tools_net__watcher_net__watcher.cc
	chromium-next/patches/patch-net_traffic__annotation_network__traffic__annotation.h
	chromium-next/patches/patch-net_url__request_url__request__context.cc
	chromium-next/patches/patch-net_url__request_url__request__context.h
	chromium-next/patches/patch-net_url__request_url__request__context__builder.cc
	chromium-next/patches/patch-net_websockets_websocket__basic__stream__adapters__test.cc
	chromium-next/patches/patch-pdf_pdfium_pdfium__engine.cc
	chromium-next/patches/patch-ppapi_tests_test__utils.h
	chromium-next/patches/patch-printing_backend_cups__ipp__helper.cc
	chromium-next/patches/patch-printing_backend_print__backend__cups.cc
	chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits.cc
	chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits.h
	chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits__unittest.cc
	chromium-next/patches/patch-printing_print__settings.cc
	chromium-next/patches/patch-printing_print__settings.h
	chromium-next/patches/patch-printing_print__settings__conversion.cc
	chromium-next/patches/patch-printing_printing__context__linux.cc
	chromium-next/patches/patch-printing_printing__features.cc
	chromium-next/patches/patch-printing_printing__features.h
	chromium-next/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
	chromium-next/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
	chromium-next/patches/patch-remoting_base_chromoting__event.cc
	chromium-next/patches/patch-remoting_base_host__settings.cc
	chromium-next/patches/patch-remoting_codec_webrtc__video__encoder__vpx.cc
	chromium-next/patches/patch-remoting_host_base_desktop__environment__options.cc
	chromium-next/patches/patch-remoting_host_base_switches.cc
	chromium-next/patches/patch-remoting_host_base_switches.h
	chromium-next/patches/patch-remoting_host_chromoting__host.cc
	chromium-next/patches/patch-remoting_host_chromoting__host.h
	chromium-next/patches/patch-remoting_host_chromoting__host__context.cc
	chromium-next/patches/patch-remoting_host_chromoting__host__services__client.cc
	chromium-next/patches/patch-remoting_host_client__session.cc
	chromium-next/patches/patch-remoting_host_crash_crash__file__uploader.cc
	chromium-next/patches/patch-remoting_host_evaluate__capability.cc
	chromium-next/patches/patch-remoting_host_host__attributes.cc
	chromium-next/patches/patch-remoting_host_host__details.cc
	chromium-next/patches/patch-remoting_host_host__main.cc
	chromium-next/patches/patch-remoting_host_ipc__constants.cc
	chromium-next/patches/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
	chromium-next/patches/patch-remoting_host_me2me__desktop__environment.cc
	chromium-next/patches/patch-remoting_host_mojo__caller__security__checker.cc
	chromium-next/patches/patch-remoting_host_policy__watcher.cc
	chromium-next/patches/patch-remoting_host_remote__open__url_remote__open__url__client.cc
	chromium-next/patches/patch-remoting_host_remote__open__url_remote__open__url__util.cc
	chromium-next/patches/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
	chromium-next/patches/patch-remoting_host_remoting__me2me__host.cc
	chromium-next/patches/patch-remoting_host_session__policies__from__dict.cc
	chromium-next/patches/patch-remoting_host_setup_start__host__main.cc
	chromium-next/patches/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
	chromium-next/patches/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
	chromium-next/patches/patch-remoting_protocol_webrtc__video__stream.cc
	chromium-next/patches/patch-remoting_signaling_ftl__host__device__id__provider.cc
	chromium-next/patches/patch-sandbox_BUILD.gn
	chromium-next/patches/patch-sandbox_features.gni
	chromium-next/patches/patch-sandbox_linux_BUILD.gn
	chromium-next/patches/patch-sandbox_linux_services_init__process__reaper.cc
	chromium-next/patches/patch-sandbox_linux_services_libc__interceptor.cc
	chromium-next/patches/patch-sandbox_policy_BUILD.gn
	chromium-next/patches/patch-sandbox_policy_features.cc
	chromium-next/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
	chromium-next/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.h
	chromium-next/patches/patch-sandbox_policy_mojom_sandbox.mojom
	chromium-next/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.cc
	chromium-next/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.h
	chromium-next/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
	chromium-next/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.h
	chromium-next/patches/patch-sandbox_policy_sandbox.cc
	chromium-next/patches/patch-sandbox_policy_sandbox.h
	chromium-next/patches/patch-sandbox_policy_sandbox__type.cc
	chromium-next/patches/patch-sandbox_policy_switches.cc
	chromium-next/patches/patch-sandbox_policy_switches.h
	chromium-next/patches/patch-services_audio_audio__sandbox__hook__linux.cc
	chromium-next/patches/patch-services_audio_audio__sandbox__hook__linux.h
	chromium-next/patches/patch-services_device_BUILD.gn
	chromium-next/patches/patch-services_device_geolocation_location__provider__manager.cc
	chromium-next/patches/patch-services_device_hid_BUILD.gn
	chromium-next/patches/patch-services_device_hid_hid__connection__fido.cc
	chromium-next/patches/patch-services_device_hid_hid__connection__fido.h
	chromium-next/patches/patch-services_device_hid_hid__connection__freebsd.cc
	chromium-next/patches/patch-services_device_hid_hid__connection__freebsd.h
	chromium-next/patches/patch-services_device_hid_hid__service.cc
	chromium-next/patches/patch-services_device_hid_hid__service__fido.cc
	chromium-next/patches/patch-services_device_hid_hid__service__fido.h
	chromium-next/patches/patch-services_device_hid_hid__service__freebsd.cc
	chromium-next/patches/patch-services_device_hid_hid__service__freebsd.h
	chromium-next/patches/patch-services_device_hid_hid__service__netbsd.cc
	chromium-next/patches/patch-services_device_hid_hid__service__netbsd.h
	chromium-next/patches/patch-services_device_public_cpp_device__features.cc
	chromium-next/patches/patch-services_device_public_cpp_device__features.h
	chromium-next/patches/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
	chromium-next/patches/patch-services_device_public_mojom_BUILD.gn
	chromium-next/patches/patch-services_device_serial_BUILD.gn
	chromium-next/patches/patch-services_device_serial_serial__device__enumerator.cc
	chromium-next/patches/patch-services_device_serial_serial__io__handler__posix.cc
	chromium-next/patches/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
	chromium-next/patches/patch-services_device_usb_BUILD.gn
	chromium-next/patches/patch-services_device_usb_usb__device__handle__usbfs.cc
	chromium-next/patches/patch-services_device_usb_usb__device__handle__usbfs.h
	chromium-next/patches/patch-services_device_usb_usb__service.cc
	chromium-next/patches/patch-services_device_usb_usb__service__fake.cc
	chromium-next/patches/patch-services_device_usb_usb__service__fake.h
	chromium-next/patches/patch-services_network_BUILD.gn
	chromium-next/patches/patch-services_network_network__context.cc
	chromium-next/patches/patch-services_network_network__context.h
	chromium-next/patches/patch-services_network_network__sandbox__hook__linux.cc
	chromium-next/patches/patch-services_network_network__sandbox__hook__linux.h
	chromium-next/patches/patch-services_network_network__service.cc
	chromium-next/patches/patch-services_network_network__service.h
	chromium-next/patches/patch-services_network_public_cpp_BUILD.gn
	chromium-next/patches/patch-services_network_public_cpp_features.cc
	chromium-next/patches/patch-services_network_public_mojom_BUILD.gn
	chromium-next/patches/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
	chromium-next/patches/patch-services_on__device__model_on__device__model__service.h
	chromium-next/patches/patch-services_on__device__model_pre__sandbox__init.cc
	chromium-next/patches/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
	chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
	chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
	chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
	chromium-next/patches/patch-services_screen__ai_public_cpp_utilities.cc
	chromium-next/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
	chromium-next/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
	chromium-next/patches/patch-services_service__manager_BUILD.gn
	chromium-next/patches/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
	chromium-next/patches/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
	chromium-next/patches/patch-services_tracing_public_cpp_system__metrics__sampler.cc
	chromium-next/patches/patch-services_video__capture_public_mojom_video__capture__service.mojom
	chromium-next/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
	chromium-next/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.h
	chromium-next/patches/patch-services_viz_public_mojom_BUILD.gn
	chromium-next/patches/patch-skia_ext_SkMemory__new__handler.cpp
	chromium-next/patches/patch-skia_ext_font__utils.cc
	chromium-next/patches/patch-skia_ext_skcolorspace__trfn.cc
	chromium-next/patches/patch-third__party_abseil-cpp_absl_base_config.h
	chromium-next/patches/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc
	chromium-next/patches/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
	chromium-next/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
	chromium-next/patches/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc
	chromium-next/patches/patch-third__party_afl_src_afl-fuzz.c
	chromium-next/patches/patch-third__party_angle_BUILD.gn
	chromium-next/patches/patch-third__party_angle_src_common_platform.h
	chromium-next/patches/patch-third__party_angle_src_common_platform__helpers.h
	chromium-next/patches/patch-third__party_angle_src_common_system__utils.cpp
	chromium-next/patches/patch-third__party_angle_src_common_system__utils__linux.cpp
	chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
	chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
	chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
	chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
	chromium-next/patches/patch-third__party_angle_src_libANGLE_Display.cpp
	chromium-next/patches/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
	chromium-next/patches/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
	chromium-next/patches/patch-third__party_angle_util_BUILD.gn
	chromium-next/patches/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
	chromium-next/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
	chromium-next/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
	chromium-next/patches/patch-third__party_blink_public_platform_platform.h
	chromium-next/patches/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
	chromium-next/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
	chromium-next/patches/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
	chromium-next/patches/patch-third__party_blink_renderer_controller_blink__initializer.cc
	chromium-next/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
	chromium-next/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
	chromium-next/patches/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_layout_layout__view.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_paint_paint__layer.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
	chromium-next/patches/patch-third__party_blink_renderer_core_xml_xslt__processor.h
	chromium-next/patches/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
	chromium-next/patches/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
	chromium-next/patches/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
	chromium-next/patches/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
	chromium-next/patches/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
	chromium-next/patches/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
	chromium-next/patches/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
	chromium-next/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
	chromium-next/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_BUILD.gn
	chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.h
	chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__description.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
	chromium-next/patches/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
	chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
	chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_math__extras.h
	chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
	chromium-next/patches/patch-third__party_brotli_common_platform.h
	chromium-next/patches/patch-third__party_cpuinfo_cpuinfo.gni
	chromium-next/patches/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
	chromium-next/patches/patch-third__party_crashpad_crashpad_client_BUILD.gn
	chromium-next/patches/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
	chromium-next/patches/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
	chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_address__types.h
	chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
	chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
	chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
	chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
	chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
	chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_signals.cc
	chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
	chromium-next/patches/patch-third__party_crc32c_BUILD.gn
	chromium-next/patches/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
	chromium-next/patches/patch-third__party_dawn_src_dawn_common_Platform.h
	chromium-next/patches/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
	chromium-next/patches/patch-third__party_ffmpeg_BUILD.gn
	chromium-next/patches/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
	chromium-next/patches/patch-third__party_ffmpeg_libavutil_cpu.c
	chromium-next/patches/patch-third__party_ffmpeg_libavutil_mem.c
	chromium-next/patches/patch-third__party_ffmpeg_libavutil_random__seed.c
	chromium-next/patches/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
	chromium-next/patches/patch-third__party_fontconfig_include_config.h
	chromium-next/patches/patch-third__party_fontconfig_src_src_fccompat.c
	chromium-next/patches/patch-third__party_ipcz_src_BUILD.gn
	chromium-next/patches/patch-third__party_ipcz_src_reference__drivers_random.cc
	chromium-next/patches/patch-third__party_ipcz_src_standalone_base_logging.cc
	chromium-next/patches/patch-third__party_leveldatabase_env__chromium.cc
	chromium-next/patches/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
	chromium-next/patches/patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h
	chromium-next/patches/patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h
	chromium-next/patches/patch-third__party_libc++_src_src_chrono.cpp
	chromium-next/patches/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
	chromium-next/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
	chromium-next/patches/patch-third__party_libdrm_src_xf86drmMode.c
	chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
	chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
	chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
	chromium-next/patches/patch-third__party_libsync_src_include_sync_sync.h
	chromium-next/patches/patch-third__party_libsync_src_sync.c
	chromium-next/patches/patch-third__party_libusb_BUILD.gn
	chromium-next/patches/patch-third__party_libusb_src_libusb_core.c
	chromium-next/patches/patch-third__party_libusb_src_libusb_os_threads__posix.c
	chromium-next/patches/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
	chromium-next/patches/patch-third__party_lzma__sdk_C_CpuArch.c
	chromium-next/patches/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
	chromium-next/patches/patch-third__party_nasm_BUILD.gn
	chromium-next/patches/patch-third__party_nasm_config_config-linux.h
	chromium-next/patches/patch-third__party_node_node.gni
	chromium-next/patches/patch-third__party_node_node.py
	chromium-next/patches/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
	chromium-next/patches/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
	chromium-next/patches/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
	chromium-next/patches/patch-third__party_pdfium_pdfium.gni
	chromium-next/patches/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
	chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_build__config.h
	chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
	chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_time.h
	chromium-next/patches/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
	chromium-next/patches/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
	chromium-next/patches/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
	chromium-next/patches/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
	chromium-next/patches/patch-third__party_perfetto_src_base_clock__snapshots.cc
	chromium-next/patches/patch-third__party_perfetto_src_base_event__fd.cc
	chromium-next/patches/patch-third__party_perfetto_src_base_periodic__task.cc
	chromium-next/patches/patch-third__party_perfetto_src_base_string__utils.cc
	chromium-next/patches/patch-third__party_perfetto_src_base_subprocess__posix.cc
	chromium-next/patches/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
	chromium-next/patches/patch-third__party_perfetto_src_base_thread__task__runner.cc
	chromium-next/patches/patch-third__party_perfetto_src_base_unix__socket.cc
	chromium-next/patches/patch-third__party_perfetto_src_base_utils.cc
	chromium-next/patches/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
	chromium-next/patches/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
	chromium-next/patches/patch-third__party_perfetto_src_tracing_platform__posix.cc
	chromium-next/patches/patch-third__party_perfetto_src_tracing_track.cc
	chromium-next/patches/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
	chromium-next/patches/patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h
	chromium-next/patches/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
	chromium-next/patches/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
	chromium-next/patches/patch-third__party_speech-dispatcher_libspeechd__version.h
	chromium-next/patches/patch-third__party_speech-dispatcher_speechd__types.h
	chromium-next/patches/patch-third__party_sqlite_BUILD.gn
	chromium-next/patches/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
	chromium-next/patches/patch-third__party_sqlite_src_amalgamation_sqlite3.c
	chromium-next/patches/patch-third__party_swiftshader_src_Reactor_Debug.cpp
	chromium-next/patches/patch-third__party_swiftshader_src_System_Configurator.cpp
	chromium-next/patches/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
	chromium-next/patches/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
	chromium-next/patches/patch-third__party_swiftshader_src_WSI_libXCB.cpp
	chromium-next/patches/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
	chromium-next/patches/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
	chromium-next/patches/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
	chromium-next/patches/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
	chromium-next/patches/patch-third__party_test__fonts_fontconfig_BUILD.gn
	chromium-next/patches/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
	chromium-next/patches/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
	chromium-next/patches/patch-third__party_tflite_features.gni
	chromium-next/patches/patch-third__party_unrar_src_crypt.cpp
	chromium-next/patches/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
	chromium-next/patches/patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp
	chromium-next/patches/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
	chromium-next/patches/patch-third__party_wayland_BUILD.gn
	chromium-next/patches/patch-third__party_wayland_include_config.h
	chromium-next/patches/patch-third__party_webrtc_BUILD.gn
	chromium-next/patches/patch-third__party_webrtc_modules_audio__device_BUILD.gn
	chromium-next/patches/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
	chromium-next/patches/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
	chromium-next/patches/patch-third__party_webrtc_rtc__base_byte__order.h
	chromium-next/patches/patch-third__party_webrtc_rtc__base_ip__address.cc
	chromium-next/patches/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
	chromium-next/patches/patch-third__party_webrtc_rtc__base_network.cc
	chromium-next/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
	chromium-next/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.h
	chromium-next/patches/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
	chromium-next/patches/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
	chromium-next/patches/patch-third__party_webrtc_system__wrappers_BUILD.gn
	chromium-next/patches/patch-third__party_widevine_cdm_widevine.gni
	chromium-next/patches/patch-third__party_zlib_BUILD.gn
	chromium-next/patches/patch-third__party_zlib_cpu__features.c
	chromium-next/patches/patch-tools_code__cache__generator_BUILD.gn
	chromium-next/patches/patch-tools_generate__shim__headers_generate__shim__headers.py
	chromium-next/patches/patch-tools_generate__stubs_rules.gni
	chromium-next/patches/patch-tools_gn_build_build__linux.ninja.template
	chromium-next/patches/patch-tools_gn_build_gen.py
	chromium-next/patches/patch-tools_gn_src_base_files_file__posix.cc
	chromium-next/patches/patch-tools_gn_src_gn_version.h
	chromium-next/patches/patch-tools_gn_src_util_exe__path.cc
	chromium-next/patches/patch-tools_grit_grit_node_base.py
	chromium-next/patches/patch-tools_json__schema__compiler_cpp__bundle__generator.py
	chromium-next/patches/patch-tools_json__schema__compiler_feature__compiler.py
	chromium-next/patches/patch-tools_memory_partition__allocator_inspect__utils.h
	chromium-next/patches/patch-tools_perf_chrome__telemetry__build_BUILD.gn
	chromium-next/patches/patch-tools_protoc__wrapper_protoc__wrapper.py
	chromium-next/patches/patch-tools_v8__context__snapshot_BUILD.gn
	chromium-next/patches/patch-tools_variations_fieldtrial__to__struct.py
	chromium-next/patches/patch-ui_accessibility_accessibility__features.cc
	chromium-next/patches/patch-ui_accessibility_accessibility__features.h
	chromium-next/patches/patch-ui_accessibility_ax__node.cc
	chromium-next/patches/patch-ui_accessibility_ax__node.h
	chromium-next/patches/patch-ui_accessibility_ax__tree.cc
	chromium-next/patches/patch-ui_accessibility_ax__tree.h
	chromium-next/patches/patch-ui_aura_client_drag__drop__client.h
	chromium-next/patches/patch-ui_aura_screen__ozone.cc
	chromium-next/patches/patch-ui_aura_screen__ozone.h
	chromium-next/patches/patch-ui_base_accelerators_accelerator.cc
	chromium-next/patches/patch-ui_base_accelerators_command.cc
	chromium-next/patches/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc
	chromium-next/patches/patch-ui_base_clipboard_clipboard__constants.cc
	chromium-next/patches/patch-ui_base_clipboard_clipboard__constants.h
	chromium-next/patches/patch-ui_base_clipboard_clipboard__non__backed.cc
	chromium-next/patches/patch-ui_base_cursor_cursor__factory.cc
	chromium-next/patches/patch-ui_base_cursor_cursor__factory.h
	chromium-next/patches/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
	chromium-next/patches/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
	chromium-next/patches/patch-ui_base_ime_dummy__text__input__client.cc
	chromium-next/patches/patch-ui_base_ime_dummy__text__input__client.h
	chromium-next/patches/patch-ui_base_ime_fake__text__input__client.cc
	chromium-next/patches/patch-ui_base_ime_fake__text__input__client.h
	chromium-next/patches/patch-ui_base_ime_init_input__method__initializer.cc
	chromium-next/patches/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
	chromium-next/patches/patch-ui_base_ime_text__input__client.h
	chromium-next/patches/patch-ui_base_resource_resource__bundle.cc
	chromium-next/patches/patch-ui_base_test_skia__gold__pixel__diff.cc
	chromium-next/patches/patch-ui_base_test_ui__controls.h
	chromium-next/patches/patch-ui_base_ui__base__features.cc
	chromium-next/patches/patch-ui_base_ui__base__features.h
	chromium-next/patches/patch-ui_base_ui__base__switches.cc
	chromium-next/patches/patch-ui_base_ui__base__switches.h
	chromium-next/patches/patch-ui_base_webui_web__ui__util.cc
	chromium-next/patches/patch-ui_base_x_x11__cursor__factory.cc
	chromium-next/patches/patch-ui_base_x_x11__cursor__factory.h
	chromium-next/patches/patch-ui_base_x_x11__cursor__loader.cc
	chromium-next/patches/patch-ui_base_x_x11__display__manager.cc
	chromium-next/patches/patch-ui_base_x_x11__shm__image__pool.cc
	chromium-next/patches/patch-ui_color_color__id.h
	chromium-next/patches/patch-ui_color_color__provider__utils.cc
	chromium-next/patches/patch-ui_color_system__theme.h
	chromium-next/patches/patch-ui_compositor_compositor.cc
	chromium-next/patches/patch-ui_compositor_compositor.h
	chromium-next/patches/patch-ui_compositor_compositor__observer.h
	chromium-next/patches/patch-ui_display_screen.cc
	chromium-next/patches/patch-ui_display_screen.h
	chromium-next/patches/patch-ui_events_devices_x11_device__data__manager__x11.cc
	chromium-next/patches/patch-ui_events_event.cc
	chromium-next/patches/patch-ui_events_event__switches.cc
	chromium-next/patches/patch-ui_events_event__switches.h
	chromium-next/patches/patch-ui_events_keycodes_dom_keycode__converter.cc
	chromium-next/patches/patch-ui_events_keycodes_dom_keycode__converter.h
	chromium-next/patches/patch-ui_gfx_BUILD.gn
	chromium-next/patches/patch-ui_gfx_canvas__skia.cc
	chromium-next/patches/patch-ui_gfx_font__fallback__linux.cc
	chromium-next/patches/patch-ui_gfx_font__render__params.h
	chromium-next/patches/patch-ui_gfx_font__render__params__linux.cc
	chromium-next/patches/patch-ui_gfx_font__util.cc
	chromium-next/patches/patch-ui_gfx_gpu__memory__buffer.cc
	chromium-next/patches/patch-ui_gfx_gpu__memory__buffer.h
	chromium-next/patches/patch-ui_gfx_linux_dmabuf__uapi.h
	chromium-next/patches/patch-ui_gfx_linux_gbm__wrapper.cc
	chromium-next/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
	chromium-next/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
	chromium-next/patches/patch-ui_gfx_native__pixmap__handle.cc
	chromium-next/patches/patch-ui_gfx_native__pixmap__handle.h
	chromium-next/patches/patch-ui_gfx_native__widget__types.h
	chromium-next/patches/patch-ui_gfx_platform__font__skia.cc
	chromium-next/patches/patch-ui_gfx_render__text__api__fuzzer.cc
	chromium-next/patches/patch-ui_gfx_render__text__fuzzer.cc
	chromium-next/patches/patch-ui_gfx_switches.cc
	chromium-next/patches/patch-ui_gfx_switches.h
	chromium-next/patches/patch-ui_gfx_x_atom__cache.cc
	chromium-next/patches/patch-ui_gfx_x_generated__protos_dri3.cc
	chromium-next/patches/patch-ui_gfx_x_generated__protos_shm.cc
	chromium-next/patches/patch-ui_gfx_x_xlib__support.cc
	chromium-next/patches/patch-ui_gl_BUILD.gn
	chromium-next/patches/patch-ui_gl_gl__context.cc
	chromium-next/patches/patch-ui_gl_gl__fence.cc
	chromium-next/patches/patch-ui_gl_gl__implementation.cc
	chromium-next/patches/patch-ui_gl_gl__switches.cc
	chromium-next/patches/patch-ui_gl_sync__control__vsync__provider.cc
	chromium-next/patches/patch-ui_gl_sync__control__vsync__provider.h
	chromium-next/patches/patch-ui_gtk_gtk__compat.cc
	chromium-next/patches/patch-ui_gtk_printing_print__dialog__gtk.cc
	chromium-next/patches/patch-ui_message__center_views_message__popup__view.cc
	chromium-next/patches/patch-ui_native__theme_features_native__theme__features.cc
	chromium-next/patches/patch-ui_native__theme_native__theme.h
	chromium-next/patches/patch-ui_native__theme_native__theme__base.cc
	chromium-next/patches/patch-ui_ozone_common_egl__util.cc
	chromium-next/patches/patch-ui_ozone_platform_headless_headless__surface__factory.cc
	chromium-next/patches/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
	chromium-next/patches/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
	chromium-next/patches/patch-ui_ozone_platform_wayland_common_wayland__util.cc
	chromium-next/patches/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
	chromium-next/patches/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
	chromium-next/patches/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
	chromium-next/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
	chromium-next/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.h
	chromium-next/patches/patch-ui_ozone_platform_x11_x11__window.cc
	chromium-next/patches/patch-ui_ozone_public_ozone__ui__controls__test__helper.h
	chromium-next/patches/patch-ui_ozone_test_mock__platform__window__delegate.h
	chromium-next/patches/patch-ui_platform__window_platform__window__delegate.cc
	chromium-next/patches/patch-ui_platform__window_platform__window__delegate.h
	chromium-next/patches/patch-ui_platform__window_platform__window__init__properties.h
	chromium-next/patches/patch-ui_qt_BUILD.gn
	chromium-next/patches/patch-ui_strings_translations_app__locale__settings__bn.xtb
	chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ja.xtb
	chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ko.xtb
	chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ml.xtb
	chromium-next/patches/patch-ui_strings_translations_app__locale__settings__th.xtb
	chromium-next/patches/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
	chromium-next/patches/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
	chromium-next/patches/patch-ui_views_BUILD.gn
	chromium-next/patches/patch-ui_views_accessibility_view__accessibility.cc
	chromium-next/patches/patch-ui_views_controls_prefix__selector.cc
	chromium-next/patches/patch-ui_views_controls_prefix__selector.h
	chromium-next/patches/patch-ui_views_controls_textfield_textfield.cc
	chromium-next/patches/patch-ui_views_controls_textfield_textfield.h
	chromium-next/patches/patch-ui_views_corewm_tooltip__aura.cc
	chromium-next/patches/patch-ui_views_examples_widget__example.cc
	chromium-next/patches/patch-ui_views_focus_focus__manager.cc
	chromium-next/patches/patch-ui_views_style_platform__style.cc
	chromium-next/patches/patch-ui_views_style_platform__style.h
	chromium-next/patches/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
	chromium-next/patches/patch-ui_views_views__delegate.cc
	chromium-next/patches/patch-ui_views_views__delegate.h
	chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
	chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
	chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
	chromium-next/patches/patch-ui_views_widget_root__view.cc
	chromium-next/patches/patch-ui_views_widget_widget.cc
	chromium-next/patches/patch-ui_views_widget_widget.h
	chromium-next/patches/patch-ui_views_window_custom__frame__view.cc
	chromium-next/patches/patch-ui_views_window_dialog__delegate.cc
	chromium-next/patches/patch-ui_views_window_frame__background.cc
	chromium-next/patches/patch-v8_BUILD.gn
	chromium-next/patches/patch-v8_include_v8-internal.h
	chromium-next/patches/patch-v8_include_v8config.h
	chromium-next/patches/patch-v8_src_api_api.cc
	chromium-next/patches/patch-v8_src_base_atomicops.h
	chromium-next/patches/patch-v8_src_base_platform_memory.h
	chromium-next/patches/patch-v8_src_base_platform_platform-freebsd.cc
	chromium-next/patches/patch-v8_src_base_platform_platform-openbsd.cc
	chromium-next/patches/patch-v8_src_base_platform_platform-posix.cc
	chromium-next/patches/patch-v8_src_base_strings.h
	chromium-next/patches/patch-v8_src_base_sys-info.cc
	chromium-next/patches/patch-v8_src_base_utils_random-number-generator.cc
	chromium-next/patches/patch-v8_src_diagnostics_perf-jit.cc
	chromium-next/patches/patch-v8_src_diagnostics_perf-jit.h
	chromium-next/patches/patch-v8_src_execution_isolate.cc
	chromium-next/patches/patch-v8_src_flags_flags.cc
	chromium-next/patches/patch-v8_src_libsampler_sampler.cc
	chromium-next/patches/patch-v8_src_sandbox_sandbox.cc
	chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
	chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
	chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
	chromium-next/patches/patch-v8_src_trap-handler_handler-inside-posix.cc
	chromium-next/patches/patch-v8_src_trap-handler_handler-inside-posix.h
	chromium-next/patches/patch-v8_src_trap-handler_trap-handler.h
	chromium-next/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
	chromium-next/patches/patch-v8_tools_run-paxctl.py
	chromium-next/patches/patch-v8_tools_run.py
	chromium-next/tests.mk
	chromium/patches/patch-.gn
	chromium/patches/patch-base_files_file__path__watcher__kqueue.cc
	chromium/patches/patch-base_threading_hang__watcher.cc
	chromium/patches/patch-build_linux_unbundle_libevent.gn
	chromium/patches/patch-chrome_browser_background_background__mode__manager.cc
	chromium/patches/patch-chrome_browser_background_background__mode__optimizer.cc
	chromium/patches/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc
	chromium/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc
	chromium/patches/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
	chromium/patches/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
	chromium/patches/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc
	chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h
	chromium/patches/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc
	chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
	chromium/patches/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
	chromium/patches/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc
	chromium/patches/patch-components_autofill_core_browser_autofill__optimization__guide.cc
	chromium/patches/patch-components_autofill_core_browser_payments__data__manager.cc
	chromium/patches/patch-components_autofill_core_common_autofill__payments__features.h
	chromium/patches/patch-components_flags__ui_flags__state.cc
	chromium/patches/patch-components_metrics_drive__metrics__provider__linux.cc
	chromium/patches/patch-components_neterror_resources_neterror.js
	chromium/patches/patch-components_os__crypt_async_common_encryptor.cc
	chromium/patches/patch-components_safe__browsing_core_common_features.cc
	chromium/patches/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc
	chromium/patches/patch-components_supervised__user_core_browser_supervised__user__service.cc
	chromium/patches/patch-content_browser_utility__process__host.cc
	chromium/patches/patch-content_browser_utility__process__host.h
	chromium/patches/patch-content_browser_utility__process__host__receiver__bindings.cc
	chromium/patches/patch-content_browser_utility__sandbox__delegate.cc
	chromium/patches/patch-content_browser_webui_web__ui__main__frame__observer.h
	chromium/patches/patch-content_common_user__agent.cc
	chromium/patches/patch-content_public_browser_service__process__host.cc
	chromium/patches/patch-media_base_user__input__monitor__unittest.cc
	chromium/patches/patch-media_gpu_buffer__validation.cc
	chromium/patches/patch-media_mojo_mojom_stable_BUILD.gn
	chromium/patches/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
	chromium/patches/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
	chromium/patches/patch-net_base_mock__network__change__notifier.cc
	chromium/patches/patch-net_base_mock__network__change__notifier.h
	chromium/patches/patch-net_socket_socket__posix.cc
	chromium/patches/patch-remoting_client_display_sys__opengl.h
	chromium/patches/patch-remoting_host_basic__desktop__environment.cc
	chromium/patches/patch-remoting_host_desktop__and__cursor__conditional__composer.cc
	chromium/patches/patch-remoting_host_desktop__capturer__proxy.cc
	chromium/patches/patch-remoting_host_desktop__capturer__wrapper.cc
	chromium/patches/patch-remoting_host_it2me_it2me__host.cc
	chromium/patches/patch-remoting_host_mouse__cursor__monitor__proxy.cc
	chromium/patches/patch-sandbox_policy_features.h
	chromium/patches/patch-services_video__capture_video__capture__service__impl.cc
	chromium/patches/patch-services_video__capture_video__capture__service__impl.h
	chromium/patches/patch-skia_ext_platform__canvas.h
	chromium/patches/patch-third__party_angle_src_libANGLE_formatutils.cpp
	chromium/patches/patch-third__party_blink_public_platform_web__vector.h
	chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
	chromium/patches/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc
	chromium/patches/patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc
	chromium/patches/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
	chromium/patches/patch-ui_native__theme_native__theme__features.cc
	chromium/patches/patch-ui_ozone_common_features.cc
	chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc
	chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h
	chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__connection.cc
	chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc
	chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__popup.cc
	chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__screen.cc
	chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__screen.h
	chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
	chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h
	chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__window.cc
	chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__window.h
	chromium/patches/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
	chromium/patches/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
	chromium/patches/patch-ui_qt_qt.gni
	chromium/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc
	chromium/patches/patch-v8_src_base_small-vector.h

Log Message:
chromium: merge chromium-next

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1025a717b525c1ef082a165655ba822a7295717f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 chromium-next/COMMIT_MSG                           |  277 --
 chromium-next/DESCR                                |    3 -
 chromium-next/Makefile                             |  373 ---
 chromium-next/PLIST                                |  139 -
 chromium-next/TODO                                 |   17 -
 chromium-next/distinfo                             | 1452 ----------
 chromium-next/files/chromium-browser.desktop       |  220 --
 chromium-next/files/chromium.sh.in                 |   80 -
 chromium-next/options.mk                           |   53 -
 chromium-next/patches/patch-BUILD.gn               |  104 -
 ...patch-apps_ui_views_app__window__frame__view.cc |   17 -
 ...patch-ash_display_mirror__window__controller.cc |   20 -
 chromium-next/patches/patch-base_BUILD.gn          |  172 --
 .../patches/patch-base_allocator_dispatcher_tls.h  |   17 -
 ...cator_partition__allocator_partition__alloc.gni |   35 -
 ...tition__allocator_src_partition__alloc_BUILD.gn |   17 -
 ...artition__alloc_address__space__randomization.h |   26 -
 ...llocator_src_partition__alloc_page__allocator.h |   17 -
 ...c_partition__alloc_page__allocator__constants.h |   19 -
 ...ion__alloc_page__allocator__internals__posix.cc |   17 -
 ...tion__alloc_page__allocator__internals__posix.h |   22 -
 ...rtition__alloc__base_debug_proc__maps__linux.cc |   17 -
 ...ition__alloc__base_debug_stack__trace__posix.cc |   40 -
 ...loc_partition__alloc__base_rand__util__posix.cc |   19 -
 ...ition__alloc__base_threading_platform__thread.h |   17 -
 ...e_threading_platform__thread__internal__posix.h |   17 -
 ...lloc__base_threading_platform__thread__posix.cc |   17 -
 ...src_partition__alloc_partition__alloc__config.h |   37 -
 ..._partition__alloc_partition__alloc__constants.h |   26 -
 ...rc_partition__alloc_partition__alloc__forward.h |   22 -
 ...locator_src_partition__alloc_partition__root.cc |   35 -
 ...locator_src_partition__alloc_spinning__mutex.cc |   65 -
 ...__allocator_src_partition__alloc_stack_stack.cc |   56 -
 ..._src_partition__alloc_thread__isolation_pkey.cc |   17 -
 chromium-next/patches/patch-base_atomicops.h       |   20 -
 .../patches/patch-base_base__paths__posix.cc       |  128 -
 .../patches/patch-base_compiler__specific.h        |   16 -
 .../patches/patch-base_debug_debugger__posix.cc    |  106 -
 .../patches/patch-base_debug_elf__reader.cc        |   19 -
 .../patches/patch-base_debug_proc__maps__linux.cc  |   17 -
 .../patches/patch-base_debug_stack__trace.cc       |   45 -
 .../patch-base_debug_stack__trace__posix.cc        |  109 -
 .../patches/patch-base_files_dir__reader__linux.h  |   45 -
 .../patches/patch-base_files_dir__reader__posix.h  |   26 -
 .../patches/patch-base_files_drive__info.h         |   17 -
 .../patches/patch-base_files_drive__info__posix.cc |   17 -
 .../patches/patch-base_files_file__path__watcher.h |   17 -
 .../patch-base_files_file__path__watcher__bsd.cc   |   63 -
 .../patch-base_files_file__path__watcher__kqueue.h |   16 -
 ...tch-base_files_file__path__watcher__unittest.cc |   35 -
 .../patches/patch-base_files_file__util__posix.cc  |   54 -
 .../patch-base_files_file__util__unittest.cc       |   46 -
 ...-base_files_important__file__writer__cleaner.cc |   18 -
 .../patches/patch-base_files_scoped__file.cc       |   17 -
 .../patch-base_functional_unretained__traits.h     |   17 -
 chromium-next/patches/patch-base_i18n_icu__util.cc |   26 -
 chromium-next/patches/patch-base_linux__util.cc    |   23 -
 .../patches/patch-base_logging__unittest.cc        |   37 -
 .../patch-base_memory_discardable__memory.cc       |   44 -
 ...tch-base_memory_discardable__memory__internal.h |   17 -
 ...emory_madv__free__discardable__memory__posix.cc |   27 -
 ...-base_memory_platform__shared__memory__region.h |   35 -
 ...mory_platform__shared__memory__region__posix.cc |   35 -
 .../patches/patch-base_memory_protected__memory.h  |   50 -
 .../patch-base_memory_protected__memory__posix.cc  |   26 -
 ...atch-base_message__loop_message__pump__epoll.cc |   17 -
 ...patch-base_message__loop_message__pump__epoll.h |   20 -
 ...patch-base_message__loop_message__pump__glib.cc |   44 -
 .../patches/patch-base_native__library__posix.cc   |   17 -
 .../patch-base_native__library__unittest.cc        |   17 -
 .../patch-base_posix_can__lower__nice__to.cc       |   22 -
 .../patch-base_posix_file__descriptor__shuffle.h   |   17 -
 chromium-next/patches/patch-base_posix_sysctl.cc   |   38 -
 .../patch-base_posix_unix__domain__socket.cc       |   63 -
 ...ch-base_posix_unix__domain__socket__unittest.cc |   17 -
 .../patches/patch-base_process_internal__linux.h   |   26 -
 chromium-next/patches/patch-base_process_kill.h    |   17 -
 .../patches/patch-base_process_kill__posix.cc      |   17 -
 chromium-next/patches/patch-base_process_launch.h  |   31 -
 .../patches/patch-base_process_launch__posix.cc    |   27 -
 .../patches/patch-base_process_memory__linux.cc    |   50 -
 .../patches/patch-base_process_process__handle.cc  |   17 -
 .../patches/patch-base_process_process__handle.h   |   17 -
 .../patch-base_process_process__handle__freebsd.cc |   32 -
 .../patch-base_process_process__handle__netbsd.cc  |   65 -
 .../patch-base_process_process__handle__openbsd.cc |  145 -
 .../patches/patch-base_process_process__iterator.h |   29 -
 ...atch-base_process_process__iterator__freebsd.cc |   58 -
 ...patch-base_process_process__iterator__netbsd.cc |  143 -
 ...atch-base_process_process__iterator__openbsd.cc |   52 -
 .../patches/patch-base_process_process__metrics.cc |   55 -
 .../patches/patch-base_process_process__metrics.h  |  112 -
 ...patch-base_process_process__metrics__freebsd.cc |  287 --
 .../patch-base_process_process__metrics__netbsd.cc |  237 --
 ...patch-base_process_process__metrics__openbsd.cc |  247 --
 .../patch-base_process_process__metrics__posix.cc  |   26 -
 ...atch-base_process_process__metrics__unittest.cc |   18 -
 .../patches/patch-base_process_process__posix.cc   |  100 -
 .../patch-base_process_process__unittest.cc        |   17 -
 .../patches/patch-base_profiler_module__cache.cc   |   17 -
 ...e_profiler_sampling__profiler__thread__token.cc |   26 -
 ...se_profiler_sampling__profiler__thread__token.h |   26 -
 ...ch-base_profiler_stack__base__address__posix.cc |   69 -
 ...ofiler_stack__sampling__profiler__test__util.cc |   17 -
 ...profiler_stack__sampling__profiler__unittest.cc |   17 -
 .../patch-base_profiler_thread__delegate__posix.cc |   26 -
 chromium-next/patches/patch-base_rand__util.h      |   17 -
 .../patches/patch-base_rand__util__posix.cc        |   68 -
 .../patch-base_strings_safe__sprintf__unittest.cc  |   24 -
 .../patch-base_synchronization_cancelable__event.h |   26 -
 .../patch-base_synchronization_lock__impl.h        |   29 -
 .../patches/patch-base_syslog__logging.cc          |   26 -
 .../patches/patch-base_system_sys__info.cc         |   17 -
 .../patches/patch-base_system_sys__info.h          |   26 -
 .../patch-base_system_sys__info__freebsd.cc        |  118 -
 .../patches/patch-base_system_sys__info__netbsd.cc |   98 -
 .../patch-base_system_sys__info__openbsd.cc        |   88 -
 .../patches/patch-base_system_sys__info__posix.cc  |   35 -
 .../patch-base_system_sys__info__unittest.cc       |   26 -
 ...k_thread__pool_environment__config__unittest.cc |   26 -
 .../patch-base_test_launcher_test__launcher.cc     |   27 -
 .../patch-base_test_test__file__util__linux.cc     |   20 -
 .../patch-base_test_test__file__util__posix.cc     |   17 -
 .../patch-base_threading_platform__thread.h        |   17 -
 .../patch-base_threading_platform__thread__bsd.cc  |   40 -
 ..._threading_platform__thread__internal__posix.cc |   17 -
 ...patch-base_threading_platform__thread__posix.cc |   59 -
 ...ch-base_threading_platform__thread__unittest.cc |   53 -
 .../patches/patch-base_time_time__now__posix.cc    |   17 -
 ...tch-base_trace__event_malloc__dump__provider.cc |   36 -
 ...atch-base_trace__event_memory__dump__manager.cc |   17 -
 ...atch-base_trace__event_process__memory__dump.cc |   26 -
 .../patches/patch-base_tracing_trace__time.cc      |   28 -
 .../patches/patch-base_tracing_trace__time.h       |   17 -
 .../patch-base_version__info_version__info.h       |   17 -
 chromium-next/patches/patch-build_config_BUILD.gn  |   19 -
 .../patches/patch-build_config_BUILDCONFIG.gn      |   54 -
 .../patches/patch-build_config_clang_BUILD.gn      |   22 -
 .../patches/patch-build_config_compiler_BUILD.gn   |  155 --
 .../patches/patch-build_config_gcc_BUILD.gn        |   19 -
 .../patches/patch-build_config_linux_BUILD.gn      |   17 -
 .../patch-build_config_linux_libdrm_BUILD.gn       |   17 -
 .../patches/patch-build_config_linux_pkg-config.py |   17 -
 chromium-next/patches/patch-build_config_ozone.gni |   29 -
 chromium-next/patches/patch-build_config_rust.gni  |   28 -
 .../patches/patch-build_config_v8__target__cpu.gni |   19 -
 .../patches/patch-build_detect__host__arch.py      |   17 -
 .../patches/patch-build_gn__run__binary.py         |   17 -
 chromium-next/patches/patch-build_linux_chrome.map |   19 -
 .../patches/patch-build_linux_strip__binary.py     |   16 -
 .../patches/patch-build_linux_unbundle_icu.gn      |   49 -
 .../patches/patch-build_linux_unbundle_libusb.gn   |   36 -
 chromium-next/patches/patch-build_nocompile.gni    |   17 -
 .../patches/patch-build_rust_rust__bindgen.gni     |   25 -
 .../patch-build_rust_rust__bindgen__generator.gni  |   25 -
 .../patches/patch-build_rust_std_BUILD.gn          |   38 -
 .../patches/patch-build_toolchain_freebsd_BUILD.gn |   75 -
 .../patch-build_toolchain_gcc__solink__wrapper.py  |   17 -
 .../patch-build_toolchain_gcc__toolchain.gni       |   59 -
 .../patches/patch-build_toolchain_netbsd_BUILD.gn  |   75 -
 .../patches/patch-build_toolchain_openbsd_BUILD.gn |   75 -
 .../patches/patch-build_toolchain_toolchain.gni    |   17 -
 chromium-next/patches/patch-cc_base_features.cc    |   17 -
 .../patch-chrome_app_chrome__command__ids.h        |   22 -
 .../patches/patch-chrome_app_chrome__main.cc       |   49 -
 .../patch-chrome_app_chrome__main__delegate.cc     |  153 --
 .../patches/patch-chrome_browser_BUILD.gn          |   22 -
 .../patches/patch-chrome_browser_about__flags.cc   |  390 ---
 ...ch-chrome_browser_accessibility_page__colors.cc |   26 -
 ...h-chrome_browser_after__startup__task__utils.cc |   17 -
 ...apps_app__service_publishers_extension__apps.cc |   17 -
 ...er_apps_platform__apps_platform__app__launch.cc |   71 -
 ...ser_apps_platform__apps_platform__app__launch.h |   17 -
 ...ete_chrome__autocomplete__scheme__classifier.cc |   17 -
 ...kground_extensions_background__mode__manager.cc |   17 -
 ...round_extensions_background__mode__optimizer.cc |   17 -
 ...e_browser_background_glic_glic__status__icon.cc |   44 -
 .../patch-chrome_browser_browser__features.cc      |   35 -
 .../patch-chrome_browser_browser__features.h       |   26 -
 .../patch-chrome_browser_browser__process__impl.cc |   53 -
 .../patch-chrome_browser_browser__process__impl.h  |   17 -
 ...hrome_browser_chrome__browser__field__trials.cc |   26 -
 ...chrome_browser_chrome__browser__field__trials.h |   17 -
 ..._browser_chrome__browser__interface__binders.cc |   35 -
 ...r_chrome__browser__interface__binders__webui.cc |   70 -
 .../patch-chrome_browser_chrome__browser__main.cc  |  121 -
 ...r_chrome__browser__main__extra__parts__linux.cc |   17 -
 ...r_chrome__browser__main__extra__parts__ozone.cc |   17 -
 ...-chrome_browser_chrome__browser__main__linux.cc |   45 -
 ...h-chrome_browser_chrome__browser__main__linux.h |   17 -
 ...-chrome_browser_chrome__browser__main__posix.cc |   17 -
 ...ome_browser_chrome__content__browser__client.cc |  194 --
 ...rome_browser_chrome__content__browser__client.h |   17 -
 ...ssaging_messaging__backend__service__factory.cc |   17 -
 ...iwa__key__distribution__component__installer.cc |   26 -
 ..._iwa__key__distribution__component__installer.h |   17 -
 ...rome_browser_component__updater_registration.cc |   41 -
 ...ater_wasm__tts__engine__component__installer.cc |   35 -
 ...dater_wasm__tts__engine__component__installer.h |   17 -
 ..._updater_widevine__cdm__component__installer.cc |   44 -
 ...hrome__protocol__handler__registry__delegate.cc |   17 -
 .../patches/patch-chrome_browser_defaults.cc       |   17 -
 ...tity_device__oauth2__token__service__factory.cc |   17 -
 .../patch-chrome_browser_devtools_features.cc      |   17 -
 .../patch-chrome_browser_devtools_features.h       |   17 -
 ...e_browser_devtools_remote__debugging__server.cc |   17 -
 ...hrome_browser_diagnostics_diagnostics__writer.h |   17 -
 ...download_chrome__download__manager__delegate.cc |   35 -
 ...h-chrome_browser_download_download__commands.cc |   26 -
 ...ch-chrome_browser_download_download__commands.h |   17 -
 ...rome_browser_download_download__file__picker.cc |   26 -
 ...hrome_browser_download_download__item__model.cc |   35 -
 ...atch-chrome_browser_download_download__prefs.cc |   96 -
 ...patch-chrome_browser_download_download__prefs.h |   26 -
 ...nectors_analysis_analysis__service__settings.cc |   17 -
 ...-chrome_browser_enterprise_connectors_common.cc |   26 -
 ...er_enterprise_connectors_connectors__service.cc |   17 -
 ...t_device__trust__connector__service__factory.cc |   35 -
 ...evice__trust_device__trust__service__factory.cc |   35 -
 ...ser_commands_key__rotation__command__factory.cc |   26 -
 ...sistence_key__persistence__delegate__factory.cc |   26 -
 ...ice__trust_signals_signals__service__factory.cc |   26 -
 ...tors_reporting_browser__crash__event__router.cc |   26 -
 ...nnectors_reporting_crash__reporting__context.cc |   17 -
 ...ectors_reporting_realtime__reporting__client.cc |   44 -
 ...nectors_reporting_realtime__reporting__client.h |   35 -
 ...nt_profile__management__navigation__throttle.cc |   19 -
 ...te__commands_cbcm__remote__commands__factory.cc |   26 -
 ...er_enterprise_signals_context__info__fetcher.cc |   26 -
 ...ser_enterprise_signals_device__info__fetcher.cc |   26 -
 ...enterprise_signin_enterprise__signin__service.h |   17 -
 ...terstitials_managed__profile__required__page.cc |   17 -
 ...wser_enterprise_util_managed__browser__utils.cc |   17 -
 .../patch-chrome_browser_extensions_BUILD.gn       |   19 -
 ...ate_chrome__desktop__report__request__helper.cc |   35 -
 ...rprise__reporting__private_conversion__utils.cc |   17 -
 ...erprise__reporting__private_conversion__utils.h |   17 -
 ..._private_enterprise__reporting__private__api.cc |   53 -
 ...__private_enterprise__reporting__private__api.h |   35 -
 ...writer__private_removable__storage__provider.cc |   26 -
 ...management_chrome__management__api__delegate.cc |   17 -
 ...ensions_api_messaging_launch__context__posix.cc |   17 -
 ...__private_passwords__private__delegate__impl.cc |   17 -
 ...s_api_runtime_chrome__runtime__api__delegate.cc |   21 -
 ...extensions_api_settings__private_prefs__util.cc |   35 -
 ...chrome_browser_extensions_api_tabs_tabs__api.cc |   17 -
 ...gging__private_webrtc__logging__private__api.cc |   35 -
 ...api_webstore__private_webstore__private__api.cc |   17 -
 ...s_component__extensions__allowlist_allowlist.cc |   26 -
 ..._browser_extensions_external__provider__impl.cc |   26 -
 ...ck_system__logs_about__system__logs__fetcher.cc |   26 -
 ...k_system__logs_chrome__system__logs__fetcher.cc |   26 -
 ...e__file__system__access__permission__context.cc |   17 -
 ...-chrome_browser_first__run_first__run__dialog.h |   17 -
 ...hrome_browser_first__run_first__run__internal.h |   17 -
 .../patch-chrome_browser_flag__descriptions.cc     |  182 --
 .../patch-chrome_browser_flag__descriptions.h      |  171 --
 ...e_browser_gcm_gcm__profile__service__factory.cc |   26 -
 ...__id_instance__id__profile__service__factory.cc |   26 -
 .../patch-chrome_browser_global__features.cc       |   35 -
 .../patch-chrome_browser_global__features.h        |   44 -
 ...chrome_browser_headless_headless__mode__util.cc |   35 -
 ...h-chrome_browser_intranet__redirect__detector.h |   17 -
 ..._galleries_fileapi_mtp__device__map__service.cc |   21 -
 ...dia__galleries_media__file__system__registry.cc |   22 -
 ...ch-chrome_browser_media_audio__service__util.cc |   26 -
 ...-chrome_browser_media_router_discovery_BUILD.gn |   17 -
 ...er_discovery_discovery__network__list__posix.cc |   54 -
 ...covery_discovery__network__list__wifi__linux.cc |   36 -
 ...wser_media_webrtc_chrome__screen__enumerator.cc |   53 -
 ...owser_media_webrtc_chrome__screen__enumerator.h |   26 -
 ...ia_webrtc_desktop__media__picker__controller.cc |   17 -
 ...e_browser_media_webrtc_webrtc__log__uploader.cc |   17 -
 ...ser_media_webrtc_webrtc__logging__controller.cc |   39 -
 ...wser_media_webrtc_webrtc__logging__controller.h |   26 -
 .../patch-chrome_browser_memory__details.cc        |   17 -
 ...chrome__browser__main__extra__parts__metrics.cc |   58 -
 ..._chrome__browser__main__extra__parts__metrics.h |   26 -
 ...ser_metrics_chrome__metrics__service__client.cc |  103 -
 ...ch-chrome_browser_metrics_perf_cpu__identity.cc |   17 -
 ...trics_power_process__metrics__recorder__util.cc |   17 -
 ...hrome_browser_metrics_power_process__monitor.cc |   35 -
 ...chrome_browser_metrics_power_process__monitor.h |   17 -
 ...owser_net_profile__network__context__service.cc |   35 -
 ..._profile__network__context__service__factory.cc |   26 -
 ...rowser_net_system__network__context__manager.cc |  144 -
 ...browser_net_system__network__context__manager.h |   26 -
 ...page_modules_file__suggestion_drive__service.cc |   17 -
 ..._browser_new__tab__page_new__tab__page__util.cc |   17 -
 ...cations_notification__display__service__impl.cc |   44 -
 ...ns_notification__platform__bridge__delegator.cc |   17 -
 ...d__manager_chrome__password__manager__client.cc |   26 -
 ...d__manager_password__reuse__manager__factory.cc |   17 -
 .../patch-chrome_browser_platform__util__linux.cc  |   18 -
 ...wser_policy_browser__signin__policy__handler.cc |   17 -
 ...wser__cloud__management__controller__desktop.cc |   53 -
 ...onfiguration__policy__handler__list__factory.cc |  260 --
 ...y_device__management__service__configuration.cc |   17 -
 ...olicy_policy__value__and__status__aggregator.cc |   17 -
 .../patch-chrome_browser_prefs_browser__prefs.cc   |   73 -
 ...er_prefs_pref__service__incognito__allowlist.cc |   17 -
 ...er_printing_print__backend__service__manager.cc |   35 -
 ...patch-chrome_browser_printing_printer__query.cc |   17 -
 ...tch-chrome_browser_process__singleton__posix.cc |   26 -
 ...hrome__browser__main__extra__parts__profiles.cc |  145 -
 .../patch-chrome_browser_profiles_profile__impl.cc |   46 -
 ...atch-chrome_browser_profiles_profiles__state.cc |   35 -
 ...ties_regional__capabilities__service__client.cc |   17 -
 ...h-chrome_browser_renderer__preferences__util.cc |   35 -
 ...s_settings_autofill__page_passwords__shared.css |   17 -
 ...ome_browser_resources_signin_signin__shared.css |   17 -
 ...owsing_chrome__password__protection__service.cc |   17 -
 ...d__content__scanning_binary__upload__service.cc |   17 -
 ...dent__reporting_incident__reporting__service.cc |   17 -
 ...owsing_safe__browsing__pref__change__handler.cc |   26 -
 ...rowser_screen__ai_screen__ai__install__state.cc |   17 -
 ...owser_screen__ai_screen__ai__service__router.cc |   26 -
 ...tch-chrome_browser_sessions_session__restore.cc |   26 -
 ...ser_sharing_sharing__handler__registry__impl.cc |   26 -
 ...patch-chrome_browser_shortcuts_icon__badging.cc |   17 -
 ...ome_browser_signin_accounts__policy__manager.cc |   44 -
 ...rome_browser_signin_accounts__policy__manager.h |   35 -
 .../patch-chrome_browser_signin_signin__util.cc    |   17 -
 ...ed__user_classify__url__navigation__throttle.cc |   26 -
 ...vised__user_supervised__user__browser__utils.cc |   26 -
 ...rvised__user_supervised__user__browser__utils.h |   17 -
 ...supervised__user__extensions__delegate__impl.cc |   17 -
 ...__user_supervised__user__extensions__manager.cc |   26 -
 ...d__user_supervised__user__extensions__manager.h |   17 -
 ...ed__user__google__auth__navigation__throttle.cc |   32 -
 ..._supervised__user__metrics__service__factory.cc |   26 -
 ..._user_supervised__user__navigation__observer.cc |   26 -
 ...owser_sync_chrome__sync__controller__builder.cc |   17 -
 ...rowser_sync_device__info__sync__client__impl.cc |   17 -
 ...h-chrome_browser_sync_sync__service__factory.cc |   44 -
 ...e_browser_task__manager_sampling_task__group.cc |   44 -
 ...me_browser_task__manager_sampling_task__group.h |   44 -
 ..._task__manager_sampling_task__group__sampler.cc |   53 -
 ...r_task__manager_sampling_task__group__sampler.h |   44 -
 ...r_task__manager_sampling_task__manager__impl.cc |   17 -
 ...browser_task__manager_task__manager__observer.h |   17 -
 .../patch-chrome_browser_themes_theme__helper.cc   |   17 -
 .../patch-chrome_browser_themes_theme__service.cc  |   26 -
 ...e_browser_themes_theme__service__aura__linux.cc |   17 -
 ...hrome_browser_themes_theme__service__factory.cc |   35 -
 ...-chrome_browser_ui_actions_chrome__action__id.h |   17 -
 ..._payments_desktop__payments__window__manager.cc |   26 -
 ...l_payments_desktop__payments__window__manager.h |   44 -
 .../patches/patch-chrome_browser_ui_browser.h      |   17 -
 ...rome_browser_ui_browser__command__controller.cc |   80 -
 .../patch-chrome_browser_ui_browser__commands.cc   |   17 -
 .../patch-chrome_browser_ui_browser__ui__prefs.cc  |   26 -
 ...patch-chrome_browser_ui_browser__view__prefs.cc |   26 -
 .../patch-chrome_browser_ui_chrome__pages.cc       |   35 -
 .../patch-chrome_browser_ui_chrome__pages.h        |   26 -
 ...rowser_ui_color_native__chrome__color__mixer.cc |   17 -
 .../patches/patch-chrome_browser_ui_managed__ui.cc |   26 -
 ...r_ui_omnibox_omnibox__pedal__implementations.cc |   17 -
 ...rollers_relaunch__chrome__bubble__controller.cc |   26 -
 ..._passwords_manage__passwords__ui__controller.cc |   26 -
 ...h-chrome_browser_ui_prefs_prefs__tab__helper.cc |   17 -
 .../patches/patch-chrome_browser_ui_sad__tab.cc    |   17 -
 ...sharing__hub_sharing__hub__bubble__controller.h |   17 -
 ...e_browser_ui_signin_signin__view__controller.cc |   17 -
 ..._ui_signin_signin__view__controller__delegate.h |   17 -
 ...chrome_browser_ui_startup_bad__flags__prompt.cc |   17 -
 ...browser_ui_startup_startup__browser__creator.cc |   44 -
 ...r_ui_startup_startup__browser__creator__impl.cc |   35 -
 ...me_browser_ui_startup_startup__tab__provider.cc |   26 -
 .../patch-chrome_browser_ui_tab__helpers.cc        |   32 -
 .../patch-chrome_browser_ui_tabs_features.cc       |   17 -
 ...-chrome_browser_ui_tabs_tab__dialog__manager.cc |   17 -
 ...tch-chrome_browser_ui_tabs_tab__strip__prefs.cc |   17 -
 ...owser_ui_task__manager_task__manager__columns.h |   17 -
 ...ui_task__manager_task__manager__table__model.cc |   44 -
 ...ch-chrome_browser_ui_test_popup__browsertest.cc |   26 -
 ...tch-chrome_browser_ui_test_test__browser__ui.cc |   26 -
 .../patch-chrome_browser_ui_ui__features.cc        |   26 -
 .../patches/patch-chrome_browser_ui_ui__features.h |   26 -
 ...h-chrome_browser_ui_views_accelerator__table.cc |   40 -
 ...pps_chrome__native__app__window__views__aura.cc |   26 -
 ...s_chrome__browser__main__extra__parts__views.cc |   26 -
 ...rome_browser_ui_views_chrome__views__delegate.h |   17 -
 ...wser_ui_views_chrome__views__delegate__linux.cc |   26 -
 ...owser_ui_views_compose_compose__dialog__view.cc |   17 -
 ...chrome_browser_ui_views_frame_browser__frame.cc |   62 -
 ...-chrome_browser_ui_views_frame_browser__frame.h |   26 -
 ...ws_frame_browser__frame__view__layout__linux.cc |   17 -
 ..._browser__frame__view__layout__linux__native.cc |   17 -
 ...r_ui_views_frame_browser__frame__view__linux.cc |   26 -
 ...er__non__client__frame__view__factory__views.cc |   26 -
 ...-chrome_browser_ui_views_frame_browser__view.cc |   26 -
 ..._ui_views_frame_opaque__browser__frame__view.cc |   44 -
 ...r_ui_views_frame_opaque__browser__frame__view.h |   26 -
 ...paque__browser__frame__view__layout__delegate.h |   26 -
 ...e_picture__in__picture__browser__frame__view.cc |  107 -
 ...me_picture__in__picture__browser__frame__view.h |   44 -
 ..._ui_views_frame_system__menu__model__builder.cc |   35 -
 ...ui_views_frame_system__menu__model__delegate.cc |   35 -
 ...wser_ui_views_frame_tab__strip__region__view.cc |   17 -
 ...chrome_browser_ui_views_hung__renderer__view.cc |   17 -
 ...rowser_ui_views_omnibox_omnibox__view__views.cc |   17 -
 ...views_passwords_password__bubble__view__base.cc |   26 -
 ...er_ui_views_profiles_avatar__toolbar__button.cc |   17 -
 ...ser_ui_views_profiles_avatar__toolbar__button.h |   17 -
 ...ui_views_profiles_profile__menu__coordinator.cc |   17 -
 ...rowser_ui_views_profiles_profile__menu__view.cc |   35 -
 ..._ui_views_profiles_profile__menu__view__base.cc |   17 -
 ...wser_ui_views_profiles_profile__picker__view.cc |   26 -
 ...es_signin__view__controller__delegate__views.cc |   53 -
 ...les_signin__view__controller__delegate__views.h |   26 -
 ...ui_views_tabs_dragging_tab__drag__controller.cc |   53 -
 .../patch-chrome_browser_ui_views_tabs_tab.cc      |   17 -
 ...ui_views_tabs_tab__hover__card__bubble__view.cc |   17 -
 ...wser_ui_views_tabs_tab__strip__combo__button.cc |   17 -
 ...rome_browser_ui_views_tabs_tab__style__views.cc |   17 -
 ...er_ui_views_task__manager__search__bar__view.cc |   17 -
 ..._education_browser__user__education__service.cc |   26 -
 ...eb__apps_web__app__integration__test__driver.cc |   89 -
 ...rowser_ui_web__applications_web__app__dialogs.h |   17 -
 ...eb__applications_web__app__ui__manager__impl.cc |   26 -
 ...web__applications_web__app__ui__manager__impl.h |   17 -
 ...atch-chrome_browser_ui_webui_about_about__ui.cc |   35 -
 ...patch-chrome_browser_ui_webui_about_about__ui.h |   17 -
 ..._ui_webui_app__home_app__home__page__handler.cc |   17 -
 ...r_ui_webui_app__home_app__home__page__handler.h |   17 -
 ...ui_webui_app__settings_web__app__settings__ui.h |   24 -
 ...icate__manager_certificate__manager__handler.cc |   17 -
 ...i_certificate__manager_client__cert__sources.cc |   71 -
 ...ui_certificate__manager_client__cert__sources.h |   26 -
 ...me_browser_ui_webui_chrome__web__ui__configs.cc |   83 -
 ...i_webui_chrome__web__ui__controller__factory.cc |   46 -
 ...i_connectors__internals_device__trust__utils.cc |   35 -
 ...wser_ui_webui_interstitials_interstitial__ui.cc |   35 -
 ...e_browser_ui_webui_management_management__ui.cc |   22 -
 ...i_webui_management_management__ui__constants.cc |   23 -
 ...ui_webui_management_management__ui__constants.h |   25 -
 ..._ui_webui_management_management__ui__handler.cc |   44 -
 ...r_ui_webui_management_management__ui__handler.h |   26 -
 ...ebui_password__manager_promo__cards__handler.cc |   26 -
 ...manager_promo__cards_relaunch__chrome__promo.cc |   26 -
 ...rowser_ui_webui_searchbox_searchbox__handler.cc |   35 -
 ...rowser_ui_webui_settings_appearance__handler.cc |   17 -
 ...tings_settings__localized__strings__provider.cc |   71 -
 ...ser_ui_webui_signin_profile__picker__handler.cc |   17 -
 ...r__education__internals__page__handler__impl.cc |   35 -
 ...hrome_browser_ui_window__sizer_window__sizer.cc |   17 -
 ...r_upgrade__detector_version__history__client.cc |   17 -
 ...king_visited__url__ranking__service__factory.cc |   26 -
 ...lications_commands_launch__web__app__command.cc |   17 -
 ...s_commands_set__user__display__mode__command.cc |   17 -
 ...er_web__applications_extension__status__utils.h |   17 -
 ...ications_extensions_extension__status__utils.cc |   26 -
 ...ons_os__integration_os__integration__manager.cc |   17 -
 ...__integration_os__integration__test__override.h |   17 -
 ...integration_run__on__os__login__sub__manager.cc |   17 -
 ...tions_os__integration_shortcut__sub__manager.cc |   17 -
 ...gration_web__app__file__handler__registration.h |   17 -
 ...lications_os__integration_web__app__shortcut.cc |   26 -
 ...plications_os__integration_web__app__shortcut.h |   26 -
 ...pplications_policy_web__app__policy__manager.cc |   17 -
 ...s_test_os__integration__test__override__impl.cc |  125 -
 ...ns_test_os__integration__test__override__impl.h |   44 -
 ..._browser_web__applications_web__app__helpers.cc |   17 -
 ...ser_web__applications_web__app__install__info.h |   17 -
 ...thn_chrome__authenticator__request__delegate.cc |   17 -
 ...tch-chrome_browser_webauthn_enclave__manager.cc |   26 -
 ...ser_webauthn_gpm__user__verification__policy.cc |   17 -
 ...er_webauthn_password__credential__controller.cc |   17 -
 ...me_browser_webauthn_unexportable__key__utils.cc |   17 -
 .../patches/patch-chrome_common_channel__info.h    |   26 -
 .../patch-chrome_common_channel__info__posix.cc    |   26 -
 .../patch-chrome_common_chrome__features.cc        |   62 -
 .../patches/patch-chrome_common_chrome__features.h |   51 -
 .../patches/patch-chrome_common_chrome__paths.cc   |   88 -
 .../patches/patch-chrome_common_chrome__paths.h    |   35 -
 .../patch-chrome_common_chrome__paths__internal.h  |   17 -
 .../patch-chrome_common_chrome__switches.cc        |   26 -
 .../patches/patch-chrome_common_chrome__switches.h |   26 -
 .../patches/patch-chrome_common_crash__keys.cc     |   34 -
 ...hrome_common_extensions_extension__constants.cc |   17 -
 ...chrome_common_extensions_extension__constants.h |   17 -
 ...rmissions_chrome__permission__message__rules.cc |   17 -
 ...ch-chrome_common_media_cdm__host__file__path.cc |   17 -
 .../patch-chrome_common_media_cdm__registration.cc |   62 -
 .../patch-chrome_common_media_cdm__registration.h  |   17 -
 ...a_component__widevine__cdm__hint__file__linux.h |   17 -
 .../patches/patch-chrome_common_pref__names.h      |   97 -
 .../patches/patch-chrome_common_url__constants.h   |   17 -
 .../patch-chrome_common_webui__url__constants.cc   |   30 -
 .../patch-chrome_common_webui__url__constants.h    |   53 -
 ...ise__companion_enterprise__companion__client.cc |   17 -
 ...h-chrome_enterprise__companion_event__logger.cc |   17 -
 .../patch-chrome_enterprise__companion_lock.cc     |   26 -
 ...vices_printing_print__backend__service__impl.cc |   53 -
 ...services_speech_audio__source__fetcher__impl.cc |   17 -
 ...e_test_base_scoped__channel__override__posix.cc |   17 -
 ...ch-chrome_test_chromedriver_chrome__launcher.cc |   16 -
 ...rome_test_chromedriver_chrome_chrome__finder.cc |   35 -
 ...e_test_chromedriver_key__converter__unittest.cc |   26 -
 ...medriver_keycode__text__conversion__unittest.cc |   26 -
 ...sed__user_google__auth__state__waiter__mixin.cc |   17 -
 .../patch-chrome_updater_app_app__uninstall.cc     |   17 -
 .../patches/patch-chrome_updater_configurator.cc   |   17 -
 chromium-next/patches/patch-chrome_updater_lock.cc |   17 -
 .../patch-chrome_updater_util_posix__util.cc       |   17 -
 .../patches/patch-chrome_utility_services.cc       |   35 -
 ...hromecast_browser_cast__browser__main__parts.cc |   44 -
 ...ecast_browser_cast__content__browser__client.cc |   17 -
 ..._browser_runtime__application__service__impl.cc |   17 -
 ...omecast_media_base_default__monotonic__clock.cc |   26 -
 chromium-next/patches/patch-components_BUILD.gn    |   34 -
 ...ta__manager_payments_payments__data__manager.cc |   44 -
 ...ata__manager_payments_payments__data__manager.h |   26 -
 ...er_integrators_autofill__optimization__guide.cc |   17 -
 ...autofill_core_browser_payments_bnpl__manager.cc |   26 -
 ...ill_core_common_autofill__payments__features.cc |   17 -
 ...ponents_autofill_core_common_autofill__prefs.cc |   44 -
 ...mponents_autofill_core_common_autofill__prefs.h |   35 -
 ...onents_commerce_core_commerce__feature__list.cc |   45 -
 ...nstrained__window_constrained__window__views.cc |   17 -
 ...ngs_core_browser_website__settings__registry.cc |   17 -
 ...omponents_cookie__config_cookie__store__util.cc |   17 -
 .../patch-components_crash_core_app_BUILD.gn       |   49 -
 ...nts_crash_core_app_chrome__crashpad__handler.cc |   18 -
 ...nents_crash_core_app_crashpad__handler__main.cc |   26 -
 ...h_core_browser_crash__upload__list__crashpad.cc |   32 -
 .../patch-components_crash_core_common_BUILD.gn    |   17 -
 ...s_device__signals_core_browser_browser__utils.h |   26 -
 ...ignals_core_browser_mock__signals__aggregator.h |   17 -
 ...ice__signals_core_browser_signals__aggregator.h |   17 -
 ...gnals_core_browser_signals__aggregator__impl.cc |   17 -
 ...ignals_core_browser_signals__aggregator__impl.h |   17 -
 ...ignals_core_browser_user__permission__service.h |   17 -
 ...core_browser_user__permission__service__impl.cc |   17 -
 ..._core_browser_user__permission__service__impl.h |   17 -
 ...als_core_common_linux_platform__utils__linux.cc |   83 -
 ...evice__signals_core_common_signals__features.cc |   17 -
 ...device__signals_core_common_signals__features.h |   17 -
 ...nals_core_system__signals_platform__delegate.cc |   17 -
 ...nents_device__signals_test_signals__contract.cc |   17 -
 ...service_discardable__shared__memory__manager.cc |   17 -
 ...ponents_embedder__support_user__agent__utils.cc |   53 -
 ...bedder__support_user__agent__utils__unittest.cc |   35 -
 ...ctors_core_realtime__reporting__client__base.cc |   26 -
 ...components_enterprise_watermarking_watermark.cc |   26 -
 ...mponents_error__page_common_localized__error.cc |   17 -
 ...h-components_eye__dropper_eye__dropper__view.cc |   17 -
 ..._feature__engagement_public_event__constants.cc |   17 -
 ...s_feature__engagement_public_event__constants.h |   17 -
 ...e__engagement_public_feature__configurations.cc |   36 -
 ...eature__engagement_public_feature__constants.cc |   35 -
 ...feature__engagement_public_feature__constants.h |   35 -
 ...nts_feature__engagement_public_feature__list.cc |   35 -
 ...ents_feature__engagement_public_feature__list.h |   64 -
 ...omponents_feed_core_proto_v2_wire_version.proto |   19 -
 ...s_feed_core_v2_feed__network__impl__unittest.cc |   19 -
 .../patch-components_feed_core_v2_proto__util.cc   |   30 -
 ...omponents_feed_core_v2_proto__util__unittest.cc |   19 -
 ...-components_feed_core_v2_test_proto__printer.cc |   19 -
 ...h-components_gcm__driver_gcm__desktop__utils.cc |   17 -
 .../patches/patch-components_gwp__asan_BUILD.gn    |   17 -
 ...-components_gwp__asan_buildflags_buildflags.gni |   20 -
 ..._asan_client_guarded__page__allocator__posix.cc |   19 -
 .../patch-components_gwp__asan_client_gwp__asan.cc |   17 -
 ...ponents_gwp__asan_client_gwp__asan__features.cc |   17 -
 ...nts_gwp__asan_crash__handler_crash__analyzer.cc |   26 -
 ...patch-components_live__caption_caption__util.cc |   17 -
 .../patch-components_live__caption_caption__util.h |   17 -
 ...omponents_media__router_common_media__source.cc |   17 -
 ...n_providers_cast_channel_cast__message__util.cc |   17 -
 ...ter_common_providers_cast_channel_enum__table.h |   21 -
 ...-components_metrics_drive__metrics__provider.cc |   26 -
 .../patch-components_metrics_dwa_dwa__service.cc   |   17 -
 .../patch-components_metrics_metrics__log.cc       |   44 -
 .../patch-components_metrics_motherboard.cc        |   16 -
 ...nts_named__mojo__ipc__server_connection__info.h |   36 -
 ...erver_named__mojo__ipc__server__client__util.cc |   17 -
 ...ed__mojo__server__endpoint__connector__linux.cc |   18 -
 .../patch-components_named__system__lock_BUILD.gn  |   26 -
 .../patch-components_named__system__lock_lock.h    |   17 -
 ...omponents_named__system__lock_lock__unittest.cc |   35 -
 ...on__guide_core_optimization__guide__features.cc |   17 -
 ...zation__guide_core_optimization__guide__util.cc |   17 -
 ..._async_browser_secret__portal__key__provider.cc |   18 -
 ...onents_os__crypt_sync_libsecret__util__linux.cc |   33 -
 .../patch-components_os__crypt_sync_os__crypt.h    |   69 -
 ...aint__preview_browser_paint__preview__client.cc |   19 -
 ...iew_browser_paint__preview__client__unittest.cc |   19 -
 ...aint__preview_common_proto_paint__preview.proto |   19 -
 ..._preview_player_player__compositor__delegate.cc |   19 -
 ...ger_core_browser_features_password__features.cc |   26 -
 ...ager_core_browser_features_password__features.h |   17 -
 ...manager_core_browser_password__form__manager.cc |   35 -
 ...word__manager_core_browser_password__manager.cc |   26 -
 ...anager_core_browser_password__manager__client.h |   26 -
 ...ger_core_browser_password__manager__switches.cc |   17 -
 ...ager_core_browser_password__manager__switches.h |   17 -
 ...ore_browser_password__manual__fallback__flow.cc |   35 -
 ...core_browser_password__manual__fallback__flow.h |   26 -
 ..._core_browser_password__store__factory__util.cc |   17 -
 ...core_browser_password__store_login__database.cc |   26 -
 ...ssword__store_login__database__async__helper.cc |   17 -
 ...er_password__store_login__database__unittest.cc |   17 -
 ...core_browser_stub__password__manager__client.cc |   17 -
 ..._core_browser_stub__password__manager__client.h |   17 -
 ...er_core_common_password__manager__pref__names.h |   26 -
 ...nager_decorators_process__metrics__decorator.cc |   17 -
 ...mponents_performance__manager_public_features.h |   17 -
 ...sions_prediction__service_prediction__common.cc |   26 -
 ...icy_core_browser_policy__pref__mapping__test.cc |   17 -
 ...licy_core_common_cloud_cloud__policy__client.cc |   17 -
 ...mmon_cloud_cloud__policy__refresh__scheduler.cc |   26 -
 ...policy_core_common_cloud_cloud__policy__util.cc |   61 -
 ...ts_policy_core_common_policy__loader__common.cc |   26 -
 ...-components_policy_core_common_policy__paths.cc |   19 -
 ...-components_policy_core_common_policy__utils.cc |   17 -
 ...onents_policy_tools_generate__policy__source.py |   20 -
 .../patch-components_power__metrics_BUILD.gn       |   17 -
 ...nts_power__metrics_energy__metrics__provider.cc |   27 -
 ...capabilities_regional__capabilities__service.cc |   17 -
 ...apabilities_regional__capabilities__switches.cc |   17 -
 ...capabilities_regional__capabilities__switches.h |   17 -
 ...ontent_common_file__type__policies__unittest.cc |   17 -
 ...ing_content_resources_gen__file__type__proto.py |   27 -
 ..._core_browser_db_v4__protocol__manager__util.cc |   17 -
 ..._browser_realtime_url__lookup__service__base.cc |   17 -
 ...nents_search__engines_template__url__service.cc |   17 -
 ...onents_security__interstitials_content_utils.cc |   17 -
 ..._default__model_cross__device__user__segment.cc |   17 -
 ...rvices_on__device__translation_sandbox__hook.cc |   49 -
 ...ervices_on__device__translation_sandbox__hook.h |   22 -
 ...paint__preview__compositor__collection__impl.cc |   35 -
 ...mponents_signin_public_base_signin__switches.cc |   17 -
 ...omponents_signin_public_base_signin__switches.h |   17 -
 .../patches/patch-components_soda_soda__util.cc    |   35 -
 ..._metric__utils_common_startup__metric__utils.cc |   17 -
 .../patch-components_storage__monitor_BUILD.gn     |   26 -
 ...torage__monitor_removable__device__constants.cc |   17 -
 ...storage__monitor_removable__device__constants.h |   17 -
 ...r_core_browser_list__family__members__service.h |   17 -
 ...e_browser_supervised__user__metrics__service.cc |   17 -
 ...r_core_browser_supervised__user__preferences.cc |   17 -
 ...onents_supervised__user_core_common_features.cc |   78 -
 ...ponents_supervised__user_core_common_features.h |   50 -
 ...ents_supervised__user_core_common_pref__names.h |   17 -
 ...sync__device__info_local__device__info__util.cc |   35 -
 ...evice__info_local__device__info__util__linux.cc |   20 -
 ...references_common__syncable__prefs__database.cc |   17 -
 .../patch-components_sync_base_sync__util.cc       |   17 -
 .../patch-components_system__cpu_cpu__probe.cc     |   18 -
 ...onents_translate_core_common_translate__util.cc |   17 -
 ...sted__vault_trusted__vault__connection__impl.cc |   17 -
 ...ponents_update__client_update__query__params.cc |   19 -
 ..._formatter_spoof__checks_idn__spoof__checker.cc |   17 -
 ...nts_user__education_views_help__bubble__view.cc |   35 -
 ...ents_user__education_views_help__bubble__view.h |   17 -
 ...nents_variations_service_variations__service.cc |   17 -
 ...isited__url__ranking_public_url__visit__util.cc |   17 -
 .../patch-components_viz_host_gpu__host__impl.cc   |   17 -
 ...ch-components_viz_host_host__display__client.cc |   17 -
 ...tch-components_viz_host_host__display__client.h |   17 -
 ...isplay__embedder_skia__output__surface__impl.cc |   17 -
 ..._display__embedder_software__output__surface.cc |   26 -
 ...e_display__embedder_software__output__surface.h |   26 -
 ...omponents_viz_service_display_skia__renderer.cc |   17 -
 ...e__sinks_root__compositor__frame__sink__impl.cc |   26 -
 ...me__sinks_root__compositor__frame__sink__impl.h |   17 -
 ...ch-components_viz_test_fake__display__client.cc |   17 -
 ...tch-components_viz_test_fake__display__client.h |   17 -
 ...tch-components_viz_test_mock__display__client.h |   17 -
 .../patch-components_webui_flags_flags__state.cc   |   17 -
 chromium-next/patches/patch-content_app_BUILD.gn   |   21 -
 .../patches/patch-content_app_content__main.cc     |   26 -
 ...atch-content_app_content__main__runner__impl.cc |  137 -
 .../patches/patch-content_browser_BUILD.gn         |   39 -
 ...sibility_browser__accessibility__state__impl.cc |   17 -
 ...owser__accessibility__state__impl__auralinux.cc |   43 -
 .../patch-content_browser_audio_audio__service.cc  |   26 -
 ..._browser_browser__child__process__host__impl.cc |   25 -
 ...t_browser_browser__child__process__host__impl.h |   26 -
 ...ild__process__host__impl__receiver__bindings.cc |   17 -
 .../patch-content_browser_browser__main__loop.cc   |   43 -
 ...tent_browser_child__process__launcher__helper.h |   17 -
 ...wser_child__process__launcher__helper__linux.cc |  131 -
 ...browser_child__thread__type__switcher__linux.cc |   35 -
 ..._browser_child__thread__type__switcher__linux.h |   17 -
 ..._compositor_viz__process__transport__factory.cc |   17 -
 ...wser_devtools_devtools__frontend__host__impl.cc |   44 -
 ...owser_devtools_devtools__frontend__host__impl.h |   17 -
 ...wser_devtools_protocol_system__info__handler.cc |   17 -
 ...ccess_file__path__watcher_file__path__watcher.h |   17 -
 ...file__path__watcher_file__path__watcher__bsd.cc |   69 -
 ...le__path__watcher_file__path__watcher__kqueue.h |   16 -
 ...s_file__system__access__local__path__watcher.cc |   17 -
 ...font__access_font__enumeration__data__source.cc |   35 -
 .../patch-content_browser_gpu_compositor__util.cc  |   26 -
 ...content_browser_gpu_gpu__data__manager__impl.cc |   17 -
 ...-content_browser_gpu_gpu__data__manager__impl.h |   17 -
 ...rowser_gpu_gpu__data__manager__impl__private.cc |   17 -
 ...browser_gpu_gpu__data__manager__impl__private.h |   26 -
 ..._gpu_gpu__memory__buffer__manager__singleton.cc |   26 -
 ...patch-content_browser_gpu_gpu__process__host.cc |   25 -
 ...wser_media_frameless__media__interface__proxy.h |   26 -
 ...r_media_media__keys__listener__manager__impl.cc |   17 -
 ...ent_browser_network__service__instance__impl.cc |   35 -
 ...i__plugin__process__host__receiver__bindings.cc |   26 -
 ...rowser_renderer__host_delegated__frame__host.cc |   17 -
 ...ia_service__video__capture__device__launcher.cc |   26 -
 ...renderer__host_pepper_pepper__file__io__host.cc |   26 -
 ...r_renderer__host_render__process__host__impl.cc |   61 -
 ...er_renderer__host_render__process__host__impl.h |   35 -
 ...der__process__host__impl__receiver__bindings.cc |   26 -
 ...wser_renderer__host_render__view__host__impl.cc |   17 -
 ...derer__host_render__widget__host__view__aura.cc |   53 -
 ...nderer__host_render__widget__host__view__aura.h |   17 -
 ...t_render__widget__host__view__event__handler.cc |   17 -
 .../patch-content_browser_sandbox__host__linux.cc  |   24 -
 ...scheduler_responsiveness_jank__monitor__impl.cc |   17 -
 ...duler_responsiveness_native__event__observer.cc |   26 -
 ...eduler_responsiveness_native__event__observer.h |   53 -
 ...browser_service__host_utility__process__host.cc |   44 -
 ...t_utility__process__host__receiver__bindings.cc |   26 -
 ...ser_service__host_utility__sandbox__delegate.cc |   58 -
 .../patch-content_browser_v8__snapshot__files.cc   |   17 -
 ...r_web__contents_slow__web__preference__cache.cc |   35 -
 ...wser_web__contents_web__contents__view__aura.cc |   35 -
 ...contents_web__contents__view__aura__unittest.cc |   80 -
 ...browser_webui_web__ui__main__frame__observer.cc |   17 -
 ...owser_zygote__host_zygote__host__impl__linux.cc |   87 -
 ...rowser_zygote__host_zygote__host__impl__linux.h |   35 -
 chromium-next/patches/patch-content_child_BUILD.gn |   22 -
 .../patches/patch-content_child_child__process.cc  |   26 -
 .../patches/patch-content_child_child__process.h   |   17 -
 .../patches/patch-content_common_BUILD.gn          |   42 -
 .../patches/patch-content_common_features.cc       |   17 -
 .../patches/patch-content_common_features.h        |   17 -
 .../patch-content_common_font__list__unittest.cc   |   17 -
 ...-content_common_gpu__pre__sandbox__hook__bsd.cc |   77 -
 ...h-content_common_gpu__pre__sandbox__hook__bsd.h |   29 -
 ...content_common_gpu__pre__sandbox__hook__linux.h |   22 -
 ...tch-content_common_thread__type__switcher.mojom |   16 -
 .../patch-content_gpu_gpu__child__thread.cc        |   27 -
 .../patches/patch-content_gpu_gpu__main.cc         |   79 -
 ...t_ppapi__plugin_ppapi__blink__platform__impl.cc |   35 -
 ...nt_ppapi__plugin_ppapi__blink__platform__impl.h |   17 -
 ...ch-content_ppapi__plugin_ppapi__plugin__main.cc |   29 -
 ...tent_public_browser_content__browser__client.cc |   17 -
 ...blic_browser_zygote__host_zygote__host__linux.h |   22 -
 ...atch-content_public_common_content__features.cc |   41 -
 ...atch-content_public_common_content__switches.cc |   26 -
 ...patch-content_public_common_content__switches.h |   25 -
 ...patch-content_public_common_zygote_features.gni |   14 -
 .../patch-content_renderer_render__thread__impl.cc |   44 -
 ...ent_renderer_renderer__blink__platform__impl.cc |   51 -
 ...tent_renderer_renderer__blink__platform__impl.h |   17 -
 ...er_renderer__main__platform__delegate__linux.cc |   24 -
 chromium-next/patches/patch-content_shell_BUILD.gn |   17 -
 ...atch-content_shell_app_shell__main__delegate.cc |   17 -
 ...nt_shell_browser_shell__browser__main__parts.cc |   53 -
 .../patch-content_shell_browser_shell__paths.cc    |   26 -
 ...ell_browser_shell__platform__delegate__views.cc |   17 -
 ...ll_renderer_shell__content__renderer__client.cc |   17 -
 ...hell_utility_shell__content__utility__client.cc |   26 -
 chromium-next/patches/patch-content_test_BUILD.gn  |   17 -
 .../patches/patch-content_utility_services.cc      |   71 -
 ...ch_speech__recognition__sandbox__hook__linux.cc |   43 -
 ...ech_speech__recognition__sandbox__hook__linux.h |   22 -
 ...link__platform__with__sandbox__support__impl.cc |   35 -
 ...blink__platform__with__sandbox__support__impl.h |   17 -
 .../patches/patch-content_utility_utility__main.cc |  128 -
 .../patch-content_utility_utility__thread__impl.cc |   27 -
 .../patches/patch-content_zygote_BUILD.gn          |   17 -
 .../patches/patch-content_zygote_zygote__linux.cc  |   21 -
 .../patch-content_zygote_zygote__main__linux.cc    |   64 -
 .../patch-device_bluetooth_bluetooth__adapter.cc   |   17 -
 .../patch-device_bluetooth_cast__bluetooth.gni     |   15 -
 .../patches/patch-device_gamepad_BUILD.gn          |   17 -
 .../patch-device_gamepad_gamepad__provider.cc      |   17 -
 .../patch-device_gamepad_hid__writer__linux.cc     |   17 -
 ..._browser__context__keyed__service__factories.cc |   17 -
 ...sions_browser_api_management_management__api.cc |   17 -
 ...sions_browser_api_messaging_message__service.cc |   26 -
 ...ivate_networking__private__delegate__factory.cc |   35 -
 ...tensions_common_api___permission__features.json |   35 -
 .../patch-extensions_common_api_runtime.json       |   17 -
 .../patches/patch-extensions_common_command.cc     |   17 -
 .../patch-extensions_common_features_feature.cc    |   17 -
 ...ensions_renderer_bindings_api__binding__util.cc |   17 -
 ...-extensions_renderer_bindings_argument__spec.cc |   17 -
 ...h-extensions_shell_app_shell__main__delegate.cc |   26 -
 ...er_api_runtime_shell__runtime__api__delegate.cc |   17 -
 ...ns_shell_browser_shell__browser__main__parts.cc |   17 -
 ...shell_browser_shell__extensions__api__client.cc |   26 -
 ..._shell_browser_shell__extensions__api__client.h |   25 -
 ...h-google__apis_gcm_engine_heartbeat__manager.cc |   35 -
 ...mand__buffer_service_dawn__context__provider.cc |   17 -
 ..._command__buffer_service_gles2__cmd__decoder.cc |   17 -
 ...ice_raster__decoder__unittest__context__lost.cc |   27 -
 ...mmand__buffer_service_shared__context__state.cc |   35 -
 ...ommand__buffer_service_shared__context__state.h |   26 -
 ...image_angle__vulkan__image__backing__factory.cc |   26 -
 ...e_shared__image_external__vk__image__backing.cc |   26 -
 ..._image_external__vk__image__backing__factory.cc |   17 -
 ...service_shared__image_shared__image__factory.cc |   44 -
 ...service_shared__image_shared__image__manager.cc |   17 -
 ...ce_shared__image_wrapped__sk__image__backing.cc |   17 -
 ...ommand__buffer_service_webgpu__decoder__impl.cc |   26 -
 ...ffer_tests_gl__gpu__memory__buffer__unittest.cc |   26 -
 .../patches/patch-gpu_config_gpu__control__list.cc |   17 -
 .../patch-gpu_config_gpu__finch__features.cc       |   18 -
 .../patch-gpu_config_gpu__info__collector.cc       |   17 -
 .../patches/patch-gpu_config_gpu__test__config.cc  |   17 -
 ...-gpu_ipc_common_gpu__memory__buffer__support.cc |   26 -
 ...h-gpu_ipc_common_gpu__memory__buffer__support.h |   17 -
 .../patches/patch-gpu_ipc_service_gpu__init.cc     |   89 -
 ...gpu_ipc_service_gpu__memory__buffer__factory.cc |   26 -
 .../patches/patch-gpu_ipc_service_x__util.h        |   17 -
 .../patches/patch-gpu_vulkan_generate__bindings.py |   17 -
 .../patches/patch-gpu_vulkan_semaphore__handle.cc  |   26 -
 .../patch-gpu_vulkan_vulkan__device__queue.cc      |   26 -
 .../patch-gpu_vulkan_vulkan__device__queue.h       |   17 -
 .../patch-gpu_vulkan_vulkan__function__pointers.cc |   26 -
 .../patch-gpu_vulkan_vulkan__function__pointers.h  |   33 -
 .../patches/patch-gpu_vulkan_vulkan__image.h       |   26 -
 .../patches/patch-gpu_vulkan_vulkan__util.cc       |   17 -
 chromium-next/patches/patch-headless_BUILD.gn      |   17 -
 ...rowser_headless__browser__main__parts__posix.cc |   45 -
 ...b_browser_headless__content__browser__client.cc |   26 -
 ...ib_browser_headless__content__browser__client.h |   17 -
 ...ss_lib_browser_headless__web__contents__impl.cc |   17 -
 ...adless_lib_headless__content__main__delegate.cc |   17 -
 chromium-next/patches/patch-ipc_ipc__channel.h     |   17 -
 .../patches/patch-ipc_ipc__channel__common.cc      |   17 -
 .../patches/patch-ipc_ipc__channel__mojo.cc        |   17 -
 .../patches/patch-ipc_ipc__message__utils.cc       |   17 -
 .../patches/patch-ipc_ipc__message__utils.h        |   17 -
 chromium-next/patches/patch-media_BUILD.gn         |   21 -
 chromium-next/patches/patch-media_audio_BUILD.gn   |   45 -
 .../patch-media_audio_alsa_audio__manager__alsa.cc |   60 -
 .../patch-media_audio_audio__input__device.cc      |   17 -
 ...h-media_audio_audio__output__proxy__unittest.cc |   20 -
 .../patches/patch-media_audio_pulse_pulse__util.cc |   21 -
 ...atch-media_audio_sndio_audio__manager__sndio.cc |  222 --
 ...patch-media_audio_sndio_audio__manager__sndio.h |   75 -
 .../patch-media_audio_sndio_sndio__input.cc        |  209 --
 .../patches/patch-media_audio_sndio_sndio__input.h |  100 -
 .../patch-media_audio_sndio_sndio__output.cc       |  196 --
 .../patch-media_audio_sndio_sndio__output.h        |   97 -
 .../patches/patch-media_base_audio__latency.cc     |   17 -
 .../patch-media_base_libaom__thread__wrapper.cc    |   30 -
 .../patch-media_base_libvpx__thread__wrapper.cc    |   31 -
 .../patches/patch-media_base_media__switches.cc    |  132 -
 .../patches/patch-media_base_media__switches.h     |   73 -
 .../patches/patch-media_base_video__frame.cc       |   53 -
 .../patches/patch-media_base_video__frame.h        |   53 -
 ...ideo_create__video__capture__device__factory.cc |   26 -
 ..._video_fake__video__capture__device__factory.cc |   17 -
 ..._video_file__video__capture__device__factory.cc |   17 -
 ...h-media_capture_video_linux_fake__v4l2__impl.cc |   17 -
 ...ch-media_capture_video_linux_fake__v4l2__impl.h |   31 -
 ..._capture_video_linux_v4l2__capture__delegate.cc |  183 --
 ...a_capture_video_linux_v4l2__capture__delegate.h |   66 -
 ...dia_capture_video_linux_v4l2__capture__device.h |   17 -
 ...ture_video_linux_v4l2__capture__device__impl.cc |   17 -
 ...pture_video_linux_v4l2__capture__device__impl.h |   17 -
 ..._linux_video__capture__device__factory__v4l2.cc |  107 -
 ...o_linux_video__capture__device__factory__v4l2.h |   17 -
 ...re_video_linux_video__capture__device__linux.cc |   17 -
 ...deo__capture__buffer__tracker__factory__impl.cc |   26 -
 ...capture_video_video__capture__device__client.cc |   17 -
 .../patch-media_cdm_cdm__paths__unittest.cc        |   17 -
 .../patch-media_cdm_library__cdm_cdm__paths.gni    |   17 -
 .../patch-media_ffmpeg_scripts_build__ffmpeg.py    |   82 -
 .../patch-media_ffmpeg_scripts_robo__lib_config.py |   64 -
 ...a_gpu_chromeos_gl__image__processor__backend.cc |   19 -
 ...u_chromeos_libyuv__image__processor__backend.cc |   35 -
 ...pu_chromeos_mailbox__video__frame__converter.cc |   17 -
 ...a_gpu_chromeos_platform__video__frame__utils.cc |   26 -
 ...-media_gpu_chromeos_video__decoder__pipeline.cc |   35 -
 ...gpu_gpu__video__decode__accelerator__factory.cc |   26 -
 ...gpu_gpu__video__encode__accelerator__factory.cc |   26 -
 ...dware__video__decoding__sandbox__hook__linux.cc |   50 -
 ...rdware__video__decoding__sandbox__hook__linux.h |   22 -
 ...dware__video__encoding__sandbox__hook__linux.cc |   32 -
 ...rdware__video__encoding__sandbox__hook__linux.h |   29 -
 .../patches/patch-media_gpu_test_raw__video.cc     |   17 -
 ...ch-media_gpu_test_video__frame__file__writer.cc |   17 -
 .../patch-media_gpu_test_video__frame__helpers.cc  |   17 -
 ...patch-media_gpu_test_video__frame__validator.cc |   17 -
 .../patch-media_gpu_vaapi_vaapi__video__decoder.cc |   17 -
 .../patch-media_gpu_vaapi_vaapi__wrapper.cc        |   17 -
 .../patches/patch-media_media__options.gni         |   28 -
 .../patches/patch-media_mojo_mojom_BUILD.gn        |   17 -
 ...media_mojo_mojom_video__frame__mojom__traits.cc |   44 -
 ...-media_mojo_mojom_video__frame__mojom__traits.h |   17 -
 .../patch-media_video_fake__gpu__memory__buffer.cc |   35 -
 .../patch-media_video_fake__gpu__memory__buffer.h  |   17 -
 ...ideo_gpu__memory__buffer__video__frame__pool.cc |   35 -
 ...ia_video_video__encode__accelerator__adapter.cc |   17 -
 ...eo_video__encode__accelerator__adapter__test.cc |   44 -
 .../patches/patch-media_webrtc_audio__processor.cc |   17 -
 .../patches/patch-media_webrtc_helpers.cc          |   25 -
 .../patch-media_webrtc_helpers__unittests.cc       |   44 -
 chromium-next/patches/patch-mojo_core_BUILD.gn     |   17 -
 chromium-next/patches/patch-mojo_core_channel.cc   |   20 -
 .../patches/patch-mojo_core_embedder_features.h    |   17 -
 ...ojo_public_cpp_platform_socket__utils__posix.cc |   17 -
 .../patch-mojo_public_tools_bindings_mojom.gni     |   30 -
 chromium-next/patches/patch-net_BUILD.gn           |  101 -
 chromium-next/patches/patch-net_base_features.cc   |   30 -
 .../patch-net_base_network__change__notifier.cc    |   45 -
 .../patch-net_base_network__change__notifier.h     |   35 -
 ...-net_base_network__change__notifier__passive.cc |   17 -
 .../patch-net_base_network__interfaces__posix.h    |   17 -
 .../patch-net_base_sockaddr__util__posix.cc        |   18 -
 ...tch-net_base_sockaddr__util__posix__unittest.cc |   18 -
 .../patches/patch-net_cert_cert__verify__proc.h    |   17 -
 .../patch-net_disk__cache_backend__experiment.h    |   17 -
 ...net_disk__cache_simple_simple__file__tracker.cc |   26 -
 chromium-next/patches/patch-net_dns_BUILD.gn       |   49 -
 .../patches/patch-net_dns_address__info.cc         |   22 -
 .../patch-net_dns_address__sorter__posix.cc        |   16 -
 .../patch-net_dns_dns__config__service__posix.cc   |   32 -
 .../patches/patch-net_dns_dns__reloader.cc         |   25 -
 chromium-next/patches/patch-net_dns_dns__util.cc   |   17 -
 .../patches/patch-net_dns_host__resolver__proc.cc  |   19 -
 .../patches/patch-net_dns_public_BUILD.gn          |   17 -
 .../patches/patch-net_dns_public_resolv__reader.cc |   17 -
 .../patches/patch-net_dns_public_resolv__reader.h  |   16 -
 .../patch-net_dns_public_scoped__res__state.cc     |   17 -
 .../patch-net_dns_public_scoped__res__state.h      |   16 -
 .../patch-net_filter_zstd__source__stream.cc       |   16 -
 .../patch-net_http_http__auth__gssapi__posix.cc    |   19 -
 .../patch-net_http_http__auth__gssapi__posix.h     |   18 -
 ...atch-net_http_http__auth__handler__negotiate.cc |   17 -
 .../patch-net_http_http__auth__preferences.cc      |   17 -
 .../patch-net_http_http__auth__preferences.h       |   35 -
 .../patch-net_http_http__network__session.cc       |   18 -
 ...net_proxy__resolution_proxy__config__service.cc |   41 -
 ...xy__resolution_proxy__config__service__linux.cc |   46 -
 ...et_quic_quic__network__transaction__unittest.cc |   34 -
 .../patch-net_socket_socks5__client__socket.cc     |   18 -
 .../patches/patch-net_socket_tcp__socket__posix.cc |   26 -
 .../patches/patch-net_socket_udp__socket__posix.cc |  132 -
 .../patch-net_socket_udp__socket__unittest.cc      |   53 -
 .../patches/patch-net_third__party_quiche_BUILD.gn |   17 -
 ..._tools_cert__verify__tool_cert__verify__tool.cc |   35 -
 .../patch-net_tools_net__watcher_net__watcher.cc   |   44 -
 ...ffic__annotation_network__traffic__annotation.h |   26 -
 ...patch-net_url__request_url__request__context.cc |   17 -
 .../patch-net_url__request_url__request__context.h |   17 -
 ..._url__request_url__request__context__builder.cc |   17 -
 ...ets_websocket__basic__stream__adapters__test.cc |   21 -
 .../patches/patch-pdf_pdfium_pdfium__engine.cc     |   26 -
 .../patches/patch-ppapi_tests_test__utils.h        |   27 -
 .../patch-printing_backend_cups__ipp__helper.cc    |   17 -
 .../patch-printing_backend_print__backend__cups.cc |   35 -
 ...nting_mojom_printing__context__mojom__traits.cc |   35 -
 ...inting_mojom_printing__context__mojom__traits.h |   17 -
 ...m_printing__context__mojom__traits__unittest.cc |   71 -
 .../patches/patch-printing_print__settings.cc      |   44 -
 .../patches/patch-printing_print__settings.h       |   53 -
 .../patch-printing_print__settings__conversion.cc  |   17 -
 .../patch-printing_printing__context__linux.cc     |   44 -
 .../patches/patch-printing_printing__features.cc   |   32 -
 .../patches/patch-printing_printing__features.h    |   17 -
 ...sandbox_print__backend__sandbox__hook__linux.cc |   56 -
 ..._sandbox_print__backend__sandbox__hook__linux.h |   22 -
 .../patch-remoting_base_chromoting__event.cc       |   17 -
 .../patches/patch-remoting_base_host__settings.cc  |   26 -
 ...h-remoting_codec_webrtc__video__encoder__vpx.cc |   17 -
 ...ting_host_base_desktop__environment__options.cc |   17 -
 .../patches/patch-remoting_host_base_switches.cc   |   24 -
 .../patches/patch-remoting_host_base_switches.h    |   24 -
 .../patch-remoting_host_chromoting__host.cc        |   17 -
 .../patches/patch-remoting_host_chromoting__host.h |   35 -
 ...atch-remoting_host_chromoting__host__context.cc |   17 -
 ...ting_host_chromoting__host__services__client.cc |   26 -
 .../patches/patch-remoting_host_client__session.cc |   17 -
 ...ch-remoting_host_crash_crash__file__uploader.cc |   17 -
 .../patch-remoting_host_evaluate__capability.cc    |   17 -
 .../patch-remoting_host_host__attributes.cc        |   17 -
 .../patches/patch-remoting_host_host__details.cc   |   35 -
 .../patches/patch-remoting_host_host__main.cc      |   44 -
 .../patches/patch-remoting_host_ipc__constants.cc  |   26 -
 ...t_it2me_it2me__native__messaging__host__main.cc |   53 -
 ...ch-remoting_host_me2me__desktop__environment.cc |   35 -
 ...emoting_host_mojo__caller__security__checker.cc |   35 -
 .../patches/patch-remoting_host_policy__watcher.cc |   17 -
 ..._remote__open__url_remote__open__url__client.cc |   26 -
 ...st_remote__open__url_remote__open__url__util.cc |   17 -
 ...mote__open__url_url__forwarder__configurator.cc |   17 -
 .../patch-remoting_host_remoting__me2me__host.cc   |  152 --
 ...-remoting_host_session__policies__from__dict.cc |   17 -
 .../patch-remoting_host_setup_start__host__main.cc |   35 -
 ...hn_remote__webauthn__caller__security__utils.cc |   35 -
 ...bauthn_remote__webauthn__extension__notifier.cc |   34 -
 ...atch-remoting_protocol_webrtc__video__stream.cc |   17 -
 ...ng_signaling_ftl__host__device__id__provider.cc |   17 -
 chromium-next/patches/patch-sandbox_BUILD.gn       |   17 -
 chromium-next/patches/patch-sandbox_features.gni   |   17 -
 chromium-next/patches/patch-sandbox_linux_BUILD.gn |   41 -
 ...sandbox_linux_services_init__process__reaper.cc |   21 -
 ...tch-sandbox_linux_services_libc__interceptor.cc |   27 -
 .../patches/patch-sandbox_policy_BUILD.gn          |   56 -
 .../patches/patch-sandbox_policy_features.cc       |   20 -
 ...atch-sandbox_policy_freebsd_sandbox__freebsd.cc |  220 --
 ...patch-sandbox_policy_freebsd_sandbox__freebsd.h |  285 --
 .../patch-sandbox_policy_mojom_sandbox.mojom       |   24 -
 .../patch-sandbox_policy_netbsd_sandbox__netbsd.cc |  220 --
 .../patch-sandbox_policy_netbsd_sandbox__netbsd.h  |  285 --
 ...atch-sandbox_policy_openbsd_sandbox__openbsd.cc |  401 ---
 ...patch-sandbox_policy_openbsd_sandbox__openbsd.h |  289 --
 .../patches/patch-sandbox_policy_sandbox.cc        |   28 -
 .../patches/patch-sandbox_policy_sandbox.h         |   32 -
 .../patches/patch-sandbox_policy_sandbox__type.cc  |  181 --
 .../patches/patch-sandbox_policy_switches.cc       |   19 -
 .../patches/patch-sandbox_policy_switches.h        |   18 -
 ...h-services_audio_audio__sandbox__hook__linux.cc |   37 -
 ...ch-services_audio_audio__sandbox__hook__linux.h |   22 -
 .../patches/patch-services_device_BUILD.gn         |   17 -
 ...vice_geolocation_location__provider__manager.cc |   17 -
 .../patches/patch-services_device_hid_BUILD.gn     |   43 -
 ...ch-services_device_hid_hid__connection__fido.cc |  225 --
 ...tch-services_device_hid_hid__connection__fido.h |   69 -
 ...services_device_hid_hid__connection__freebsd.cc |  249 --
 ...-services_device_hid_hid__connection__freebsd.h |   76 -
 .../patch-services_device_hid_hid__service.cc      |   46 -
 ...patch-services_device_hid_hid__service__fido.cc |  405 ---
 .../patch-services_device_hid_hid__service__fido.h |   74 -
 ...ch-services_device_hid_hid__service__freebsd.cc |  404 ---
 ...tch-services_device_hid_hid__service__freebsd.h |   58 -
 ...tch-services_device_hid_hid__service__netbsd.cc |   36 -
 ...atch-services_device_hid_hid__service__netbsd.h |   42 -
 ...-services_device_public_cpp_device__features.cc |   17 -
 ...h-services_device_public_cpp_device__features.h |   17 -
 ...ce_public_cpp_generic__sensor_sensor__reading.h |   17 -
 .../patch-services_device_public_mojom_BUILD.gn    |   17 -
 .../patches/patch-services_device_serial_BUILD.gn  |   17 -
 ...ces_device_serial_serial__device__enumerator.cc |   26 -
 ...ces_device_serial_serial__io__handler__posix.cc |   17 -
 ...me__zone__monitor_time__zone__monitor__linux.cc |   22 -
 .../patches/patch-services_device_usb_BUILD.gn     |   40 -
 ...rvices_device_usb_usb__device__handle__usbfs.cc |   44 -
 ...ervices_device_usb_usb__device__handle__usbfs.h |   44 -
 .../patch-services_device_usb_usb__service.cc      |   42 -
 ...patch-services_device_usb_usb__service__fake.cc |   58 -
 .../patch-services_device_usb_usb__service__fake.h |   57 -
 .../patches/patch-services_network_BUILD.gn        |   16 -
 .../patch-services_network_network__context.cc     |   26 -
 .../patch-services_network_network__context.h      |   17 -
 ...rvices_network_network__sandbox__hook__linux.cc |   43 -
 ...ervices_network_network__sandbox__hook__linux.h |   20 -
 .../patch-services_network_network__service.cc     |   40 -
 .../patch-services_network_network__service.h      |   35 -
 .../patch-services_network_public_cpp_BUILD.gn     |   26 -
 .../patch-services_network_public_cpp_features.cc  |   17 -
 .../patch-services_network_public_mojom_BUILD.gn   |   31 -
 ...ionary_shared__dictionary__writer__in__memory.h |   17 -
 ..._on__device__model_on__device__model__service.h |   28 -
 ...ervices_on__device__model_pre__sandbox__init.cc |   44 -
 ..._instrumentation_queued__request__dispatcher.cc |   71 -
 ...tor_public_cpp_memory__instrumentation_BUILD.gn |   24 -
 ...ublic_cpp_memory__instrumentation_os__metrics.h |   26 -
 ...cpp_memory__instrumentation_os__metrics__bsd.cc |   75 -
 ...tch-services_screen__ai_public_cpp_utilities.cc |   35 -
 ..._ai_sandbox_screen__ai__sandbox__hook__linux.cc |   24 -
 ...__ai_sandbox_screen__ai__sandbox__hook__linux.h |   22 -
 .../patch-services_service__manager_BUILD.gn       |   17 -
 ...manager_public_cpp_service__executable_BUILD.gn |   17 -
 ...p_stack__sampling_tracing__sampler__profiler.cc |   17 -
 ..._tracing_public_cpp_system__metrics__sampler.cc |   19 -
 ...ture_public_mojom_video__capture__service.mojom |   21 -
 ...effects_video__effects__sandbox__hook__linux.cc |   33 -
 ..._effects_video__effects__sandbox__hook__linux.h |   22 -
 .../patch-services_viz_public_mojom_BUILD.gn       |   17 -
 .../patch-skia_ext_SkMemory__new__handler.cpp      |   26 -
 .../patches/patch-skia_ext_font__utils.cc          |   26 -
 .../patches/patch-skia_ext_skcolorspace__trfn.cc   |   17 -
 ...atch-third__party_abseil-cpp_absl_base_config.h |   28 -
 ...y_abseil-cpp_absl_base_internal_raw__logging.cc |   17 -
 ..._party_abseil-cpp_absl_base_internal_sysinfo.cc |   71 -
 ...l-cpp_absl_debugging_internal_elf__mem__image.h |   18 -
 ...sl_time_internal_cctz_src_time__zone__format.cc |   18 -
 .../patches/patch-third__party_afl_src_afl-fuzz.c  |   48 -
 .../patches/patch-third__party_angle_BUILD.gn      |   35 -
 .../patch-third__party_angle_src_common_platform.h |   30 -
 ...ird__party_angle_src_common_platform__helpers.h |   17 -
 ...third__party_angle_src_common_system__utils.cpp |   17 -
 ...party_angle_src_common_system__utils__linux.cpp |   47 -
 ...ngle_src_gpu__info__util_SystemInfo__internal.h |   22 -
 ...ngle_src_gpu__info__util_SystemInfo__libpci.cpp |   96 -
 ...angle_src_gpu__info__util_SystemInfo__linux.cpp |   41 -
 ...y_angle_src_gpu__info__util_SystemInfo__x11.cpp |   67 -
 ...tch-third__party_angle_src_libANGLE_Display.cpp |   62 -
 ...e_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp |   21 -
 ...e_src_libANGLE_renderer_vulkan_DisplayVk__api.h |   17 -
 .../patches/patch-third__party_angle_util_BUILD.gn |   17 -
 ...erences_renderer__preferences__mojom__traits.cc |   17 -
 ...n_renderer__preferences_renderer__preferences.h |   17 -
 ...ferences_renderer__preferences__mojom__traits.h |   17 -
 ...h-third__party_blink_public_platform_platform.h |   17 -
 ...rer_bindings_scripts_bind__gen_style__format.py |   17 -
 ...rd__party_blink_renderer_build_scripts_gperf.py |   33 -
 ...renderer_build_scripts_run__with__pythonpath.py |   16 -
 ...blink_renderer_controller_blink__initializer.cc |   41 -
 ...rer_controller_memory__usage__monitor__posix.cc |   27 -
 ...erer_controller_memory__usage__monitor__posix.h |   53 -
 ...link_renderer_core_editing_editing__behavior.cc |   17 -
 ...erer_core_execution__context_navigator__base.cc |   17 -
 ...blink_renderer_core_exported_web__view__impl.cc |   26 -
 ...y_blink_renderer_core_frame_web__frame__test.cc |   26 -
 ...ore_html_canvas_canvas__async__blob__creator.cc |   17 -
 ...erer_core_inspector_inspector__memory__agent.cc |   17 -
 ...arty_blink_renderer_core_layout_layout__view.cc |   26 -
 ...renderer_core_loader_mixed__content__checker.cc |   17 -
 ...r_core_origin__trials_origin__trial__context.cc |   17 -
 ...renderer_core_page_context__menu__controller.cc |   17 -
 ...party_blink_renderer_core_paint_paint__layer.cc |   17 -
 ..._renderer_core_scroll_scrollbar__theme__aura.cc |   26 -
 ...party_blink_renderer_core_xml_xslt__processor.h |   20 -
 ...k_renderer_core_xml_xslt__processor__libxslt.cc |   20 -
 ...r_modules_media_audio_audio__device__factory.cc |   17 -
 ..._audio_audio__renderer__mixer__manager__test.cc |   17 -
 ...er_modules_peerconnection_rtc__data__channel.cc |   16 -
 ...peerconnection_webrtc__audio__renderer__test.cc |   17 -
 ...odules_webaudio_audio__worklet__thread__test.cc |   17 -
 ...odules_webgl_webgl__rendering__context__base.cc |   17 -
 ...renderer_modules_webgpu_gpu__canvas__context.cc |   17 -
 ...rty_blink_renderer_modules_webgpu_gpu__queue.cc |   17 -
 ...h-third__party_blink_renderer_platform_BUILD.gn |   17 -
 ...ty_blink_renderer_platform_fonts_font__cache.cc |   26 -
 ...rty_blink_renderer_platform_fonts_font__cache.h |   53 -
 ...nk_renderer_platform_fonts_font__description.cc |   26 -
 ..._blink_renderer_platform_fonts_font__metrics.cc |   35 -
 ...er_platform_fonts_font__unique__name__lookup.cc |   26 -
 ...nderer_platform_fonts_skia_font__cache__skia.cc |   26 -
 ...rer_platform_graphics_begin__frame__provider.cc |   21 -
 ...r_platform_graphics_gpu_image__layer__bridge.cc |   17 -
 ...er_platform_graphics_video__frame__submitter.cc |   17 -
 ...ion_partition__alloc__memory__dump__provider.cc |   34 -
 ..._peerconnection_rtc__video__encoder__factory.cc |   23 -
 ...derer_platform_runtime__enabled__features.json5 |   80 -
 ...nk_renderer_platform_scheduler_common_thread.cc |   17 -
 ...g_blink__categorized__worker__pool__delegate.cc |   17 -
 ..._renderer_platform_wtf_container__annotations.h |   17 -
 ...arty_blink_renderer_platform_wtf_math__extras.h |   29 -
 ...arty_blink_renderer_platform_wtf_stack__util.cc |   82 -
 .../patch-third__party_brotli_common_platform.h    |   17 -
 .../patches/patch-third__party_cpuinfo_cpuinfo.gni |   17 -
 ...ashpad_crashpad_build_crashpad__buildconfig.gni |   17 -
 ...-third__party_crashpad_crashpad_client_BUILD.gn |   22 -
 ...hpad_crashpad_client_crashpad__client__posix.cc |   49 -
 ...ashpad_minidump_minidump__misc__info__writer.cc |   21 -
 ...ty_crashpad_crashpad_util_misc_address__types.h |   26 -
 ..._crashpad_crashpad_util_misc_capture__context.h |   28 -
 ...d__party_crashpad_crashpad_util_misc_metrics.cc |   17 -
 ...hird__party_crashpad_crashpad_util_misc_uuid.cc |   17 -
 ...crashpad_crashpad_util_posix_close__multiple.cc |   17 -
 ...rashpad_crashpad_util_posix_drop__privileges.cc |   17 -
 ...__party_crashpad_crashpad_util_posix_signals.cc |   39 -
 ...ashpad_util_posix_symbolic__constants__posix.cc |   26 -
 .../patches/patch-third__party_crc32c_BUILD.gn     |   17 -
 ..._party_dawn_include_dawn_native_VulkanBackend.h |   18 -
 ...ch-third__party_dawn_src_dawn_common_Platform.h |   20 -
 ...party_dawn_src_dawn_native_vulkan_BackendVk.cpp |   17 -
 .../patches/patch-third__party_ffmpeg_BUILD.gn     |   16 -
 ...atch-third__party_ffmpeg_libavcodec_x86_cabac.h |   18 -
 .../patch-third__party_ffmpeg_libavutil_cpu.c      |   20 -
 .../patch-third__party_ffmpeg_libavutil_mem.c      |   18 -
 ...ch-third__party_ffmpeg_libavutil_random__seed.c |   31 -
 ...ch-third__party_ffmpeg_libavutil_x86_x86inc.asm |   29 -
 .../patch-third__party_fontconfig_include_config.h |   55 -
 ...atch-third__party_fontconfig_src_src_fccompat.c |   19 -
 .../patches/patch-third__party_ipcz_src_BUILD.gn   |   17 -
 ...rd__party_ipcz_src_reference__drivers_random.cc |   26 -
 ...hird__party_ipcz_src_standalone_base_logging.cc |   18 -
 ...tch-third__party_leveldatabase_env__chromium.cc |   18 -
 ...m_source_libaom_aom__ports_aarch64__cpudetect.c |   56 -
 ...src_include_____locale__dir_locale__base__api.h |   17 -
 ...src_include_____locale__dir_support_bsd__like.h |   20 -
 .../patch-third__party_libc++_src_src_chrono.cpp   |   17 -
 ...libc++_src_src_filesystem_filesystem__clock.cpp |   17 -
 ...ird__party_libc++abi_src_src_cxa__guard__impl.h |   26 -
 .../patch-third__party_libdrm_src_xf86drmMode.c    |   29 -
 ...st_cpp_src_phonenumbers_base_memory_singleton.h |   18 -
 ...pp_src_phonenumbers_base_synchronization_lock.h |   18 -
 ...ist_cpp_src_phonenumbers_base_thread__checker.h |   29 -
 ...ch-third__party_libsync_src_include_sync_sync.h |   18 -
 .../patches/patch-third__party_libsync_src_sync.c  |   31 -
 .../patches/patch-third__party_libusb_BUILD.gn     |   58 -
 .../patch-third__party_libusb_src_libusb_core.c    |   17 -
 ...rd__party_libusb_src_libusb_os_threads__posix.c |   30 -
 ...x_source_libvpx_vpx__ports_aarch64__cpudetect.c |   34 -
 .../patch-third__party_lzma__sdk_C_CpuArch.c       |   43 -
 ...ial__color__utilities_src_cpp_palettes_tones.cc |   17 -
 .../patches/patch-third__party_nasm_BUILD.gn       |   22 -
 .../patch-third__party_nasm_config_config-linux.h  |  108 -
 .../patches/patch-third__party_node_node.gni       |   34 -
 .../patches/patch-third__party_node_node.py        |   18 -
 ...ird__party_pdfium_core_fxge_cfx__fontmapper.cpp |   17 -
 ...arty_pdfium_core_fxge_linux_fx__linux__impl.cpp |   31 -
 ...-third__party_pdfium_fxjs_fx__date__helpers.cpp |   28 -
 .../patches/patch-third__party_pdfium_pdfium.gni   |   17 -
 ...fium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp |   47 -
 ..._perfetto_include_perfetto_base_build__config.h |   76 -
 ..._perfetto_include_perfetto_base_thread__utils.h |   28 -
 ...rd__party_perfetto_include_perfetto_base_time.h |   40 -
 ..._perfetto_include_perfetto_ext_base_event__fd.h |   17 -
 ...fetto_include_perfetto_ext_base_thread__utils.h |   21 -
 ...erfetto_tracing_internal_track__event__legacy.h |   17 -
 ...erfetto_protos_perfetto_trace_ftrace_v4l2.proto |   62 -
 ...rd__party_perfetto_src_base_clock__snapshots.cc |   16 -
 ...tch-third__party_perfetto_src_base_event__fd.cc |   28 -
 ...hird__party_perfetto_src_base_periodic__task.cc |   26 -
 ...third__party_perfetto_src_base_string__utils.cc |   18 -
 ...d__party_perfetto_src_base_subprocess__posix.cc |   28 -
 ...party_perfetto_src_base_test_vm__test__utils.cc |   17 -
 ...party_perfetto_src_base_thread__task__runner.cc |   18 -
 ...-third__party_perfetto_src_base_unix__socket.cc |   46 -
 .../patch-third__party_perfetto_src_base_utils.cc  |   53 -
 ...ce__processor_importers_ftrace_v4l2__tracker.cc |   62 -
 ...-third__party_perfetto_src_tracing_ipc_memfd.cc |   18 -
 ...__party_perfetto_src_tracing_platform__posix.cc |   25 -
 ...atch-third__party_perfetto_src_tracing_track.cc |   29 -
 ...uf_src_google_protobuf_stubs_platform__macros.h |   17 -
 ..._party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h |   17 -
 ...hird__party_skia_src_ports_SkMemory__malloc.cpp |   27 -
 ...third__party_skia_src_ports_SkOSFile__posix.cpp |   17 -
 ...__party_speech-dispatcher_libspeechd__version.h |   38 -
 ...third__party_speech-dispatcher_speechd__types.h |  148 -
 .../patches/patch-third__party_sqlite_BUILD.gn     |   17 -
 ...d__party_sqlite_src_amalgamation__dev_sqlite3.c |   27 -
 ...-third__party_sqlite_src_amalgamation_sqlite3.c |   47 -
 ...-third__party_swiftshader_src_Reactor_Debug.cpp |   18 -
 ...__party_swiftshader_src_System_Configurator.cpp |   18 -
 ...d__party_swiftshader_src_System_Linux_MemFd.cpp |   43 -
 ...tshader_src_Vulkan_VkSemaphoreExternalLinux.hpp |   26 -
 ...tch-third__party_swiftshader_src_WSI_libXCB.cpp |   26 -
 ...10.0_configs_linux_include_llvm_Config_config.h |  180 --
 ...ubzero_build_Linux_include_llvm_Config_config.h |   53 -
 ...ty_swiftshader_third__party_marl_src_memory.cpp |   18 -
 ...ty_swiftshader_third__party_marl_src_thread.cpp |   29 -
 ...ch-third__party_test__fonts_fontconfig_BUILD.gn |   34 -
 ...st__fonts_fontconfig_fontconfig__util__linux.cc |   33 -
 ...onts_fontconfig_generate__fontconfig__caches.cc |   26 -
 .../patches/patch-third__party_tflite_features.gni |   19 -
 .../patches/patch-third__party_unrar_src_crypt.cpp |   17 -
 ...layers_src_layers_external_vma_vk__mem__alloc.h |   17 -
 ...ers_vulkan_generated_vk__function__pointers.cpp |   18 -
 ...kan__memory__allocator_include_vk__mem__alloc.h |   17 -
 .../patches/patch-third__party_wayland_BUILD.gn    |   20 -
 .../patch-third__party_wayland_include_config.h    |   35 -
 .../patches/patch-third__party_webrtc_BUILD.gn     |   18 -
 ...rd__party_webrtc_modules_audio__device_BUILD.gn |   17 -
 ...s_desktop__capture_linux_wayland_egl__dmabuf.cc |   18 -
 ...__capture_linux_x11_x__server__pixel__buffer.cc |   21 -
 ...tch-third__party_webrtc_rtc__base_byte__order.h |   17 -
 ...ch-third__party_webrtc_rtc__base_ip__address.cc |   18 -
 ...d__party_webrtc_rtc__base_net__test__helpers.cc |   16 -
 .../patch-third__party_webrtc_rtc__base_network.cc |   21 -
 ...ty_webrtc_rtc__base_physical__socket__server.cc |  120 -
 ...rty_webrtc_rtc__base_physical__socket__server.h |   17 -
 ...rty_webrtc_rtc__base_platform__thread__types.cc |   43 -
 ...webrtc_rtc__base_third__party_sigslot_sigslot.h |   29 -
 ...h-third__party_webrtc_system__wrappers_BUILD.gn |   17 -
 .../patch-third__party_widevine_cdm_widevine.gni   |   18 -
 .../patches/patch-third__party_zlib_BUILD.gn       |   37 -
 .../patch-third__party_zlib_cpu__features.c        |   57 -
 .../patch-tools_code__cache__generator_BUILD.gn    |   52 -
 ...erate__shim__headers_generate__shim__headers.py |   27 -
 .../patches/patch-tools_generate__stubs_rules.gni  |   16 -
 ...atch-tools_gn_build_build__linux.ninja.template |   17 -
 chromium-next/patches/patch-tools_gn_build_gen.py  |   40 -
 .../patch-tools_gn_src_base_files_file__posix.cc   |   17 -
 .../patches/patch-tools_gn_src_gn_version.h        |   21 -
 .../patches/patch-tools_gn_src_util_exe__path.cc   |   96 -
 .../patches/patch-tools_grit_grit_node_base.py     |   18 -
 ...son__schema__compiler_cpp__bundle__generator.py |   17 -
 ...ols_json__schema__compiler_feature__compiler.py |   18 -
 ...ls_memory_partition__allocator_inspect__utils.h |   17 -
 ...ch-tools_perf_chrome__telemetry__build_BUILD.gn |   26 -
 .../patch-tools_protoc__wrapper_protoc__wrapper.py |   30 -
 .../patch-tools_v8__context__snapshot_BUILD.gn     |   43 -
 ...atch-tools_variations_fieldtrial__to__struct.py |   18 -
 ...tch-ui_accessibility_accessibility__features.cc |   17 -
 ...atch-ui_accessibility_accessibility__features.h |   17 -
 .../patches/patch-ui_accessibility_ax__node.cc     |   26 -
 .../patches/patch-ui_accessibility_ax__node.h      |   17 -
 .../patches/patch-ui_accessibility_ax__tree.cc     |   44 -
 .../patches/patch-ui_accessibility_ax__tree.h      |   35 -
 .../patch-ui_aura_client_drag__drop__client.h      |   17 -
 .../patches/patch-ui_aura_screen__ozone.cc         |   17 -
 .../patches/patch-ui_aura_screen__ozone.h          |   26 -
 .../patch-ui_base_accelerators_accelerator.cc      |   17 -
 .../patches/patch-ui_base_accelerators_command.cc  |   17 -
 ...istener_global__accelerator__listener__ozone.cc |   35 -
 ...patch-ui_base_clipboard_clipboard__constants.cc |   26 -
 .../patch-ui_base_clipboard_clipboard__constants.h |   26 -
 ...tch-ui_base_clipboard_clipboard__non__backed.cc |   17 -
 .../patch-ui_base_cursor_cursor__factory.cc        |   17 -
 .../patches/patch-ui_base_cursor_cursor__factory.h |   17 -
 ...agdrop_os__exchange__data__provider__factory.cc |   26 -
 ...op_os__exchange__data__provider__non__backed.cc |   17 -
 ...patch-ui_base_ime_dummy__text__input__client.cc |   17 -
 .../patch-ui_base_ime_dummy__text__input__client.h |   17 -
 .../patch-ui_base_ime_fake__text__input__client.cc |   17 -
 .../patch-ui_base_ime_fake__text__input__client.h  |   17 -
 ...-ui_base_ime_init_input__method__initializer.cc |   35 -
 ...linux_linux__input__method__context__factory.cc |   26 -
 .../patch-ui_base_ime_text__input__client.h        |   17 -
 .../patch-ui_base_resource_resource__bundle.cc     |   17 -
 .../patch-ui_base_test_skia__gold__pixel__diff.cc  |   17 -
 .../patches/patch-ui_base_test_ui__controls.h      |   17 -
 .../patches/patch-ui_base_ui__base__features.cc    |   44 -
 .../patches/patch-ui_base_ui__base__features.h     |   17 -
 .../patches/patch-ui_base_ui__base__switches.cc    |   24 -
 .../patches/patch-ui_base_ui__base__switches.h     |   22 -
 .../patches/patch-ui_base_webui_web__ui__util.cc   |   26 -
 .../patch-ui_base_x_x11__cursor__factory.cc        |   26 -
 .../patches/patch-ui_base_x_x11__cursor__factory.h |   26 -
 .../patches/patch-ui_base_x_x11__cursor__loader.cc |   47 -
 .../patch-ui_base_x_x11__display__manager.cc       |   26 -
 .../patch-ui_base_x_x11__shm__image__pool.cc       |   77 -
 chromium-next/patches/patch-ui_color_color__id.h   |   17 -
 .../patch-ui_color_color__provider__utils.cc       |   17 -
 .../patches/patch-ui_color_system__theme.h         |   17 -
 .../patches/patch-ui_compositor_compositor.cc      |   17 -
 .../patches/patch-ui_compositor_compositor.h       |   17 -
 .../patch-ui_compositor_compositor__observer.h     |   17 -
 chromium-next/patches/patch-ui_display_screen.cc   |   17 -
 chromium-next/patches/patch-ui_display_screen.h    |   26 -
 ...vents_devices_x11_device__data__manager__x11.cc |   16 -
 chromium-next/patches/patch-ui_events_event.cc     |   35 -
 .../patches/patch-ui_events_event__switches.cc     |   17 -
 .../patches/patch-ui_events_event__switches.h      |   17 -
 ...ch-ui_events_keycodes_dom_keycode__converter.cc |   44 -
 ...tch-ui_events_keycodes_dom_keycode__converter.h |   17 -
 chromium-next/patches/patch-ui_gfx_BUILD.gn        |   17 -
 chromium-next/patches/patch-ui_gfx_canvas__skia.cc |   17 -
 .../patches/patch-ui_gfx_font__fallback__linux.cc  |   17 -
 .../patches/patch-ui_gfx_font__render__params.h    |   26 -
 .../patch-ui_gfx_font__render__params__linux.cc    |   26 -
 chromium-next/patches/patch-ui_gfx_font__util.cc   |   26 -
 .../patches/patch-ui_gfx_gpu__memory__buffer.cc    |   17 -
 .../patches/patch-ui_gfx_gpu__memory__buffer.h     |   35 -
 .../patches/patch-ui_gfx_linux_dmabuf__uapi.h      |   42 -
 .../patches/patch-ui_gfx_linux_gbm__wrapper.cc     |   17 -
 ...x_mojom_native__handle__types__mojom__traits.cc |   67 -
 ...fx_mojom_native__handle__types__mojom__traits.h |   51 -
 .../patches/patch-ui_gfx_native__pixmap__handle.cc |   68 -
 .../patches/patch-ui_gfx_native__pixmap__handle.h  |   44 -
 .../patches/patch-ui_gfx_native__widget__types.h   |   26 -
 .../patches/patch-ui_gfx_platform__font__skia.cc   |   26 -
 .../patch-ui_gfx_render__text__api__fuzzer.cc      |   26 -
 .../patches/patch-ui_gfx_render__text__fuzzer.cc   |   26 -
 chromium-next/patches/patch-ui_gfx_switches.cc     |   17 -
 chromium-next/patches/patch-ui_gfx_switches.h      |   17 -
 .../patches/patch-ui_gfx_x_atom__cache.cc          |   16 -
 .../patch-ui_gfx_x_generated__protos_dri3.cc       |   17 -
 .../patch-ui_gfx_x_generated__protos_shm.cc        |   17 -
 .../patches/patch-ui_gfx_x_xlib__support.cc        |   27 -
 chromium-next/patches/patch-ui_gl_BUILD.gn         |   32 -
 chromium-next/patches/patch-ui_gl_gl__context.cc   |   17 -
 chromium-next/patches/patch-ui_gl_gl__fence.cc     |   17 -
 .../patches/patch-ui_gl_gl__implementation.cc      |   17 -
 chromium-next/patches/patch-ui_gl_gl__switches.cc  |   35 -
 .../patch-ui_gl_sync__control__vsync__provider.cc  |   44 -
 .../patch-ui_gl_sync__control__vsync__provider.h   |   26 -
 chromium-next/patches/patch-ui_gtk_gtk__compat.cc  |   56 -
 .../patch-ui_gtk_printing_print__dialog__gtk.cc    |   17 -
 ...i_message__center_views_message__popup__view.cc |   17 -
 ...tive__theme_features_native__theme__features.cc |   26 -
 .../patches/patch-ui_native__theme_native__theme.h |   17 -
 .../patch-ui_native__theme_native__theme__base.cc  |   17 -
 .../patches/patch-ui_ozone_common_egl__util.cc     |   20 -
 ...platform_headless_headless__surface__factory.cc |   26 -
 ..._platform_headless_ozone__platform__headless.cc |   17 -
 ...rm_headless_vulkan__implementation__headless.cc |   35 -
 ..._ozone_platform_wayland_common_wayland__util.cc |   24 -
 ..._wayland_gpu_vulkan__implementation__wayland.cc |   20 -
 ...m_wayland_host_zwp__text__input__wrapper__v1.cc |   27 -
 ...one_platform_x11_vulkan__implementation__x11.cc |   20 -
 ...tch-ui_ozone_platform_x11_x11__screen__ozone.cc |   35 -
 ...atch-ui_ozone_platform_x11_x11__screen__ozone.h |   44 -
 .../patch-ui_ozone_platform_x11_x11__window.cc     |   17 -
 ...zone_public_ozone__ui__controls__test__helper.h |   17 -
 ...i_ozone_test_mock__platform__window__delegate.h |   17 -
 ..._platform__window_platform__window__delegate.cc |   17 -
 ...i_platform__window_platform__window__delegate.h |   17 -
 ...rm__window_platform__window__init__properties.h |   26 -
 chromium-next/patches/patch-ui_qt_BUILD.gn         |   17 -
 ...ings_translations_app__locale__settings__bn.xtb |   17 -
 ...ings_translations_app__locale__settings__ja.xtb |   17 -
 ...ings_translations_app__locale__settings__ko.xtb |   17 -
 ...ings_translations_app__locale__settings__ml.xtb |   17 -
 ...ings_translations_app__locale__settings__th.xtb |   17 -
 ...s_translations_app__locale__settings__zh-CN.xtb |   17 -
 ...s_translations_app__locale__settings__zh-TW.xtb |   17 -
 chromium-next/patches/patch-ui_views_BUILD.gn      |   16 -
 ...h-ui_views_accessibility_view__accessibility.cc |   26 -
 .../patch-ui_views_controls_prefix__selector.cc    |   17 -
 .../patch-ui_views_controls_prefix__selector.h     |   17 -
 .../patch-ui_views_controls_textfield_textfield.cc |   71 -
 .../patch-ui_views_controls_textfield_textfield.h  |   26 -
 .../patches/patch-ui_views_corewm_tooltip__aura.cc |   17 -
 .../patch-ui_views_examples_widget__example.cc     |   17 -
 .../patches/patch-ui_views_focus_focus__manager.cc |   26 -
 .../patch-ui_views_style_platform__style.cc        |   26 -
 .../patches/patch-ui_views_style_platform__style.h |   17 -
 ..._ui__controls__factory__desktop__aura__ozone.cc |   17 -
 .../patches/patch-ui_views_views__delegate.cc      |   17 -
 .../patches/patch-ui_views_views__delegate.h       |   17 -
 ...top__aura_desktop__drag__drop__client__ozone.cc |   17 -
 ...ktop__aura_desktop__drag__drop__client__ozone.h |   26 -
 ...__aura_desktop__window__tree__host__platform.cc |   35 -
 .../patches/patch-ui_views_widget_root__view.cc    |   17 -
 .../patches/patch-ui_views_widget_widget.cc        |   26 -
 .../patches/patch-ui_views_widget_widget.h         |   17 -
 .../patch-ui_views_window_custom__frame__view.cc   |   17 -
 .../patch-ui_views_window_dialog__delegate.cc      |   17 -
 .../patch-ui_views_window_frame__background.cc     |   17 -
 chromium-next/patches/patch-v8_BUILD.gn            |  139 -
 .../patches/patch-v8_include_v8-internal.h         |   17 -
 chromium-next/patches/patch-v8_include_v8config.h  |   59 -
 chromium-next/patches/patch-v8_src_api_api.cc      |   26 -
 .../patches/patch-v8_src_base_atomicops.h          |   30 -
 .../patches/patch-v8_src_base_platform_memory.h    |   24 -
 .../patch-v8_src_base_platform_platform-freebsd.cc |   38 -
 .../patch-v8_src_base_platform_platform-openbsd.cc |   53 -
 .../patch-v8_src_base_platform_platform-posix.cc   |  101 -
 chromium-next/patches/patch-v8_src_base_strings.h  |   18 -
 .../patches/patch-v8_src_base_sys-info.cc          |   21 -
 ...ch-v8_src_base_utils_random-number-generator.cc |   17 -
 .../patches/patch-v8_src_diagnostics_perf-jit.cc   |   17 -
 .../patches/patch-v8_src_diagnostics_perf-jit.h    |   17 -
 .../patches/patch-v8_src_execution_isolate.cc      |   33 -
 chromium-next/patches/patch-v8_src_flags_flags.cc  |   30 -
 .../patches/patch-v8_src_libsampler_sampler.cc     |   25 -
 .../patches/patch-v8_src_sandbox_sandbox.cc        |   17 -
 ..._embedded_platform-embedded-file-writer-base.cc |   17 -
 ...t_embedded_platform-embedded-file-writer-base.h |   16 -
 ...bedded_platform-embedded-file-writer-generic.cc |   48 -
 ...tch-v8_src_trap-handler_handler-inside-posix.cc |   43 -
 ...atch-v8_src_trap-handler_handler-inside-posix.h |   17 -
 .../patch-v8_src_trap-handler_trap-handler.h       |   17 -
 ...wasm_baseline_ia32_liftoff-assembler-ia32-inl.h |  134 -
 chromium-next/patches/patch-v8_tools_run-paxctl.py |   25 -
 chromium-next/patches/patch-v8_tools_run.py        |   17 -
 chromium-next/tests.mk                             |   59 -
 chromium/COMMIT_MSG                                |  277 ++
 chromium/Makefile                                  |   32 +-
 chromium/PLIST                                     |    4 +-
 chromium/TODO                                      |   17 +
 chromium/distinfo                                  | 2858 ++++++++++----------
 chromium/options.mk                                |    2 +-
 chromium/patches/patch-.gn                         |   15 -
 chromium/patches/patch-BUILD.gn                    |   43 +-
 ...patch-apps_ui_views_app__window__frame__view.cc |   14 +-
 ...patch-ash_display_mirror__window__controller.cc |    4 +-
 chromium/patches/patch-base_BUILD.gn               |   26 +-
 .../patches/patch-base_allocator_dispatcher_tls.h  |    6 +-
 ...cator_partition__allocator_partition__alloc.gni |   25 +-
 ...tition__allocator_src_partition__alloc_BUILD.gn |    6 +-
 ...artition__alloc_address__space__randomization.h |    4 +-
 ...llocator_src_partition__alloc_page__allocator.h |    4 +-
 ...c_partition__alloc_page__allocator__constants.h |    8 +-
 ...ion__alloc_page__allocator__internals__posix.cc |   14 +-
 ...tion__alloc_page__allocator__internals__posix.h |    6 +-
 ...rtition__alloc__base_debug_proc__maps__linux.cc |    4 +-
 ...ition__alloc__base_debug_stack__trace__posix.cc |    4 +-
 ...loc_partition__alloc__base_rand__util__posix.cc |    4 +-
 ...ition__alloc__base_threading_platform__thread.h |    4 +-
 ...e_threading_platform__thread__internal__posix.h |    4 +-
 ...lloc__base_threading_platform__thread__posix.cc |    4 +-
 ...src_partition__alloc_partition__alloc__config.h |    4 +-
 ..._partition__alloc_partition__alloc__constants.h |    8 +-
 ...rc_partition__alloc_partition__alloc__forward.h |    4 +-
 ...locator_src_partition__alloc_partition__root.cc |    8 +-
 ...locator_src_partition__alloc_spinning__mutex.cc |    4 +-
 ...__allocator_src_partition__alloc_stack_stack.cc |    4 +-
 ..._src_partition__alloc_thread__isolation_pkey.cc |    4 +-
 chromium/patches/patch-base_atomicops.h            |    6 +-
 chromium/patches/patch-base_base__paths__posix.cc  |   18 +-
 chromium/patches/patch-base_compiler__specific.h   |   11 +-
 .../patches/patch-base_debug_debugger__posix.cc    |   30 +-
 chromium/patches/patch-base_debug_elf__reader.cc   |    6 +-
 .../patches/patch-base_debug_proc__maps__linux.cc  |    6 +-
 chromium/patches/patch-base_debug_stack__trace.cc  |   20 +-
 .../patch-base_debug_stack__trace__posix.cc        |   24 +-
 .../patches/patch-base_files_dir__reader__linux.h  |   18 +-
 .../patches/patch-base_files_dir__reader__posix.h  |    4 +-
 chromium/patches/patch-base_files_drive__info.h    |    6 +-
 .../patches/patch-base_files_drive__info__posix.cc |    6 +-
 .../patches/patch-base_files_file__path__watcher.h |    4 +-
 .../patch-base_files_file__path__watcher__bsd.cc   |    4 +-
 ...patch-base_files_file__path__watcher__kqueue.cc |   24 -
 .../patch-base_files_file__path__watcher__kqueue.h |    4 +-
 ...tch-base_files_file__path__watcher__unittest.cc |    4 +-
 .../patches/patch-base_files_file__util__posix.cc  |   55 +-
 .../patch-base_files_file__util__unittest.cc       |   28 +-
 ...-base_files_important__file__writer__cleaner.cc |    4 +-
 chromium/patches/patch-base_files_scoped__file.cc  |    4 +-
 .../patch-base_functional_unretained__traits.h     |    6 +-
 chromium/patches/patch-base_i18n_icu__util.cc      |    8 +-
 chromium/patches/patch-base_linux__util.cc         |    8 +-
 chromium/patches/patch-base_logging__unittest.cc   |    8 +-
 .../patch-base_memory_discardable__memory.cc       |   10 +-
 ...tch-base_memory_discardable__memory__internal.h |    4 +-
 ...emory_madv__free__discardable__memory__posix.cc |   10 +-
 ...-base_memory_platform__shared__memory__region.h |   10 +-
 ...mory_platform__shared__memory__region__posix.cc |    8 +-
 .../patches/patch-base_memory_protected__memory.h  |   12 +-
 .../patch-base_memory_protected__memory__posix.cc  |    4 +-
 ...atch-base_message__loop_message__pump__epoll.cc |    6 +-
 ...patch-base_message__loop_message__pump__epoll.h |    4 +-
 ...patch-base_message__loop_message__pump__glib.cc |    8 +-
 .../patches/patch-base_native__library__posix.cc   |    4 +-
 .../patch-base_native__library__unittest.cc        |    4 +-
 .../patch-base_posix_can__lower__nice__to.cc       |    4 +-
 .../patch-base_posix_file__descriptor__shuffle.h   |    4 +-
 chromium/patches/patch-base_posix_sysctl.cc        |    4 +-
 .../patch-base_posix_unix__domain__socket.cc       |   20 +-
 ...ch-base_posix_unix__domain__socket__unittest.cc |    4 +-
 .../patches/patch-base_process_internal__linux.h   |    8 +-
 chromium/patches/patch-base_process_kill.h         |    8 +-
 chromium/patches/patch-base_process_kill__posix.cc |    6 +-
 chromium/patches/patch-base_process_launch.h       |    4 +-
 .../patches/patch-base_process_launch__posix.cc    |    8 +-
 .../patches/patch-base_process_memory__linux.cc    |   10 +-
 .../patches/patch-base_process_process__handle.cc  |    4 +-
 .../patches/patch-base_process_process__handle.h   |    4 +-
 .../patch-base_process_process__handle__freebsd.cc |   17 +-
 .../patch-base_process_process__handle__netbsd.cc  |    9 +-
 .../patch-base_process_process__handle__openbsd.cc |   41 +-
 .../patches/patch-base_process_process__iterator.h |    8 +-
 ...atch-base_process_process__iterator__freebsd.cc |   17 +-
 ...patch-base_process_process__iterator__netbsd.cc |   14 +-
 ...atch-base_process_process__iterator__openbsd.cc |   19 +-
 .../patches/patch-base_process_process__metrics.cc |    6 +-
 .../patches/patch-base_process_process__metrics.h  |   41 +-
 ...patch-base_process_process__metrics__freebsd.cc |  129 +-
 .../patch-base_process_process__metrics__netbsd.cc |   67 +-
 ...patch-base_process_process__metrics__openbsd.cc |  134 +-
 .../patch-base_process_process__metrics__posix.cc  |    6 +-
 ...atch-base_process_process__metrics__unittest.cc |   10 +-
 .../patches/patch-base_process_process__posix.cc   |   10 +-
 .../patch-base_process_process__unittest.cc        |    6 +-
 .../patches/patch-base_profiler_module__cache.cc   |    4 +-
 ...e_profiler_sampling__profiler__thread__token.cc |    6 +-
 ...se_profiler_sampling__profiler__thread__token.h |    8 +-
 ...ch-base_profiler_stack__base__address__posix.cc |   16 +-
 ...ofiler_stack__sampling__profiler__test__util.cc |    6 +-
 ...profiler_stack__sampling__profiler__unittest.cc |    6 +-
 .../patch-base_profiler_thread__delegate__posix.cc |    8 +-
 chromium/patches/patch-base_rand__util.h           |    6 +-
 chromium/patches/patch-base_rand__util__posix.cc   |   22 +-
 .../patch-base_strings_safe__sprintf__unittest.cc  |    8 +-
 .../patch-base_synchronization_cancelable__event.h |   26 +
 .../patch-base_synchronization_lock__impl.h        |    8 +-
 chromium/patches/patch-base_syslog__logging.cc     |   10 +-
 chromium/patches/patch-base_system_sys__info.cc    |    6 +-
 chromium/patches/patch-base_system_sys__info.h     |    8 +-
 .../patch-base_system_sys__info__freebsd.cc        |    4 +-
 .../patches/patch-base_system_sys__info__netbsd.cc |    9 +-
 .../patch-base_system_sys__info__openbsd.cc        |   10 +-
 .../patches/patch-base_system_sys__info__posix.cc  |   10 +-
 .../patch-base_system_sys__info__unittest.cc       |    4 +-
 ...k_thread__pool_environment__config__unittest.cc |   14 +-
 .../patch-base_test_launcher_test__launcher.cc     |    8 +-
 .../patch-base_test_test__file__util__linux.cc     |   13 +-
 .../patch-base_test_test__file__util__posix.cc     |    6 +-
 .../patches/patch-base_threading_hang__watcher.cc  |   17 -
 .../patch-base_threading_platform__thread.h        |   14 +-
 .../patch-base_threading_platform__thread__bsd.cc  |    4 +-
 ..._threading_platform__thread__internal__posix.cc |    4 +-
 ...patch-base_threading_platform__thread__posix.cc |   26 +-
 ...ch-base_threading_platform__thread__unittest.cc |   23 +-
 .../patches/patch-base_time_time__now__posix.cc    |   17 +
 ...tch-base_trace__event_malloc__dump__provider.cc |   10 +-
 ...atch-base_trace__event_memory__dump__manager.cc |    6 +-
 ...atch-base_trace__event_process__memory__dump.cc |   10 +-
 chromium/patches/patch-base_tracing_trace__time.cc |   18 +-
 chromium/patches/patch-base_tracing_trace__time.h  |    4 +-
 .../patch-base_version__info_version__info.h       |    4 +-
 chromium/patches/patch-build_config_BUILD.gn       |    6 +-
 chromium/patches/patch-build_config_BUILDCONFIG.gn |   12 +-
 chromium/patches/patch-build_config_clang_BUILD.gn |    8 +-
 .../patches/patch-build_config_compiler_BUILD.gn   |   97 +-
 chromium/patches/patch-build_config_gcc_BUILD.gn   |   19 +
 chromium/patches/patch-build_config_linux_BUILD.gn |    4 +-
 .../patch-build_config_linux_libdrm_BUILD.gn       |   17 +
 .../patches/patch-build_config_linux_pkg-config.py |    4 +-
 chromium/patches/patch-build_config_ozone.gni      |   12 +-
 chromium/patches/patch-build_config_rust.gni       |    8 +-
 .../patches/patch-build_config_v8__target__cpu.gni |    4 +-
 chromium/patches/patch-build_detect__host__arch.py |    4 +-
 chromium/patches/patch-build_gn__run__binary.py    |    6 +-
 chromium/patches/patch-build_linux_chrome.map      |    4 +-
 .../patches/patch-build_linux_strip__binary.py     |    4 +-
 chromium/patches/patch-build_linux_unbundle_icu.gn |   25 +-
 .../patches/patch-build_linux_unbundle_libevent.gn |   21 -
 .../patches/patch-build_linux_unbundle_libusb.gn   |    4 +-
 chromium/patches/patch-build_nocompile.gni         |   17 +
 .../patches/patch-build_rust_rust__bindgen.gni     |    6 +-
 .../patch-build_rust_rust__bindgen__generator.gni  |   25 +
 chromium/patches/patch-build_rust_std_BUILD.gn     |   28 +-
 .../patches/patch-build_toolchain_freebsd_BUILD.gn |    4 +-
 .../patch-build_toolchain_gcc__solink__wrapper.py  |    4 +-
 .../patch-build_toolchain_gcc__toolchain.gni       |    8 +-
 .../patches/patch-build_toolchain_netbsd_BUILD.gn  |    4 +-
 .../patches/patch-build_toolchain_openbsd_BUILD.gn |    4 +-
 .../patches/patch-build_toolchain_toolchain.gni    |    6 +-
 chromium/patches/patch-cc_base_features.cc         |    6 +-
 .../patch-chrome_app_chrome__command__ids.h        |   11 +-
 chromium/patches/patch-chrome_app_chrome__main.cc  |   18 +-
 .../patch-chrome_app_chrome__main__delegate.cc     |   54 +-
 chromium/patches/patch-chrome_browser_BUILD.gn     |   26 +-
 .../patches/patch-chrome_browser_about__flags.cc   |  317 ++-
 ...ch-chrome_browser_accessibility_page__colors.cc |    4 +-
 ...h-chrome_browser_after__startup__task__utils.cc |    6 +-
 ...apps_app__service_publishers_extension__apps.cc |    4 +-
 ...er_apps_platform__apps_platform__app__launch.cc |    4 +-
 ...ser_apps_platform__apps_platform__app__launch.h |    4 +-
 ...ete_chrome__autocomplete__scheme__classifier.cc |    4 +-
 ...browser_background_background__mode__manager.cc |   17 -
 ...owser_background_background__mode__optimizer.cc |   17 -
 ...kground_extensions_background__mode__manager.cc |   17 +
 ...round_extensions_background__mode__optimizer.cc |   17 +
 ...e_browser_background_glic_glic__status__icon.cc |   44 +
 .../patch-chrome_browser_browser__features.cc      |   20 +-
 .../patch-chrome_browser_browser__features.h       |   12 +-
 .../patch-chrome_browser_browser__process__impl.cc |   57 +-
 .../patch-chrome_browser_browser__process__impl.h  |   14 +-
 ...hrome_browser_chrome__browser__field__trials.cc |   12 +-
 ...chrome_browser_chrome__browser__field__trials.h |    4 +-
 ..._browser_chrome__browser__interface__binders.cc |   80 +-
 ...r_chrome__browser__interface__binders__webui.cc |   70 +
 .../patch-chrome_browser_chrome__browser__main.cc  |  123 +-
 ...r_chrome__browser__main__extra__parts__linux.cc |    4 +-
 ...r_chrome__browser__main__extra__parts__ozone.cc |   16 +-
 ...-chrome_browser_chrome__browser__main__linux.cc |   14 +-
 ...h-chrome_browser_chrome__browser__main__linux.h |    6 +-
 ...-chrome_browser_chrome__browser__main__posix.cc |   14 +-
 ...ome_browser_chrome__content__browser__client.cc |  133 +-
 ...rome_browser_chrome__content__browser__client.h |    6 +-
 ...ssaging_messaging__backend__service__factory.cc |   17 +
 ...iwa__key__distribution__component__installer.cc |   26 +
 ..._iwa__key__distribution__component__installer.h |   17 +
 ...rome_browser_component__updater_registration.cc |   39 +-
 ...ater_wasm__tts__engine__component__installer.cc |   35 +
 ...dater_wasm__tts__engine__component__installer.h |   17 +
 ..._updater_widevine__cdm__component__installer.cc |   14 +-
 ...hrome__protocol__handler__registry__delegate.cc |    4 +-
 chromium/patches/patch-chrome_browser_defaults.cc  |    6 +-
 ...tity_device__oauth2__token__service__factory.cc |   14 +-
 .../patch-chrome_browser_devtools_features.cc      |   17 +
 .../patch-chrome_browser_devtools_features.h       |   17 +
 ...e_browser_devtools_remote__debugging__server.cc |   17 +
 ...hrome_browser_diagnostics_diagnostics__writer.h |    6 +-
 ...download_chrome__download__manager__delegate.cc |   20 +-
 ...h-chrome_browser_download_download__commands.cc |    8 +-
 ...ch-chrome_browser_download_download__commands.h |    4 +-
 ...rome_browser_download_download__file__picker.cc |   12 +-
 ...hrome_browser_download_download__item__model.cc |   10 +-
 ...atch-chrome_browser_download_download__prefs.cc |   24 +-
 ...patch-chrome_browser_download_download__prefs.h |    8 +-
 ...nectors_analysis_analysis__service__settings.cc |    6 +-
 ...-chrome_browser_enterprise_connectors_common.cc |   10 +-
 ...er_enterprise_connectors_connectors__service.cc |    8 +-
 ...t_device__trust__connector__service__factory.cc |    4 +-
 ...evice__trust_device__trust__service__factory.cc |   10 +-
 ...ser_commands_key__rotation__command__factory.cc |    4 +-
 ...sistence_key__persistence__delegate__factory.cc |    6 +-
 ...ice__trust_signals_signals__service__factory.cc |   14 +-
 ...tors_reporting_browser__crash__event__router.cc |    4 +-
 ...nnectors_reporting_crash__reporting__context.cc |    4 +-
 ...ectors_reporting_realtime__reporting__client.cc |   45 +-
 ...nectors_reporting_realtime__reporting__client.h |   17 +-
 ...rise_identifiers_profile__id__delegate__impl.cc |   26 -
 ...nt_profile__management__navigation__throttle.cc |    4 +-
 ...te__commands_cbcm__remote__commands__factory.cc |    4 +-
 ...er_enterprise_signals_context__info__fetcher.cc |   26 +
 ...ser_enterprise_signals_device__info__fetcher.cc |    6 +-
 ...erprise_signals_device__info__fetcher__linux.cc |   83 -
 ...enterprise_signin_enterprise__signin__service.h |    4 +-
 ...terstitials_managed__profile__required__page.cc |   17 +
 ...wser_enterprise_util_managed__browser__utils.cc |   17 +
 .../patch-chrome_browser_extensions_BUILD.gn       |   22 +-
 ..._browser__context__keyed__service__factories.cc |   26 -
 ...ate_chrome__desktop__report__request__helper.cc |    4 +-
 ...rprise__reporting__private_conversion__utils.cc |    4 +-
 ...erprise__reporting__private_conversion__utils.h |    4 +-
 ..._private_enterprise__reporting__private__api.cc |   14 +-
 ...__private_enterprise__reporting__private__api.h |    4 +-
 ...writer__private_removable__storage__provider.cc |    4 +-
 ...management_chrome__management__api__delegate.cc |    6 +-
 ...ensions_api_messaging_launch__context__posix.cc |    4 +-
 ...__private_passwords__private__delegate__impl.cc |    6 +-
 ...s_api_runtime_chrome__runtime__api__delegate.cc |   10 +-
 ...extensions_api_settings__private_prefs__util.cc |   12 +-
 ...chrome_browser_extensions_api_tabs_tabs__api.cc |    6 +-
 ...gging__private_webrtc__logging__private__api.cc |    4 +-
 ...api_webstore__private_webstore__private__api.cc |    6 +-
 ...s_component__extensions__allowlist_allowlist.cc |   26 +
 ..._browser_extensions_external__provider__impl.cc |    8 +-
 ...ck_system__logs_about__system__logs__fetcher.cc |   26 +
 ...k_system__logs_chrome__system__logs__fetcher.cc |   26 +
 ...e__file__system__access__permission__context.cc |    6 +-
 ...-chrome_browser_first__run_first__run__dialog.h |   14 +-
 ...hrome_browser_first__run_first__run__internal.h |    6 +-
 .../patch-chrome_browser_flag__descriptions.cc     |  135 +-
 .../patch-chrome_browser_flag__descriptions.h      |  127 +-
 ...e_browser_gcm_gcm__profile__service__factory.cc |   10 +-
 ...__id_instance__id__profile__service__factory.cc |    8 +-
 .../patch-chrome_browser_global__features.cc       |   22 +-
 .../patch-chrome_browser_global__features.h        |   18 +-
 ...chrome_browser_headless_headless__mode__util.cc |   10 +-
 ...h-chrome_browser_intranet__redirect__detector.h |    4 +-
 ..._galleries_fileapi_mtp__device__map__service.cc |    4 +-
 ...dia__galleries_media__file__system__registry.cc |    6 +-
 ...ch-chrome_browser_media_audio__service__util.cc |   24 +-
 ...-chrome_browser_media_router_discovery_BUILD.gn |    6 +-
 ...er_discovery_discovery__network__list__posix.cc |    4 +-
 ...covery_discovery__network__list__wifi__linux.cc |   18 +-
 ...wser_media_webrtc_chrome__screen__enumerator.cc |   22 +-
 ...owser_media_webrtc_chrome__screen__enumerator.h |   20 +-
 ...ia_webrtc_desktop__media__picker__controller.cc |    4 +-
 ...e_browser_media_webrtc_webrtc__log__uploader.cc |   14 +-
 ...ser_media_webrtc_webrtc__logging__controller.cc |    8 +-
 ...wser_media_webrtc_webrtc__logging__controller.h |    4 +-
 .../patch-chrome_browser_memory__details.cc        |   13 +-
 ...chrome__browser__main__extra__parts__metrics.cc |   37 +-
 ..._chrome__browser__main__extra__parts__metrics.h |    8 +-
 ...ser_metrics_chrome__metrics__service__client.cc |   83 +-
 ...ch-chrome_browser_metrics_perf_cpu__identity.cc |   12 +-
 ...trics_power_process__metrics__recorder__util.cc |    4 +-
 ...hrome_browser_metrics_power_process__monitor.cc |    6 +-
 ...chrome_browser_metrics_power_process__monitor.h |    4 +-
 ...owser_net_profile__network__context__service.cc |   22 +-
 ..._profile__network__context__service__factory.cc |   26 +
 ...rowser_net_system__network__context__manager.cc |   45 +-
 ...browser_net_system__network__context__manager.h |    4 +-
 ...page_modules_file__suggestion_drive__service.cc |    6 +-
 ..._browser_new__tab__page_new__tab__page__util.cc |    6 +-
 ...cations_notification__display__service__impl.cc |   20 +-
 ...ns_notification__platform__bridge__delegator.cc |    6 +-
 ...d__manager_chrome__password__manager__client.cc |   10 +-
 ...d__manager_password__reuse__manager__factory.cc |   16 +-
 .../patch-chrome_browser_platform__util__linux.cc  |    6 +-
 ...wser_policy_browser__signin__policy__handler.cc |    4 +-
 ...wser__cloud__management__controller__desktop.cc |   25 +-
 ...onfiguration__policy__handler__list__factory.cc |  107 +-
 ...y_device__management__service__configuration.cc |    6 +-
 ...olicy_policy__value__and__status__aggregator.cc |    6 +-
 .../patch-chrome_browser_prefs_browser__prefs.cc   |   44 +-
 ...er_prefs_pref__service__incognito__allowlist.cc |    6 +-
 ...er_printing_print__backend__service__manager.cc |    8 +-
 ...patch-chrome_browser_printing_printer__query.cc |    6 +-
 ...tch-chrome_browser_process__singleton__posix.cc |    4 +-
 ...hrome__browser__main__extra__parts__profiles.cc |  133 +-
 .../patch-chrome_browser_profiles_profile__impl.cc |   12 +-
 ...atch-chrome_browser_profiles_profiles__state.cc |   20 +-
 ...ties_regional__capabilities__service__client.cc |   17 +
 ...h-chrome_browser_renderer__preferences__util.cc |   10 +-
 ...s_settings_autofill__page_passwords__shared.css |    4 +-
 ...ome_browser_resources_signin_signin__shared.css |    4 +-
 ...owsing_chrome__password__protection__service.cc |    8 +-
 ...d__content__scanning_binary__upload__service.cc |   17 +-
 ...dent__reporting_incident__reporting__service.cc |    6 +-
 ...owsing_safe__browsing__pref__change__handler.cc |   26 +
 ...rowser_screen__ai_screen__ai__install__state.cc |   31 +-
 ...owser_screen__ai_screen__ai__service__router.cc |    8 +-
 ...b__to__self_receiving__ui__handler__registry.cc |   26 -
 ...o__self_send__tab__to__self__client__service.cc |   26 -
 ...tch-chrome_browser_sessions_session__restore.cc |   10 +-
 ...ser_sharing_sharing__handler__registry__impl.cc |   12 +-
 ...patch-chrome_browser_shortcuts_icon__badging.cc |    4 +-
 ...ome_browser_signin_accounts__policy__manager.cc |   44 +
 ...rome_browser_signin_accounts__policy__manager.h |   35 +
 .../patch-chrome_browser_signin_signin__util.cc    |    6 +-
 ...ed__user_classify__url__navigation__throttle.cc |   21 +-
 ...vised__user_supervised__user__browser__utils.cc |    6 +-
 ...rvised__user_supervised__user__browser__utils.h |    4 +-
 ...supervised__user__extensions__delegate__impl.cc |    8 +-
 ...__user_supervised__user__extensions__manager.cc |    6 +-
 ...d__user_supervised__user__extensions__manager.h |    6 +-
 ...ed__user__google__auth__navigation__throttle.cc |   14 +-
 ..._supervised__user__metrics__service__factory.cc |    6 +-
 ..._user_supervised__user__navigation__observer.cc |    4 +-
 ..._user_supervised__user__navigation__throttle.cc |   26 -
 ...__user_supervised__user__navigation__throttle.h |   17 -
 ...owser_sync_chrome__sync__controller__builder.cc |    6 +-
 ...rowser_sync_device__info__sync__client__impl.cc |   16 +-
 ...h-chrome_browser_sync_sync__service__factory.cc |   24 +-
 ...oup__sync_tab__group__sync__service__factory.cc |   26 -
 ...e_browser_task__manager_sampling_task__group.cc |   12 +-
 ...me_browser_task__manager_sampling_task__group.h |   12 +-
 ..._task__manager_sampling_task__group__sampler.cc |   14 +-
 ...r_task__manager_sampling_task__group__sampler.h |    4 +-
 ...r_task__manager_sampling_task__manager__impl.cc |    6 +-
 ...browser_task__manager_task__manager__observer.h |    6 +-
 .../patch-chrome_browser_themes_theme__helper.cc   |    6 +-
 .../patch-chrome_browser_themes_theme__service.cc  |    8 +-
 ...e_browser_themes_theme__service__aura__linux.cc |    4 +-
 ...hrome_browser_themes_theme__service__factory.cc |   34 +-
 ...-chrome_browser_ui_actions_chrome__action__id.h |   12 +-
 ..._payments_desktop__payments__window__manager.cc |   18 +-
 ...l_payments_desktop__payments__window__manager.h |   34 +-
 chromium/patches/patch-chrome_browser_ui_browser.h |    6 +-
 ...rome_browser_ui_browser__command__controller.cc |   68 +-
 .../patch-chrome_browser_ui_browser__commands.cc   |    6 +-
 .../patch-chrome_browser_ui_browser__ui__prefs.cc  |   16 +-
 ...patch-chrome_browser_ui_browser__view__prefs.cc |    8 +-
 .../patch-chrome_browser_ui_chrome__pages.cc       |   12 +-
 .../patch-chrome_browser_ui_chrome__pages.h        |    6 +-
 ...rowser_ui_color_native__chrome__color__mixer.cc |    4 +-
 .../patches/patch-chrome_browser_ui_managed__ui.cc |   10 +-
 ...r_ui_omnibox_omnibox__pedal__implementations.cc |    6 +-
 ...rollers_relaunch__chrome__bubble__controller.cc |    4 +-
 ..._passwords_manage__passwords__ui__controller.cc |    8 +-
 ...h-chrome_browser_ui_prefs_prefs__tab__helper.cc |   17 +
 .../patches/patch-chrome_browser_ui_sad__tab.cc    |   10 +-
 ...sharing__hub_sharing__hub__bubble__controller.h |    4 +-
 ...e_browser_ui_signin_signin__view__controller.cc |   12 +-
 ..._ui_signin_signin__view__controller__delegate.h |   14 +-
 ...chrome_browser_ui_startup_bad__flags__prompt.cc |   14 +-
 ...browser_ui_startup_startup__browser__creator.cc |   14 +-
 ...r_ui_startup_startup__browser__creator__impl.cc |   12 +-
 ...me_browser_ui_startup_startup__tab__provider.cc |   18 +-
 .../patch-chrome_browser_ui_tab__helpers.cc        |   18 +-
 .../patch-chrome_browser_ui_tabs_features.cc       |    8 +-
 ...-chrome_browser_ui_tabs_tab__dialog__manager.cc |   17 +
 ...tch-chrome_browser_ui_tabs_tab__strip__prefs.cc |    6 +-
 ...wser_ui_task__manager_task__manager__columns.cc |   17 -
 ...owser_ui_task__manager_task__manager__columns.h |   17 +
 ...ui_task__manager_task__manager__table__model.cc |   23 +-
 ...ch-chrome_browser_ui_test_popup__browsertest.cc |    4 +-
 ...tch-chrome_browser_ui_test_test__browser__ui.cc |   26 +-
 .../patch-chrome_browser_ui_ui__features.cc        |   16 +-
 .../patches/patch-chrome_browser_ui_ui__features.h |   16 +-
 ...h-chrome_browser_ui_views_accelerator__table.cc |   10 +-
 ...pps_chrome__native__app__window__views__aura.cc |   10 +-
 ...s_chrome__browser__main__extra__parts__views.cc |    6 +-
 ...rome_browser_ui_views_chrome__views__delegate.h |   13 +-
 ...wser_ui_views_chrome__views__delegate__linux.cc |    4 +-
 ...owser_ui_views_compose_compose__dialog__view.cc |    6 +-
 ...chrome_browser_ui_views_frame_browser__frame.cc |   18 +-
 ...-chrome_browser_ui_views_frame_browser__frame.h |    6 +-
 ...ws_frame_browser__frame__view__layout__linux.cc |    4 +-
 ..._browser__frame__view__layout__linux__native.cc |    6 +-
 ...r_ui_views_frame_browser__frame__view__linux.cc |    4 +-
 ...er__non__client__frame__view__factory__views.cc |    8 +-
 ...-chrome_browser_ui_views_frame_browser__view.cc |   31 +-
 ..._ui_views_frame_opaque__browser__frame__view.cc |   18 +-
 ...r_ui_views_frame_opaque__browser__frame__view.h |    8 +-
 ...paque__browser__frame__view__layout__delegate.h |   14 +-
 ...e_picture__in__picture__browser__frame__view.cc |   37 +-
 ...me_picture__in__picture__browser__frame__view.h |   21 +-
 ..._ui_views_frame_system__menu__model__builder.cc |   26 +-
 ...ui_views_frame_system__menu__model__delegate.cc |   20 +-
 ...wser_ui_views_frame_tab__strip__region__view.cc |   20 +-
 ...chrome_browser_ui_views_hung__renderer__view.cc |    6 +-
 ...rowser_ui_views_omnibox_omnibox__view__views.cc |    6 +-
 ...views_passwords_password__bubble__view__base.cc |    8 +-
 ...er_ui_views_profiles_avatar__toolbar__button.cc |   17 +
 ...ser_ui_views_profiles_avatar__toolbar__button.h |   17 +
 ...ui_views_profiles_profile__menu__coordinator.cc |   17 +
 ...rowser_ui_views_profiles_profile__menu__view.cc |   17 +-
 ..._ui_views_profiles_profile__menu__view__base.cc |   10 +-
 ...wser_ui_views_profiles_profile__picker__view.cc |   10 +-
 ...es_signin__view__controller__delegate__views.cc |   48 +-
 ...les_signin__view__controller__delegate__views.h |   22 +-
 ...ui_views_tabs_dragging_tab__drag__controller.cc |   53 +
 .../patch-chrome_browser_ui_views_tabs_tab.cc      |    6 +-
 ..._browser_ui_views_tabs_tab__drag__controller.cc |   53 -
 ...ui_views_tabs_tab__hover__card__bubble__view.cc |    6 +-
 ...wser_ui_views_tabs_tab__strip__combo__button.cc |   17 +
 ...rome_browser_ui_views_tabs_tab__style__views.cc |    6 +-
 ...er_ui_views_task__manager__search__bar__view.cc |   17 +
 ..._education_browser__user__education__service.cc |   10 +-
 ...eb__apps_web__app__integration__test__driver.cc |   22 +-
 ...rowser_ui_web__applications_web__app__dialogs.h |    6 +-
 ...eb__applications_web__app__ui__manager__impl.cc |   14 +-
 ...web__applications_web__app__ui__manager__impl.h |    6 +-
 ...atch-chrome_browser_ui_webui_about_about__ui.cc |   10 +-
 ...patch-chrome_browser_ui_webui_about_about__ui.h |    6 +-
 ..._ui_webui_app__home_app__home__page__handler.cc |    6 +-
 ...r_ui_webui_app__home_app__home__page__handler.h |    4 +-
 ...ui_webui_app__settings_web__app__settings__ui.h |    4 +-
 ...icate__manager_certificate__manager__handler.cc |   10 +-
 ...i_certificate__manager_client__cert__sources.cc |   50 +-
 ...ui_certificate__manager_client__cert__sources.h |   13 +-
 ...me_browser_ui_webui_chrome__web__ui__configs.cc |   59 +-
 ...i_webui_chrome__web__ui__controller__factory.cc |   18 +-
 ...i_connectors__internals_device__trust__utils.cc |    4 +-
 ...r__education__internals__page__handler__impl.cc |   35 -
 ...wser_ui_webui_interstitials_interstitial__ui.cc |   12 +-
 ...e_browser_ui_webui_management_management__ui.cc |    6 +-
 ...i_webui_management_management__ui__constants.cc |    4 +-
 ...ui_webui_management_management__ui__constants.h |    8 +-
 ..._ui_webui_management_management__ui__handler.cc |   10 +-
 ...r_ui_webui_management_management__ui__handler.h |    8 +-
 ...ebui_password__manager_promo__cards__handler.cc |    6 +-
 ...manager_promo__cards_relaunch__chrome__promo.cc |    4 +-
 ...rowser_ui_webui_searchbox_searchbox__handler.cc |   10 +-
 ...rowser_ui_webui_settings_appearance__handler.cc |    6 +-
 ...tings_settings__localized__strings__provider.cc |   47 +-
 ...ser_ui_webui_signin_profile__picker__handler.cc |   17 +-
 ...r__education__internals__page__handler__impl.cc |   35 +
 ...hrome_browser_ui_window__sizer_window__sizer.cc |    6 +-
 ...r_upgrade__detector_version__history__client.cc |   17 +
 ...king_visited__url__ranking__service__factory.cc |    8 +-
 ...lications_commands_launch__web__app__command.cc |    6 +-
 ...s_commands_set__user__display__mode__command.cc |    4 +-
 ...er_web__applications_extension__status__utils.h |    4 +-
 ...ications_extensions_extension__status__utils.cc |    8 +-
 ...ons_os__integration_os__integration__manager.cc |    6 +-
 ...__integration_os__integration__test__override.h |    4 +-
 ...integration_run__on__os__login__sub__manager.cc |    6 +-
 ...tions_os__integration_shortcut__sub__manager.cc |    6 +-
 ...gration_web__app__file__handler__registration.h |    4 +-
 ...lications_os__integration_web__app__shortcut.cc |    6 +-
 ...plications_os__integration_web__app__shortcut.h |   14 +-
 ...pplications_policy_web__app__policy__manager.cc |    6 +-
 ...s_test_os__integration__test__override__impl.cc |   32 +-
 ...ns_test_os__integration__test__override__impl.h |    8 +-
 ..._browser_web__applications_web__app__helpers.cc |    6 +-
 ...ser_web__applications_web__app__install__info.h |    6 +-
 ...thn_chrome__authenticator__request__delegate.cc |    6 +-
 ...tch-chrome_browser_webauthn_enclave__manager.cc |   16 +-
 ...ser_webauthn_gpm__user__verification__policy.cc |    4 +-
 ...er_webauthn_password__credential__controller.cc |   17 +
 ...me_browser_webauthn_unexportable__key__utils.cc |    8 +-
 .../patches/patch-chrome_common_channel__info.h    |   10 +-
 .../patch-chrome_common_channel__info__posix.cc    |   16 +-
 .../patch-chrome_common_chrome__features.cc        |   16 +-
 .../patches/patch-chrome_common_chrome__features.h |   12 +-
 .../patches/patch-chrome_common_chrome__paths.cc   |   36 +-
 .../patches/patch-chrome_common_chrome__paths.h    |   22 +-
 .../patch-chrome_common_chrome__paths__internal.h  |    6 +-
 .../patch-chrome_common_chrome__switches.cc        |   10 +-
 .../patches/patch-chrome_common_chrome__switches.h |    8 +-
 .../patches/patch-chrome_common_crash__keys.cc     |   10 +-
 ...hrome_common_extensions_extension__constants.cc |   17 +
 ...chrome_common_extensions_extension__constants.h |   17 +
 ...rmissions_chrome__permission__message__rules.cc |    8 +-
 ...ch-chrome_common_media_cdm__host__file__path.cc |    6 +-
 .../patch-chrome_common_media_cdm__registration.cc |   40 +-
 .../patch-chrome_common_media_cdm__registration.h  |   10 +-
 ...a_component__widevine__cdm__hint__file__linux.h |   10 +-
 chromium/patches/patch-chrome_common_pref__names.h |   34 +-
 .../patches/patch-chrome_common_url__constants.h   |    6 +-
 .../patch-chrome_common_webui__url__constants.cc   |   21 +-
 .../patch-chrome_common_webui__url__constants.h    |   33 +-
 ...ise__companion_enterprise__companion__client.cc |    6 +-
 ...h-chrome_enterprise__companion_event__logger.cc |   17 +
 .../patch-chrome_enterprise__companion_lock.cc     |    4 +-
 ...vices_printing_print__backend__service__impl.cc |   14 +-
 ...services_speech_audio__source__fetcher__impl.cc |    4 +-
 ...e_test_base_scoped__channel__override__posix.cc |    4 +-
 ...ch-chrome_test_chromedriver_chrome__launcher.cc |    4 +-
 ...rome_test_chromedriver_chrome_chrome__finder.cc |    4 +-
 ...e_test_chromedriver_key__converter__unittest.cc |   14 +-
 ...medriver_keycode__text__conversion__unittest.cc |   24 +-
 ...sed__user_google__auth__state__waiter__mixin.cc |    4 +-
 .../patch-chrome_updater_app_app__uninstall.cc     |    6 +-
 .../patches/patch-chrome_updater_configurator.cc   |    6 +-
 chromium/patches/patch-chrome_updater_lock.cc      |    4 +-
 .../patch-chrome_updater_util_posix__util.cc       |    4 +-
 chromium/patches/patch-chrome_utility_services.cc  |   10 +-
 ...hromecast_browser_cast__browser__main__parts.cc |   12 +-
 ...ecast_browser_cast__content__browser__client.cc |    6 +-
 ..._browser_runtime__application__service__impl.cc |    6 +-
 ...omecast_media_base_default__monotonic__clock.cc |    4 +-
 chromium/patches/patch-components_BUILD.gn         |   34 +
 ...l_core_browser_autofill__optimization__guide.cc |   17 -
 ...ta__manager_payments_payments__data__manager.cc |   44 +
 ...ata__manager_payments_payments__data__manager.h |   26 +
 ...er_integrators_autofill__optimization__guide.cc |   17 +
 ...utofill_core_browser_payments__data__manager.cc |   17 -
 ...autofill_core_browser_payments_bnpl__manager.cc |   26 +
 ...ill_core_common_autofill__payments__features.cc |   23 +-
 ...fill_core_common_autofill__payments__features.h |   17 -
 ...ponents_autofill_core_common_autofill__prefs.cc |   39 +-
 ...mponents_autofill_core_common_autofill__prefs.h |   34 +-
 ...onents_commerce_core_commerce__feature__list.cc |   38 +-
 ...nstrained__window_constrained__window__views.cc |   10 +-
 ...ngs_core_browser_website__settings__registry.cc |    6 +-
 ...omponents_cookie__config_cookie__store__util.cc |    4 +-
 .../patch-components_crash_core_app_BUILD.gn       |    8 +-
 ...nts_crash_core_app_chrome__crashpad__handler.cc |    4 +-
 ...nents_crash_core_app_crashpad__handler__main.cc |    4 +-
 ...h_core_browser_crash__upload__list__crashpad.cc |    8 +-
 .../patch-components_crash_core_common_BUILD.gn    |    4 +-
 ...s_device__signals_core_browser_browser__utils.h |   26 +
 ...ignals_core_browser_mock__signals__aggregator.h |    4 +-
 ...ice__signals_core_browser_signals__aggregator.h |    4 +-
 ...gnals_core_browser_signals__aggregator__impl.cc |    6 +-
 ...ignals_core_browser_signals__aggregator__impl.h |    6 +-
 ...ignals_core_browser_user__permission__service.h |    4 +-
 ...core_browser_user__permission__service__impl.cc |    4 +-
 ..._core_browser_user__permission__service__impl.h |    4 +-
 ...als_core_common_linux_platform__utils__linux.cc |   83 +
 ...evice__signals_core_common_signals__features.cc |   10 +-
 ...device__signals_core_common_signals__features.h |   12 +-
 ...nals_core_system__signals_platform__delegate.cc |    4 +-
 ...nents_device__signals_test_signals__contract.cc |    6 +-
 ...service_discardable__shared__memory__manager.cc |    4 +-
 ...ponents_embedder__support_user__agent__utils.cc |   45 +-
 ...bedder__support_user__agent__utils__unittest.cc |   26 +-
 ...ctors_core_realtime__reporting__client__base.cc |   26 +
 ...components_enterprise_watermarking_watermark.cc |    8 +-
 ...mponents_error__page_common_localized__error.cc |   17 +
 ...h-components_eye__dropper_eye__dropper__view.cc |    6 +-
 ..._feature__engagement_public_event__constants.cc |    4 +-
 ...s_feature__engagement_public_event__constants.h |    4 +-
 ...e__engagement_public_feature__configurations.cc |   16 +-
 ...eature__engagement_public_feature__constants.cc |   23 +-
 ...feature__engagement_public_feature__constants.h |   35 +-
 ...nts_feature__engagement_public_feature__list.cc |   31 +-
 ...ents_feature__engagement_public_feature__list.h |   40 +-
 ...omponents_feed_core_proto_v2_wire_version.proto |    4 +-
 ...s_feed_core_v2_feed__network__impl__unittest.cc |    4 +-
 .../patch-components_feed_core_v2_proto__util.cc   |    4 +-
 ...omponents_feed_core_v2_proto__util__unittest.cc |    4 +-
 ...-components_feed_core_v2_test_proto__printer.cc |    4 +-
 .../patch-components_flags__ui_flags__state.cc     |   17 -
 ...h-components_gcm__driver_gcm__desktop__utils.cc |   17 +
 .../patches/patch-components_gwp__asan_BUILD.gn    |    8 +-
 ...-components_gwp__asan_buildflags_buildflags.gni |   20 +
 ..._asan_client_guarded__page__allocator__posix.cc |    4 +-
 .../patch-components_gwp__asan_client_gwp__asan.cc |    6 +-
 ...ponents_gwp__asan_client_gwp__asan__features.cc |    4 +-
 ...nts_gwp__asan_crash__handler_crash__analyzer.cc |    6 +-
 ...patch-components_live__caption_caption__util.cc |   18 +-
 .../patch-components_live__caption_caption__util.h |    4 +-
 ...omponents_media__router_common_media__source.cc |    6 +-
 ...n_providers_cast_channel_cast__message__util.cc |   12 +-
 ...ter_common_providers_cast_channel_enum__table.h |    4 +-
 ...-components_metrics_drive__metrics__provider.cc |   26 +
 ...ents_metrics_drive__metrics__provider__linux.cc |   22 -
 .../patch-components_metrics_dwa_dwa__service.cc   |    6 +-
 .../patch-components_metrics_metrics__log.cc       |   18 +-
 .../patch-components_metrics_motherboard.cc        |    4 +-
 ...nts_named__mojo__ipc__server_connection__info.h |   13 +-
 ...erver_named__mojo__ipc__server__client__util.cc |    4 +-
 ...ed__mojo__server__endpoint__connector__linux.cc |   18 +
 .../patch-components_named__system__lock_BUILD.gn  |   26 +
 .../patch-components_named__system__lock_lock.h    |    4 +-
 ...omponents_named__system__lock_lock__unittest.cc |   35 +
 ...patch-components_neterror_resources_neterror.js |   17 -
 ...on__guide_core_optimization__guide__features.cc |    6 +-
 ...zation__guide_core_optimization__guide__util.cc |    4 +-
 ..._async_browser_secret__portal__key__provider.cc |    4 +-
 ...-components_os__crypt_async_common_encryptor.cc |   17 -
 ...onents_os__crypt_sync_libsecret__util__linux.cc |    4 +-
 .../patch-components_os__crypt_sync_os__crypt.h    |   33 +-
 ...aint__preview_browser_paint__preview__client.cc |    4 +-
 ...iew_browser_paint__preview__client__unittest.cc |    4 +-
 ...aint__preview_common_proto_paint__preview.proto |    4 +-
 ..._preview_player_player__compositor__delegate.cc |    6 +-
 ...ger_core_browser_features_password__features.cc |   10 +-
 ...ager_core_browser_features_password__features.h |    6 +-
 ...manager_core_browser_password__form__manager.cc |   10 +-
 ...word__manager_core_browser_password__manager.cc |    8 +-
 ...anager_core_browser_password__manager__client.h |   12 +-
 ...ger_core_browser_password__manager__switches.cc |    4 +-
 ...ager_core_browser_password__manager__switches.h |    6 +-
 ...ore_browser_password__manual__fallback__flow.cc |   10 +-
 ...core_browser_password__manual__fallback__flow.h |    8 +-
 ..._core_browser_password__store__factory__util.cc |    4 +-
 ...core_browser_password__store_login__database.cc |    8 +-
 ...ssword__store_login__database__async__helper.cc |    4 +-
 ...er_password__store_login__database__unittest.cc |    6 +-
 ...core_browser_stub__password__manager__client.cc |    8 +-
 ..._core_browser_stub__password__manager__client.h |    8 +-
 ...er_core_common_password__manager__pref__names.h |    8 +-
 ...nager_decorators_process__metrics__decorator.cc |    4 +-
 ...mponents_performance__manager_public_features.h |    6 +-
 ...sions_prediction__service_prediction__common.cc |    8 +-
 ...icy_core_browser_policy__pref__mapping__test.cc |    8 +-
 ...licy_core_common_cloud_cloud__policy__client.cc |    6 +-
 ...mmon_cloud_cloud__policy__refresh__scheduler.cc |    4 +-
 ...policy_core_common_cloud_cloud__policy__util.cc |   30 +-
 ...ts_policy_core_common_policy__loader__common.cc |    8 +-
 ...-components_policy_core_common_policy__paths.cc |    4 +-
 ...-components_policy_core_common_policy__utils.cc |    4 +-
 ...onents_policy_tools_generate__policy__source.py |    4 +-
 .../patch-components_power__metrics_BUILD.gn       |    4 +-
 ...nts_power__metrics_energy__metrics__provider.cc |    4 +-
 ...capabilities_regional__capabilities__service.cc |   17 +
 ...apabilities_regional__capabilities__switches.cc |   17 +
 ...capabilities_regional__capabilities__switches.h |   17 +
 ...ontent_common_file__type__policies__unittest.cc |   10 +-
 ...ing_content_resources_gen__file__type__proto.py |    4 +-
 ..._core_browser_db_v4__protocol__manager__util.cc |    4 +-
 ..._browser_realtime_url__lookup__service__base.cc |    6 +-
 ...mponents_safe__browsing_core_common_features.cc |   17 -
 ...gine__choice_search__engine__choice__service.cc |   17 -
 ...nents_search__engines_template__url__service.cc |   16 +-
 ...onents_security__interstitials_content_utils.cc |   10 +-
 ..._default__model_cross__device__user__segment.cc |    6 +-
 ...rvices_on__device__translation_sandbox__hook.cc |    4 +-
 ...ervices_on__device__translation_sandbox__hook.h |    4 +-
 ...paint__preview__compositor__collection__impl.cc |    4 +-
 ...mponents_signin_public_base_signin__switches.cc |   17 +
 ...omponents_signin_public_base_signin__switches.h |   17 +
 .../patches/patch-components_soda_soda__util.cc    |   10 +-
 ..._metric__utils_common_startup__metric__utils.cc |    4 +-
 .../patch-components_storage__monitor_BUILD.gn     |   14 +-
 ...torage__monitor_removable__device__constants.cc |    4 +-
 ...storage__monitor_removable__device__constants.h |   14 +-
 ...r_core_browser_list__family__members__service.h |   17 +
 ...e_browser_supervised__user__metrics__service.cc |    4 +-
 ...r_core_browser_supervised__user__preferences.cc |    4 +-
 ..._user_core_browser_supervised__user__service.cc |   17 -
 ...onents_supervised__user_core_common_features.cc |   76 +-
 ...ponents_supervised__user_core_common_features.h |   44 +-
 ...ents_supervised__user_core_common_pref__names.h |    8 +-
 ...sync__device__info_local__device__info__util.cc |   14 +-
 ...evice__info_local__device__info__util__linux.cc |    4 +-
 ...references_common__syncable__prefs__database.cc |   17 +
 .../patch-components_sync_base_sync__util.cc       |    6 +-
 .../patch-components_system__cpu_cpu__probe.cc     |    4 +-
 ...onents_translate_core_common_translate__util.cc |    4 +-
 ...sted__vault_trusted__vault__connection__impl.cc |    6 +-
 ...ponents_update__client_update__query__params.cc |    6 +-
 ..._formatter_spoof__checks_idn__spoof__checker.cc |    6 +-
 ...nts_user__education_views_help__bubble__view.cc |   26 +-
 ...ents_user__education_views_help__bubble__view.h |   17 +
 ...nents_variations_service_variations__service.cc |    6 +-
 ...isited__url__ranking_public_url__visit__util.cc |    6 +-
 .../patch-components_viz_host_gpu__host__impl.cc   |   17 +
 ...ch-components_viz_host_host__display__client.cc |    4 +-
 ...tch-components_viz_host_host__display__client.h |    4 +-
 ...isplay__embedder_skia__output__surface__impl.cc |    6 +-
 ..._display__embedder_software__output__surface.cc |   22 +-
 ...e_display__embedder_software__output__surface.h |   24 +-
 ...omponents_viz_service_display_skia__renderer.cc |    6 +-
 ...e__sinks_root__compositor__frame__sink__impl.cc |    8 +-
 ...me__sinks_root__compositor__frame__sink__impl.h |   10 +-
 ...ch-components_viz_test_fake__display__client.cc |    4 +-
 ...tch-components_viz_test_fake__display__client.h |    4 +-
 ...tch-components_viz_test_mock__display__client.h |    8 +-
 .../patch-components_webui_flags_flags__state.cc   |   17 +
 chromium/patches/patch-content_app_BUILD.gn        |   12 +-
 .../patches/patch-content_app_content__main.cc     |    8 +-
 ...atch-content_app_content__main__runner__impl.cc |   34 +-
 chromium/patches/patch-content_browser_BUILD.gn    |   14 +-
 ...sibility_browser__accessibility__state__impl.cc |   17 +
 ...owser__accessibility__state__impl__auralinux.cc |   43 +
 .../patch-content_browser_audio_audio__service.cc  |    8 +-
 ..._browser_browser__child__process__host__impl.cc |    8 +-
 ...t_browser_browser__child__process__host__impl.h |    8 +-
 ...ild__process__host__impl__receiver__bindings.cc |    6 +-
 .../patch-content_browser_browser__main__loop.cc   |   10 +-
 ...tent_browser_child__process__launcher__helper.h |    6 +-
 ...wser_child__process__launcher__helper__linux.cc |    4 +-
 ...browser_child__thread__type__switcher__linux.cc |   25 +-
 ..._browser_child__thread__type__switcher__linux.h |   17 +
 ..._compositor_viz__process__transport__factory.cc |    6 +-
 ...wser_devtools_devtools__frontend__host__impl.cc |   12 +-
 ...owser_devtools_devtools__frontend__host__impl.h |    4 +-
 ...wser_devtools_protocol_system__info__handler.cc |    6 +-
 ...ccess_file__path__watcher_file__path__watcher.h |    6 +-
 ...file__path__watcher_file__path__watcher__bsd.cc |   11 +-
 ...le__path__watcher_file__path__watcher__kqueue.h |    4 +-
 ...s_file__system__access__local__path__watcher.cc |    6 +-
 ...font__access_font__enumeration__data__source.cc |    4 +-
 .../patch-content_browser_gpu_compositor__util.cc  |    8 +-
 ...content_browser_gpu_gpu__data__manager__impl.cc |    6 +-
 ...-content_browser_gpu_gpu__data__manager__impl.h |    6 +-
 ...rowser_gpu_gpu__data__manager__impl__private.cc |    6 +-
 ...browser_gpu_gpu__data__manager__impl__private.h |   10 +-
 ..._gpu_gpu__memory__buffer__manager__singleton.cc |    6 +-
 ...patch-content_browser_gpu_gpu__process__host.cc |   10 +-
 ...wser_media_frameless__media__interface__proxy.h |   14 +-
 ...r_media_media__keys__listener__manager__impl.cc |   10 +-
 ...ent_browser_network__service__instance__impl.cc |   10 +-
 ...i__plugin__process__host__receiver__bindings.cc |    4 +-
 ...rowser_renderer__host_delegated__frame__host.cc |   10 +-
 ...ia_service__video__capture__device__launcher.cc |    8 +-
 ...renderer__host_pepper_pepper__file__io__host.cc |    4 +-
 ...r_renderer__host_render__process__host__impl.cc |   16 +-
 ...er_renderer__host_render__process__host__impl.h |   24 +-
 ...der__process__host__impl__receiver__bindings.cc |    6 +-
 ...wser_renderer__host_render__view__host__impl.cc |    6 +-
 ...derer__host_render__widget__host__view__aura.cc |   22 +-
 ...nderer__host_render__widget__host__view__aura.h |    6 +-
 ...t_render__widget__host__view__event__handler.cc |    4 +-
 .../patch-content_browser_sandbox__host__linux.cc  |    4 +-
 ...scheduler_responsiveness_jank__monitor__impl.cc |   12 +-
 ...duler_responsiveness_native__event__observer.cc |    4 +-
 ...eduler_responsiveness_native__event__observer.h |    4 +-
 ...browser_service__host_utility__process__host.cc |   44 +
 ...t_utility__process__host__receiver__bindings.cc |   26 +
 ...ser_service__host_utility__sandbox__delegate.cc |   58 +
 ...patch-content_browser_utility__process__host.cc |   87 -
 .../patch-content_browser_utility__process__host.h |   26 -
 ...r_utility__process__host__receiver__bindings.cc |   41 -
 ...h-content_browser_utility__sandbox__delegate.cc |   56 -
 .../patch-content_browser_v8__snapshot__files.cc   |   10 +-
 ...r_web__contents_slow__web__preference__cache.cc |   10 +-
 ...wser_web__contents_web__contents__view__aura.cc |    8 +-
 ...contents_web__contents__view__aura__unittest.cc |   69 +-
 ...browser_webui_web__ui__main__frame__observer.cc |   49 +-
 ..._browser_webui_web__ui__main__frame__observer.h |   26 -
 ...owser_zygote__host_zygote__host__impl__linux.cc |   22 +-
 ...rowser_zygote__host_zygote__host__impl__linux.h |    8 +-
 chromium/patches/patch-content_child_BUILD.gn      |    8 +-
 .../patches/patch-content_child_child__process.cc  |    6 +-
 .../patches/patch-content_child_child__process.h   |    4 +-
 chromium/patches/patch-content_common_BUILD.gn     |    6 +-
 chromium/patches/patch-content_common_features.cc  |   17 +-
 chromium/patches/patch-content_common_features.h   |   21 +-
 .../patch-content_common_font__list__unittest.cc   |    4 +-
 ...-content_common_gpu__pre__sandbox__hook__bsd.cc |    4 +-
 ...h-content_common_gpu__pre__sandbox__hook__bsd.h |    4 +-
 ...content_common_gpu__pre__sandbox__hook__linux.h |    4 +-
 ...tch-content_common_thread__type__switcher.mojom |   16 +
 .../patches/patch-content_common_user__agent.cc    |   43 -
 .../patch-content_gpu_gpu__child__thread.cc        |    8 +-
 chromium/patches/patch-content_gpu_gpu__main.cc    |   18 +-
 ...t_ppapi__plugin_ppapi__blink__platform__impl.cc |    4 +-
 ...nt_ppapi__plugin_ppapi__blink__platform__impl.h |    4 +-
 ...ch-content_ppapi__plugin_ppapi__plugin__main.cc |    6 +-
 ...tent_public_browser_content__browser__client.cc |    6 +-
 ...ontent_public_browser_service__process__host.cc |   17 -
 ...blic_browser_zygote__host_zygote__host__linux.h |    6 +-
 ...atch-content_public_common_content__features.cc |   22 +-
 ...atch-content_public_common_content__switches.cc |   16 +-
 ...patch-content_public_common_content__switches.h |   18 +-
 ...patch-content_public_common_zygote_features.gni |    4 +-
 .../patch-content_renderer_render__thread__impl.cc |   12 +-
 ...ent_renderer_renderer__blink__platform__impl.cc |   22 +-
 ...tent_renderer_renderer__blink__platform__impl.h |   12 +-
 ...er_renderer__main__platform__delegate__linux.cc |    4 +-
 chromium/patches/patch-content_shell_BUILD.gn      |    6 +-
 ...atch-content_shell_app_shell__main__delegate.cc |    4 +-
 ...nt_shell_browser_shell__browser__main__parts.cc |   30 +-
 .../patch-content_shell_browser_shell__paths.cc    |    4 +-
 ...ell_browser_shell__platform__delegate__views.cc |   17 +
 ...ll_renderer_shell__content__renderer__client.cc |    6 +-
 ...hell_utility_shell__content__utility__client.cc |    8 +-
 chromium/patches/patch-content_test_BUILD.gn       |    6 +-
 chromium/patches/patch-content_utility_services.cc |   77 +-
 ...ch_speech__recognition__sandbox__hook__linux.cc |    4 +-
 ...ech_speech__recognition__sandbox__hook__linux.h |    4 +-
 ...link__platform__with__sandbox__support__impl.cc |   18 +-
 ...blink__platform__with__sandbox__support__impl.h |   12 +-
 .../patches/patch-content_utility_utility__main.cc |   90 +-
 .../patch-content_utility_utility__thread__impl.cc |    4 +-
 chromium/patches/patch-content_zygote_BUILD.gn     |    4 +-
 .../patches/patch-content_zygote_zygote__linux.cc  |   10 +-
 .../patch-content_zygote_zygote__main__linux.cc    |    4 +-
 .../patch-device_bluetooth_bluetooth__adapter.cc   |    4 +-
 .../patch-device_bluetooth_cast__bluetooth.gni     |    4 +-
 chromium/patches/patch-device_gamepad_BUILD.gn     |    6 +-
 .../patch-device_gamepad_gamepad__provider.cc      |    6 +-
 .../patch-device_gamepad_hid__writer__linux.cc     |    4 +-
 ..._browser__context__keyed__service__factories.cc |   10 +-
 ...sions_browser_api_management_management__api.cc |    6 +-
 ...sions_browser_api_messaging_message__service.cc |    8 +-
 ...ivate_networking__private__delegate__factory.cc |   13 +-
 ...tensions_common_api___permission__features.json |   18 +-
 .../patch-extensions_common_api_runtime.json       |    4 +-
 .../patches/patch-extensions_common_command.cc     |   12 +-
 .../patch-extensions_common_features_feature.cc    |    6 +-
 ...ensions_renderer_bindings_api__binding__util.cc |   10 +-
 ...-extensions_renderer_bindings_argument__spec.cc |    4 +-
 ...h-extensions_shell_app_shell__main__delegate.cc |    8 +-
 ...er_api_runtime_shell__runtime__api__delegate.cc |   10 +-
 ...ns_shell_browser_shell__browser__main__parts.cc |   10 +-
 ...shell_browser_shell__extensions__api__client.cc |   23 +-
 ..._shell_browser_shell__extensions__api__client.h |   23 +-
 ...h-google__apis_gcm_engine_heartbeat__manager.cc |   22 +-
 ...mand__buffer_service_dawn__context__provider.cc |    6 +-
 ..._command__buffer_service_gles2__cmd__decoder.cc |    6 +-
 ...ice_raster__decoder__unittest__context__lost.cc |   27 +
 ...mmand__buffer_service_shared__context__state.cc |   12 +-
 ...ommand__buffer_service_shared__context__state.h |    8 +-
 ...image_angle__vulkan__image__backing__factory.cc |   13 +-
 ...e_shared__image_external__vk__image__backing.cc |    6 +-
 ..._image_external__vk__image__backing__factory.cc |    6 +-
 ...service_shared__image_shared__image__factory.cc |   17 +-
 ...service_shared__image_shared__image__manager.cc |   12 +-
 ...ce_shared__image_wrapped__sk__image__backing.cc |    4 +-
 ...ommand__buffer_service_webgpu__decoder__impl.cc |   24 +-
 ...ffer_tests_gl__gpu__memory__buffer__unittest.cc |    4 +-
 .../patches/patch-gpu_config_gpu__control__list.cc |   15 +-
 .../patch-gpu_config_gpu__finch__features.cc       |    6 +-
 .../patch-gpu_config_gpu__info__collector.cc       |    6 +-
 .../patches/patch-gpu_config_gpu__test__config.cc  |   14 +-
 ...-gpu_ipc_common_gpu__memory__buffer__support.cc |    4 +-
 ...h-gpu_ipc_common_gpu__memory__buffer__support.h |    4 +-
 .../patches/patch-gpu_ipc_service_gpu__init.cc     |   29 +-
 ...gpu_ipc_service_gpu__memory__buffer__factory.cc |    4 +-
 chromium/patches/patch-gpu_ipc_service_x__util.h   |    4 +-
 .../patches/patch-gpu_vulkan_generate__bindings.py |    4 +-
 .../patches/patch-gpu_vulkan_semaphore__handle.cc  |    4 +-
 .../patch-gpu_vulkan_vulkan__device__queue.cc      |    8 +-
 .../patch-gpu_vulkan_vulkan__device__queue.h       |    6 +-
 .../patch-gpu_vulkan_vulkan__function__pointers.cc |    4 +-
 .../patch-gpu_vulkan_vulkan__function__pointers.h  |   10 +-
 chromium/patches/patch-gpu_vulkan_vulkan__image.h  |    4 +-
 chromium/patches/patch-gpu_vulkan_vulkan__util.cc  |    6 +-
 chromium/patches/patch-headless_BUILD.gn           |   17 +
 ...rowser_headless__browser__main__parts__posix.cc |   18 +-
 ...b_browser_headless__content__browser__client.cc |    8 +-
 ...ib_browser_headless__content__browser__client.h |    6 +-
 ...ss_lib_browser_headless__web__contents__impl.cc |   10 +-
 ...adless_lib_headless__content__main__delegate.cc |    4 +-
 chromium/patches/patch-ipc_ipc__channel.h          |    4 +-
 chromium/patches/patch-ipc_ipc__channel__common.cc |    4 +-
 chromium/patches/patch-ipc_ipc__channel__mojo.cc   |    4 +-
 chromium/patches/patch-ipc_ipc__message__utils.cc  |    4 +-
 chromium/patches/patch-ipc_ipc__message__utils.h   |    6 +-
 chromium/patches/patch-media_BUILD.gn              |    6 +-
 chromium/patches/patch-media_audio_BUILD.gn        |    6 +-
 .../patch-media_audio_alsa_audio__manager__alsa.cc |   14 +-
 .../patch-media_audio_audio__input__device.cc      |    6 +-
 ...h-media_audio_audio__output__proxy__unittest.cc |    4 +-
 .../patches/patch-media_audio_pulse_pulse__util.cc |    4 +-
 ...atch-media_audio_sndio_audio__manager__sndio.cc |    4 +-
 ...patch-media_audio_sndio_audio__manager__sndio.h |    4 +-
 .../patch-media_audio_sndio_sndio__input.cc        |    4 +-
 .../patches/patch-media_audio_sndio_sndio__input.h |    4 +-
 .../patch-media_audio_sndio_sndio__output.cc       |    4 +-
 .../patch-media_audio_sndio_sndio__output.h        |    4 +-
 .../patches/patch-media_base_audio__latency.cc     |    6 +-
 .../patch-media_base_libaom__thread__wrapper.cc    |    4 +-
 .../patch-media_base_libvpx__thread__wrapper.cc    |    4 +-
 .../patches/patch-media_base_media__switches.cc    |   32 +-
 .../patches/patch-media_base_media__switches.h     |   16 +-
 ...ch-media_base_user__input__monitor__unittest.cc |   35 -
 chromium/patches/patch-media_base_video__frame.cc  |   34 +-
 chromium/patches/patch-media_base_video__frame.h   |   59 +-
 ...ideo_create__video__capture__device__factory.cc |   20 +-
 ..._video_fake__video__capture__device__factory.cc |    4 +-
 ..._video_file__video__capture__device__factory.cc |    4 +-
 ...h-media_capture_video_linux_fake__v4l2__impl.cc |    6 +-
 ...ch-media_capture_video_linux_fake__v4l2__impl.h |    4 +-
 ..._capture_video_linux_v4l2__capture__delegate.cc |   42 +-
 ...a_capture_video_linux_v4l2__capture__delegate.h |   20 +-
 ...dia_capture_video_linux_v4l2__capture__device.h |    8 +-
 ...ture_video_linux_v4l2__capture__device__impl.cc |    4 +-
 ...pture_video_linux_v4l2__capture__device__impl.h |    4 +-
 ..._linux_video__capture__device__factory__v4l2.cc |   31 +-
 ...o_linux_video__capture__device__factory__v4l2.h |    4 +-
 ...re_video_linux_video__capture__device__linux.cc |    4 +-
 ...deo__capture__buffer__tracker__factory__impl.cc |    8 +-
 ...capture_video_video__capture__device__client.cc |    6 +-
 .../patch-media_cdm_cdm__paths__unittest.cc        |    6 +-
 .../patch-media_cdm_library__cdm_cdm__paths.gni    |    6 +-
 .../patch-media_ffmpeg_scripts_build__ffmpeg.py    |    4 +-
 .../patch-media_ffmpeg_scripts_robo__lib_config.py |   14 +-
 .../patches/patch-media_gpu_buffer__validation.cc  |   35 -
 ...a_gpu_chromeos_gl__image__processor__backend.cc |    4 +-
 ...u_chromeos_libyuv__image__processor__backend.cc |    4 +-
 ...pu_chromeos_mailbox__video__frame__converter.cc |    6 +-
 ...a_gpu_chromeos_platform__video__frame__utils.cc |   15 +-
 ...-media_gpu_chromeos_video__decoder__pipeline.cc |   10 +-
 ...gpu_gpu__video__decode__accelerator__factory.cc |   26 +
 ...gpu_gpu__video__encode__accelerator__factory.cc |   16 +-
 ...dware__video__decoding__sandbox__hook__linux.cc |   14 +-
 ...rdware__video__decoding__sandbox__hook__linux.h |    4 +-
 ...dware__video__encoding__sandbox__hook__linux.cc |    4 +-
 ...rdware__video__encoding__sandbox__hook__linux.h |    4 +-
 .../patches/patch-media_gpu_test_raw__video.cc     |    6 +-
 ...ch-media_gpu_test_video__frame__file__writer.cc |    6 +-
 .../patch-media_gpu_test_video__frame__helpers.cc  |    6 +-
 ...patch-media_gpu_test_video__frame__validator.cc |    6 +-
 .../patch-media_gpu_vaapi_vaapi__video__decoder.cc |    6 +-
 .../patch-media_gpu_vaapi_vaapi__wrapper.cc        |    6 +-
 chromium/patches/patch-media_media__options.gni    |    6 +-
 chromium/patches/patch-media_mojo_mojom_BUILD.gn   |   17 +
 .../patches/patch-media_mojo_mojom_stable_BUILD.gn |   17 -
 ...stable__video__decoder__types__mojom__traits.cc |   26 -
 ..._stable__video__decoder__types__mojom__traits.h |   17 -
 ...media_mojo_mojom_video__frame__mojom__traits.cc |   51 +-
 ...-media_mojo_mojom_video__frame__mojom__traits.h |   17 +
 .../patch-media_video_fake__gpu__memory__buffer.cc |   29 +-
 .../patch-media_video_fake__gpu__memory__buffer.h  |   17 +
 ...ideo_gpu__memory__buffer__video__frame__pool.cc |   14 +-
 ...ia_video_video__encode__accelerator__adapter.cc |   23 +-
 ...eo_video__encode__accelerator__adapter__test.cc |   35 +-
 .../patches/patch-media_webrtc_audio__processor.cc |   12 +-
 chromium/patches/patch-media_webrtc_helpers.cc     |    6 +-
 .../patch-media_webrtc_helpers__unittests.cc       |   12 +-
 chromium/patches/patch-mojo_core_BUILD.gn          |    6 +-
 chromium/patches/patch-mojo_core_channel.cc        |    6 +-
 .../patches/patch-mojo_core_embedder_features.h    |    4 +-
 ...ojo_public_cpp_platform_socket__utils__posix.cc |    4 +-
 .../patch-mojo_public_tools_bindings_mojom.gni     |   12 +-
 chromium/patches/patch-net_BUILD.gn                |   22 +-
 chromium/patches/patch-net_base_features.cc        |   12 +-
 ...tch-net_base_mock__network__change__notifier.cc |   17 -
 ...atch-net_base_mock__network__change__notifier.h |   26 -
 .../patch-net_base_network__change__notifier.cc    |   12 +-
 .../patch-net_base_network__change__notifier.h     |    8 +-
 ...-net_base_network__change__notifier__passive.cc |    6 +-
 .../patch-net_base_network__interfaces__posix.h    |    4 +-
 .../patch-net_base_sockaddr__util__posix.cc        |    6 +-
 ...tch-net_base_sockaddr__util__posix__unittest.cc |    4 +-
 .../patches/patch-net_cert_cert__verify__proc.h    |    6 +-
 .../patch-net_disk__cache_backend__experiment.h    |    4 +-
 ...net_disk__cache_simple_simple__file__tracker.cc |    8 +-
 chromium/patches/patch-net_dns_BUILD.gn            |   12 +-
 chromium/patches/patch-net_dns_address__info.cc    |    4 +-
 .../patch-net_dns_address__sorter__posix.cc        |    4 +-
 .../patch-net_dns_dns__config__service__posix.cc   |    4 +-
 chromium/patches/patch-net_dns_dns__reloader.cc    |    4 +-
 chromium/patches/patch-net_dns_dns__util.cc        |    4 +-
 .../patches/patch-net_dns_host__resolver__proc.cc  |    4 +-
 chromium/patches/patch-net_dns_public_BUILD.gn     |    4 +-
 .../patches/patch-net_dns_public_resolv__reader.cc |    4 +-
 .../patches/patch-net_dns_public_resolv__reader.h  |    4 +-
 .../patch-net_dns_public_scoped__res__state.cc     |    6 +-
 .../patch-net_dns_public_scoped__res__state.h      |    4 +-
 .../patch-net_filter_zstd__source__stream.cc       |    4 +-
 .../patch-net_http_http__auth__gssapi__posix.cc    |   19 +-
 .../patch-net_http_http__auth__gssapi__posix.h     |    4 +-
 ...atch-net_http_http__auth__handler__negotiate.cc |    6 +-
 .../patch-net_http_http__auth__preferences.cc      |    6 +-
 .../patch-net_http_http__auth__preferences.h       |   10 +-
 .../patch-net_http_http__network__session.cc       |    4 +-
 ...net_proxy__resolution_proxy__config__service.cc |    4 +-
 ...xy__resolution_proxy__config__service__linux.cc |    8 +-
 ...et_quic_quic__network__transaction__unittest.cc |   34 +
 chromium/patches/patch-net_socket_socket__posix.cc |   17 -
 .../patch-net_socket_socks5__client__socket.cc     |    6 +-
 .../patches/patch-net_socket_tcp__socket__posix.cc |    4 +-
 .../patches/patch-net_socket_udp__socket__posix.cc |   18 +-
 .../patch-net_socket_udp__socket__unittest.cc      |   18 +-
 .../patches/patch-net_third__party_quiche_BUILD.gn |    6 +-
 ..._tools_cert__verify__tool_cert__verify__tool.cc |    6 +-
 .../patch-net_tools_net__watcher_net__watcher.cc   |   23 +-
 ...ffic__annotation_network__traffic__annotation.h |   18 +-
 ...patch-net_url__request_url__request__context.cc |   16 +-
 .../patch-net_url__request_url__request__context.h |   16 +-
 ..._url__request_url__request__context__builder.cc |    6 +-
 ...ets_websocket__basic__stream__adapters__test.cc |   21 +
 .../patches/patch-pdf_pdfium_pdfium__engine.cc     |    8 +-
 chromium/patches/patch-ppapi_tests_test__utils.h   |    4 +-
 .../patch-printing_backend_cups__ipp__helper.cc    |    6 +-
 .../patch-printing_backend_print__backend__cups.cc |   10 +-
 ...nting_mojom_printing__context__mojom__traits.cc |    4 +-
 ...inting_mojom_printing__context__mojom__traits.h |    4 +-
 ...m_printing__context__mojom__traits__unittest.cc |   71 +
 chromium/patches/patch-printing_print__settings.cc |    4 +-
 chromium/patches/patch-printing_print__settings.h  |    4 +-
 .../patch-printing_print__settings__conversion.cc  |    4 +-
 .../patch-printing_printing__context__linux.cc     |    4 +-
 .../patches/patch-printing_printing__features.cc   |   15 +-
 .../patches/patch-printing_printing__features.h    |    8 +-
 ...sandbox_print__backend__sandbox__hook__linux.cc |    4 +-
 ..._sandbox_print__backend__sandbox__hook__linux.h |    4 +-
 .../patch-remoting_base_chromoting__event.cc       |   12 +-
 .../patches/patch-remoting_base_host__settings.cc  |    4 +-
 .../patch-remoting_client_display_sys__opengl.h    |   17 -
 ...h-remoting_codec_webrtc__video__encoder__vpx.cc |   10 +-
 ...ting_host_base_desktop__environment__options.cc |    6 +-
 .../patches/patch-remoting_host_base_switches.cc   |    4 +-
 .../patches/patch-remoting_host_base_switches.h    |    4 +-
 ...ch-remoting_host_basic__desktop__environment.cc |   17 -
 .../patch-remoting_host_chromoting__host.cc        |    6 +-
 .../patches/patch-remoting_host_chromoting__host.h |   10 +-
 ...atch-remoting_host_chromoting__host__context.cc |    6 +-
 ...ting_host_chromoting__host__services__client.cc |    4 +-
 .../patches/patch-remoting_host_client__session.cc |    8 +-
 ...ch-remoting_host_crash_crash__file__uploader.cc |    4 +-
 ..._desktop__and__cursor__conditional__composer.cc |   26 -
 ...patch-remoting_host_desktop__capturer__proxy.cc |   35 -
 ...tch-remoting_host_desktop__capturer__wrapper.cc |   35 -
 .../patch-remoting_host_evaluate__capability.cc    |    4 +-
 .../patch-remoting_host_host__attributes.cc        |    6 +-
 .../patches/patch-remoting_host_host__details.cc   |   30 +-
 chromium/patches/patch-remoting_host_host__main.cc |   16 +-
 .../patches/patch-remoting_host_ipc__constants.cc  |    4 +-
 .../patch-remoting_host_it2me_it2me__host.cc       |   35 -
 ...t_it2me_it2me__native__messaging__host__main.cc |   28 +-
 ...ch-remoting_host_me2me__desktop__environment.cc |   23 +-
 ...emoting_host_mojo__caller__security__checker.cc |    6 +-
 ...-remoting_host_mouse__cursor__monitor__proxy.cc |   17 -
 .../patches/patch-remoting_host_policy__watcher.cc |    6 +-
 ..._remote__open__url_remote__open__url__client.cc |    4 +-
 ...st_remote__open__url_remote__open__url__util.cc |    4 +-
 ...mote__open__url_url__forwarder__configurator.cc |    4 +-
 .../patch-remoting_host_remoting__me2me__host.cc   |   81 +-
 ...-remoting_host_session__policies__from__dict.cc |   17 +
 .../patch-remoting_host_setup_start__host__main.cc |    6 +-
 ...hn_remote__webauthn__caller__security__utils.cc |    8 +-
 ...bauthn_remote__webauthn__extension__notifier.cc |    4 +-
 ...atch-remoting_protocol_webrtc__video__stream.cc |    8 +-
 ...ng_signaling_ftl__host__device__id__provider.cc |   17 +
 chromium/patches/patch-sandbox_BUILD.gn            |    4 +-
 chromium/patches/patch-sandbox_features.gni        |    4 +-
 chromium/patches/patch-sandbox_linux_BUILD.gn      |    6 +-
 ...sandbox_linux_services_init__process__reaper.cc |   12 +-
 ...tch-sandbox_linux_services_libc__interceptor.cc |    4 +-
 chromium/patches/patch-sandbox_policy_BUILD.gn     |   10 +-
 chromium/patches/patch-sandbox_policy_features.cc  |   15 +-
 chromium/patches/patch-sandbox_policy_features.h   |   17 -
 ...atch-sandbox_policy_freebsd_sandbox__freebsd.cc |    4 +-
 ...patch-sandbox_policy_freebsd_sandbox__freebsd.h |    4 +-
 .../patch-sandbox_policy_mojom_sandbox.mojom       |   12 +-
 .../patch-sandbox_policy_netbsd_sandbox__netbsd.cc |    4 +-
 .../patch-sandbox_policy_netbsd_sandbox__netbsd.h  |    4 +-
 ...atch-sandbox_policy_openbsd_sandbox__openbsd.cc |    6 +-
 ...patch-sandbox_policy_openbsd_sandbox__openbsd.h |    4 +-
 chromium/patches/patch-sandbox_policy_sandbox.cc   |    4 +-
 chromium/patches/patch-sandbox_policy_sandbox.h    |    4 +-
 .../patches/patch-sandbox_policy_sandbox__type.cc  |  161 +-
 chromium/patches/patch-sandbox_policy_switches.cc  |   28 +-
 chromium/patches/patch-sandbox_policy_switches.h   |   28 +-
 ...h-services_audio_audio__sandbox__hook__linux.cc |    4 +-
 ...ch-services_audio_audio__sandbox__hook__linux.h |    4 +-
 chromium/patches/patch-services_device_BUILD.gn    |   10 +-
 ...vice_geolocation_location__provider__manager.cc |   10 +-
 .../patches/patch-services_device_hid_BUILD.gn     |    6 +-
 ...ch-services_device_hid_hid__connection__fido.cc |    4 +-
 ...tch-services_device_hid_hid__connection__fido.h |    4 +-
 ...services_device_hid_hid__connection__freebsd.cc |    6 +-
 ...-services_device_hid_hid__connection__freebsd.h |    4 +-
 .../patch-services_device_hid_hid__service.cc      |    4 +-
 ...patch-services_device_hid_hid__service__fido.cc |    4 +-
 .../patch-services_device_hid_hid__service__fido.h |    4 +-
 ...ch-services_device_hid_hid__service__freebsd.cc |   12 +-
 ...tch-services_device_hid_hid__service__freebsd.h |    4 +-
 ...tch-services_device_hid_hid__service__netbsd.cc |    4 +-
 ...atch-services_device_hid_hid__service__netbsd.h |    4 +-
 ...-services_device_public_cpp_device__features.cc |   17 +
 ...h-services_device_public_cpp_device__features.h |   17 +
 ...ce_public_cpp_generic__sensor_sensor__reading.h |    4 +-
 .../patch-services_device_public_mojom_BUILD.gn    |    6 +-
 .../patches/patch-services_device_serial_BUILD.gn  |   12 +-
 ...ces_device_serial_serial__device__enumerator.cc |    6 +-
 ...ces_device_serial_serial__io__handler__posix.cc |    4 +-
 ...me__zone__monitor_time__zone__monitor__linux.cc |   14 +-
 .../patches/patch-services_device_usb_BUILD.gn     |   10 +-
 ...rvices_device_usb_usb__device__handle__usbfs.cc |   44 +
 ...ervices_device_usb_usb__device__handle__usbfs.h |   44 +
 .../patch-services_device_usb_usb__service.cc      |    4 +-
 ...patch-services_device_usb_usb__service__fake.cc |    4 +-
 .../patch-services_device_usb_usb__service__fake.h |    4 +-
 chromium/patches/patch-services_network_BUILD.gn   |    6 +-
 .../patch-services_network_network__context.cc     |    8 +-
 .../patch-services_network_network__context.h      |    6 +-
 ...rvices_network_network__sandbox__hook__linux.cc |    4 +-
 ...ervices_network_network__sandbox__hook__linux.h |    4 +-
 .../patch-services_network_network__service.cc     |   23 +-
 .../patch-services_network_network__service.h      |   10 +-
 .../patch-services_network_public_cpp_BUILD.gn     |    8 +-
 .../patch-services_network_public_cpp_features.cc  |    6 +-
 .../patch-services_network_public_mojom_BUILD.gn   |    8 +-
 ...ionary_shared__dictionary__writer__in__memory.h |    4 +-
 ..._on__device__model_on__device__model__service.h |    4 +-
 ...ervices_on__device__model_pre__sandbox__init.cc |    6 +-
 ..._instrumentation_queued__request__dispatcher.cc |   16 +-
 ...tor_public_cpp_memory__instrumentation_BUILD.gn |    6 +-
 ...ublic_cpp_memory__instrumentation_os__metrics.h |   16 +-
 ...cpp_memory__instrumentation_os__metrics__bsd.cc |    4 +-
 ...tch-services_screen__ai_public_cpp_utilities.cc |    4 +-
 ..._ai_sandbox_screen__ai__sandbox__hook__linux.cc |    8 +-
 ...__ai_sandbox_screen__ai__sandbox__hook__linux.h |    4 +-
 .../patch-services_service__manager_BUILD.gn       |    6 +-
 ...manager_public_cpp_service__executable_BUILD.gn |    4 +-
 ...p_stack__sampling_tracing__sampler__profiler.cc |    4 +-
 ..._tracing_public_cpp_system__metrics__sampler.cc |   19 +
 ...ture_public_mojom_video__capture__service.mojom |    4 +-
 ...video__capture_video__capture__service__impl.cc |   44 -
 ..._video__capture_video__capture__service__impl.h |   35 -
 ...effects_video__effects__sandbox__hook__linux.cc |    6 +-
 ..._effects_video__effects__sandbox__hook__linux.h |    4 +-
 .../patch-services_viz_public_mojom_BUILD.gn       |   17 +
 .../patch-skia_ext_SkMemory__new__handler.cpp      |    8 +-
 chromium/patches/patch-skia_ext_font__utils.cc     |   16 +-
 chromium/patches/patch-skia_ext_platform__canvas.h |   17 -
 .../patches/patch-skia_ext_skcolorspace__trfn.cc   |   12 +-
 ...atch-third__party_abseil-cpp_absl_base_config.h |   13 +-
 ...y_abseil-cpp_absl_base_internal_raw__logging.cc |    4 +-
 ..._party_abseil-cpp_absl_base_internal_sysinfo.cc |    4 +-
 ...l-cpp_absl_debugging_internal_elf__mem__image.h |   10 +-
 ...sl_time_internal_cctz_src_time__zone__format.cc |    4 +-
 .../patches/patch-third__party_afl_src_afl-fuzz.c  |    4 +-
 chromium/patches/patch-third__party_angle_BUILD.gn |   10 +-
 .../patch-third__party_angle_src_common_platform.h |    6 +-
 ...ird__party_angle_src_common_platform__helpers.h |    4 +-
 ...third__party_angle_src_common_system__utils.cpp |    4 +-
 ...party_angle_src_common_system__utils__linux.cpp |   20 +-
 ...ngle_src_gpu__info__util_SystemInfo__internal.h |    4 +-
 ...ngle_src_gpu__info__util_SystemInfo__libpci.cpp |    4 +-
 ...angle_src_gpu__info__util_SystemInfo__linux.cpp |    4 +-
 ...y_angle_src_gpu__info__util_SystemInfo__x11.cpp |    4 +-
 ...tch-third__party_angle_src_libANGLE_Display.cpp |   29 +-
 ...third__party_angle_src_libANGLE_formatutils.cpp |   17 -
 ...e_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp |    4 +-
 ...e_src_libANGLE_renderer_vulkan_DisplayVk__api.h |    4 +-
 .../patches/patch-third__party_angle_util_BUILD.gn |    6 +-
 ...erences_renderer__preferences__mojom__traits.cc |    6 +-
 ...n_renderer__preferences_renderer__preferences.h |    4 +-
 ...ferences_renderer__preferences__mojom__traits.h |    6 +-
 ...h-third__party_blink_public_platform_platform.h |    6 +-
 ...hird__party_blink_public_platform_web__vector.h |   17 -
 ...rer_bindings_scripts_bind__gen_style__format.py |    4 +-
 ...rd__party_blink_renderer_build_scripts_gperf.py |   10 +-
 ...renderer_build_scripts_run__with__pythonpath.py |    6 +-
 ...blink_renderer_controller_blink__initializer.cc |   12 +-
 ...rer_controller_memory__usage__monitor__posix.cc |    6 +-
 ...erer_controller_memory__usage__monitor__posix.h |    4 +-
 ...link_renderer_core_editing_editing__behavior.cc |    4 +-
 ...erer_core_execution__context_navigator__base.cc |    4 +-
 ...blink_renderer_core_exported_web__view__impl.cc |   26 +-
 ...y_blink_renderer_core_frame_web__frame__test.cc |    8 +-
 ...ore_html_canvas_canvas__async__blob__creator.cc |    6 +-
 ...erer_core_inspector_inspector__memory__agent.cc |    6 +-
 ...arty_blink_renderer_core_layout_layout__view.cc |    8 +-
 ...renderer_core_loader_mixed__content__checker.cc |   17 +
 ...r_core_origin__trials_origin__trial__context.cc |    8 +-
 ...renderer_core_page_context__menu__controller.cc |   17 +
 ...party_blink_renderer_core_paint_paint__layer.cc |    6 +-
 ..._renderer_core_scroll_scrollbar__theme__aura.cc |   24 +-
 ...party_blink_renderer_core_xml_xslt__processor.h |    4 +-
 ...k_renderer_core_xml_xslt__processor__libxslt.cc |    6 +-
 ...r_modules_media_audio_audio__device__factory.cc |   12 +-
 ..._audio_audio__renderer__mixer__manager__test.cc |    6 +-
 ...er_modules_peerconnection_rtc__data__channel.cc |    4 +-
 ...peerconnection_webrtc__audio__renderer__test.cc |    4 +-
 ...odules_webaudio_audio__worklet__thread__test.cc |    6 +-
 ...odules_webgl_webgl__rendering__context__base.cc |    6 +-
 ...renderer_modules_webgpu_gpu__canvas__context.cc |   17 +
 ...rty_blink_renderer_modules_webgpu_gpu__queue.cc |    6 +-
 ...h-third__party_blink_renderer_platform_BUILD.gn |    6 +-
 ...ty_blink_renderer_platform_fonts_font__cache.cc |    8 +-
 ...rty_blink_renderer_platform_fonts_font__cache.h |    4 +-
 ...nk_renderer_platform_fonts_font__description.cc |    8 +-
 ..._blink_renderer_platform_fonts_font__metrics.cc |    4 +-
 ...renderer_platform_fonts_font__platform__data.cc |   26 -
 ...er_platform_fonts_font__unique__name__lookup.cc |    4 +-
 ...nderer_platform_fonts_skia_font__cache__skia.cc |    6 +-
 ...rer_platform_graphics_begin__frame__provider.cc |    4 +-
 ...r_platform_graphics_gpu_image__layer__bridge.cc |   10 +-
 ...er_platform_graphics_video__frame__submitter.cc |    6 +-
 ...ion_partition__alloc__memory__dump__provider.cc |    4 +-
 ..._peerconnection_rtc__video__encoder__factory.cc |   16 +-
 ...derer_platform_runtime__enabled__features.json5 |   45 +-
 ...nk_renderer_platform_scheduler_common_thread.cc |    4 +-
 ...g_blink__categorized__worker__pool__delegate.cc |    4 +-
 ..._renderer_platform_wtf_container__annotations.h |    6 +-
 ...arty_blink_renderer_platform_wtf_math__extras.h |    4 +-
 ...arty_blink_renderer_platform_wtf_stack__util.cc |    6 +-
 ..._renderer_platform_wtf_text_text__codec__icu.cc |   42 -
 .../patch-third__party_brotli_common_platform.h    |    4 +-
 .../patches/patch-third__party_cpuinfo_cpuinfo.gni |    4 +-
 ...ashpad_crashpad_build_crashpad__buildconfig.gni |    4 +-
 ...-third__party_crashpad_crashpad_client_BUILD.gn |    6 +-
 ...hpad_crashpad_client_crashpad__client__posix.cc |    4 +-
 ...ashpad_minidump_minidump__misc__info__writer.cc |    4 +-
 ...ty_crashpad_crashpad_util_misc_address__types.h |    4 +-
 ..._crashpad_crashpad_util_misc_capture__context.h |    4 +-
 ...d__party_crashpad_crashpad_util_misc_metrics.cc |    4 +-
 ...hird__party_crashpad_crashpad_util_misc_uuid.cc |    4 +-
 ...crashpad_crashpad_util_posix_close__multiple.cc |    4 +-
 ...rashpad_crashpad_util_posix_drop__privileges.cc |    4 +-
 ...__party_crashpad_crashpad_util_posix_signals.cc |    4 +-
 ...ashpad_util_posix_symbolic__constants__posix.cc |    4 +-
 .../patches/patch-third__party_crc32c_BUILD.gn     |    4 +-
 ..._party_dawn_include_dawn_native_VulkanBackend.h |    4 +-
 ...ch-third__party_dawn_src_dawn_common_Platform.h |    6 +-
 ...party_dawn_src_dawn_native_vulkan_BackendVk.cpp |    6 +-
 .../patches/patch-third__party_ffmpeg_BUILD.gn     |    4 +-
 ...atch-third__party_ffmpeg_libavcodec_x86_cabac.h |    4 +-
 .../patch-third__party_ffmpeg_libavutil_cpu.c      |    4 +-
 .../patch-third__party_ffmpeg_libavutil_mem.c      |    4 +-
 ...ch-third__party_ffmpeg_libavutil_random__seed.c |    4 +-
 ...ch-third__party_ffmpeg_libavutil_x86_x86inc.asm |    4 +-
 .../patch-third__party_fontconfig_include_config.h |    4 +-
 ...atch-third__party_fontconfig_src_src_fccompat.c |    4 +-
 .../patches/patch-third__party_ipcz_src_BUILD.gn   |   17 +
 ...rd__party_ipcz_src_reference__drivers_random.cc |   51 +-
 ...hird__party_ipcz_src_standalone_base_logging.cc |    6 +-
 ...tch-third__party_leveldatabase_env__chromium.cc |    4 +-
 ...m_source_libaom_aom__ports_aarch64__cpudetect.c |    4 +-
 ...src_include_____locale__dir_locale__base__api.h |   17 +
 ...src_include_____locale__dir_support_bsd__like.h |   20 +
 .../patch-third__party_libc++_src_src_chrono.cpp   |    6 +-
 ...libc++_src_src_filesystem_filesystem__clock.cpp |    6 +-
 ...ird__party_libc++abi_src_src_cxa__guard__impl.h |   10 +-
 .../patch-third__party_libdrm_src_xf86drmMode.c    |    4 +-
 ...st_cpp_src_phonenumbers_base_memory_singleton.h |    4 +-
 ...pp_src_phonenumbers_base_synchronization_lock.h |    4 +-
 ...ist_cpp_src_phonenumbers_base_thread__checker.h |    4 +-
 ...ch-third__party_libsync_src_include_sync_sync.h |    4 +-
 .../patches/patch-third__party_libsync_src_sync.c  |    4 +-
 .../patches/patch-third__party_libusb_BUILD.gn     |    4 +-
 .../patch-third__party_libusb_src_libusb_core.c    |    4 +-
 ...rd__party_libusb_src_libusb_os_threads__posix.c |    4 +-
 ...x_source_libvpx_vpx__ports_aarch64__cpudetect.c |    4 +-
 .../patch-third__party_lzma__sdk_C_CpuArch.c       |   13 +-
 ...ial__color__utilities_src_cpp_palettes_tones.cc |    4 +-
 chromium/patches/patch-third__party_nasm_BUILD.gn  |    4 +-
 .../patch-third__party_nasm_config_config-linux.h  |    4 +-
 chromium/patches/patch-third__party_node_node.gni  |   21 +-
 chromium/patches/patch-third__party_node_node.py   |    6 +-
 ...ird__party_pdfium_core_fxge_cfx__fontmapper.cpp |    4 +-
 ...arty_pdfium_core_fxge_linux_fx__linux__impl.cpp |   14 +-
 ...-third__party_pdfium_fxjs_fx__date__helpers.cpp |    4 +-
 .../patches/patch-third__party_pdfium_pdfium.gni   |    4 +-
 ...fium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp |    4 +-
 ..._perfetto_include_perfetto_base_build__config.h |   44 +-
 ..._perfetto_include_perfetto_base_thread__utils.h |    8 +-
 ...rd__party_perfetto_include_perfetto_base_time.h |   10 +-
 ..._perfetto_include_perfetto_ext_base_event__fd.h |    6 +-
 ...fetto_include_perfetto_ext_base_thread__utils.h |    4 +-
 ...erfetto_tracing_internal_track__event__legacy.h |    4 +-
 ...erfetto_protos_perfetto_trace_ftrace_v4l2.proto |    4 +-
 ...rd__party_perfetto_src_base_clock__snapshots.cc |   14 +-
 ...tch-third__party_perfetto_src_base_event__fd.cc |   16 +-
 ...hird__party_perfetto_src_base_periodic__task.cc |   12 +-
 ...third__party_perfetto_src_base_string__utils.cc |   19 +-
 ...d__party_perfetto_src_base_subprocess__posix.cc |   12 +-
 ...party_perfetto_src_base_test_vm__test__utils.cc |    4 +-
 ...party_perfetto_src_base_thread__task__runner.cc |   16 +-
 ...-third__party_perfetto_src_base_unix__socket.cc |   18 +-
 .../patch-third__party_perfetto_src_base_utils.cc  |   30 +-
 ...ce__processor_importers_ftrace_v4l2__tracker.cc |   16 +-
 ...-third__party_perfetto_src_tracing_ipc_memfd.cc |   10 +-
 ...__party_perfetto_src_tracing_platform__posix.cc |    4 +-
 ...atch-third__party_perfetto_src_tracing_track.cc |    6 +-
 ...uf_src_google_protobuf_stubs_platform__macros.h |    6 +-
 ..._party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h |    4 +-
 ...hird__party_skia_src_ports_SkMemory__malloc.cpp |    4 +-
 ...third__party_skia_src_ports_SkOSFile__posix.cpp |    4 +-
 ...__party_speech-dispatcher_libspeechd__version.h |    4 +-
 ...third__party_speech-dispatcher_speechd__types.h |    4 +-
 .../patches/patch-third__party_sqlite_BUILD.gn     |    6 +-
 ...d__party_sqlite_src_amalgamation__dev_sqlite3.c |   15 +-
 ...-third__party_sqlite_src_amalgamation_sqlite3.c |   12 +-
 ...-third__party_swiftshader_src_Reactor_Debug.cpp |    4 +-
 ...__party_swiftshader_src_System_Configurator.cpp |    4 +-
 ...d__party_swiftshader_src_System_Linux_MemFd.cpp |    4 +-
 ...tshader_src_Vulkan_VkSemaphoreExternalLinux.hpp |    4 +-
 ...tch-third__party_swiftshader_src_WSI_libXCB.cpp |    4 +-
 ...10.0_configs_linux_include_llvm_Config_config.h |    4 +-
 ...ubzero_build_Linux_include_llvm_Config_config.h |    4 +-
 ...ty_swiftshader_third__party_marl_src_memory.cpp |    4 +-
 ...ty_swiftshader_third__party_marl_src_thread.cpp |    4 +-
 ...ch-third__party_test__fonts_fontconfig_BUILD.gn |   17 +-
 ...st__fonts_fontconfig_fontconfig__util__linux.cc |    4 +-
 ...onts_fontconfig_generate__fontconfig__caches.cc |    4 +-
 .../patches/patch-third__party_tflite_features.gni |    4 +-
 .../patches/patch-third__party_unrar_src_crypt.cpp |    4 +-
 ...layers_src_layers_external_vma_vk__mem__alloc.h |    6 +-
 ...ers_vulkan_generated_vk__function__pointers.cpp |    4 +-
 ...kan__memory__allocator_include_vk__mem__alloc.h |    4 +-
 .../patches/patch-third__party_wayland_BUILD.gn    |    4 +-
 .../patch-third__party_wayland_include_config.h    |    4 +-
 .../patches/patch-third__party_webrtc_BUILD.gn     |    6 +-
 ...rd__party_webrtc_modules_audio__device_BUILD.gn |    4 +-
 ...s_desktop__capture_linux_wayland_egl__dmabuf.cc |   14 +-
 ...__capture_linux_x11_x__server__pixel__buffer.cc |    4 +-
 ...ideo__coding_codecs_av1_libaom__av1__encoder.cc |   29 -
 ...tch-third__party_webrtc_rtc__base_byte__order.h |    4 +-
 ...ch-third__party_webrtc_rtc__base_ip__address.cc |    4 +-
 ...d__party_webrtc_rtc__base_net__test__helpers.cc |    4 +-
 .../patch-third__party_webrtc_rtc__base_network.cc |   10 +-
 ...ty_webrtc_rtc__base_physical__socket__server.cc |   24 +-
 ...rty_webrtc_rtc__base_physical__socket__server.h |    4 +-
 ...rty_webrtc_rtc__base_platform__thread__types.cc |    4 +-
 ...webrtc_rtc__base_third__party_sigslot_sigslot.h |    4 +-
 ...h-third__party_webrtc_system__wrappers_BUILD.gn |    4 +-
 .../patch-third__party_widevine_cdm_widevine.gni   |    4 +-
 chromium/patches/patch-third__party_zlib_BUILD.gn  |    4 +-
 .../patch-third__party_zlib_cpu__features.c        |    4 +-
 .../patch-tools_code__cache__generator_BUILD.gn    |   52 +
 ...erate__shim__headers_generate__shim__headers.py |    4 +-
 .../patches/patch-tools_generate__stubs_rules.gni  |    4 +-
 ...atch-tools_gn_build_build__linux.ninja.template |    4 +-
 chromium/patches/patch-tools_gn_build_gen.py       |    6 +-
 .../patch-tools_gn_src_base_files_file__posix.cc   |    4 +-
 chromium/patches/patch-tools_gn_src_gn_version.h   |    4 +-
 .../patches/patch-tools_gn_src_util_exe__path.cc   |    4 +-
 .../patches/patch-tools_grit_grit_node_base.py     |    6 +-
 ...son__schema__compiler_cpp__bundle__generator.py |   10 +-
 ...ols_json__schema__compiler_feature__compiler.py |    6 +-
 ...ls_memory_partition__allocator_inspect__utils.h |    4 +-
 ...ch-tools_perf_chrome__telemetry__build_BUILD.gn |    8 +-
 .../patch-tools_protoc__wrapper_protoc__wrapper.py |    8 +-
 .../patch-tools_v8__context__snapshot_BUILD.gn     |   20 +-
 ...atch-tools_variations_fieldtrial__to__struct.py |    4 +-
 ...tch-ui_accessibility_accessibility__features.cc |   17 +
 ...atch-ui_accessibility_accessibility__features.h |   17 +
 .../patches/patch-ui_accessibility_ax__node.cc     |   26 +
 chromium/patches/patch-ui_accessibility_ax__node.h |   17 +
 .../patches/patch-ui_accessibility_ax__tree.cc     |   44 +
 chromium/patches/patch-ui_accessibility_ax__tree.h |   35 +
 .../patch-ui_aura_client_drag__drop__client.h      |    4 +-
 chromium/patches/patch-ui_aura_screen__ozone.cc    |    8 +-
 chromium/patches/patch-ui_aura_screen__ozone.h     |   18 +-
 .../patch-ui_base_accelerators_accelerator.cc      |   17 +
 .../patches/patch-ui_base_accelerators_command.cc  |   17 +
 ...istener_global__accelerator__listener__ozone.cc |   35 +
 ...patch-ui_base_clipboard_clipboard__constants.cc |   13 +-
 .../patch-ui_base_clipboard_clipboard__constants.h |   15 +-
 ...tch-ui_base_clipboard_clipboard__non__backed.cc |    4 +-
 .../patch-ui_base_cursor_cursor__factory.cc        |    4 +-
 .../patches/patch-ui_base_cursor_cursor__factory.h |    4 +-
 ...agdrop_os__exchange__data__provider__factory.cc |    4 +-
 ...op_os__exchange__data__provider__non__backed.cc |    6 +-
 ...patch-ui_base_ime_dummy__text__input__client.cc |    6 +-
 .../patch-ui_base_ime_dummy__text__input__client.h |    6 +-
 .../patch-ui_base_ime_fake__text__input__client.cc |    6 +-
 .../patch-ui_base_ime_fake__text__input__client.h  |    6 +-
 ...-ui_base_ime_init_input__method__initializer.cc |   22 +-
 ...linux_linux__input__method__context__factory.cc |    4 +-
 .../patch-ui_base_ime_text__input__client.h        |    6 +-
 .../patch-ui_base_resource_resource__bundle.cc     |    6 +-
 .../patch-ui_base_test_skia__gold__pixel__diff.cc  |   14 +-
 chromium/patches/patch-ui_base_test_ui__controls.h |    6 +-
 .../patches/patch-ui_base_ui__base__features.cc    |   31 +-
 .../patches/patch-ui_base_ui__base__features.h     |    8 +-
 .../patches/patch-ui_base_ui__base__switches.cc    |    8 +-
 .../patches/patch-ui_base_ui__base__switches.h     |    8 +-
 .../patches/patch-ui_base_webui_web__ui__util.cc   |   16 +-
 .../patch-ui_base_x_x11__cursor__factory.cc        |    4 +-
 .../patches/patch-ui_base_x_x11__cursor__factory.h |    4 +-
 .../patches/patch-ui_base_x_x11__cursor__loader.cc |   12 +-
 .../patch-ui_base_x_x11__display__manager.cc       |    4 +-
 .../patch-ui_base_x_x11__shm__image__pool.cc       |   20 +-
 chromium/patches/patch-ui_color_color__id.h        |   10 +-
 .../patch-ui_color_color__provider__utils.cc       |    6 +-
 chromium/patches/patch-ui_color_system__theme.h    |    4 +-
 chromium/patches/patch-ui_compositor_compositor.cc |    6 +-
 chromium/patches/patch-ui_compositor_compositor.h  |    6 +-
 .../patch-ui_compositor_compositor__observer.h     |    6 +-
 chromium/patches/patch-ui_display_screen.cc        |    8 +-
 chromium/patches/patch-ui_display_screen.h         |   16 +-
 ...vents_devices_x11_device__data__manager__x11.cc |    4 +-
 chromium/patches/patch-ui_events_event.cc          |   10 +-
 .../patches/patch-ui_events_event__switches.cc     |    4 +-
 chromium/patches/patch-ui_events_event__switches.h |    4 +-
 ...ch-ui_events_keycodes_dom_keycode__converter.cc |    4 +-
 ...tch-ui_events_keycodes_dom_keycode__converter.h |    4 +-
 chromium/patches/patch-ui_gfx_BUILD.gn             |    6 +-
 chromium/patches/patch-ui_gfx_canvas__skia.cc      |    6 +-
 .../patches/patch-ui_gfx_font__fallback__linux.cc  |    4 +-
 .../patches/patch-ui_gfx_font__render__params.h    |   18 +-
 .../patch-ui_gfx_font__render__params__linux.cc    |    8 +-
 chromium/patches/patch-ui_gfx_font__util.cc        |    4 +-
 .../patches/patch-ui_gfx_gpu__memory__buffer.cc    |    8 +-
 .../patches/patch-ui_gfx_gpu__memory__buffer.h     |   21 +-
 chromium/patches/patch-ui_gfx_linux_dmabuf__uapi.h |    4 +-
 .../patches/patch-ui_gfx_linux_gbm__wrapper.cc     |    6 +-
 ...ch-ui_gfx_mojom_buffer__types__mojom__traits.cc |   26 -
 ...x_mojom_native__handle__types__mojom__traits.cc |   39 +-
 ...fx_mojom_native__handle__types__mojom__traits.h |   27 +-
 .../patches/patch-ui_gfx_native__pixmap__handle.cc |    4 +-
 .../patches/patch-ui_gfx_native__pixmap__handle.h  |   12 +-
 .../patches/patch-ui_gfx_native__widget__types.h   |   24 +-
 .../patches/patch-ui_gfx_platform__font__skia.cc   |    4 +-
 .../patch-ui_gfx_render__text__api__fuzzer.cc      |    8 +-
 .../patches/patch-ui_gfx_render__text__fuzzer.cc   |    4 +-
 chromium/patches/patch-ui_gfx_switches.cc          |    4 +-
 chromium/patches/patch-ui_gfx_switches.h           |    6 +-
 chromium/patches/patch-ui_gfx_x_atom__cache.cc     |   16 +
 .../patch-ui_gfx_x_generated__protos_dri3.cc       |    4 +-
 .../patch-ui_gfx_x_generated__protos_shm.cc        |    4 +-
 chromium/patches/patch-ui_gfx_x_xlib__support.cc   |    4 +-
 chromium/patches/patch-ui_gl_BUILD.gn              |   10 +-
 chromium/patches/patch-ui_gl_gl__context.cc        |    6 +-
 chromium/patches/patch-ui_gl_gl__fence.cc          |    4 +-
 chromium/patches/patch-ui_gl_gl__implementation.cc |    6 +-
 chromium/patches/patch-ui_gl_gl__switches.cc       |   34 +-
 .../patch-ui_gl_sync__control__vsync__provider.cc  |    4 +-
 .../patch-ui_gl_sync__control__vsync__provider.h   |    4 +-
 chromium/patches/patch-ui_gtk_gtk__compat.cc       |    6 +-
 .../patch-ui_gtk_printing_print__dialog__gtk.cc    |    6 +-
 ...i_message__center_views_message__popup__view.cc |   14 +-
 ...tive__theme_features_native__theme__features.cc |   26 +
 .../patches/patch-ui_native__theme_native__theme.h |   14 +-
 .../patch-ui_native__theme_native__theme__base.cc  |   16 +-
 ...tch-ui_native__theme_native__theme__features.cc |   26 -
 .../patches/patch-ui_ozone_common_egl__util.cc     |    6 +-
 chromium/patches/patch-ui_ozone_common_features.cc |   26 -
 ...platform_headless_headless__surface__factory.cc |    6 +-
 ..._platform_headless_ozone__platform__headless.cc |    6 +-
 ...rm_headless_vulkan__implementation__headless.cc |   10 +-
 ..._ozone_platform_wayland_common_wayland__util.cc |   34 +-
 ...form_wayland_emulate_wayland__input__emulate.cc |   17 -
 ...tform_wayland_emulate_wayland__input__emulate.h |   17 -
 ..._wayland_gpu_vulkan__implementation__wayland.cc |    4 +-
 ...ne_platform_wayland_host_wayland__connection.cc |   17 -
 ...wayland_host_wayland__input__method__context.cc |   17 -
 ...i_ozone_platform_wayland_host_wayland__popup.cc |   17 -
 ..._ozone_platform_wayland_host_wayland__screen.cc |   35 -
 ...i_ozone_platform_wayland_host_wayland__screen.h |   44 -
 ...tform_wayland_host_wayland__toplevel__window.cc |   17 -
 ...atform_wayland_host_wayland__toplevel__window.h |   17 -
 ..._ozone_platform_wayland_host_wayland__window.cc |   50 -
 ...i_ozone_platform_wayland_host_wayland__window.h |   44 -
 ...rm_wayland_host_xdg__toplevel__wrapper__impl.cc |   17 -
 ...m_wayland_host_zwp__text__input__wrapper__v1.cc |    8 +-
 ...ne_platform_wayland_ozone__platform__wayland.cc |   60 -
 ...one_platform_x11_vulkan__implementation__x11.cc |    4 +-
 ...tch-ui_ozone_platform_x11_x11__screen__ozone.cc |    6 +-
 ...atch-ui_ozone_platform_x11_x11__screen__ozone.h |    4 +-
 .../patch-ui_ozone_platform_x11_x11__window.cc     |    6 +-
 ...zone_public_ozone__ui__controls__test__helper.h |   17 +
 ...i_ozone_test_mock__platform__window__delegate.h |    4 +-
 ..._platform__window_platform__window__delegate.cc |    6 +-
 ...i_platform__window_platform__window__delegate.h |    6 +-
 ...rm__window_platform__window__init__properties.h |    6 +-
 chromium/patches/patch-ui_qt_BUILD.gn              |    4 +-
 chromium/patches/patch-ui_qt_qt.gni                |   17 -
 ...ings_translations_app__locale__settings__bn.xtb |    4 +-
 ...ings_translations_app__locale__settings__ja.xtb |    4 +-
 ...ings_translations_app__locale__settings__ko.xtb |    4 +-
 ...ings_translations_app__locale__settings__ml.xtb |    4 +-
 ...ings_translations_app__locale__settings__th.xtb |    4 +-
 ...s_translations_app__locale__settings__zh-CN.xtb |    4 +-
 ...s_translations_app__locale__settings__zh-TW.xtb |    4 +-
 chromium/patches/patch-ui_views_BUILD.gn           |   16 +
 ...h-ui_views_accessibility_view__accessibility.cc |   26 +
 .../patch-ui_views_controls_prefix__selector.cc    |    6 +-
 .../patch-ui_views_controls_prefix__selector.h     |    6 +-
 .../patch-ui_views_controls_textfield_textfield.cc |   31 +-
 .../patch-ui_views_controls_textfield_textfield.h  |    6 +-
 .../patches/patch-ui_views_corewm_tooltip__aura.cc |   14 +-
 .../patch-ui_views_examples_widget__example.cc     |    6 +-
 .../patches/patch-ui_views_focus_focus__manager.cc |   24 +-
 .../patch-ui_views_style_platform__style.cc        |   19 +-
 .../patches/patch-ui_views_style_platform__style.h |   17 +
 ..._ui__controls__factory__desktop__aura__ozone.cc |    8 +-
 chromium/patches/patch-ui_views_views__delegate.cc |    6 +-
 chromium/patches/patch-ui_views_views__delegate.h  |    6 +-
 ...top__aura_desktop__drag__drop__client__ozone.cc |    6 +-
 ...ktop__aura_desktop__drag__drop__client__ozone.h |    4 +-
 ...__aura_desktop__window__tree__host__platform.cc |   10 +-
 ...e__host__platform__impl__interactive__uitest.cc |   17 -
 .../patches/patch-ui_views_widget_root__view.cc    |    6 +-
 chromium/patches/patch-ui_views_widget_widget.cc   |   14 +-
 chromium/patches/patch-ui_views_widget_widget.h    |   17 +
 .../patch-ui_views_window_custom__frame__view.cc   |   14 +-
 .../patch-ui_views_window_dialog__delegate.cc      |   12 +-
 .../patch-ui_views_window_frame__background.cc     |    4 +-
 chromium/patches/patch-v8_BUILD.gn                 |   22 +-
 chromium/patches/patch-v8_include_v8-internal.h    |    6 +-
 chromium/patches/patch-v8_include_v8config.h       |   12 +-
 chromium/patches/patch-v8_src_api_api.cc           |    8 +-
 chromium/patches/patch-v8_src_base_atomicops.h     |    4 +-
 .../patches/patch-v8_src_base_platform_memory.h    |    4 +-
 .../patch-v8_src_base_platform_platform-freebsd.cc |    4 +-
 .../patch-v8_src_base_platform_platform-openbsd.cc |    4 +-
 .../patch-v8_src_base_platform_platform-posix.cc   |   14 +-
 chromium/patches/patch-v8_src_base_small-vector.h  |   17 -
 chromium/patches/patch-v8_src_base_strings.h       |    4 +-
 chromium/patches/patch-v8_src_base_sys-info.cc     |    4 +-
 ...ch-v8_src_base_utils_random-number-generator.cc |    4 +-
 .../patches/patch-v8_src_diagnostics_perf-jit.cc   |    4 +-
 .../patches/patch-v8_src_diagnostics_perf-jit.h    |    4 +-
 chromium/patches/patch-v8_src_execution_isolate.cc |    8 +-
 chromium/patches/patch-v8_src_flags_flags.cc       |    8 +-
 .../patches/patch-v8_src_libsampler_sampler.cc     |   25 +
 chromium/patches/patch-v8_src_sandbox_sandbox.cc   |    6 +-
 ..._embedded_platform-embedded-file-writer-base.cc |    4 +-
 ...t_embedded_platform-embedded-file-writer-base.h |    4 +-
 ...bedded_platform-embedded-file-writer-generic.cc |    4 +-
 ...tch-v8_src_trap-handler_handler-inside-posix.cc |    4 +-
 ...atch-v8_src_trap-handler_handler-inside-posix.h |    4 +-
 .../patch-v8_src_trap-handler_trap-handler.h       |    8 +-
 ...wasm_baseline_ia32_liftoff-assembler-ia32-inl.h |    4 +-
 chromium/patches/patch-v8_tools_run-paxctl.py      |    4 +-
 chromium/patches/patch-v8_tools_run.py             |    6 +-
 chromium/tests.mk                                  |    4 +-
 2976 files changed, 12021 insertions(+), 60969 deletions(-)

diffs:
diff --git a/chromium-next/COMMIT_MSG b/chromium-next/COMMIT_MSG
deleted file mode 100644
index 7363236555..0000000000
--- a/chromium-next/COMMIT_MSG
+++ /dev/null
@@ -1,277 +0,0 @@
-www/chromium: update to ***
-
-* 131.0.6778.264
-This update includes 4 security fixes. Below, we highlight
-fixes that were contributed by external researchers.
-Please see the Chrome Security Page for more information.
-[$55000][383356864] High CVE-2025-0291: Type Confusion in
-V8. Reported by Popax21 on 2024-12-11
-We would also like to thank all security researchers that
-worked with us during the development cycle to prevent
-security bugs from ever reaching the stable channel.
-
-As usual, our ongoing internal security work was responsible
-for a wide range of fixes:
-[388088544] Various fixes from internal audits, fuzzing and
-other initiatives
-
-* 132.0.6834.83
-This update includes 16 security fixes. Below, we highlight
-fixes that were contributed by external researchers.
-Please see the Chrome Security Page for more information.
-[$7000][374627491] High CVE-2025-0434: Out of bounds memory
-access in V8. Reported by ddme on 2024-10-21
-[$7000][379652406] High CVE-2025-0435: Inappropriate
-implementation in Navigation. Reported by Alesandro Ortiz
-on 2024-11-18
-[$3000][382786791] High CVE-2025-0436: Integer overflow in
-Skia. Reported by Han Zheng (HexHive) on 2024-12-08
-[$2000][378623799] High CVE-2025-0437: Out of bounds read
-in Metrics. Reported by Xiantong Hou of Wuheng Lab and
-Pisanbao on 2024-11-12
-[TBD][384186539] High CVE-2025-0438: Stack buffer overflow
-in Tracing. Reported by Han Zheng (HexHive) on 2024-12-15
-[$5000][371247941] Medium CVE-2025-0439: Race in Frames.
-Reported by Hafiizh on 2024-10-03
-[$5000][40067914] Medium CVE-2025-0440: Inappropriate
-implementation in Fullscreen. Reported by Umar Farooq on 2023-07-22
-[$2000][368628042] Medium CVE-2025-0441: Inappropriate
-implementation in Fenced Frames. Reported by someoneverycurious
-on 2024-09-21
-[$2000][40940854] Medium CVE-2025-0442: Inappropriate
-implementation in Payments. Reported by Ahmed ElMasry on 2023-11-08
-[$1000][376625003] Medium CVE-2025-0443: Insufficient
-data validation in Extensions. Reported by Anonymous on 2024-10-31
-[$1000][359949844] Low CVE-2025-0446: Inappropriate
-implementation in Extensions. Reported by Hafiizh on 2024-08-15
-[$1000][375550814] Low CVE-2025-0447: Inappropriate
-implementation in Navigation. Reported by Khiem Tran (@duckhiem)
-on 2024-10-25
-[$1000][377948403] Low CVE-2025-0448: Inappropriate
-implementation in Compositing. Reported by Dahyeon Park on 2024-11-08
-We would also like to thank all security researchers that
-worked with us during the development cycle to prevent security
-bugs from ever reaching the stable channel.
-
-As usual, our ongoing internal security work was responsible
-for a wide range of fixes:
-[389761478] Various fixes from internal audits, fuzzing and
-other initiatives
-
-* 132.0.6834.110
-This update includes 3 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$11000][386143468] High CVE-2025-0611: Object corruption in V8.
-Reported by 303f06e3 on 2024-12-26
-[$8000][385155406] High CVE-2025-0612: Out of bounds memory access
-in V8. Reported by Alan Goodman on 2024-12-20
-
-As usual, our ongoing internal security work was responsible for
-a wide range of fixes:
-[391144311] Various fixes from internal audits, fuzzing and other
-initiatives
-
-* 132.0.6834.159
-This update includes 2 security fixes. Below, we highlight fixes that
-were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$2000][384844003] Medium CVE-2025-0762: Use after free in DevTools.
-Reported by Sakana.S on 2024-12-18
-
-As usual, our ongoing internal security work was responsible for a
-wide range of fixes:
-[392630675] Various fixes from internal audits, fuzzing and other
-initiatives
-
-* 133.0.6943.53
-This update includes 12 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$7000][390889644] High CVE-2025-0444: Use after free in Skia.
-Reported by Francisco Alonso (@revskills) on 2025-01-19
-[TBD][392521083] High CVE-2025-0445: Use after free in V8.
-Reported by 303f06e3 on 2025-01-27
-[$2000][40061026] Medium CVE-2025-0451: Inappropriate implementation
-in Extensions API. Reported by Vitor Torres and
-Alesandro Ortiz on 2022-09-18
-
-As usual, our ongoing internal security work was responsible for
-a wide range of fixes:
-[394135363] Various fixes from internal audits, fuzzing and other
-initiatives
-
-* 133.0.6943.98
-This update includes 4 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$55000][391907159] High CVE-2025-0995: Use after free in V8.
-Reported by Popax21 on 2025-01-24
-[TBD][391788835] High CVE-2025-0996: Inappropriate implementation
-in Browser UI. Reported by yuki yamaoto on 2025-01-23
-[TBD][391666328] High CVE-2025-0997: Use after free in Navigation.
-Reported by asnine on 2025-01-23
-[TBD][386857213] High CVE-2025-0998: Out of bounds memory access
-in V8. Reported by Alan Goodman on 2024-12-31
-
-* 133.0.6943.126
-This update includes 3 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$11000][394350433] High CVE-2025-0999: Heap buffer overflow in V8.
-Reported by Seunghyun Lee (@0x10n) on 2025-02-04
-[TBD][383465163] High CVE-2025-1426: Heap buffer overflow in GPU.
-Reported by un3xploitable && GF on 2024-12-11
-[$4000][390590778] Medium CVE-2025-1006: Use after free in Network.
-Reported by Tal Keren, Sam Agranat, Eran Rom, Edouard Bochin,
-Adam Hatsir of Palo Alto Networks on 2025-01-18
-
-* 133.0.6943.141
-This update includes 1 security fix. Please see the Chrome Security
-Page for more information.
-
-As usual, our ongoing internal security work was responsible for a
-wide range of fixes:
-[399107077]Various fixes from internal audits, fuzzing and other
-initiatives
-
-* 134.0.6998.35
-This update includes 14 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$7000][397731718] High CVE-2025-1914: Out of bounds read in V8.
-Reported by Zhenghang Xiao (@Kipreyyy) and Nan Wang (@eternalsakura13)
-on 2025-02-20
-[$4000][391114799] Medium CVE-2025-1915: Improper Limitation of a
-Pathname to a Restricted Directory in DevTools. Reported by
-Topi Lassila on 2025-01-20
-[$3000][376493203] Medium CVE-2025-1916: Use after free in Profiles.
-Reported by parkminchan, SSD Labs Korea on 2024-10-31
-[$2000][329476341] Medium CVE-2025-1917: Inappropriate Implementation
-in Browser UI. Reported by Khalil Zhani on 2024-03-14
-[$2000][388557904] Medium CVE-2025-1918: Out of bounds read in PDFium.
-AReported by asnine on 2025-01-09
-[$2000][392375312] Medium CVE-2025-1919: Out of bounds read in Media.
-Reported by @Bl1nnnk and @Pisanbao on 2025-01-26
-[$1000][387583503] Medium CVE-2025-1921: Inappropriate Implementation
-in Media Stream. Reported by Kaiido on 2025-01-04
-[$5000][384033062] Low CVE-2025-1922: Inappropriate Implementation in
-Selection. Reported by Alesandro Ortiz on 2024-12-14
-[$1000][382540635] Low CVE-2025-1923: Inappropriate Implementation in
-Permission Prompts. Reported by Khalil Zhani on 2024-12-06
-
-As usual, our ongoing internal security work was responsible for a
-wide range of fixes:
-[400559715] Various fixes from internal audits, fuzzing and other initiatives
-
-* 134.0.6998.88
-This update includes 5 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$7000][398065918] High CVE-2025-1920: Type Confusion in V8.
-Reported by Excello s.r.o. on 2025-02-21
-[TBD][400052777] High CVE-2025-2135: Type Confusion in V8.
-Reported by Zhenghang Xiao (@Kipreyyy) and Nan Wang (@eternalsakura13)
-on 2025-03-02
-[NA][401059730] High CVE-2025-24201: Out of bounds write in
-GPU on Mac. Reported by Apple Security Engineering and
-Architecture (SEAR) on 2025-03-05
-[$3000][395032416] Medium CVE-2025-2136: Use after free in
-Inspector. Reported by Sakana.S on 2025-02-10
-[$2000][398999390] Medium CVE-2025-2137: Out of bounds read in V8.
-Reported by zeroxiaobai@ on 2025-02-25
-
-Google is aware of reports that an exploit for CVE-2025-24201 exists in the wild.
-
-* 134.0.6998.117
-This update includes 2 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[TBD][401029609] Critical CVE-2025-2476: Use after free in Lens.
-Reported by SungKwon Lee of Enki Whitehat on 2025-03-05
-
-As usual, our ongoing internal security work was responsible for a
-wide range of fixes:
-[404324707] Various fixes from internal audits, fuzzing and other initiatives
-
-* 134.0.6998.165
-This update doesn't include security fix.
-
-* 135.0.7049.52
-This update includes 13 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$10000][376491759] Medium CVE-2025-3067: Inappropriate implementation
-in Custom Tabs. Reported by Philipp Beer (TU Wien) on 2024-10-31
-[$2000][401823929] Medium CVE-2025-3068: Inappropriate implementation
-in Intents. Reported by Simon Rawet on 2025-03-09
-[$1000][40060076] Medium CVE-2025-3069: Inappropriate implementation in
-Extensions. Reported by NDevTK on 2022-06-26
-[$1000][40086360] Medium CVE-2025-3070: Insufficient validation of
-untrusted input in Extensions. Reported by Anonymous on 2017-01-01
-[$2000][40051596] Low CVE-2025-3071: Inappropriate implementation in
-Navigations. Reported by David Erceg on 2020-02-23
-[$1000][362545037] Low CVE-2025-3072: Inappropriate implementation in
-Custom Tabs. Reported by Om Apip on 2024-08-27
-[$500][388680893] Low CVE-2025-3073: Inappropriate implementation in
-Autofill. Reported by Hafiizh on 2025-01-09
-[$500][392818696] Low CVE-2025-3074: Inappropriate implementation in
-Downloads. Reported by Farras Givari on 2025-01-28
-
-As usual, our ongoing internal security work was responsible for a
-wide range of fixes:
-[407621901]Various fixes from internal audits, fuzzing and other initiatives
-
-* 135.0.7049.84
-This update includes 2 security fixes. Below, we highlight fixes that
-were contributed by external researchers. Please see the Chrome Security
-Page for more information.
-[$4000][405140652] High CVE-2025-3066: Use after free in Site Isolation.
-Reported by Sven Dysthe (@svn-dys) on 2025-03-21
-
-As usual, our ongoing internal security work was responsible for a
-wide range of fixes:
-[409114118] Various fixes from internal audits, fuzzing and other initiatives
-
-* 135.0.7049.95
-This update includes 2 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[TBD][409619251] Critical CVE-2025-3619: Heap buffer overflow
-in Codecs. Reported by Elias Hohl on 2025-04-09
-[TBD][405292639] High CVE-2025-3620: Use after free in USB.
-Reported by @retsew0x01 on 2025-03-21
-
-* 135.0.7049.114
-This update includes 1 security fix. Please see the Chrome Security Page
-for more information.
-Our ongoing internal security work was responsible for a wide range of fixes:
-[412443038] Various fixes from internal audits, fuzzing and other initiatives
-
-* 136.0.7103.59
-This update includes 8 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$5000][409911705] High CVE-2025-4096: Heap buffer overflow in HTML.
-Reported by Anonymous on 2025-04-11
-[$2000][409342999] Medium CVE-2025-4050: Out of bounds memory access
-in DevTools. Reported by Anonymous on 2025-04-09
-[$2000][404000989] Medium CVE-2025-4051: Insufficient data validation
-in DevTools. Reported by Daniel Fröjdendahl on 2025-03-16
-[$1000][401927528] Low CVE-2025-4052: Inappropriate implementation
-in DevTools. Reported by vanillawebdev on 2025-03-10
-
-As usual, our ongoing internal security work was responsible for a
-wide range of fixes:
-[414433561]Various fixes from internal audits, fuzzing and other initiatives
-
-* 136.0.7103.92
-This update includes 2 security fixes. Below, we highlight fixes
-that were contributed by external researchers. Please see the
-Chrome Security Page for more information.
-[$7000][412057896] Medium CVE-2025-4372: Use after free in WebAudio.
-Reported by Huang Xilin of Ant Group Light-Year Security Lab on 2025-04-20
-
-As usual, our ongoing internal security work was responsible for a
-wide range of fixes:
-[415837391] Various fixes from internal audits, fuzzing and other initiatives
diff --git a/chromium-next/DESCR b/chromium-next/DESCR
deleted file mode 100644
index 2a86084420..0000000000
--- a/chromium-next/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Chromium is an open-source browser project that aims to build a
-safer, faster, and more stable way for all Internet users to
-experience the web.
diff --git a/chromium-next/Makefile b/chromium-next/Makefile
deleted file mode 100644
index 3ea5dd5436..0000000000
--- a/chromium-next/Makefile
+++ /dev/null
@@ -1,373 +0,0 @@
-# $NetBSD$
-
-DISTNAME=			chromium-${VERSION}
-PKGNAME=			${DISTNAME:S/chromium/chromium-next/}
-VERSION=			136.0.7103.92
-CATEGORIES=			www
-MASTER_SITES=			https://commondatastorage.googleapis.com/chromium-browser-official/
-EXTRACT_SUFX_C=			.tar.xz
-
-#PROFILE_DISTFILES=		chromium-linux-${VERSION}-llvm17.profdata${EXTRACT_SUFX_C}
-#SITES.${PROFILE_DISTFILES}=	https://nerd.hu/distfiles/
-DISTFILES+=			${DISTNAME}${EXTRACT_SUFX_C}
-#DISTFILES+=			${PROFILE_DISTFILES}
-
-# audioio source
-A_VERSION=			130.0
-GITHUB_SUBMODULES=		kikadf chromium-audioio v${A_VERSION} media/audio/audioio
-
-# LLVM_MAJOR_VERSION
-LLVM_MV=			19
-
-MAINTAINER=			kikadf.01%gmail.com@localhost
-HOMEPAGE=			https://www.chromium.org/Home
-COMMENT=			Open source web browser
-LICENSE=			modified-bsd AND gnu-lgpl-v3 AND mpl-2.0
-
-USE_TOOLS+=			bash bison flex:pkgsrc gmake pax perl pkg-config
-TOOLS_PLATFORM.flex=		# override the platform definition to use pkgsrc's flex.
-USE_LANGUAGES=			c c++
-
-CHECK_PORTABILITY_SKIP+=	third_party/dawn/third_party/dxc/utils/buildit/build_llvm
-CHECK_PORTABILITY_SKIP+=	third_party/sqlite/src/configure
-CHECK_PORTABILITY_SKIP+=	third_party/protobuf/post_process_dist.sh
-CHECK_PORTABILITY_SKIP+=	third_party/ffmpeg/configure
-CHECK_PORTABILITY_SKIP+=	third_party/nearby/src/embedded/build.sh
-CHECK_PORTABILITY_SKIP+=	third_party/xdg-utils/scripts/xdg-terminal
-CHECK_PORTABILITY_SKIP+=	third_party/xdg-utils/scripts/xdg-terminal.in
-CHECK_PORTABILITY_SKIP+=	third_party/llvm/flang/tools/f18/flang.sh.in
-CHECK_PORTABILITY_SKIP+=	third_party/rust-src/vendor/libdbus-sys-0.2.5/vendor/dbus/tools/cmake-format
-CHECK_PORTABILITY_SKIP+=	third_party/rust-toolchain/lib/rustlib/src/rust/vendor/libdbus-sys-0.2.5/vendor/dbus/tools/cmake-format
-CHECK_PORTABILITY_SKIP+=	v8/tools/run-llprof.sh
-CHECK_PORTABILITY_SKIP+=	v8/tools/profiling/run-llprof.sh
-
-TOOL_DEPENDS+=			gperf>=3.2:../../devel/gperf
-TOOL_DEPENDS+=			nasm-[0-9]*:../../devel/nasm
-TOOL_DEPENDS+=			ninja-build-[0-9]*:../../devel/ninja-build
-TOOL_DEPENDS+=			${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
-TOOL_DEPENDS+=			${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
-TOOL_DEPENDS+=			${PYPKGPREFIX}-ply-[0-9]*:../../devel/py-ply
-TOOL_DEPENDS+=			nodejs-[0-9]*:../../lang/nodejs
-TOOL_DEPENDS+=			rust-bindgen-[0-9]*:../../devel/rust-bindgen
-
-DEPENDS+=			xdg-utils-[0-9]*:../../misc/xdg-utils
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/compiler.mk"
-
-# Supported platforms, synced with rust/platform.mk
-.for c_arch in x86_64 aarch64
-ONLY_FOR_PLATFORM+=		NetBSD-1[0-9].*-${c_arch}
-ONLY_FOR_PLATFORM+=		Linux-*-${c_arch}
-ONLY_FOR_PLATFORM+=		Darwin-*-${c_arch}
-ONLY_FOR_PLATFORM+=		FreeBSD-*-${c_arch}
-.endfor
-
-# Workaround for brotli and other commands.
-#BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
-
-# Let to chromium use the -Wl,-z,relro flag
-BUILDLINK_TRANSFORM+=		rm:-Wl,-zrelro
-
-# Do not use alloca(3) in libc.
-BUILDLINK_TRANSFORM+=		opt:-std=c11:-std=gnu11
-BUILDLINK_TRANSFORM+=		opt:-std=c99:-std=gnu99
-BUILDLINK_TRANSFORM+=		opt:-std=c++14:-std=gnu++14
-BUILDLINK_TRANSFORM+=		opt:-std=c++17:-std=gnu++17
-BUILDLINK_TRANSFORM+=		opt:-std=c++20:-std=gnu++20
-
-REPLACE_BASH=		chrome/tools/build/linux/chrome-wrapper
-FILES_SUBST+=		PYTHONBIN=${PYTHONBIN:Q}
-
-SUBST_CLASSES+=		path
-SUBST_STAGE.path=	pre-configure
-SUBST_MESSAGE.path=	Fixing pathes
-SUBST_FILES.path+=	base/base_paths_posix.cc
-SUBST_FILES.path+=	base/process/process_handle_openbsd.cc
-SUBST_FILES.path+=	build/rust/rust_bindgen.gni
-SUBST_FILES.path+=	build/rust/rust_bindgen_generator.gni
-SUBST_FILES.path+=	chrome/common/chrome_paths.cc
-SUBST_FILES.path+=	chromium.sh
-SUBST_FILES.path+=	components/policy/core/common/policy_paths.cc
-SUBST_FILES.path+=	sandbox/policy/openbsd/sandbox_openbsd.cc
-SUBST_FILES.path+=	services/device/hid/hid_service_freebsd.cc
-SUBST_FILES.path+=	services/device/time_zone_monitor/time_zone_monitor_linux.cc
-SUBST_FILES.path+=	third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp
-SUBST_FILES.path+=	third_party/perfetto/src/base/utils.cc
-SUBST_FILES.path+=	v8/tools/run-paxctl.py
-SUBST_VARS.path+=	PREFIX PKG_SYSCONFBASE VARBASE QTDIR X11BASE PYTHONBIN
-
-SUBST_CLASSES+=		man
-SUBST_STAGE.man=	pre-configure
-SUBST_MESSAGE.man=	Fixing manpage
-SUBST_FILES.man+=	chrome/app/resources/manpage.1.in
-SUBST_SED.man+=		-e 's,@@PACKAGE@@,chromium,g'
-SUBST_SED.man+=		-e 's,@@MENUNAME@@,Chromium Web Browser,g'
-
-.include "options.mk"
-
-SUBST_CLASSES+=		pulse
-SUBST_STAGE.pulse=	pre-configure
-SUBST_MESSAGE.pulse=	Set BUILT_WITH_PULSE to ${WITH_PA} in chromium wrapper
-SUBST_FILES.pulse+=	chromium.sh
-SUBST_SED.pulse+=	-e 's,@PULSE@,${WITH_PA},g'
-
-.include "tests.mk"
-
-MAKE_ENV+=	BUILDTYPE=${BUILDTYPE}
-MAKE_ENV+=	GPERF=${PREFIX}/bin/gperf
-TARGET=		chrome chromedriver
-
-# These libraries are used from the system and the build infrastructure
-# removes them from the bundled third_party directory and replaces them
-# with hooks to use them from the system.
-GN_SYSTEM_LIBS=		dav1d
-GN_SYSTEM_LIBS+=	fontconfig
-GN_SYSTEM_LIBS+=	icu
-GN_SYSTEM_LIBS+=	libaom
-GN_SYSTEM_LIBS+=	libjpeg # libjpeg-turbo
-GN_SYSTEM_LIBS+=	libpng
-GN_SYSTEM_LIBS+=	libvpx
-GN_SYSTEM_LIBS+=	libxml
-GN_SYSTEM_LIBS+=	libxslt
-GN_SYSTEM_LIBS+=	openh264
-GN_SYSTEM_LIBS+=	opus
-
-#GN_ARGS+=	chrome_pgo_phase=0
-GN_ARGS+=	clang_use_chrome_plugins=false
-GN_ARGS+=	disable_fieldtrial_testing_config=true
-GN_ARGS+=	enable_backup_ref_ptr_support=false
-GN_ARGS+=	enable_hangout_services_extension=true
-GN_ARGS+=	enable_nacl=false
-GN_ARGS+=	enable_remoting=false
-GN_ARGS+=	fatal_linker_warnings=false
-GN_ARGS+=	icu_use_data_file=false
-GN_ARGS+=	is_cfi=false
-GN_ARGS+=	is_clang=true
-GN_ARGS+=	moc_qt6_path=\"${PREFIX}/qt6/libexec\"
-GN_ARGS+=	optimize_webui=true
-GN_ARGS+=	thin_lto_enable_optimizations=true
-GN_ARGS+=	treat_warnings_as_errors=false
-GN_ARGS+=	use_allocator_shim=false
-GN_ARGS+=	use_cups=true
-GN_ARGS+=	use_custom_libcxx=true
-GN_ARGS+=	use_custom_libunwind=true
-GN_ARGS+=	use_kerberos=false
-GN_ARGS+=	use_lld=false
-GN_ARGS+=	use_partition_alloc=true
-GN_ARGS+=	use_partition_alloc_as_malloc=false
-GN_ARGS+=	use_qt5=false
-GN_ARGS+=	use_qt6=true
-GN_ARGS+=	use_sndio=false
-GN_ARGS+=	use_sysroot=false
-GN_ARGS+=	use_system_freetype=true
-GN_ARGS+=	use_system_harfbuzz=true
-GN_ARGS+=	use_system_libdrm=true
-#GN_ARGS+=	use_system_libjpeg=true #libjpeg-turbo
-GN_ARGS+=	use_thin_lto=false
-GN_ARGS+=	use_udev=false
-GN_ARGS+=	use_vaapi=false
-GN_ARGS+=	v8_enable_cet_ibt=true
-
-# flags
-CFLAGS+=	-fno-stack-protector
-CFLAGS+=	-isystem${PREFIX}/lib/clang/${LLVM_MV}/include # third_party/zlib with clang
-CFLAGS+=	-Wno-error=unused-command-line-argument
-CFLAGS+=	-Wno-unknown-warning-option
-
-EXTRA_LDFLAGS=	-L${PREFIX}/lib \
-		-L${X11BASE}/lib \
-		${COMPILER_RPATH_FLAG}${PREFIX}/lib \
-		${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr \
-		${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss \
-		${COMPILER_RPATH_FLAG}${X11BASE}/lib
-EXTRA_CXXFLAGS=	-Wno-unknown-warning-option \
-		-I${BUILDLINK_DIR}/include \
-		-I${BUILDLINK_DIR}/include/libepoll-shim \
-		-I${BUILDLINK_DIR}/include/glib \
-		-I${BUILDLINK_DIR}/include/nss
-
-# rust
-RUSTC_VERSION=	rustc -V
-MAKE_ENV+=	RUSTC_BOOTSTRAP=1
-GN_ARGS+=	enable_rust=true \
-		rust_sysroot_absolute=\"${PREFIX}\" \
-		rustc_version=\"${RUSTC_VERSION:sh}\"
-
-PLIST_VARS+=		swiftshader
-.if ${MACHINE_ARCH} == "aarch64"
-FFMPEG_TARGET=		arm64
-.elif ${MACHINE_ARCH} == "x86_64"
-PLIST.swiftshader=	yes
-FFMPEG_TARGET=		x64
-.endif
-
-GN_ARGS+=	extra_cxxflags=\"${EXTRA_CXXFLAGS}\" \
-		extra_ldflags=\"${EXTRA_LDFLAGS}\"
-
-# Proprietary codecs are enabled.
-FFMPEG_BRAND=	Chrome
-FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.${LOWER_OPSYS}/${FFMPEG_BRAND}
-FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/${LOWER_OPSYS}/${FFMPEG_TARGET}
-
-GN_ARGS+=	proprietary_codecs=true \
-		ffmpeg_branding=\"${FFMPEG_BRAND}\"
-
-GN_BOOTSTRAP_FLAGS+=	--no-clean --no-rebuild
-GN_BOOTSTRAP_FLAGS+=	--skip-generate-buildfiles
-
-# API key and OAuth credential for Google.
-# This is pkgsrc use only.
-GN_ARGS+=	google_api_key=\"AIzaSyAT_3ogzNMKbBMFk3xQ6T35fg52Y9GrFBg\"
-#GN_ARGS+=	google_default_client_id=\"74061691103-faqqnan75j2s8ej3p7lh2k98dhkee816.apps.googleusercontent.com\"
-#GN_ARGS+=	google_default_client_secret=\"3R9TyUv14OXgzJnZi6Ismela\"
-
-NOT_PAX_MPROTECT_SAFE+=	lib/chromium/chrome
-#NOT_PAX_ASLR_SAFE+=	lib/chromium/chrome
-
-PKG_CC=			clang
-PKG_CXX=		clang++
-
-CONFLICTS=		chromium-[0-9]*
-
-post-extract:
-	${CP} ${FILESDIR}/chromium.sh.in ${WRKSRC}/chromium.sh
-
-pre-configure:
-	# Prepare internal ffmpeg
-	cd ${WRKSRC}/media/ffmpeg && \
-		${PYTHONBIN} scripts/build_ffmpeg.py \
-		${LOWER_OPSYS} ${FFMPEG_TARGET} --config-only --branding=${FFMPEG_BRAND}
-	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
-	${INSTALL_DATA_DIR} ${FFMPEG_CDIR}
-.for ffmpeg_part in config.h config.asm config_components.h libavcodec libavformat libavutil
-	cp -pR ${FFMPEG_BDIR}/${ffmpeg_part} ${FFMPEG_CDIR}
-.endfor
-
-	# Create symlink to NetBSD nodejs command.
-	${MKDIR} ${WRKSRC}/third_party/node/${LOWER_OPSYS}/node-${LOWER_OPSYS}/bin
-	${LN} -sf ${PREFIX}/bin/node \
-		${WRKSRC}/third_party/node/${LOWER_OPSYS}/node-${LOWER_OPSYS}/bin/node
-
-do-configure:
-	cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./build/linux/unbundle/replace_gn_files.py \
-		--system-libraries ${GN_SYSTEM_LIBS} || ${FALSE}
-
-	cd ${WRKSRC}/tools/gn && \
-		${SETENV} ${MAKE_ENV} ${PYTHONBIN} bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
-
-	cd ${WRKSRC} && \
-		${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \
-		gen --args="${GN_ARGS}" --script-executable="${PYTHONBIN}" ${GN_VERBOSE} out/${BUILDTYPE}
-
-do-build:
-	${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
-	${SETENV} ${MAKE_ENV} ${PREFIX}/bin/ninja -j ${_MAKE_JOBS_N} -C out/${BUILDTYPE} ${TARGET}
-
-
-CHROMIUM=		chromium
-BUILDDIR=		${WRKSRC}/out/${BUILDTYPE}
-INSTALLATION_DIRS+=	lib/${CHROMIUM}
-INSTALLATION_DIRS+=	bin
-INSTALLATION_DIRS+=	${PKGMANDIR}/man1
-INSTALLATION_DIRS+=	${PREFIX}/share/applications
-
-ICON_SIZES=		22_mono 24 48 64 128 256
-.for i in ${ICON_SIZES}
-ICONS_DIR${i}+=		share/icons/hicolor/${i}x${i}/apps
-INSTALLATION_DIRS+=	${ICONS_DIR${i}}
-.endfor
-
-CHROMIUM_LIBS+=		libEGL.so
-CHROMIUM_LIBS+=		libGLESv2.so
-CHROMIUM_LIBS+=		libVkICD_mock_icd.so
-.if ${MACHINE_ARCH} != "aarch64"
-CHROMIUM_LIBS+=		libvk_swiftshader.so
-CHROMIUM_LIBS+=		vk_swiftshader_icd.json
-.endif
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${CHROMIUM}.sh ${DESTDIR}${PREFIX}/bin/${CHROMIUM}
-	${INSTALL_DATA} ${FILESDIR}/chromium-browser.desktop ${DESTDIR}${PREFIX}/share/applications
-	${INSTALL_PROGRAM} ${BUILDDIR}/chrome ${DESTDIR}${PREFIX}/lib/${CHROMIUM}
-	${INSTALL_PROGRAM} ${BUILDDIR}/chromedriver.unstripped  ${DESTDIR}${PREFIX}/bin/chromedriver
-.for i in ${CHROMIUM_LIBS}
-	${INSTALL_LIB} ${BUILDDIR}/${i} ${DESTDIR}${PREFIX}/lib/${CHROMIUM}
-.endfor
-	${INSTALL_LIB} ${BUILDDIR}/libvulkan.so.1 ${DESTDIR}${PREFIX}/lib/${CHROMIUM}/libvulkan.so
-	${INSTALL_DATA} ${WRKSRC}/chrome/app/resources/manpage.1.in \
-		 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1/${CHROMIUM}.1
-	${INSTALL_DATA} ${BUILDDIR}/*.pak ${DESTDIR}${PREFIX}/lib/${CHROMIUM}
-.for i in ${ICON_SIZES}
-	${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${i}.png \
-		${DESTDIR}${PREFIX}/${ICONS_DIR${i}}/${CHROMIUM}.png
-.endfor
-.for i in locales resources
-	cd ${WRKSRC}/out/${BUILDTYPE} && \
-		${FIND} ${i} -type f -print | pax -rw -pmp ${DESTDIR}${PREFIX}/lib/${CHROMIUM}
-.endfor
-.for f in snapshot_blob.bin v8_context_snapshot.bin
-	${INSTALL_DATA} ${BUILDDIR}/${f} ${DESTDIR}${PREFIX}/lib/${CHROMIUM}
-.endfor
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../audio/libopus/buildlink3.mk"
-.include "../../audio/speech-dispatcher/buildlink3.mk"
-.include "../../audio/speex/buildlink3.mk"
-.include "../../devel/dconf/buildlink3.mk"
-.include "../../devel/libepoll-shim/buildlink3.mk"
-.include "../../devel/libusb1/buildlink3.mk"
-.include "../../devel/nspr/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../fonts/harfbuzz/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/libwebp/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-BUILDLINK_DEPMETHOD.clang=	build
-.include "../../lang/clang/buildlink3.mk"
-.include "../../lang/compiler-rt/buildlink3.mk"
-.include "../../lang/python/tool.mk"
-.include "../../lang/rust/rust.mk"
-.include "../../misc/usbids/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk" # libjpeg-turbo
-.include "../../multimedia/dav1d/buildlink3.mk"
-.include "../../multimedia/libaom/buildlink3.mk"
-.include "../../multimedia/libvpx/buildlink3.mk"
-.include "../../multimedia/openh264/buildlink3.mk"
-.include "../../print/libcups/buildlink3.mk"
-.include "../../security/libgnome-keyring/buildlink3.mk"
-.include "../../security/libsecret/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/pciutils/buildlink3.mk"
-# Use -lpciutils instead of -lpci for pkgsrc.
-BUILDLINK_TRANSFORM+=	l:pci:pciutils
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
-.include "../../textproc/jsoncpp/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libxcb/buildlink3.mk"
-.include "../../x11/libXcomposite/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/qt6-qtbase/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/chromium-next/PLIST b/chromium-next/PLIST
deleted file mode 100644
index fef392748e..0000000000
--- a/chromium-next/PLIST
+++ /dev/null
@@ -1,139 +0,0 @@
-@comment $NetBSD$
-bin/chromedriver
-bin/chromium
-lib/chromium/chrome
-lib/chromium/chrome_100_percent.pak
-lib/chromium/chrome_200_percent.pak
-lib/chromium/headless_command_resources.pak
-lib/chromium/libEGL.so
-lib/chromium/libGLESv2.so
-lib/chromium/libVkICD_mock_icd.so
-${PLIST.swiftshader}lib/chromium/libvk_swiftshader.so
-lib/chromium/libvulkan.so
-lib/chromium/locales/af.pak
-lib/chromium/locales/af.pak.info
-lib/chromium/locales/am.pak
-lib/chromium/locales/am.pak.info
-lib/chromium/locales/ar.pak
-lib/chromium/locales/ar.pak.info
-lib/chromium/locales/bg.pak
-lib/chromium/locales/bg.pak.info
-lib/chromium/locales/bn.pak
-lib/chromium/locales/bn.pak.info
-lib/chromium/locales/ca.pak
-lib/chromium/locales/ca.pak.info
-lib/chromium/locales/cs.pak
-lib/chromium/locales/cs.pak.info
-lib/chromium/locales/da.pak
-lib/chromium/locales/da.pak.info
-lib/chromium/locales/de.pak
-lib/chromium/locales/de.pak.info
-lib/chromium/locales/el.pak
-lib/chromium/locales/el.pak.info
-lib/chromium/locales/en-GB.pak
-lib/chromium/locales/en-GB.pak.info
-lib/chromium/locales/en-US.pak
-lib/chromium/locales/en-US.pak.info
-lib/chromium/locales/es-419.pak
-lib/chromium/locales/es-419.pak.info
-lib/chromium/locales/es.pak
-lib/chromium/locales/es.pak.info
-lib/chromium/locales/et.pak
-lib/chromium/locales/et.pak.info
-lib/chromium/locales/fa.pak
-lib/chromium/locales/fa.pak.info
-lib/chromium/locales/fi.pak
-lib/chromium/locales/fi.pak.info
-lib/chromium/locales/fil.pak
-lib/chromium/locales/fil.pak.info
-lib/chromium/locales/fr.pak
-lib/chromium/locales/fr.pak.info
-lib/chromium/locales/gu.pak
-lib/chromium/locales/gu.pak.info
-lib/chromium/locales/he.pak
-lib/chromium/locales/he.pak.info
-lib/chromium/locales/hi.pak
-lib/chromium/locales/hi.pak.info
-lib/chromium/locales/hr.pak
-lib/chromium/locales/hr.pak.info
-lib/chromium/locales/hu.pak
-lib/chromium/locales/hu.pak.info
-lib/chromium/locales/id.pak
-lib/chromium/locales/id.pak.info
-lib/chromium/locales/it.pak
-lib/chromium/locales/it.pak.info
-lib/chromium/locales/ja.pak
-lib/chromium/locales/ja.pak.info
-lib/chromium/locales/kn.pak
-lib/chromium/locales/kn.pak.info
-lib/chromium/locales/ko.pak
-lib/chromium/locales/ko.pak.info
-lib/chromium/locales/lt.pak
-lib/chromium/locales/lt.pak.info
-lib/chromium/locales/lv.pak
-lib/chromium/locales/lv.pak.info
-lib/chromium/locales/ml.pak
-lib/chromium/locales/ml.pak.info
-lib/chromium/locales/mr.pak
-lib/chromium/locales/mr.pak.info
-lib/chromium/locales/ms.pak
-lib/chromium/locales/ms.pak.info
-lib/chromium/locales/nb.pak
-lib/chromium/locales/nb.pak.info
-lib/chromium/locales/nl.pak
-lib/chromium/locales/nl.pak.info
-lib/chromium/locales/pl.pak
-lib/chromium/locales/pl.pak.info
-lib/chromium/locales/pt-BR.pak
-lib/chromium/locales/pt-BR.pak.info
-lib/chromium/locales/pt-PT.pak
-lib/chromium/locales/pt-PT.pak.info
-lib/chromium/locales/ro.pak
-lib/chromium/locales/ro.pak.info
-lib/chromium/locales/ru.pak
-lib/chromium/locales/ru.pak.info
-lib/chromium/locales/sk.pak
-lib/chromium/locales/sk.pak.info
-lib/chromium/locales/sl.pak
-lib/chromium/locales/sl.pak.info
-lib/chromium/locales/sr.pak
-lib/chromium/locales/sr.pak.info
-lib/chromium/locales/sv.pak
-lib/chromium/locales/sv.pak.info
-lib/chromium/locales/sw.pak
-lib/chromium/locales/sw.pak.info
-lib/chromium/locales/ta.pak
-lib/chromium/locales/ta.pak.info
-lib/chromium/locales/te.pak
-lib/chromium/locales/te.pak.info
-lib/chromium/locales/th.pak
-lib/chromium/locales/th.pak.info
-lib/chromium/locales/tr.pak
-lib/chromium/locales/tr.pak.info
-lib/chromium/locales/uk.pak
-lib/chromium/locales/uk.pak.info
-lib/chromium/locales/ur.pak
-lib/chromium/locales/ur.pak.info
-lib/chromium/locales/vi.pak
-lib/chromium/locales/vi.pak.info
-lib/chromium/locales/zh-CN.pak
-lib/chromium/locales/zh-CN.pak.info
-lib/chromium/locales/zh-TW.pak
-lib/chromium/locales/zh-TW.pak.info
-lib/chromium/resources.pak
-lib/chromium/resources/accessibility/reading_mode_gdocs_helper/content.js
-lib/chromium/resources/accessibility/reading_mode_gdocs_helper/gdocs_script.js
-lib/chromium/resources/accessibility/reading_mode_gdocs_helper_manifest.json
-lib/chromium/resources/inspector_overlay/inspector_overlay_resources.grd
-lib/chromium/resources/inspector_overlay/main.js
-lib/chromium/snapshot_blob.bin
-lib/chromium/v8_context_snapshot.bin
-${PLIST.swiftshader}lib/chromium/vk_swiftshader_icd.json
-man/man1/chromium.1
-share/applications/chromium-browser.desktop
-share/icons/hicolor/128x128/apps/chromium.png
-share/icons/hicolor/22_monox22_mono/apps/chromium.png
-share/icons/hicolor/24x24/apps/chromium.png
-share/icons/hicolor/256x256/apps/chromium.png
-share/icons/hicolor/48x48/apps/chromium.png
-share/icons/hicolor/64x64/apps/chromium.png
diff --git a/chromium-next/TODO b/chromium-next/TODO
deleted file mode 100644
index e611a939c9..0000000000
--- a/chromium-next/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-To Do:
-
-0) Build on NetBSD-10 amd64
-
-1) Audio backends
- a) NetBSD uses sunaudio (https://github.com/kikadf/chromium-audioio)
- b) FreeBSD uses pulseaudio
-
-If pulseaudio not run, chromium can't start it, so no sound:
-VERBOSE1:pulse_util.cc(261)] Failed to connect to the context. Error: Connection refused
-WARNING:audio_manager_linux.cc(53)] Falling back to ALSA for audio output. PulseAudio is not available or could not be initialized.
-
-If pulseaudio already started, chromium can join it, and has sound.
-This is the workaround, see the files/chromium.sh.in launch wrapper.
-
-2) HID doesn't work on NetBSD.
-NOTE: For this OpenBSD uses libudev-openbsd, FreeBSD uses devd.
diff --git a/chromium-next/distinfo b/chromium-next/distinfo
deleted file mode 100644
index fb12dd3cd2..0000000000
--- a/chromium-next/distinfo
+++ /dev/null
@@ -1,1452 +0,0 @@
-$NetBSD$
-
-BLAKE2s (chromium-136.0.7103.92-testdata.tar.xz) = 5c0f1bb395618d0a1c9b9ad3ee2badca9418ba8d072ffc389de059b049cad60e
-SHA512 (chromium-136.0.7103.92-testdata.tar.xz) = 82d1c3a01d3859a9f0b311d9b75421bd5d9cc01ae13cfd9c7d18efbfa90768b6eae5fdafa84142b42c455c797f02471aa0d42995b00fc5a4d6e8f81c0d48f626
-Size (chromium-136.0.7103.92-testdata.tar.xz) = 651393856 bytes
-BLAKE2s (chromium-136.0.7103.92.tar.xz) = d60bc473fcab6277415b41831a5d50b803c664a72b2f71200e3d93cf116ac790
-SHA512 (chromium-136.0.7103.92.tar.xz) = 63cf064de6e6a17bfd6e337a7c8ae66a503275e6be0f119317c1d923d78d56e0cc2a906e84a3d173d9e584c696dd5276533b156a4f8ab368e53b2f350bee480a
-Size (chromium-136.0.7103.92.tar.xz) = 7188412240 bytes
-BLAKE2s (kikadf-chromium-audioio-v130.0.tar.gz) = 45fe07cb8280f81b8ef490059002da426b59fe69b5ebd53951fe1dc3e9495a10
-SHA512 (kikadf-chromium-audioio-v130.0.tar.gz) = 840aed119dc69982f14fd5f4767e144bfc8a66672b660f0f05f5459070d7f6a36b8719ae7c0de049f7345dec39266759aedcdd5ee37aa4e98bcd2b44d06a3a4c
-Size (kikadf-chromium-audioio-v130.0.tar.gz) = 7824 bytes
-SHA1 (patch-BUILD.gn) = 81fad72248088176cfee42da5b384a1873d507b1
-SHA1 (patch-apps_ui_views_app__window__frame__view.cc) = 44b1229fe8b71422d9b8c45f83c410399a4a8f45
-SHA1 (patch-ash_display_mirror__window__controller.cc) = 9e8a4f791d5eba16b2c26a4764165dfdface63ed
-SHA1 (patch-base_BUILD.gn) = 2351d49c592134b22dda58d5b756f2a63ef8b06e
-SHA1 (patch-base_allocator_dispatcher_tls.h) = 8f3dbde9302821848a284def72db329da1829137
-SHA1 (patch-base_allocator_partition__allocator_partition__alloc.gni) = a2668e6f32908f01df64287c59732f187648ed87
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn) = d7d9fc1b40fec9360b26169b0202f0f3759fa866
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h) = 7b3a0ac6b9aeecc7389c7e92d475a73df292ad0d
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h) = 160bc43163e070ec218f3c3ee570368214309623
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h) = ffbae8ffeef596b72f1be2491f3433bb6dbe6203
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc) = 45c151af4f382b0e72214867b428a65f84833e02
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h) = a380d2195353410f30af0d1afb7065fd0d87f7f5
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc) = 45febe7f5eb95cb5efb46d77502070fae248eef5
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc) = 3ca63ec69f0a1294d2b77c2ec57f6d212e95bde5
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc) = 02ac45c991d2cb405dcb168324b317e22345f4fc
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h) = 379aa4e06de413c70667835293728e5882fdeaae
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h) = 5a1bbe8a338de868c7d6d6aabe3e5352f513aec5
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc) = a1948534d0a810889e0981197f245d4e6423910b
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h) = 2bac22b84619d2f8e384ec13b5c00c0ed1971480
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h) = 0a12a97c8dfaae48e5aca213545de9d810965f52
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h) = 45a6fa3772b648c3b0eb547452ebc2a8158f649e
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc) = b7dd1cb499b09d787f1ba7888420bd7681d24179
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc) = 94c22de7d7722a35b172ab1447e67e2d51f6983e
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc) = aaeea62dac8fe7932082078f394c090ba7bd0fe2
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc) = d97775a431a81519120743140dfe43fd5bb81621
-SHA1 (patch-base_atomicops.h) = 08a26363b962e62b04b45539608c8e2ce6bf2c8f
-SHA1 (patch-base_base__paths__posix.cc) = f23c9235e83112a2e6daf9e4f160e6d4d9497d31
-SHA1 (patch-base_compiler__specific.h) = 809c24b4335062416ca4b74f0da4cf8cf6e13f42
-SHA1 (patch-base_debug_debugger__posix.cc) = 1abca73b0eff8dbb154f9a46c1ab1b0a99fe2d28
-SHA1 (patch-base_debug_elf__reader.cc) = bca19b4a74a28cf7d52e4f5c7797714e8fa35270
-SHA1 (patch-base_debug_proc__maps__linux.cc) = 8f73c800b400bb7b53bb7fc1690ebeb54e5456c6
-SHA1 (patch-base_debug_stack__trace.cc) = ddce880d6cbb1495c0b3af78355b4f8ba05c6150
-SHA1 (patch-base_debug_stack__trace__posix.cc) = 1962a49a43caa5faaee3a072ff64453b38f4261e
-SHA1 (patch-base_files_dir__reader__linux.h) = 7ee1196977662d921e95f96b65d9bf30ef079acf
-SHA1 (patch-base_files_dir__reader__posix.h) = f8ace25850163bd8d362dfb139107cb37545c2e3
-SHA1 (patch-base_files_drive__info.h) = 9269beceacb7ef4afa68223d928f18442bb5de40
-SHA1 (patch-base_files_drive__info__posix.cc) = 7fc57217b31ff6b6bf515ac39e92eb1147975f06
-SHA1 (patch-base_files_file__path__watcher.h) = 4651927149611dd3c29742b92946d696c07a271c
-SHA1 (patch-base_files_file__path__watcher__bsd.cc) = 4b4f33e812b11cceec23b2b9e4b9651a62727c66
-SHA1 (patch-base_files_file__path__watcher__kqueue.h) = 443cea79f92d0a19d6de7b5238318d0dc0c4b8b2
-SHA1 (patch-base_files_file__path__watcher__unittest.cc) = 37f644df816cb9e6d7af4ed3ec2b9e823ce719e7
-SHA1 (patch-base_files_file__util__posix.cc) = 9f04202cd85e8877e911623a634f53f80fe4e08e
-SHA1 (patch-base_files_file__util__unittest.cc) = 2e8d82469325e479259c44d2c60d943c44699eb0
-SHA1 (patch-base_files_important__file__writer__cleaner.cc) = d1365492b18ab5f4fcf4fb9a53b6f879f877c7ed
-SHA1 (patch-base_files_scoped__file.cc) = 89bedb2c6132d5a11ba4349bc5326bfe086277c1
-SHA1 (patch-base_functional_unretained__traits.h) = ff0fef27db201d083cff29abb1e356f81176e8f6
-SHA1 (patch-base_i18n_icu__util.cc) = 79fed33cfb37949589f018fa4f24b19205c25de0
-SHA1 (patch-base_linux__util.cc) = 150e6cee27a4068de91f1b7fb5f227e6b9987275
-SHA1 (patch-base_logging__unittest.cc) = 1ae9e4accf2b2ec38feb08b5cf8b07a45553b0dc
-SHA1 (patch-base_memory_discardable__memory.cc) = 5529ea6708214ea4e5834b512f87a6e030c01d99
-SHA1 (patch-base_memory_discardable__memory__internal.h) = 5d1f25f0124c8e0c7ec560b30233a7aa5956888b
-SHA1 (patch-base_memory_madv__free__discardable__memory__posix.cc) = 582f743db49c0df388c9d03cd30a1fb00bee3147
-SHA1 (patch-base_memory_platform__shared__memory__region.h) = eec420fcacf8924a7a3704720c356f4dfeda0403
-SHA1 (patch-base_memory_platform__shared__memory__region__posix.cc) = 5c1aadb9506ebb4f132b23bc3a71e81b76cd362e
-SHA1 (patch-base_memory_protected__memory.h) = 827a4d397afe0a50763002a9f5992494275b18da
-SHA1 (patch-base_memory_protected__memory__posix.cc) = 294d94c1d0c2e38c03793d6b5b6e280eef6390ac
-SHA1 (patch-base_message__loop_message__pump__epoll.cc) = db91ea3750d1fbb814c826f0bc4f80c83e8718b9
-SHA1 (patch-base_message__loop_message__pump__epoll.h) = a6fc02601ab2eec809cb795e15ed8b8fafbbaaa7
-SHA1 (patch-base_message__loop_message__pump__glib.cc) = 541dd0879325bd7c7da5ad620b2edd0ac1ac12b3
-SHA1 (patch-base_native__library__posix.cc) = c270ebabb6151da5feca775d15ec9120da29520f
-SHA1 (patch-base_native__library__unittest.cc) = 7b93fea8b394ca4a93bf0cec1b5b9464467da050
-SHA1 (patch-base_posix_can__lower__nice__to.cc) = 14c264cd712e507d6811bc77396737c3e25f6d70
-SHA1 (patch-base_posix_file__descriptor__shuffle.h) = e5e8927f75036a7cabc3f75dff4d76111aa7c722
-SHA1 (patch-base_posix_sysctl.cc) = d3945c922634cccb85772d055d06d7a773ce9b59
-SHA1 (patch-base_posix_unix__domain__socket.cc) = c7cd709a20ef0fbb075b98365c76dd32edd7ec54
-SHA1 (patch-base_posix_unix__domain__socket__unittest.cc) = d96885c71f628b11cab21b0ece0b48a550e2f1dd
-SHA1 (patch-base_process_internal__linux.h) = db3d99e01bfe7e2eda2ca243f1d355f4754aabcc
-SHA1 (patch-base_process_kill.h) = 0da20cc843f6633445d4beec3cb6cd638f79561c
-SHA1 (patch-base_process_kill__posix.cc) = f8fcc5c47dea9fc1ec676dd3b20dba5012ffcffd
-SHA1 (patch-base_process_launch.h) = 01d0ff325c319d608a8c1ca4f25b6b620f0c44a9
-SHA1 (patch-base_process_launch__posix.cc) = 7a5f34f00d49f380bd907a1d024b9187f1944bf6
-SHA1 (patch-base_process_memory__linux.cc) = 39da25c441b8bba011d2d5d30f2e980ead29e19c
-SHA1 (patch-base_process_process__handle.cc) = 725b5d1847c62711da3a57d90163dd5b8604f567
-SHA1 (patch-base_process_process__handle.h) = d7508a654177ce7eba79b2a782a025624c4b7c78
-SHA1 (patch-base_process_process__handle__freebsd.cc) = 627e70474bd99198533183cef06aac38681b1fe3
-SHA1 (patch-base_process_process__handle__netbsd.cc) = 791d2357d1f945dd278294707e6bb1fdd453e893
-SHA1 (patch-base_process_process__handle__openbsd.cc) = 95772dcb2e400989f01132dbad1f40effeea0db2
-SHA1 (patch-base_process_process__iterator.h) = b39c32414f3a2a920c8c840dd4ec8825fbdb4571
-SHA1 (patch-base_process_process__iterator__freebsd.cc) = 05fc210c20c4d56e9d469ab26a1a1533f1b7c024
-SHA1 (patch-base_process_process__iterator__netbsd.cc) = eb6cfe5bbf2d23cec2f80309d548e0d1bf22b7e7
-SHA1 (patch-base_process_process__iterator__openbsd.cc) = edbb1262e2d380137ca172f80ec45632e048362a
-SHA1 (patch-base_process_process__metrics.cc) = d5958a6a83bacdc606466f68b41c24278170f8c1
-SHA1 (patch-base_process_process__metrics.h) = 6df8bdabd63641fbf492cf611921afca5935fb5b
-SHA1 (patch-base_process_process__metrics__freebsd.cc) = fc7b1556163c8884a7b0b70c7ff7c44d21e1e75a
-SHA1 (patch-base_process_process__metrics__netbsd.cc) = 03125420708a20102358952d3d0c18cf5c874da5
-SHA1 (patch-base_process_process__metrics__openbsd.cc) = d8d78e31d5d73358acbeb1042acfd0377d6dd7f3
-SHA1 (patch-base_process_process__metrics__posix.cc) = d273b90cd3c8bf22815cb7dd6dad1ff602d22002
-SHA1 (patch-base_process_process__metrics__unittest.cc) = 07b5b3322f604d974d293ed68b158aa6aa0ecae6
-SHA1 (patch-base_process_process__posix.cc) = 2651e8fcb184b376adb98c68340589272d3f54b2
-SHA1 (patch-base_process_process__unittest.cc) = 3a85c0eaee5a546e40fc4bb56999a22f45ae1d9d
-SHA1 (patch-base_profiler_module__cache.cc) = 5f3c57c54ad4e0a8055cf8bc594544322c3fd3bc
-SHA1 (patch-base_profiler_sampling__profiler__thread__token.cc) = 3102b13a0f4a86baac7b75c1cccfb10fd7163517
-SHA1 (patch-base_profiler_sampling__profiler__thread__token.h) = e39f1f2d8fd83716dbf221ca433eec78ff2b0c0f
-SHA1 (patch-base_profiler_stack__base__address__posix.cc) = f5b402be55ed74d06b3bc0ce4cd976aa41edcad2
-SHA1 (patch-base_profiler_stack__sampling__profiler__test__util.cc) = 50dd576d8784bfc79ec7037083f7235a3326d48f
-SHA1 (patch-base_profiler_stack__sampling__profiler__unittest.cc) = 8369dc3047c4238f91ec4842e8ecd56a63c29851
-SHA1 (patch-base_profiler_thread__delegate__posix.cc) = 3c6b96c1233ccd8b5b8c4c0d89911967c94a8907
-SHA1 (patch-base_rand__util.h) = 1d011eca538bf58728ed92a4b81bfa51eac4702c
-SHA1 (patch-base_rand__util__posix.cc) = 85a9ab90aa334861b8b93ccd8ded60eebba15903
-SHA1 (patch-base_strings_safe__sprintf__unittest.cc) = 92c6789ca2cc30331466c5ff1adba1c0f44fa198
-SHA1 (patch-base_synchronization_cancelable__event.h) = 81ec3df5077de6121765c6b0e46bc661336dae20
-SHA1 (patch-base_synchronization_lock__impl.h) = 7e43531432a3863c1300353023a5c8b39941512e
-SHA1 (patch-base_syslog__logging.cc) = 9d6fc9846814f143e7b8be3ab99cfa0b775228ee
-SHA1 (patch-base_system_sys__info.cc) = 897e305f4533561e5f62356431d3d6f143818d67
-SHA1 (patch-base_system_sys__info.h) = f18d3d6a7ace28216ea2e657a2d4b056288103ab
-SHA1 (patch-base_system_sys__info__freebsd.cc) = 8d00ea25b54bd65cff9cf1660dc1d71b4df107a3
-SHA1 (patch-base_system_sys__info__netbsd.cc) = 803df66d72622203db50d5df902277ba2b4fbc70
-SHA1 (patch-base_system_sys__info__openbsd.cc) = ea73c75acc477b8c0c7e337c482dce483478f772
-SHA1 (patch-base_system_sys__info__posix.cc) = d355d219c599afab47856aa992d6afdfe97a53e3
-SHA1 (patch-base_system_sys__info__unittest.cc) = 9e5f8131c0d2590e631af7e7988305ad48a83e67
-SHA1 (patch-base_task_thread__pool_environment__config__unittest.cc) = 05f5f88eb4e6c2b0fe37e682b5c9c4fd04af147b
-SHA1 (patch-base_test_launcher_test__launcher.cc) = c1c945c51e362df4c666deee37c8ce8c67b8bb8e
-SHA1 (patch-base_test_test__file__util__linux.cc) = ef7b948661969daf1a1ffb689a55d70472a5310c
-SHA1 (patch-base_test_test__file__util__posix.cc) = 6e37fc56138dc9d1140752675340e33703462b28
-SHA1 (patch-base_threading_platform__thread.h) = 9c3588ded6ab6eaf62282023341deeb6aa83de4a
-SHA1 (patch-base_threading_platform__thread__bsd.cc) = 547c0caf568ed0e12f4e48225b689e828d9fb58c
-SHA1 (patch-base_threading_platform__thread__internal__posix.cc) = 41bec96e29e12e6ba0389551b3926cc71d042351
-SHA1 (patch-base_threading_platform__thread__posix.cc) = 5442a15c0b9fd0fde90c6aad118d0f256c2123d5
-SHA1 (patch-base_threading_platform__thread__unittest.cc) = e2b35758766c22cb96c6797ff17ffae16d1d8147
-SHA1 (patch-base_time_time__now__posix.cc) = 9ff904d7230e2e057b5752b1fc8851b839314d25
-SHA1 (patch-base_trace__event_malloc__dump__provider.cc) = d5ac600d1033fcb1cbe7d50b8db8a86b0b2e236a
-SHA1 (patch-base_trace__event_memory__dump__manager.cc) = 2aa0913d1697958637204b41c9752846cedc6338
-SHA1 (patch-base_trace__event_process__memory__dump.cc) = c093d03e1992b4afb3dbe8a2c43418ae45b53119
-SHA1 (patch-base_tracing_trace__time.cc) = 6ce6ac76d9abec9820b77fdd9ebf4007efd0f023
-SHA1 (patch-base_tracing_trace__time.h) = c1fed44c8fdc6e94bb7b097b10a44f13321991e6
-SHA1 (patch-base_version__info_version__info.h) = 177e485dfd7e0bea1a3fe913da267914f7099606
-SHA1 (patch-build_config_BUILD.gn) = e169571aab182a69b64b72897644846584aed53b
-SHA1 (patch-build_config_BUILDCONFIG.gn) = 3bf9aa0f3c5f2678aef5939378159de596647c76
-SHA1 (patch-build_config_clang_BUILD.gn) = d4994ead83cece1322c8e513e2e093a030875873
-SHA1 (patch-build_config_compiler_BUILD.gn) = 7ee94d3cab16987ebcf3fca50197e980286e3b6e
-SHA1 (patch-build_config_gcc_BUILD.gn) = 601f5e24f6e4d66a1b41c32788e9567ae009425c
-SHA1 (patch-build_config_linux_BUILD.gn) = b1c4a5219e254a6dc88f975efa38eb50567e8c4b
-SHA1 (patch-build_config_linux_libdrm_BUILD.gn) = 435330e572031360157f5756db339060d948f217
-SHA1 (patch-build_config_linux_pkg-config.py) = 8eb7043fc0e488be17e0267aa3be032d176ec491
-SHA1 (patch-build_config_ozone.gni) = e56bd7306c5b68971c64d8c70c5ae89e10720253
-SHA1 (patch-build_config_rust.gni) = 7cc5977f69eef1c912b3181fb966e21944fd2191
-SHA1 (patch-build_config_v8__target__cpu.gni) = 3c5278d2e9bfa991171b68cf627d0d32410dca79
-SHA1 (patch-build_detect__host__arch.py) = 22623b4cee6b1a496fd0f094f7caf81c788d727b
-SHA1 (patch-build_gn__run__binary.py) = 6cb7313e5809e16a390990723a8865ca918b53fd
-SHA1 (patch-build_linux_chrome.map) = 0cbdf673a31f0e974845d4530fb11fa9407cfeb3
-SHA1 (patch-build_linux_strip__binary.py) = 56218e9748dd663e6c13399ea475cbc18763b652
-SHA1 (patch-build_linux_unbundle_icu.gn) = 46a2a3acdd0c28a2dd8fcfa3d93e20b2d8e1f2ed
-SHA1 (patch-build_linux_unbundle_libusb.gn) = dabb282aa7040d67ae989a4d6962a4e88e2523e4
-SHA1 (patch-build_nocompile.gni) = 38a9c67b3871c05868d6146e97f18ad3265756e9
-SHA1 (patch-build_rust_rust__bindgen.gni) = 8f6efd10ec0aa09640f256be85cabcae2fe3e948
-SHA1 (patch-build_rust_rust__bindgen__generator.gni) = b263c99ce89fdfe8bc28f41ee7dbce83fb266552
-SHA1 (patch-build_rust_std_BUILD.gn) = eba891d40e595ee11a0269c742822d1be0f49ee0
-SHA1 (patch-build_toolchain_freebsd_BUILD.gn) = 3b209745d6b14b90f8300f6dba297133dbba1973
-SHA1 (patch-build_toolchain_gcc__solink__wrapper.py) = d5ca2f5347f18ea4b0371d085bb8e2cfc39c1020
-SHA1 (patch-build_toolchain_gcc__toolchain.gni) = 20c012e541c816d4dfbfe7deae7a70da6afafdf4
-SHA1 (patch-build_toolchain_netbsd_BUILD.gn) = df8540650e7373054e4ff3030e97b0dde950976b
-SHA1 (patch-build_toolchain_openbsd_BUILD.gn) = d65421a400dbd5e89480dc2d474ee671c99df7ef
-SHA1 (patch-build_toolchain_toolchain.gni) = 1759ee53855494aa9418752add3c6cd0c5073fcc
-SHA1 (patch-cc_base_features.cc) = 4f301624b1b3fe36108fe3bc3478688a1e412c20
-SHA1 (patch-chrome_app_chrome__command__ids.h) = 15ef2ba7d53e996ae6448bf3f5c16fc8603a8342
-SHA1 (patch-chrome_app_chrome__main.cc) = 055f70035df89b1de5f802f636d271f3c14d5d5c
-SHA1 (patch-chrome_app_chrome__main__delegate.cc) = 47de5f6f763ee642f8cc961e002926ad91fc9f34
-SHA1 (patch-chrome_browser_BUILD.gn) = 1756316f475190c2beac12f4f4c3e4e7f36c53c6
-SHA1 (patch-chrome_browser_about__flags.cc) = 3d514bd393943f81d46ee66d5a6c584726f9bc4e
-SHA1 (patch-chrome_browser_accessibility_page__colors.cc) = 9316c3f487af3e9e5964c1e2c7b9225e6b511ff7
-SHA1 (patch-chrome_browser_after__startup__task__utils.cc) = cf84239f7255f86525de913828c3209fff584f09
-SHA1 (patch-chrome_browser_apps_app__service_publishers_extension__apps.cc) = c85494f3bf0b48a5a39a61de61d370a1ee7195c9
-SHA1 (patch-chrome_browser_apps_platform__apps_platform__app__launch.cc) = 7e72d40ea565a592b172b5791b12417a4ceabf9f
-SHA1 (patch-chrome_browser_apps_platform__apps_platform__app__launch.h) = a7235f995575a4c2e731c0988a744535ee31836b
-SHA1 (patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc) = 6f1b37b8b262f1aa83ba86fb384c44348d17316a
-SHA1 (patch-chrome_browser_background_extensions_background__mode__manager.cc) = 1c98b136fcc984fca00614538d88a7feba885792
-SHA1 (patch-chrome_browser_background_extensions_background__mode__optimizer.cc) = dc2f5648f0448b34a79e48d15a95da2a4a81bc05
-SHA1 (patch-chrome_browser_background_glic_glic__status__icon.cc) = b88cea77461d35310adba2780e5f8766a65804e6
-SHA1 (patch-chrome_browser_browser__features.cc) = 5cf07cacb4f83aacd8dea966973d3bbb8c5e6888
-SHA1 (patch-chrome_browser_browser__features.h) = 25901dd1183551e65390132399121d610107856e
-SHA1 (patch-chrome_browser_browser__process__impl.cc) = 692ce84401164cba05f83ad4578d79a39d7ae5ff
-SHA1 (patch-chrome_browser_browser__process__impl.h) = 7023fb3a6b415776b14ea7ae3c3e56acc8150159
-SHA1 (patch-chrome_browser_chrome__browser__field__trials.cc) = 21ca9011d76717c01587290b6dcc2a47b544502d
-SHA1 (patch-chrome_browser_chrome__browser__field__trials.h) = 949ecff17510455e31cdc7f5e5608cb3b56f9034
-SHA1 (patch-chrome_browser_chrome__browser__interface__binders.cc) = 118c6fbc89a67c0151aebf3a00bcb345c40059dc
-SHA1 (patch-chrome_browser_chrome__browser__interface__binders__webui.cc) = 037e8182d14ad8c433626df8cb05795658f7f94f
-SHA1 (patch-chrome_browser_chrome__browser__main.cc) = a77e4cd27a16f30e1a89da8454d8d611660d629f
-SHA1 (patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc) = 6c105aa0f598486ca03f66c2120fcb9351011ab0
-SHA1 (patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc) = 50490395f81a817ad32ea51b6f00247f7fda54e7
-SHA1 (patch-chrome_browser_chrome__browser__main__linux.cc) = 819f5dd6e4a3fdc36089ba3795894b0e9b23083a
-SHA1 (patch-chrome_browser_chrome__browser__main__linux.h) = a5e8590a4de1f23e057d23a27b984d5dbee92f0c
-SHA1 (patch-chrome_browser_chrome__browser__main__posix.cc) = ad25fcfcaf187233d093cdc2ca10f65dc63e445c
-SHA1 (patch-chrome_browser_chrome__content__browser__client.cc) = 72b3d87590e4d6b0ba1c03298ee12f80a2800256
-SHA1 (patch-chrome_browser_chrome__content__browser__client.h) = 6ea3f378e4dc38f404812bfcd199e6db01894fa2
-SHA1 (patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc) = 69f25357fcaa1e10cfe0b2b9bca06a06eadbe50f
-SHA1 (patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc) = ded2087f5163f189c3a21a4ff15b3ab15a8474f0
-SHA1 (patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h) = fec537ec8c0ce5b14c99839b51a6480b1cacd14a
-SHA1 (patch-chrome_browser_component__updater_registration.cc) = 56811d48d6fce5361b6def936994147183ba92b8
-SHA1 (patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc) = 3fa56e923fb31c3ee83419bc2eae892e7bbba7de
-SHA1 (patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h) = 513f3322eb141abbc1cef709f89161dd1223f4c9
-SHA1 (patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc) = 60bfdecbe75faee9453eef9988354530e82e6646
-SHA1 (patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc) = b067e4f0e62e55e462d69eeb57c91ac3e39bcf44
-SHA1 (patch-chrome_browser_defaults.cc) = 6295b3f6caf42f6cea1b4516012dff922cef4c13
-SHA1 (patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc) = 5586aba9571a08a4c1840c18abfd93b74cc8b04d
-SHA1 (patch-chrome_browser_devtools_features.cc) = c4ffc2009714f453bfffaeeffbd9b304dc28660f
-SHA1 (patch-chrome_browser_devtools_features.h) = de966c650d56da1a979afce0ad0edc39d649dd6c
-SHA1 (patch-chrome_browser_devtools_remote__debugging__server.cc) = ee77d65f5382a1df38f3f3341d6f12c666a15f30
-SHA1 (patch-chrome_browser_diagnostics_diagnostics__writer.h) = 81fe656919b57e007521a17d8071d032533e0cce
-SHA1 (patch-chrome_browser_download_chrome__download__manager__delegate.cc) = b69600d49ec0a12e5b74179e7298c84174012053
-SHA1 (patch-chrome_browser_download_download__commands.cc) = 6d579378d0b40d713b7815bc781840e35b0fa6ba
-SHA1 (patch-chrome_browser_download_download__commands.h) = 0ea4644689afb592d5b472798a5e80161153cbdd
-SHA1 (patch-chrome_browser_download_download__file__picker.cc) = 088d9b0a2faed13cd0e70ba96106820091ac46cf
-SHA1 (patch-chrome_browser_download_download__item__model.cc) = 2cedca9c463a54145157618bd8cdac8f2b804992
-SHA1 (patch-chrome_browser_download_download__prefs.cc) = 090c35dc6a254c37a0b95436d59cba0bb6523ff3
-SHA1 (patch-chrome_browser_download_download__prefs.h) = cd9b33e8f4078396e8d14ba23a7333b147ea3178
-SHA1 (patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc) = 7a384313285ea3b1b768a0187382dd551339d045
-SHA1 (patch-chrome_browser_enterprise_connectors_common.cc) = 20dfec71be17dda3041a142a9426d90dbfd06393
-SHA1 (patch-chrome_browser_enterprise_connectors_connectors__service.cc) = 9ae131d617454466a1fd13d3e179fdc3aa73b830
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc) = 79f62222e5c2029e7a2d4052493bdca678219fb7
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc) = 4c1e4ffb25ee4f9e6697bdee58f925d27baeacac
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc) = 32fa318171b949d9c82746655a39d40d2c2aa2c5
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc) = 0eabf61860fc88e3960e2e2ffb26f5c4b0c7d4b7
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc) = 5560e789d6e69412ac7d65567dff11e4d74cc245
-SHA1 (patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc) = 2c90448745d56a360b1bfecfbbba315c095a176f
-SHA1 (patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc) = 6f7ecfa5adfdb3f9e91a530d3f328cf05f8ae3e4
-SHA1 (patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc) = d01404f572a792239ff06559bf4bb6e49030745d
-SHA1 (patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h) = 5db194d87910b6482daedda567fab5c04a88ee36
-SHA1 (patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc) = 65c72f6af74dca63c52dbd088db31603fe6a60db
-SHA1 (patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc) = 99c92979a2c0928bf73a737c2b4ec0d2fc8da75b
-SHA1 (patch-chrome_browser_enterprise_signals_context__info__fetcher.cc) = 32afe178dc502090793dd6592baea3a0f132c241
-SHA1 (patch-chrome_browser_enterprise_signals_device__info__fetcher.cc) = bfde64d4f62e766ab0429be78cd03bf98f75adab
-SHA1 (patch-chrome_browser_enterprise_signin_enterprise__signin__service.h) = 14a1f0a2d9426fa790039d6cdc8587b7f575c61b
-SHA1 (patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc) = 73947caa78f53fe85588494e221c6b4921eba633
-SHA1 (patch-chrome_browser_enterprise_util_managed__browser__utils.cc) = 349a9ccec4d9a489736e0b71a735acd182d88a4f
-SHA1 (patch-chrome_browser_extensions_BUILD.gn) = ca404c1fc795d8a30002bb79c3000eba7b8570dc
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc) = ff24bf0736abfbde7b0eb98d238ceacec834e9d3
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc) = d01f9cafec8f6f01db319b0a48455f35555bfd02
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h) = fde612db57c9d0ae1a8351a22689d17c1a73fcef
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc) = 960b0c516a7b6510cae524a920844ecdfd598084
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h) = 0ae86a0f63b9606aa158582f3f3a07c46369ebb7
-SHA1 (patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc) = dd745ea34ff8b48a70d3ecda455fa8081332636b
-SHA1 (patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc) = d3e1f864440a9e304b371433b947bde1290df546
-SHA1 (patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc) = 783b7eb1679e83e09a5213c81f3e46846e7cfcb7
-SHA1 (patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc) = bfc6025aa2f62a56975aa5a3455d3db0a1bb4f5d
-SHA1 (patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc) = fcfbf02aa4fff013e37510488bb40c091052ec74
-SHA1 (patch-chrome_browser_extensions_api_settings__private_prefs__util.cc) = 569f93312f51dad186e725e0d66710eb14e11090
-SHA1 (patch-chrome_browser_extensions_api_tabs_tabs__api.cc) = 74942c01a2b1addac898262d7f873741d5bf1355
-SHA1 (patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc) = 6f6cf81bd203b52cf146bb21fd6591fe159e1fcf
-SHA1 (patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc) = 52b0afe787c5c7a01fccc85edd0635bc7f907f4e
-SHA1 (patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc) = 427634e40dcdfad78146eee86635691bcc3bd72c
-SHA1 (patch-chrome_browser_extensions_external__provider__impl.cc) = 193bd548f2e56b8ff8fb869dc1104ffd0e381060
-SHA1 (patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc) = 33ce7629d0c5219ce4ad39481566915adf4fec66
-SHA1 (patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc) = b3875110133a3dbba251b701c25f28aefd1b99d9
-SHA1 (patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc) = 6b350eb1e68e2ac0bf5944069b8380ff53aa413b
-SHA1 (patch-chrome_browser_first__run_first__run__dialog.h) = 10d49fd49eaddd5ae5f44318a6dee8192c566ef3
-SHA1 (patch-chrome_browser_first__run_first__run__internal.h) = b35b9d1c7d587f3000c4235c0c6aba138333206f
-SHA1 (patch-chrome_browser_flag__descriptions.cc) = 5ed0d551a7fb2e3053635ad6126cb423f0b07818
-SHA1 (patch-chrome_browser_flag__descriptions.h) = ed7e80801bd81552b7477eb90da15b5733787d33
-SHA1 (patch-chrome_browser_gcm_gcm__profile__service__factory.cc) = 2afdac8d8f0a3022159c12897ad59548b0404ec1
-SHA1 (patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc) = bfaad1d6cbd113fb7b995a8a7322eae19fef1aa2
-SHA1 (patch-chrome_browser_global__features.cc) = c50e13aa4354c9f54cfb1371769fe0b3a8a86e7a
-SHA1 (patch-chrome_browser_global__features.h) = 3d0e444859c77964c28fb9d9a1a8f7a155dc092e
-SHA1 (patch-chrome_browser_headless_headless__mode__util.cc) = 9c2c19b9646213cf54706a3f61d03585509adb7d
-SHA1 (patch-chrome_browser_intranet__redirect__detector.h) = c2372d1dd6d312cc6436787536a614c7df43a31c
-SHA1 (patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc) = a91a2c985b5c04e77ac7b6d242fdebd56d20461a
-SHA1 (patch-chrome_browser_media__galleries_media__file__system__registry.cc) = 346fea8b4208ebb8dbc4af43b6142aeb7f858b43
-SHA1 (patch-chrome_browser_media_audio__service__util.cc) = 3577e1d9e3a9da26fccf8b9ae405b79e8aa238f1
-SHA1 (patch-chrome_browser_media_router_discovery_BUILD.gn) = aad773e3854d88a664f733f6f3515d29c1e56fd0
-SHA1 (patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc) = ac0c1333a733cf57d23b48d8a65856c813f1cb74
-SHA1 (patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc) = 2f1c2b323cc01874b2464a67c46977c192b169af
-SHA1 (patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc) = ef1514ec44dde074771eacd838c1af23545ba5cc
-SHA1 (patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h) = 15593cad4f3295a1bac4ba57ac5a2e4a8804a554
-SHA1 (patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc) = c37e1198a86fa069220d8e1b372490f3cdf1d40d
-SHA1 (patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc) = 5030e4947044c09ff99de9b60231ce08f36bc376
-SHA1 (patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc) = 48ae0a06046b213991797274678c2b145587a62f
-SHA1 (patch-chrome_browser_media_webrtc_webrtc__logging__controller.h) = e2e331651d2fdcd053d6ded4b74fad0974263eea
-SHA1 (patch-chrome_browser_memory__details.cc) = b6a37a8062fc3b19f6fbb1203d15ec999fe1fb10
-SHA1 (patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc) = b9d6f56316c81b1d69e4b8d7719c9c76c60201cf
-SHA1 (patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h) = 1a2ae8b3edf911210f2124f5c09fb3fe3b3d6221
-SHA1 (patch-chrome_browser_metrics_chrome__metrics__service__client.cc) = 58a9902564d5047c60aac09e3453d358509b10ad
-SHA1 (patch-chrome_browser_metrics_perf_cpu__identity.cc) = f9a3a8b58a183f0700b95e3a591206736eecfb64
-SHA1 (patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc) = 20f9d25552d80f1c519120689c54aef70d5fcd26
-SHA1 (patch-chrome_browser_metrics_power_process__monitor.cc) = 43aabac22e8c2d4a607a4527b633d17ab2af9106
-SHA1 (patch-chrome_browser_metrics_power_process__monitor.h) = 0ae90e714a05f758b334e1dbd7bc385a238e9b8f
-SHA1 (patch-chrome_browser_net_profile__network__context__service.cc) = af01bf0c07f511ab6295f39ddecd91f5a113c619
-SHA1 (patch-chrome_browser_net_profile__network__context__service__factory.cc) = a33f8e69765b608eea0e0400e65ee1906c98d58c
-SHA1 (patch-chrome_browser_net_system__network__context__manager.cc) = bbbb0dd0d2418b8c93399dde700f271ba4d70858
-SHA1 (patch-chrome_browser_net_system__network__context__manager.h) = dfd5440606686e3e26b54e39626a527f0e133b14
-SHA1 (patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc) = d929d869a5cfcf5d85b7943e5d46856682d11d0c
-SHA1 (patch-chrome_browser_new__tab__page_new__tab__page__util.cc) = a2150c3b9aa23b06c306625ad10a76adc368a7e3
-SHA1 (patch-chrome_browser_notifications_notification__display__service__impl.cc) = 7ee1a78218695c2250b42090b0bab65b9adeba48
-SHA1 (patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc) = 796a78ce55b0b782e22ce7583a28abe32a364f64
-SHA1 (patch-chrome_browser_password__manager_chrome__password__manager__client.cc) = 9dd6abac21141e12a6a2b3de806d65123eb2ec07
-SHA1 (patch-chrome_browser_password__manager_password__reuse__manager__factory.cc) = 42095976b95f571aceab53cedefcf2181b03b99e
-SHA1 (patch-chrome_browser_platform__util__linux.cc) = 5a26728d50d040344c28cf7b64507174f1df8a80
-SHA1 (patch-chrome_browser_policy_browser__signin__policy__handler.cc) = 2ee4f5c73b7b8e528069bd1f30dd06b27cc632be
-SHA1 (patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc) = 427dd36c9acd806119fbdd0745be88d681ba3949
-SHA1 (patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc) = c15cb94a2fc9cb6c69bb4b502c26241381ceb224
-SHA1 (patch-chrome_browser_policy_device__management__service__configuration.cc) = 40383db7aa4da19d7d1da4a4bd676677932f09ea
-SHA1 (patch-chrome_browser_policy_policy__value__and__status__aggregator.cc) = f066a25ae696ccd0245daefa85a653f89100c0f5
-SHA1 (patch-chrome_browser_prefs_browser__prefs.cc) = 25d5323fc09487964b426986c3dbe028ee9cb696
-SHA1 (patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc) = 830af07a9d3ec2b1da47383f310d2ffc76406054
-SHA1 (patch-chrome_browser_printing_print__backend__service__manager.cc) = 20f6b15263a0697f7cb0ae32f5afe8f9b7215094
-SHA1 (patch-chrome_browser_printing_printer__query.cc) = 04a5da3de6a130953de99b6b621ac732ce8495f0
-SHA1 (patch-chrome_browser_process__singleton__posix.cc) = 3e4150d7037b4db4d058cebe054f4861d27e189c
-SHA1 (patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc) = 8fbd3581121b99b4559de96ad1647d03d15533c1
-SHA1 (patch-chrome_browser_profiles_profile__impl.cc) = 131148363f2a6abf0fb83649c1bbfdaabca1974a
-SHA1 (patch-chrome_browser_profiles_profiles__state.cc) = f8f879871e353d1c23da9a015ae09ff04f611b36
-SHA1 (patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc) = 05491ae68c7a9b03dcc315781fd6d7d321ac80c5
-SHA1 (patch-chrome_browser_renderer__preferences__util.cc) = 25f11482768bf1a542a20ea15b5d15bc57448887
-SHA1 (patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css) = c282c96b8cb8c9580ed77cc3be513fd3ac723de5
-SHA1 (patch-chrome_browser_resources_signin_signin__shared.css) = 4ff5410116988da8948761d5df8e0f66918996cd
-SHA1 (patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc) = 6dcb14c5de6712b0649ce778c0d02520b93566d9
-SHA1 (patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc) = b5f7a24b56a310673afe735769f532fd1ad44c66
-SHA1 (patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc) = ae61d1758d9bccb34bf6cd6751f36d259e54bed9
-SHA1 (patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc) = da2b9ec8c5db0d0e37055ef1f1e48f082a993ba8
-SHA1 (patch-chrome_browser_screen__ai_screen__ai__install__state.cc) = 18d364f574d8019459a89477edb686e19630bd76
-SHA1 (patch-chrome_browser_screen__ai_screen__ai__service__router.cc) = 9a1f0e9c2543a8614e74e452a41507acc7793735
-SHA1 (patch-chrome_browser_sessions_session__restore.cc) = 75fc4c77588ceac2c860c58ad9714f06eae01d2f
-SHA1 (patch-chrome_browser_sharing_sharing__handler__registry__impl.cc) = a4be9fc2226e00899d5f43b286b778279168dc45
-SHA1 (patch-chrome_browser_shortcuts_icon__badging.cc) = 260242714eb6d92f964f4f3820b81bbc56389bf8
-SHA1 (patch-chrome_browser_signin_accounts__policy__manager.cc) = 15b6615b8610d584ef2133e764194434f92e61d7
-SHA1 (patch-chrome_browser_signin_accounts__policy__manager.h) = a33c2269873690a450614688bac600094f1a708b
-SHA1 (patch-chrome_browser_signin_signin__util.cc) = a740a40dd9ef58def8f0d620bfa59b3cc41c729e
-SHA1 (patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc) = d5feb1977a76edde917d2af75ce4722ecefce552
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc) = d96a527a8097b66409cf803e3d80cd077862b017
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__browser__utils.h) = 9851132eb215db91931135a326fe81563230d2e6
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc) = 876fc186b2d248281dde271b3727bda6d3135178
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc) = aabb488a38cb56b199d592d8a754856f76ad46f2
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h) = df4d3e0bc9a483a5e956d7ce37dd983ae2d09024
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc) = bf72895584e5aacfe7d4ed24bd4d031fea23f92d
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc) = 88f194137638a90f38bdd4841b194b268f5a8be3
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc) = 2748f727e334bdf277207a351c600d477ebd00e0
-SHA1 (patch-chrome_browser_sync_chrome__sync__controller__builder.cc) = 5e63a3ad3b78c5adda2514b1c8dc79e78bbb032d
-SHA1 (patch-chrome_browser_sync_device__info__sync__client__impl.cc) = 6703fcaf3fe96cb8199c7a4ca7b461658624224f
-SHA1 (patch-chrome_browser_sync_sync__service__factory.cc) = 5f70f0032b97f68a3eebd17ea0ef99a6fd505211
-SHA1 (patch-chrome_browser_task__manager_sampling_task__group.cc) = c7fc07df85a0acb605cf21182d4af30f690ae250
-SHA1 (patch-chrome_browser_task__manager_sampling_task__group.h) = c3894253eed2715303e0c45ea3c4d09ee5dcf4b1
-SHA1 (patch-chrome_browser_task__manager_sampling_task__group__sampler.cc) = 00adb2dba9ad1bfd4e4c77fbf8574dd913cfc104
-SHA1 (patch-chrome_browser_task__manager_sampling_task__group__sampler.h) = 5e1eef0d7cdfa109a4900f35ada764ff9106c50a
-SHA1 (patch-chrome_browser_task__manager_sampling_task__manager__impl.cc) = 11ec8b535ba8302b7f7b08732baf2e0eafb7abce
-SHA1 (patch-chrome_browser_task__manager_task__manager__observer.h) = 6ecfe4bde1339de88eb56be8b51ccb3cb957a7ab
-SHA1 (patch-chrome_browser_themes_theme__helper.cc) = cee1d4cd79a5c493a97357ba9d99e5f0a7dac1ac
-SHA1 (patch-chrome_browser_themes_theme__service.cc) = c026db645ab237bc4c9d1a292171588b116cab64
-SHA1 (patch-chrome_browser_themes_theme__service__aura__linux.cc) = 966cce4e654c1aa0fba27083646419e0bfaee0c5
-SHA1 (patch-chrome_browser_themes_theme__service__factory.cc) = 7b685642f3ddadb6ac12e0c8632c4011ece6f763
-SHA1 (patch-chrome_browser_ui_actions_chrome__action__id.h) = 9772e7916971f3f92dd1f39f4b783f1d007dd76c
-SHA1 (patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc) = 4ddb4a27434cc0ac3c3b7f7794498c4d8221ebac
-SHA1 (patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h) = 4a87aefe07db738019625926d39ebb665c3fe343
-SHA1 (patch-chrome_browser_ui_browser.h) = 4af609ecafe246fd45d0889596fd10b4ed221fd0
-SHA1 (patch-chrome_browser_ui_browser__command__controller.cc) = 6ccb75e5dba96f7858191207a0809f3618433df4
-SHA1 (patch-chrome_browser_ui_browser__commands.cc) = d06b45a80500462ecee82a5f4faff08f7e71a65e
-SHA1 (patch-chrome_browser_ui_browser__ui__prefs.cc) = 26170f8faa7ebd38744dfce3ac66369b46764a17
-SHA1 (patch-chrome_browser_ui_browser__view__prefs.cc) = 8e19f3f8f51ea7bcf63911c38023e1f5cba8e520
-SHA1 (patch-chrome_browser_ui_chrome__pages.cc) = b85bc27a175ef594ee35b78f9892a6ba12ce914a
-SHA1 (patch-chrome_browser_ui_chrome__pages.h) = 315b505ded5cfd3c67d8f3875e0a055b8f41e8b1
-SHA1 (patch-chrome_browser_ui_color_native__chrome__color__mixer.cc) = a592f3d6ba896c8f48c904ccd2b24d6409a2c944
-SHA1 (patch-chrome_browser_ui_managed__ui.cc) = 585497cb820e8f5de7f5ab3252677e768729bdcd
-SHA1 (patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc) = 0989551f082ec41ae0d3929599aae3661616cd43
-SHA1 (patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc) = 07fe3102e04d05d6b021685f7883c40d372f9a90
-SHA1 (patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc) = 6bcc822bbe85baade4d675a5f22503430f1c2b23
-SHA1 (patch-chrome_browser_ui_prefs_prefs__tab__helper.cc) = ba2f6f4b90c0e34640eb489013c6c14184139e38
-SHA1 (patch-chrome_browser_ui_sad__tab.cc) = ce0c64e717dfa63c63cdc021dba3d01d41aacdd2
-SHA1 (patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h) = 1e967a311e5c9c806acc38feb9d42ef8971cea25
-SHA1 (patch-chrome_browser_ui_signin_signin__view__controller.cc) = 47db9f7f7b308b6351976a2b26c380a2fd03fb23
-SHA1 (patch-chrome_browser_ui_signin_signin__view__controller__delegate.h) = 6d16433326be9d6f0ae2f0e49b12499445a13a24
-SHA1 (patch-chrome_browser_ui_startup_bad__flags__prompt.cc) = c7274e972260cb458e561fc1a79c51d7f2f963a9
-SHA1 (patch-chrome_browser_ui_startup_startup__browser__creator.cc) = c154cc5b51b8155cf5ddc1bf8103d9e37e9aa2f4
-SHA1 (patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc) = 905769d9252c89789d597a32379c7ea6e21ed5a0
-SHA1 (patch-chrome_browser_ui_startup_startup__tab__provider.cc) = ff488e01af234cbea7c0e8e99d732eb8512aa853
-SHA1 (patch-chrome_browser_ui_tab__helpers.cc) = 9084b4be6adbd68e2d96ff45e863d2e78ae8b38f
-SHA1 (patch-chrome_browser_ui_tabs_features.cc) = 7bb62bf06074693821318dd352dab170681dd390
-SHA1 (patch-chrome_browser_ui_tabs_tab__dialog__manager.cc) = 3a71ff1b9f29b0c0a5893b1dda62ba71f1dac9f5
-SHA1 (patch-chrome_browser_ui_tabs_tab__strip__prefs.cc) = bc5187409530c519770e648e56babb2aacee9b92
-SHA1 (patch-chrome_browser_ui_task__manager_task__manager__columns.h) = a21d1261ad3bc86154e19466c8e9def9599c8595
-SHA1 (patch-chrome_browser_ui_task__manager_task__manager__table__model.cc) = f325d92822dfc3d13894d206bf2839acda1a29b0
-SHA1 (patch-chrome_browser_ui_test_popup__browsertest.cc) = f8b397c075662d0be043b2a4d03547e3547e09a5
-SHA1 (patch-chrome_browser_ui_test_test__browser__ui.cc) = a55d8d29b15d8f45037b849c40b2f007157465bc
-SHA1 (patch-chrome_browser_ui_ui__features.cc) = 39a75dc183dbed7d4ec20aa031119bb040e1e265
-SHA1 (patch-chrome_browser_ui_ui__features.h) = f298195074b2914d4f653a43dc69d8958559a49b
-SHA1 (patch-chrome_browser_ui_views_accelerator__table.cc) = f987b386b127daf0379f2661fdcfc57c4435488e
-SHA1 (patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc) = a55c5ba84621051f0a4c4539733219bbe1a895d1
-SHA1 (patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc) = abb49816362f9766bf6a1736c3b7e592c47195a0
-SHA1 (patch-chrome_browser_ui_views_chrome__views__delegate.h) = 8233a5e5d2ace8e84b48cd682c3dbb37ab8a1ea0
-SHA1 (patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc) = 44dd7968f61ef01e1c41913d5cce365e80d6ceea
-SHA1 (patch-chrome_browser_ui_views_compose_compose__dialog__view.cc) = 5c4a5da4556ecb052bbd315928e04a3fa6cfa31c
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame.cc) = 0e5b7a896d4c54a339db5ba30067282098fe816b
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame.h) = dae9a85816221943a36b4938a3638398f2a707b5
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc) = 3549707f629b32567ce9ff42de5dfbac76d7a38d
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc) = e8acbc3e1917a487c50a21caa8bf384a4ea9df32
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc) = 2ac05d3abdfbef8fdc69d9c7925f6f1c96728094
-SHA1 (patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc) = e5e204f13e7e4f4c8dc579608a0ab15b6e888a36
-SHA1 (patch-chrome_browser_ui_views_frame_browser__view.cc) = 2b65c401918f0cf49a4ab226e890d9ea0192c86d
-SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc) = 28ba630e7c1557a8939528883fbe6696cbd2af41
-SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h) = 9fd3bea63eb086581a6c9e157f45d78385ba7b2e
-SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h) = 53cc661c57b4f362d4e6a2f34a6cf299c3806604
-SHA1 (patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc) = 4ea75d7a945a8c990f2e544621af01dc475b643e
-SHA1 (patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h) = 068a6b160beec495fd4b1020cd20e2b4af083af7
-SHA1 (patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc) = fea0b97a0db62718542fc4efc26979c63e9b7bbf
-SHA1 (patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc) = fcbe5f71e8fa40a4cde1d5599c6222e590e72662
-SHA1 (patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc) = 99990bf6a021261b4bb9508b6a653b84bf9612bf
-SHA1 (patch-chrome_browser_ui_views_hung__renderer__view.cc) = ca80a1853ef8fff3ef5a1062c5a9c5db75a55f5e
-SHA1 (patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc) = 2bd7c1df9ac4133d81221254a69d9d046e33e3a0
-SHA1 (patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc) = 48fdbebd29e10637e088afd82a18d11aa4c480f9
-SHA1 (patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc) = f77d282820eb7b867fafc8d7a2094326ec4684e6
-SHA1 (patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h) = e2cdb2319ee3203e0bfdc20ea1bce23689eceb61
-SHA1 (patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc) = 01f08e9b7f455d2ad1097d5338a676c8d8414c78
-SHA1 (patch-chrome_browser_ui_views_profiles_profile__menu__view.cc) = 61840a28d55023665970170e333c50163b45f7c4
-SHA1 (patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc) = 85de51f3e5873f4fa412e42c319f5dea3f72dee8
-SHA1 (patch-chrome_browser_ui_views_profiles_profile__picker__view.cc) = e7c0aa290e52281857c727848406618b1f08e50a
-SHA1 (patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc) = b76415c6bce977ab79ed3eb57c9cdf755c97c8fa
-SHA1 (patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h) = 8485451a2436764fc88ab30311bd98f54d8d2935
-SHA1 (patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc) = e677896f404625e82cd583d76d510723fa737d7a
-SHA1 (patch-chrome_browser_ui_views_tabs_tab.cc) = 7561d6e345d47053e7d9b06baa031cb1ee3d3aa8
-SHA1 (patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc) = 67acfb503a5a31e53b0a2c6d2e5b5fd6f73b2b5f
-SHA1 (patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc) = 5db01ba5cf771c6c10ed659fb94c18cf667fd24f
-SHA1 (patch-chrome_browser_ui_views_tabs_tab__style__views.cc) = c70eebc769b7ecbae7d1fafc0ba914e1e387bc49
-SHA1 (patch-chrome_browser_ui_views_task__manager__search__bar__view.cc) = f1d2a921216523888abd2284f11a65b12d837886
-SHA1 (patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc) = fc7cc7bbb80fdfa6ef037bee258aae88131e46c1
-SHA1 (patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc) = c42b5640e2fbcb44806440f129d6ec390e01f34b
-SHA1 (patch-chrome_browser_ui_web__applications_web__app__dialogs.h) = 9331d8cba2b4b7259822cedba8b5f94e2f76e868
-SHA1 (patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc) = ca935b899196ab81e90a3f826c155e8e45cfbcda
-SHA1 (patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h) = 9559f11d6955989d1744703cb17512d619aeea20
-SHA1 (patch-chrome_browser_ui_webui_about_about__ui.cc) = 45e2607d41e029a68390f0eb79faf7cd2b1ca398
-SHA1 (patch-chrome_browser_ui_webui_about_about__ui.h) = 07b85dbd158c1c4e5c399001fdc5a9e5d64d9e29
-SHA1 (patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc) = b989ab43984c836329f9fa06701f80d51bd2f014
-SHA1 (patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h) = a8d430a126e856f158e2dfbf8abd0321ae4f4e2c
-SHA1 (patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h) = d842fc3cb724785c4434bd174e8ba45d824cf886
-SHA1 (patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc) = c08c9cf67f6163e1d5756434d0415c50d674afec
-SHA1 (patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc) = 878fe72ad0034ca9833e94ed0952f26bdb1d9ab9
-SHA1 (patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h) = ba8f1d5c2f64fc3984e58ec298becb3b63b1a75c
-SHA1 (patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc) = d8cbbf5033e2e61680b3a73f51ca96f8e00a5b94
-SHA1 (patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc) = 8059c4f43010812640d9e1c9ac54eed354cb57a8
-SHA1 (patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc) = 323eb6d7d8eb0283a3b1ac3505cb897fc5e1b0be
-SHA1 (patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc) = 5ee7e20dbee0ca9090fa7f2880084da9ff4e2ec8
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui.cc) = 0bcf9b5dc5e84454ca40002beacc0eb38aa057fe
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui__constants.cc) = ae77ccfc9ca5b0e1a3a0f90e567913979ffaa8df
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui__constants.h) = 5058471d69847fb58f28a6fca6500310b592a80f
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui__handler.cc) = e0018d135725565b50ed3eab1946ade9f4dc07bb
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui__handler.h) = c9ca0c78f8b58695e6d55b5f6c291b1960e9180f
-SHA1 (patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc) = 8a3a5b9bbe4e346aeb996f4bdd2a51b5d2baa239
-SHA1 (patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc) = 0b56390c40761b1df44d8fb99c3175cf1a6c45db
-SHA1 (patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc) = 55f1f6c3670f8afc33eb8e0d302ad77cd57b3f30
-SHA1 (patch-chrome_browser_ui_webui_settings_appearance__handler.cc) = 6b0fb60944fcfcdc84ce155bdd7cf5aac6593ff7
-SHA1 (patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc) = 657ba72045dc899ed5d634a7335b271a1026ac1b
-SHA1 (patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc) = 03e65663e69ce9f2bfc3868d13e722810163cdef
-SHA1 (patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc) = 9d3d4491bc9bd82e7b91cd7f249438ac00d27d03
-SHA1 (patch-chrome_browser_ui_window__sizer_window__sizer.cc) = d44a6834ec688f81c19189d8813749c4773d787c
-SHA1 (patch-chrome_browser_upgrade__detector_version__history__client.cc) = c77069327a10e1241aa71bf9a00843e3ac57703f
-SHA1 (patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc) = 4d8761894b284099a530cebdf5bb3a852a837a34
-SHA1 (patch-chrome_browser_web__applications_commands_launch__web__app__command.cc) = 33cc87f910bd50d414c214337202531d56ce2b7c
-SHA1 (patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc) = 5867f8ad580be690541d7e1736a5a17742a59c5b
-SHA1 (patch-chrome_browser_web__applications_extension__status__utils.h) = 03638fa357985929cf0401d0c24a1f7592883b08
-SHA1 (patch-chrome_browser_web__applications_extensions_extension__status__utils.cc) = 4d326dcb006512e759e5f334dfe6fedd49ec7227
-SHA1 (patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc) = 2ea11d35222f91b1a71162742160cd6b1a88e160
-SHA1 (patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h) = 62aa831347bf1455c12bd195839aa21a9f401c2c
-SHA1 (patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc) = 24b5c197a8a2d46faee96df9bf3546a05d241813
-SHA1 (patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc) = eae0ff190894dc590da68e2ad866f85182f74cc7
-SHA1 (patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h) = a121290e563a87a11c99951a71a10026246cfe3c
-SHA1 (patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc) = 443ac5b7de3ce4aa1a15f99be589da2678bbfcd3
-SHA1 (patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h) = c027b68a4b064a2bdb9d3b7f90c9013957970323
-SHA1 (patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc) = 958f918454ab183197b67e5d2a8351defdfcdff5
-SHA1 (patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc) = 15a3c7a42dce1ed02cfcecbe6e80700959e0b1e5
-SHA1 (patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h) = 9748b1f625f3fff5ad5031c1c44aa5a44d43f878
-SHA1 (patch-chrome_browser_web__applications_web__app__helpers.cc) = 8a44f4b06e29d0fa2fdd6b06e8577cefa9e54734
-SHA1 (patch-chrome_browser_web__applications_web__app__install__info.h) = 8ab3552ac4d20afe0637427d6feb5b150854f7eb
-SHA1 (patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc) = bc5a9057a793160eea58b174a33f580d31568d94
-SHA1 (patch-chrome_browser_webauthn_enclave__manager.cc) = 5d1fd9b1d3eeb0266880c5efcbc1e500ce8c5ae8
-SHA1 (patch-chrome_browser_webauthn_gpm__user__verification__policy.cc) = 7ff03790957637518ba11ee8ecdb79c933d4e88d
-SHA1 (patch-chrome_browser_webauthn_password__credential__controller.cc) = bc929b204dbd6e2d2ed30a18594ce5e1cc5f2c12
-SHA1 (patch-chrome_browser_webauthn_unexportable__key__utils.cc) = f53397757af88246323d0efeb17e4fe4b9bfadf3
-SHA1 (patch-chrome_common_channel__info.h) = 3569e3e2e61fe0c31b75216188fceb4457933562
-SHA1 (patch-chrome_common_channel__info__posix.cc) = a14a84894bd693b8c9669f51fc7374a196727ce9
-SHA1 (patch-chrome_common_chrome__features.cc) = 0321a8bd64ef1807c860a54d01d563f2a99e45ec
-SHA1 (patch-chrome_common_chrome__features.h) = 97a8e75764fcc3009c10d1e5c0141fbef5527602
-SHA1 (patch-chrome_common_chrome__paths.cc) = a5c68c8277bcd725a0da68a31605c7f8be7d441e
-SHA1 (patch-chrome_common_chrome__paths.h) = 30550fc8cf48584a41e4f6e403ed1fc756e722d1
-SHA1 (patch-chrome_common_chrome__paths__internal.h) = 584e6991d9d7157653ceb520a6968df2d22b6383
-SHA1 (patch-chrome_common_chrome__switches.cc) = a5a882c6b70b90965860e8bb2c89f76d2091c3de
-SHA1 (patch-chrome_common_chrome__switches.h) = 08017f7d8666bb05a1e1939ba2f48822a604cf18
-SHA1 (patch-chrome_common_crash__keys.cc) = 81cf436665afd4e042e26109e243497b55265d79
-SHA1 (patch-chrome_common_extensions_extension__constants.cc) = f842f5d80cab27f0cc2d44609aebfdedfd932a73
-SHA1 (patch-chrome_common_extensions_extension__constants.h) = 793fc8bb6babcab1f3aa5190d17ac26d56b4b731
-SHA1 (patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc) = 231a259680a8476c58d5fae6e56d9c15ae6649fd
-SHA1 (patch-chrome_common_media_cdm__host__file__path.cc) = da237e2766d219b64024c892aec83348c9190fc2
-SHA1 (patch-chrome_common_media_cdm__registration.cc) = be439ab64fdc698117fc30f914398f59bfa20ec8
-SHA1 (patch-chrome_common_media_cdm__registration.h) = 96f58fd2e13639acb4c5edbdb3fbeee96d419cad
-SHA1 (patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h) = ca3f4f82afeb48cf4956024b1135236ab54de982
-SHA1 (patch-chrome_common_pref__names.h) = 7157726534d96dfb4a238cf3b92e2908f0ac5858
-SHA1 (patch-chrome_common_url__constants.h) = 548ba832cff8463e883ec46797a370a268b6ab10
-SHA1 (patch-chrome_common_webui__url__constants.cc) = f28344909ae8369a0bdf802d6c4a1a09ef7dbb12
-SHA1 (patch-chrome_common_webui__url__constants.h) = 8b314adbb501d76ff70a73469e1c627db679f03a
-SHA1 (patch-chrome_enterprise__companion_enterprise__companion__client.cc) = b6f5d51628975d23f3f60b3b716034ed18552f69
-SHA1 (patch-chrome_enterprise__companion_event__logger.cc) = 5eabd89a8b19a5d73ac494ec968fdc17d3cc1ece
-SHA1 (patch-chrome_enterprise__companion_lock.cc) = 4e4e5c608157f587e4ea719d44151cf36b9c3ab4
-SHA1 (patch-chrome_services_printing_print__backend__service__impl.cc) = c4c0b7d80ce0ac64e725d2840440205edd8cfdb1
-SHA1 (patch-chrome_services_speech_audio__source__fetcher__impl.cc) = e8f452f803050dcea9dd22328184f34723183adb
-SHA1 (patch-chrome_test_base_scoped__channel__override__posix.cc) = fcc6a039aa9efffe036df443dd146b10395550cc
-SHA1 (patch-chrome_test_chromedriver_chrome__launcher.cc) = 47f8404b9412f1f9d508ff682b5205a9df243157
-SHA1 (patch-chrome_test_chromedriver_chrome_chrome__finder.cc) = 6cf6c614acf4ece57310d93430a9b06c150d2386
-SHA1 (patch-chrome_test_chromedriver_key__converter__unittest.cc) = 6a417c058940e1d2d2d71380f227f5cb45b4bbf2
-SHA1 (patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc) = 2fd466301915ae0c9c16c601c2d9a4292331b474
-SHA1 (patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc) = 591f96622bb6b4679654c2cf17b1b37999ce06f5
-SHA1 (patch-chrome_updater_app_app__uninstall.cc) = 85782b1c2d313a4b7edc4b58b8042653ebb668fe
-SHA1 (patch-chrome_updater_configurator.cc) = db17499a58c4d151a7fe95c814848d8ee02d25cf
-SHA1 (patch-chrome_updater_lock.cc) = 6eb285b3c1b56f5ce590adbcddc12ef3da677b80
-SHA1 (patch-chrome_updater_util_posix__util.cc) = 7e452978aa216ba62444a78cc41b913ad08a29b9
-SHA1 (patch-chrome_utility_services.cc) = 44db7620c294105cdcf77a92906a85e8628b29c1
-SHA1 (patch-chromecast_browser_cast__browser__main__parts.cc) = c55dc533141434cc255e3950eee45db132d17d3a
-SHA1 (patch-chromecast_browser_cast__content__browser__client.cc) = 25645c17dfa618822ce201efeea75184e57faef5
-SHA1 (patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc) = 05a97e89bf6567c8f3c90b1b37c522d2728d5083
-SHA1 (patch-chromecast_media_base_default__monotonic__clock.cc) = 0bc801915fb3d7ca40e6a006681e2104a859b08f
-SHA1 (patch-components_BUILD.gn) = 2fc875cf1758a32a76eaa9ce67d7aee163f0549b
-SHA1 (patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc) = 5f0b4b6bdccd10f733947fa69da61d0775085bf9
-SHA1 (patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h) = cc9252125449e32628a142d6e90e7ab73db098af
-SHA1 (patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc) = e0dbee47ecdc20774d04c34780c020f26266686e
-SHA1 (patch-components_autofill_core_browser_payments_bnpl__manager.cc) = 8f7f94cb6e2da347f3443eb1957cbfba1de50652
-SHA1 (patch-components_autofill_core_common_autofill__payments__features.cc) = 4ec7a8a860e8dbde64ccae05a0a3378d3578a868
-SHA1 (patch-components_autofill_core_common_autofill__prefs.cc) = d67aa1e4c769f606a1f2ebafb71304b5a5595e1b
-SHA1 (patch-components_autofill_core_common_autofill__prefs.h) = e6ea2a7b3ad14ec22d53f7128b65fedb3fbd816a
-SHA1 (patch-components_commerce_core_commerce__feature__list.cc) = c41915b173f9b954ba5302fbca848000d80ddc32
-SHA1 (patch-components_constrained__window_constrained__window__views.cc) = a2af18227709832353929a933f56210b0054d4b1
-SHA1 (patch-components_content__settings_core_browser_website__settings__registry.cc) = c45d539f32ff64f416989c0dee8899df834267fc
-SHA1 (patch-components_cookie__config_cookie__store__util.cc) = 54f33ca74a0ea5096fc5f9856108c1d2135be769
-SHA1 (patch-components_crash_core_app_BUILD.gn) = 036a1dddfd1765a8fc0e59933a525c562c857545
-SHA1 (patch-components_crash_core_app_chrome__crashpad__handler.cc) = 42e1b660064461d08b8c2e4588305e0eddc45ddf
-SHA1 (patch-components_crash_core_app_crashpad__handler__main.cc) = 720818258fea9e04740b7e4800d2862cd2e48949
-SHA1 (patch-components_crash_core_browser_crash__upload__list__crashpad.cc) = d16c7934b34de74fbba67439e86a6c4c8ed5fcb1
-SHA1 (patch-components_crash_core_common_BUILD.gn) = 0bfaf1bc23511a8a556b385a246555914b79fa4b
-SHA1 (patch-components_device__signals_core_browser_browser__utils.h) = f2d13e95413643d12d54159d91a15d8c6dc9cae7
-SHA1 (patch-components_device__signals_core_browser_mock__signals__aggregator.h) = 03f8ed4f739ffad818a27f54776ea41df868fa6d
-SHA1 (patch-components_device__signals_core_browser_signals__aggregator.h) = 8273807bdf853775ef2848fcf27a6cbf30c74eab
-SHA1 (patch-components_device__signals_core_browser_signals__aggregator__impl.cc) = 628d3a6ae3ddcd02736c1f6dc72e27186bdd618f
-SHA1 (patch-components_device__signals_core_browser_signals__aggregator__impl.h) = 84f92194fe2f6e6a5a38d62d34e4edf21bd7195d
-SHA1 (patch-components_device__signals_core_browser_user__permission__service.h) = 3b02d32fcf081da88ce67f3374c23b76ec40748e
-SHA1 (patch-components_device__signals_core_browser_user__permission__service__impl.cc) = c8ed742d22e36c80600d422c376d9799c3cc7313
-SHA1 (patch-components_device__signals_core_browser_user__permission__service__impl.h) = db996035f373aa784dc9128609032d28e882e72c
-SHA1 (patch-components_device__signals_core_common_linux_platform__utils__linux.cc) = b973b25d93bd3ebc4aa092655804d1480fd90d4e
-SHA1 (patch-components_device__signals_core_common_signals__features.cc) = 3b6defde41686dbb91cd10f1d651b660b0d3fb66
-SHA1 (patch-components_device__signals_core_common_signals__features.h) = 8e84d702c45142b7c4e072bb6548c86dcd000d39
-SHA1 (patch-components_device__signals_core_system__signals_platform__delegate.cc) = 7b004faaf218fc83619c70c97d97c9d7303f3177
-SHA1 (patch-components_device__signals_test_signals__contract.cc) = 9b5bcda73787883d94ab5e614aa4d94860503ddb
-SHA1 (patch-components_discardable__memory_service_discardable__shared__memory__manager.cc) = 044c6f1ba4b1ebd12d55e3e389339fdda53e1b03
-SHA1 (patch-components_embedder__support_user__agent__utils.cc) = 2e46d494d05f9ccd8ed340383f8d95971141ee44
-SHA1 (patch-components_embedder__support_user__agent__utils__unittest.cc) = 369e526f7a3f4c243967c6441e71070f5f2c47a4
-SHA1 (patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc) = a5380aae2de8713551c0ed4fdc186ce38f7a5486
-SHA1 (patch-components_enterprise_watermarking_watermark.cc) = 207e5e6bc541389922bdcbd4b423986a4197240b
-SHA1 (patch-components_error__page_common_localized__error.cc) = fe3f8c1b88f119c16ce80fbca6a20f8d2d301b11
-SHA1 (patch-components_eye__dropper_eye__dropper__view.cc) = eb91b3040ffeeeeda71dc5d9c390e6344445359e
-SHA1 (patch-components_feature__engagement_public_event__constants.cc) = 7a0f4d6e06a7c211b68d61db1853b49bcafa1324
-SHA1 (patch-components_feature__engagement_public_event__constants.h) = 8e12f5a1f032b3d92d4ab99628cc51a823113f33
-SHA1 (patch-components_feature__engagement_public_feature__configurations.cc) = 73435812c40a9b38b4b7fe3e34b8c557653595ed
-SHA1 (patch-components_feature__engagement_public_feature__constants.cc) = 8b83efba2751864a10172d39600c8e7d83e084e0
-SHA1 (patch-components_feature__engagement_public_feature__constants.h) = 46c3edd83bf509ad7b18788aeed5aca134c5c75d
-SHA1 (patch-components_feature__engagement_public_feature__list.cc) = 871a97b47c6bb7a68f330d2ec3ca9318e1c95b68
-SHA1 (patch-components_feature__engagement_public_feature__list.h) = dd5e66a54706897abbb2a091f9cb1342897eb6e2
-SHA1 (patch-components_feed_core_proto_v2_wire_version.proto) = ffd5215b74132605dec746567122036133797ceb
-SHA1 (patch-components_feed_core_v2_feed__network__impl__unittest.cc) = 2e1c53520d7ab7ee2a257ea569984f28e5924fb7
-SHA1 (patch-components_feed_core_v2_proto__util.cc) = 006b01f689f0c703e71ba82db51226248b01fb14
-SHA1 (patch-components_feed_core_v2_proto__util__unittest.cc) = 39e563f7e92909ab70af466569a1de0e1b6b6bc7
-SHA1 (patch-components_feed_core_v2_test_proto__printer.cc) = a7e756209a910f8b0714886913e83f71573f4fdc
-SHA1 (patch-components_gcm__driver_gcm__desktop__utils.cc) = 9377a84e338939570bab217b8e7723711e373bfc
-SHA1 (patch-components_gwp__asan_BUILD.gn) = 56f728b82c18c39d403757e6b81490f633865356
-SHA1 (patch-components_gwp__asan_buildflags_buildflags.gni) = 07bae982c1c4273768350eec4aac0b0c219fffc5
-SHA1 (patch-components_gwp__asan_client_guarded__page__allocator__posix.cc) = fac860323de2679a9f766733fde6532be2f636a3
-SHA1 (patch-components_gwp__asan_client_gwp__asan.cc) = 24829c7ccfe7a373f28cd9a44779d7cc3ba6836f
-SHA1 (patch-components_gwp__asan_client_gwp__asan__features.cc) = 65acb6860d612f8495e98f420b4f7f8947138207
-SHA1 (patch-components_gwp__asan_crash__handler_crash__analyzer.cc) = 20cff27d42c945b91e32c9bc969e7d865d279f94
-SHA1 (patch-components_live__caption_caption__util.cc) = c80b9751efdfc1fbd97fba73e958c3f2a0409cd5
-SHA1 (patch-components_live__caption_caption__util.h) = a8af5217cb5d7cadddbe80b0c066794acfb2cffe
-SHA1 (patch-components_media__router_common_media__source.cc) = f7fd2dc32725c84db4332a0ae55fcd30434f7fe2
-SHA1 (patch-components_media__router_common_providers_cast_channel_cast__message__util.cc) = fec2bf981e08d221b3f07139a707e1500b959e32
-SHA1 (patch-components_media__router_common_providers_cast_channel_enum__table.h) = 35544dbba0e7027eeda86272621a02d117f0c61a
-SHA1 (patch-components_metrics_drive__metrics__provider.cc) = 273370e99584da5121205d822162233ede5020f4
-SHA1 (patch-components_metrics_dwa_dwa__service.cc) = 1b75bfd95a02423225e17dddba48b042cf0064b7
-SHA1 (patch-components_metrics_metrics__log.cc) = 8b0f130909a0298517ab06969623e4facfc89786
-SHA1 (patch-components_metrics_motherboard.cc) = 07965aeb47f740fe556fb8d8e6f42e1ee698e8a9
-SHA1 (patch-components_named__mojo__ipc__server_connection__info.h) = 2d3a66c84e24ef4458a7b38b1953ab628d9e1d0a
-SHA1 (patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc) = e8b0464b6235752fffbd3b77d35fd940aab79bc6
-SHA1 (patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc) = 9e823a68586bcf0547d36cc528810981407952aa
-SHA1 (patch-components_named__system__lock_BUILD.gn) = a962bbb5dc2a6ed66233577ec7df9329d099c927
-SHA1 (patch-components_named__system__lock_lock.h) = 5f94325676db06111937926165a9ff96bbd5c5a0
-SHA1 (patch-components_named__system__lock_lock__unittest.cc) = 9f9d917412763211556d0da6e72ba658134dacfd
-SHA1 (patch-components_optimization__guide_core_optimization__guide__features.cc) = f85f73cc72c16fd80417c704d2eac3ed2d3fdd8b
-SHA1 (patch-components_optimization__guide_core_optimization__guide__util.cc) = d93fd4202cdd86cc8e4425514d41d88dc1b0b208
-SHA1 (patch-components_os__crypt_async_browser_secret__portal__key__provider.cc) = b025fdfe27e0031444655280c7591c7896d015f7
-SHA1 (patch-components_os__crypt_sync_libsecret__util__linux.cc) = a3b03403bcc3bceac2f40b9a8d8d1d6bc2d6cf5a
-SHA1 (patch-components_os__crypt_sync_os__crypt.h) = b7c0f15bbfc00784cfb4aa433b33b34f948777b8
-SHA1 (patch-components_paint__preview_browser_paint__preview__client.cc) = 30613955ee3bb66949775ea187c5bb1cb6993ecd
-SHA1 (patch-components_paint__preview_browser_paint__preview__client__unittest.cc) = a64d9d8b109d45ecee8a71a655bf4765bf9e00c9
-SHA1 (patch-components_paint__preview_common_proto_paint__preview.proto) = 888910e45cf3544745659e45cc73244884400db9
-SHA1 (patch-components_paint__preview_player_player__compositor__delegate.cc) = a11abee845c4fc1ba437d54096701aaf6ce6887a
-SHA1 (patch-components_password__manager_core_browser_features_password__features.cc) = ffd39747fbfea049f3721a0941b28206925a13df
-SHA1 (patch-components_password__manager_core_browser_features_password__features.h) = 1036dd00b0daa4b7c605df0d358ef5d54537d14b
-SHA1 (patch-components_password__manager_core_browser_password__form__manager.cc) = a0aa79f16ce5ffa9000aab2c984d0ac13b7d6fb9
-SHA1 (patch-components_password__manager_core_browser_password__manager.cc) = fb52664a3fe17098b74a32acb624880ece02be4e
-SHA1 (patch-components_password__manager_core_browser_password__manager__client.h) = b205d652561c963eb4f9976d923a134e639bb1fa
-SHA1 (patch-components_password__manager_core_browser_password__manager__switches.cc) = 5394a048d6daeb43d7aef1cecf62c3ca441c5110
-SHA1 (patch-components_password__manager_core_browser_password__manager__switches.h) = 210384a44b07c50aae183321518e7a45987c34b5
-SHA1 (patch-components_password__manager_core_browser_password__manual__fallback__flow.cc) = 74be72aa6505b88ca8e483e36d1915f1d0e45ffa
-SHA1 (patch-components_password__manager_core_browser_password__manual__fallback__flow.h) = 2143403e51afc3b4137be2dfcfbd5c5eb2baadf1
-SHA1 (patch-components_password__manager_core_browser_password__store__factory__util.cc) = 69827e4e0bedc7509d041a1241f64478ca98f932
-SHA1 (patch-components_password__manager_core_browser_password__store_login__database.cc) = 14502bde74587499e0ab0631d744ed52a08f1840
-SHA1 (patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc) = 88cd23ce34fae1a07e2c231d6727564e74fc5699
-SHA1 (patch-components_password__manager_core_browser_password__store_login__database__unittest.cc) = e19369b5790ad6e97f0d65fd7330e5e49f960a07
-SHA1 (patch-components_password__manager_core_browser_stub__password__manager__client.cc) = f5380164ba1412a8f6b46092049048c8006e65b7
-SHA1 (patch-components_password__manager_core_browser_stub__password__manager__client.h) = 4700ea16236fa1ff7f573709933ad6a2191aacd2
-SHA1 (patch-components_password__manager_core_common_password__manager__pref__names.h) = 7e4335124648c3bd2bc69cd81c72792258fe1169
-SHA1 (patch-components_performance__manager_decorators_process__metrics__decorator.cc) = cedc60b920e7b1922b62a4da19fcf0f051b6d7fd
-SHA1 (patch-components_performance__manager_public_features.h) = 607e46f61515e4cde3330c30497ce21f5b4cb07e
-SHA1 (patch-components_permissions_prediction__service_prediction__common.cc) = 912df77a3877b46b9d53d80190329f751a67fec7
-SHA1 (patch-components_policy_core_browser_policy__pref__mapping__test.cc) = 89631b3a4704f990973fd6e7087a4c458bf1d061
-SHA1 (patch-components_policy_core_common_cloud_cloud__policy__client.cc) = 2de2e358fd3e9de08c4f85d0e8f002420fa19eb1
-SHA1 (patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc) = 14b7513d93e21b2a0cb4c6fd88b3f43dc4c21760
-SHA1 (patch-components_policy_core_common_cloud_cloud__policy__util.cc) = c9af3a4f50399124448dd1038edb5f00e3a59863
-SHA1 (patch-components_policy_core_common_policy__loader__common.cc) = cca72c3714bd00c148539e90e457b93c0402e52a
-SHA1 (patch-components_policy_core_common_policy__paths.cc) = 356335c33379495d8c03ad4b709ee509b5e038db
-SHA1 (patch-components_policy_core_common_policy__utils.cc) = fdfb708a9f4b8fb04ed6d6761b0d3f3f9af9bc76
-SHA1 (patch-components_policy_tools_generate__policy__source.py) = 0af28930c1cbc41efc056779422adf3c16d2ed02
-SHA1 (patch-components_power__metrics_BUILD.gn) = cfd4dbd9d58365aad81618c8054001c69ea2ad9f
-SHA1 (patch-components_power__metrics_energy__metrics__provider.cc) = 5949340b2d484eb4d98a87bebfaa77bba4134e15
-SHA1 (patch-components_regional__capabilities_regional__capabilities__service.cc) = c358f09b7d1a5b0e6faf5f1af32d06014aecb9a9
-SHA1 (patch-components_regional__capabilities_regional__capabilities__switches.cc) = ceff50009696278c2ba46a17e8ebdbc94d428c93
-SHA1 (patch-components_regional__capabilities_regional__capabilities__switches.h) = 121b9116e1ccd530d1b09e5c77dc2886b6d6684d
-SHA1 (patch-components_safe__browsing_content_common_file__type__policies__unittest.cc) = f61e7f93b39bb42b19e3f39d73ff6fe9583aff44
-SHA1 (patch-components_safe__browsing_content_resources_gen__file__type__proto.py) = b1171003379b45f98cc1dcddd81ce042ee403667
-SHA1 (patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc) = 19bb8fdffa41264e1896e0bc8dfd9f7e235adb48
-SHA1 (patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc) = 57216769d67ebbe2af0fa40056a5f1983136f218
-SHA1 (patch-components_search__engines_template__url__service.cc) = d7e6555643cd4decbe8cf8db7f3badef887aac07
-SHA1 (patch-components_security__interstitials_content_utils.cc) = 2b592cebc817d68d286fae1122601af498761e65
-SHA1 (patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc) = 83f9120bae19893d1f5343b839d20bb1ba4751d8
-SHA1 (patch-components_services_on__device__translation_sandbox__hook.cc) = 90afc9e4cd85746ece4b49997b873b0f90fcc8b3
-SHA1 (patch-components_services_on__device__translation_sandbox__hook.h) = 200dd6068d9944a9ab829cd96ef6ef933108afa2
-SHA1 (patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc) = f7759b00a764e21d2929ce803ab6b0ce4538c217
-SHA1 (patch-components_signin_public_base_signin__switches.cc) = f49be6d73fb636d044dbebe9e67aae4b366bc663
-SHA1 (patch-components_signin_public_base_signin__switches.h) = 3eff417a8befee8df0042ca5e91d0d6e00ab3abf
-SHA1 (patch-components_soda_soda__util.cc) = 928a9d624674b9f2910a8f770fc55bea03148870
-SHA1 (patch-components_startup__metric__utils_common_startup__metric__utils.cc) = 40b3ab09405f0c36aba130cd924ca8e9f2134dd0
-SHA1 (patch-components_storage__monitor_BUILD.gn) = 6e141e7c2551a67c7984f89dbdac1b247c250e60
-SHA1 (patch-components_storage__monitor_removable__device__constants.cc) = 7ee24ec4ed4580d080c74393dfec4624b11d879f
-SHA1 (patch-components_storage__monitor_removable__device__constants.h) = 2ef6b66e7ad314f4bf703e8448fee154657097ba
-SHA1 (patch-components_supervised__user_core_browser_list__family__members__service.h) = 6a24a4fa10bbe856681fc310b88fca2e1668854a
-SHA1 (patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc) = 49d7bd3e58fe893ae73b9945bddad966a3fe63a1
-SHA1 (patch-components_supervised__user_core_browser_supervised__user__preferences.cc) = aa4befa8e529936426909801d2b8e750bbb63671
-SHA1 (patch-components_supervised__user_core_common_features.cc) = 677ea4cfded043f2510fc4eadc17a00f407c2412
-SHA1 (patch-components_supervised__user_core_common_features.h) = d923ba4464fa357538f7b5006aed168330ddbe3f
-SHA1 (patch-components_supervised__user_core_common_pref__names.h) = 293015859d8f3f1b9c7e9e85278670535c6d3adf
-SHA1 (patch-components_sync__device__info_local__device__info__util.cc) = a5ff218f5de43f1579c3267e6dcd6ead10519995
-SHA1 (patch-components_sync__device__info_local__device__info__util__linux.cc) = 373f146e666cdf05c07b825beb959009d386a21c
-SHA1 (patch-components_sync__preferences_common__syncable__prefs__database.cc) = 780d0f7116a80072f47d858137fc7dcc299478b3
-SHA1 (patch-components_sync_base_sync__util.cc) = 77b5244409b0c4393a1efcd50cfbe3d5f6e7786d
-SHA1 (patch-components_system__cpu_cpu__probe.cc) = f8a3378cd99875655fad1b3fe528eed45e682b37
-SHA1 (patch-components_translate_core_common_translate__util.cc) = 5e81f47ca6aaebb7e4d17c996413acd15ca217be
-SHA1 (patch-components_trusted__vault_trusted__vault__connection__impl.cc) = cc295346e86958402946a5785a9abe1aa9485d25
-SHA1 (patch-components_update__client_update__query__params.cc) = 652e82537ec5c3d7968e47f9eca94cfb6151b19b
-SHA1 (patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc) = 32cb2cf63f8ec630c9560e70e7c65a5d491c98f1
-SHA1 (patch-components_user__education_views_help__bubble__view.cc) = 04e066476477613c8f65e3d8f3ce372e3a1eac13
-SHA1 (patch-components_user__education_views_help__bubble__view.h) = 5af7360e00fdb2a8293ac092a22a7c2595d90a94
-SHA1 (patch-components_variations_service_variations__service.cc) = e5f35b2e24c47bddd50b7cabe42f3cedc2330c1f
-SHA1 (patch-components_visited__url__ranking_public_url__visit__util.cc) = 32f98357be4237652abba9e956e78e0e94bf7b98
-SHA1 (patch-components_viz_host_gpu__host__impl.cc) = d7f27daf32b09c9b52660e9ed871f98c9b8451c6
-SHA1 (patch-components_viz_host_host__display__client.cc) = 30417726e8bf8e6c8224c660b83bc22ae5ff4f5d
-SHA1 (patch-components_viz_host_host__display__client.h) = 37b13084b43efcbc13ffac6b752b3cf9275b09dd
-SHA1 (patch-components_viz_service_display__embedder_skia__output__surface__impl.cc) = 2c48ca4dce3ee0a4c114de3ea13ce5e58f28bae1
-SHA1 (patch-components_viz_service_display__embedder_software__output__surface.cc) = eba002321ab766591bb899bdeadd7f5e6a872cc1
-SHA1 (patch-components_viz_service_display__embedder_software__output__surface.h) = 6959126a263752a2fb4ffd72bbd664602a1f1f4b
-SHA1 (patch-components_viz_service_display_skia__renderer.cc) = 682875865856e7ef8ee6e98164a327de6103beb9
-SHA1 (patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc) = add35546add043f2d8a1fa9f69bba8e7aa3281b5
-SHA1 (patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h) = f3bc2e614c50e83b3b0517d38f376f7458ec5976
-SHA1 (patch-components_viz_test_fake__display__client.cc) = e8dbac6dfa24768c629d8af0a139504f78e70055
-SHA1 (patch-components_viz_test_fake__display__client.h) = d33d72a35e082927aea74c3ffcb47ea1b7fee7cb
-SHA1 (patch-components_viz_test_mock__display__client.h) = f602cfd353baed9d7ec8202780129aecb4bfdcc0
-SHA1 (patch-components_webui_flags_flags__state.cc) = 90fe7c829c09e80a5002e9cb6e040596599f55ec
-SHA1 (patch-content_app_BUILD.gn) = 672ee049481f4b7234690aa53b2dfb73d3d95a68
-SHA1 (patch-content_app_content__main.cc) = a60fcfcb50d8f350b2ccdd5f3dbd1c3141517fde
-SHA1 (patch-content_app_content__main__runner__impl.cc) = 7b97ec85bd6277e6717d6c81eb4bf4a76769c005
-SHA1 (patch-content_browser_BUILD.gn) = de4e30bb4c2d5fc90331691d8203e9dda0071fd8
-SHA1 (patch-content_browser_accessibility_browser__accessibility__state__impl.cc) = 8fef62449d22bde491fa388f4950d13be98f2f5f
-SHA1 (patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc) = 348ee47c6e4faf1d1229ef8c596248b2e7f35b25
-SHA1 (patch-content_browser_audio_audio__service.cc) = 1796036341f59a10bbb79056fb52cb5d9a29f503
-SHA1 (patch-content_browser_browser__child__process__host__impl.cc) = 80fa8410fad5d238c09c8f76d2f9bb271d2588c5
-SHA1 (patch-content_browser_browser__child__process__host__impl.h) = 8175a619166b6ec06963013258676506562af091
-SHA1 (patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc) = 15de6a4c47f7c9c80c56432c6008b93d43d0b8b2
-SHA1 (patch-content_browser_browser__main__loop.cc) = fe32bed4afc4a182a0f7c676a2d247e73ab340dd
-SHA1 (patch-content_browser_child__process__launcher__helper.h) = acfc79aad224876c2290acdc5b967ee1a1cb87db
-SHA1 (patch-content_browser_child__process__launcher__helper__linux.cc) = b70bac3cea8ceecc59007445f89efa72f9bcf848
-SHA1 (patch-content_browser_child__thread__type__switcher__linux.cc) = 2878bfeaf07df2a7123529374efe2f2852a61697
-SHA1 (patch-content_browser_child__thread__type__switcher__linux.h) = 4cb88e79e7f3ffb17103a0731e6f8fe4b6e3491b
-SHA1 (patch-content_browser_compositor_viz__process__transport__factory.cc) = 094e87ab0529313f6f85450cd55650acfd1cb528
-SHA1 (patch-content_browser_devtools_devtools__frontend__host__impl.cc) = b4543f344439e6d58f7157c312aeb9fb3c8fa44d
-SHA1 (patch-content_browser_devtools_devtools__frontend__host__impl.h) = 32bea1425b520209957a24283c9eaf8fd3ef40b1
-SHA1 (patch-content_browser_devtools_protocol_system__info__handler.cc) = e84266327dc9eee0f23949b09fadf79c7223cc3a
-SHA1 (patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h) = 6a9d12a59a0044b0d29bd6b0b11f695b5ff2008b
-SHA1 (patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc) = 2f915ae16a691a77894e6bdc63ed6136cecccd71
-SHA1 (patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h) = 7d150842de1f3dea427ee6de958a946e6adb85ca
-SHA1 (patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc) = 9afd76fa4307a6a29abd464b134ca9b20a371f11
-SHA1 (patch-content_browser_font__access_font__enumeration__data__source.cc) = 0e4eae877526360f3481644f655d3084b6eec2c6
-SHA1 (patch-content_browser_gpu_compositor__util.cc) = 9b121059481049794d66bcdbec81aaa200286ae1
-SHA1 (patch-content_browser_gpu_gpu__data__manager__impl.cc) = 5434a01bbb003588e8ba0430cb4190e252cd714d
-SHA1 (patch-content_browser_gpu_gpu__data__manager__impl.h) = e0ca60d2c0a52011e6ac2bbd4b1331fdd7e8c642
-SHA1 (patch-content_browser_gpu_gpu__data__manager__impl__private.cc) = 03bb11e1ab0cca6f7ce09fdd45e2c0fb94feb187
-SHA1 (patch-content_browser_gpu_gpu__data__manager__impl__private.h) = f6572b7773503aea89d63233a1adc1bb620491b0
-SHA1 (patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc) = ad5feddffb8a0762c7e842fe9a20e294c5ceee79
-SHA1 (patch-content_browser_gpu_gpu__process__host.cc) = f761bbf486270ef4f471be454d3ee30792aed497
-SHA1 (patch-content_browser_media_frameless__media__interface__proxy.h) = b70c341f1aa04c74bcc029572dfcc67f426e75a2
-SHA1 (patch-content_browser_media_media__keys__listener__manager__impl.cc) = 71f7924f1dbc1a593d627131018f6811d6b81d5f
-SHA1 (patch-content_browser_network__service__instance__impl.cc) = 85991bfe1c4889b70264b4394960c1c93f858b5b
-SHA1 (patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc) = 547a1422b308dbf1e360a4cbdd07dedafd4d62ca
-SHA1 (patch-content_browser_renderer__host_delegated__frame__host.cc) = 52a12e5b0079cadb8cebbf7502f98dd107b6b14c
-SHA1 (patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc) = 1fbd48720a640eee0eeeea70faeb44dbbebf7b5f
-SHA1 (patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc) = 72825c03f50a67a2c9193e8f89eba2cf2249e8f1
-SHA1 (patch-content_browser_renderer__host_render__process__host__impl.cc) = 0915e50fd52b68d49a2d67a43ef261a38829afe2
-SHA1 (patch-content_browser_renderer__host_render__process__host__impl.h) = b0083bdf3cc50e6293cda9c1f803974299bca16d
-SHA1 (patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc) = 1e66eb5aa6df1bb2176c3f575229f6615e4cfadc
-SHA1 (patch-content_browser_renderer__host_render__view__host__impl.cc) = 4033962a5c2080b51cf3e8271f8beb68577f7d4d
-SHA1 (patch-content_browser_renderer__host_render__widget__host__view__aura.cc) = add1221da81ccbae9041c90aaeeb0a0fdec8675c
-SHA1 (patch-content_browser_renderer__host_render__widget__host__view__aura.h) = 59baf60dfd3a420ebb4df4816b0f84aa1eb4151f
-SHA1 (patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc) = db96fa6ae035872c858b52ae503b5c1c56aa240c
-SHA1 (patch-content_browser_sandbox__host__linux.cc) = 12c257baef3be12d084a239f3865dbd2834fa099
-SHA1 (patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc) = 296fe8fcc6efca795e7ffd435006021a323b6882
-SHA1 (patch-content_browser_scheduler_responsiveness_native__event__observer.cc) = fc2d91783aa017395c752df43be5a22279d2ff39
-SHA1 (patch-content_browser_scheduler_responsiveness_native__event__observer.h) = 3e570dd8fde3fd4f65d5bf976cb5a5a5eccc9da4
-SHA1 (patch-content_browser_service__host_utility__process__host.cc) = 68b8e4c1a48be8e8d23ac0d0a7628632813c3712
-SHA1 (patch-content_browser_service__host_utility__process__host__receiver__bindings.cc) = a76a5fd2950d3dbe1d6a34f47f157ae5c160554b
-SHA1 (patch-content_browser_service__host_utility__sandbox__delegate.cc) = bd7f462000a9eec53c9bd45a72b1cd6a02fa07fd
-SHA1 (patch-content_browser_v8__snapshot__files.cc) = 54e766c2a73562b066429a818086ca1645655fde
-SHA1 (patch-content_browser_web__contents_slow__web__preference__cache.cc) = 032704a8a9e6eed0c9837decf552e5a620cc3794
-SHA1 (patch-content_browser_web__contents_web__contents__view__aura.cc) = 673ab916279034a80e4d8497a292c77034e77f9e
-SHA1 (patch-content_browser_web__contents_web__contents__view__aura__unittest.cc) = 4137c3b1a62d97d532d177452ba4302e8e35950b
-SHA1 (patch-content_browser_webui_web__ui__main__frame__observer.cc) = e3d41f92e2ce02b607e327957403196866946e8a
-SHA1 (patch-content_browser_zygote__host_zygote__host__impl__linux.cc) = 8090100d773cc993a517b228e00b5bb4d97f01db
-SHA1 (patch-content_browser_zygote__host_zygote__host__impl__linux.h) = 65b26262530852a5dc35e4207f86bc4a8b279342
-SHA1 (patch-content_child_BUILD.gn) = a4bfd6ba17f2e24f1d877afadfe18e4c4bdb26ba
-SHA1 (patch-content_child_child__process.cc) = 9bf6421acd3a0ef56b82a37ed9ec353d6d62bbe1
-SHA1 (patch-content_child_child__process.h) = eab5096c8e28cc1a59cca6522dddf83ce3e40b74
-SHA1 (patch-content_common_BUILD.gn) = 6f835e11a30d5ddaa2fd83266507388800de2820
-SHA1 (patch-content_common_features.cc) = 8d0a27b3230f0ac59ec5b44ae92356c80365cf73
-SHA1 (patch-content_common_features.h) = 36b15e3d6f9a76cb4b5ac438c0384917a7537d7f
-SHA1 (patch-content_common_font__list__unittest.cc) = 2361b0d1986641bb0f4bdf738337f8a9de67ace1
-SHA1 (patch-content_common_gpu__pre__sandbox__hook__bsd.cc) = 1c1de62940fa7e388897c00ff00a54082b48bd55
-SHA1 (patch-content_common_gpu__pre__sandbox__hook__bsd.h) = 3c518f910e3868f90d463e8a0c96307835258dc8
-SHA1 (patch-content_common_gpu__pre__sandbox__hook__linux.h) = fdf37638bfe00717228d600864f3f503ffa6266c
-SHA1 (patch-content_common_thread__type__switcher.mojom) = 682c3fc22bb863d13cd9cc69b5874d0ebcb8698d
-SHA1 (patch-content_gpu_gpu__child__thread.cc) = af6e00bad4fcdedeb5c77f1fc055fc3b15bfc76c
-SHA1 (patch-content_gpu_gpu__main.cc) = aa3f8c009a056cd0724a79752982036cc610f6d5
-SHA1 (patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc) = 5b2b68ee795c2e115fff867498fdb155e59646a2
-SHA1 (patch-content_ppapi__plugin_ppapi__blink__platform__impl.h) = 18296b702c2c823e284de8dc136637896795e6de
-SHA1 (patch-content_ppapi__plugin_ppapi__plugin__main.cc) = 24e39a7631d61a0ba7c85696ee88e636ee90fec5
-SHA1 (patch-content_public_browser_content__browser__client.cc) = 33be8df89b5338f8b0c6837b8e79e21b64bb5826
-SHA1 (patch-content_public_browser_zygote__host_zygote__host__linux.h) = 6b5eab162fa1de3f5617c85eb8e832746b8e1853
-SHA1 (patch-content_public_common_content__features.cc) = fec42304470c16b5deedbc257c713f6080aa086c
-SHA1 (patch-content_public_common_content__switches.cc) = d7e761b90d40f80b459e69106cede781558872ae
-SHA1 (patch-content_public_common_content__switches.h) = b9128d35eba3f8d575d6592efa4dca68d8bf3fe4
-SHA1 (patch-content_public_common_zygote_features.gni) = 1284b4cfff8d84f63c44c3e6111eb2fa57cdfbc7
-SHA1 (patch-content_renderer_render__thread__impl.cc) = f4cceb23be39b7cdde959813bfa1748e22e83579
-SHA1 (patch-content_renderer_renderer__blink__platform__impl.cc) = 6c909626ff56812d6ca047d8db7877e5f800d917
-SHA1 (patch-content_renderer_renderer__blink__platform__impl.h) = cb4befe60e64c3723c0f2c3b0be35fdc35a30d8e
-SHA1 (patch-content_renderer_renderer__main__platform__delegate__linux.cc) = 61352b74381329a5509f0d6d0842d61c80e3e1a4
-SHA1 (patch-content_shell_BUILD.gn) = ee2b4142ff72508549c68c49931443827def152b
-SHA1 (patch-content_shell_app_shell__main__delegate.cc) = 90e3ccffbd334d77169c4f06aaf87df1ac06ae26
-SHA1 (patch-content_shell_browser_shell__browser__main__parts.cc) = 22c484f4cbe5e718b57f96b87bb628de8510a3f1
-SHA1 (patch-content_shell_browser_shell__paths.cc) = da9c10a7dcd15777f88c0de0dd0abfcf079f5e76
-SHA1 (patch-content_shell_browser_shell__platform__delegate__views.cc) = b05f91dcb7f8ec8841bc6441cc9c03510b191e49
-SHA1 (patch-content_shell_renderer_shell__content__renderer__client.cc) = 397b62180e0bd516572f946841a1df3434f7446d
-SHA1 (patch-content_shell_utility_shell__content__utility__client.cc) = d8c845c32f23d21482a928f0fa9fcd324736e21c
-SHA1 (patch-content_test_BUILD.gn) = 13ace53efba504613f94cfacbce013f8a1c61b8b
-SHA1 (patch-content_utility_services.cc) = f9df11eb32280bea9ee4cecef38e8c8a4a0da35f
-SHA1 (patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc) = 26a6c070c6bc0c84a909b32f245d526be2cb7517
-SHA1 (patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h) = 3ddfd562c2e56d422947528f3bcf872de864c4de
-SHA1 (patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc) = 71bfcc6cf60846b9ef1990c9b6926c9b1665ffc7
-SHA1 (patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h) = 1892d47d1847f7b88d07c33008978112ddab26da
-SHA1 (patch-content_utility_utility__main.cc) = 4114f8805beb01b19fec82b8d6e6dc73bc7cf2c8
-SHA1 (patch-content_utility_utility__thread__impl.cc) = 5ed784131012fd885e1f14127e6891b3f4cfde78
-SHA1 (patch-content_zygote_BUILD.gn) = ad986f664317b3aad302cc318250f94fadba3f81
-SHA1 (patch-content_zygote_zygote__linux.cc) = 646b98e8dd89c4ae6973910726a38bc2c0ff2059
-SHA1 (patch-content_zygote_zygote__main__linux.cc) = f85b4c8e1feeda66f696ea9d0a99f315c09416b3
-SHA1 (patch-device_bluetooth_bluetooth__adapter.cc) = d152aedc1702dc3f0a045ebd7ad2fd6de5c4abed
-SHA1 (patch-device_bluetooth_cast__bluetooth.gni) = 3902e659d5a47f246e01ea3d9c3689d4135fb46a
-SHA1 (patch-device_gamepad_BUILD.gn) = 4af7e4fbfddca7c5975780dafb16784cd0168098
-SHA1 (patch-device_gamepad_gamepad__provider.cc) = 7c541f0118c05bca78fb51d92cd637019c52000f
-SHA1 (patch-device_gamepad_hid__writer__linux.cc) = f84b0c1ec8950241a1a09a97b42ae2adfaa7b1df
-SHA1 (patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc) = 6655c5307ac24118c0101b4e3ae9f7652e7a7350
-SHA1 (patch-extensions_browser_api_management_management__api.cc) = d8cc11b06694a837b88231213133760081bb4ef8
-SHA1 (patch-extensions_browser_api_messaging_message__service.cc) = 2d31cb738ae197ed3a09a85dc73916253b7c1680
-SHA1 (patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc) = 6b115f8b1cc606c470a6df6cc8e8d539b42c98f4
-SHA1 (patch-extensions_common_api___permission__features.json) = fb28f4095e7d0a8938648db62661642cfdd00b98
-SHA1 (patch-extensions_common_api_runtime.json) = 3e3c24939e98771c097f9e7ea8c86e7512a3e8b4
-SHA1 (patch-extensions_common_command.cc) = 6c9949c9f92f23c6d2bf33a43defc989de1c2bf9
-SHA1 (patch-extensions_common_features_feature.cc) = 01acf7c8bcd65dceea7f0c3b3a73e1a1c6a71842
-SHA1 (patch-extensions_renderer_bindings_api__binding__util.cc) = dc833edd2875dbd1998c325149951d7dba76ed19
-SHA1 (patch-extensions_renderer_bindings_argument__spec.cc) = 29a5dab21a99a0570afafd726e531322647ff3ff
-SHA1 (patch-extensions_shell_app_shell__main__delegate.cc) = 1651daf3f3d40cb7c15885672635c261065272e3
-SHA1 (patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc) = 078164db8529543514936faacdeef37b1f17a12c
-SHA1 (patch-extensions_shell_browser_shell__browser__main__parts.cc) = 137a2c8c303c3fdd1ea2c858cf5de1cd52dd5557
-SHA1 (patch-extensions_shell_browser_shell__extensions__api__client.cc) = 7287e8fbb7436054ffdbe59a2a0c42c8582a2f96
-SHA1 (patch-extensions_shell_browser_shell__extensions__api__client.h) = 47187f8f462ba9af35394c171e36a78087487be2
-SHA1 (patch-google__apis_gcm_engine_heartbeat__manager.cc) = ceb9498f0b9d43c69b7970cc51bea18fd96f746d
-SHA1 (patch-gpu_command__buffer_service_dawn__context__provider.cc) = 92049cbbbf5ba48c50222cde442d89c0ec30d9db
-SHA1 (patch-gpu_command__buffer_service_gles2__cmd__decoder.cc) = 16e23cbc36ebc993d1d2fcb585152e76a617c47f
-SHA1 (patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc) = 7c3924b88a06b1cd7ead598bdd9cbe8cb828d12b
-SHA1 (patch-gpu_command__buffer_service_shared__context__state.cc) = 9710d030d2b2ccd5b5a7cd4080613ced190e88b3
-SHA1 (patch-gpu_command__buffer_service_shared__context__state.h) = c01723c233d70c7bbe1e5e7edf9afe338a59515f
-SHA1 (patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc) = 85b5642f1b9a8636a28724a3454f3e748ccdc725
-SHA1 (patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc) = df2974ceb9f5b68d30d28bdfe9fa25dbcecbfac9
-SHA1 (patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc) = 83284907cac8fa992905dc11db7a031ede68e400
-SHA1 (patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc) = b796ebc509672759469b00d55cc59b04cead33c5
-SHA1 (patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc) = 238822bf4b011f975137bf7abb3c269d200cda76
-SHA1 (patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc) = dd1c8458484cda8269a3e9ab6bd3cd6aa7b90975
-SHA1 (patch-gpu_command__buffer_service_webgpu__decoder__impl.cc) = 421bf21232f5cd9a4fabc4b31f0ef0b7e88414b2
-SHA1 (patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc) = 019ec9dfc8f1db126aba0164d9b71b270e0a3938
-SHA1 (patch-gpu_config_gpu__control__list.cc) = b7114acf2c088df5081e104fc62d2686d55ddf4e
-SHA1 (patch-gpu_config_gpu__finch__features.cc) = 341b12dea95b58e69a264f1c3347989141fa3fa4
-SHA1 (patch-gpu_config_gpu__info__collector.cc) = f61dc37b0c493583ad32733e8f6903d8206fb780
-SHA1 (patch-gpu_config_gpu__test__config.cc) = 29c21f0d2c8802a00fbeb56d9044f5796543cbbe
-SHA1 (patch-gpu_ipc_common_gpu__memory__buffer__support.cc) = 6918808b3dd19b8bf8d9e120cfd94214da7e7765
-SHA1 (patch-gpu_ipc_common_gpu__memory__buffer__support.h) = ac8aa17f65c0bdfaff62e6d1a52b5e6b03e3b6f1
-SHA1 (patch-gpu_ipc_service_gpu__init.cc) = a51accffc410dec1fee7d1e182c4ced13fa1b605
-SHA1 (patch-gpu_ipc_service_gpu__memory__buffer__factory.cc) = 7923a9d77833eaf821836810efb6c1bed3a970f8
-SHA1 (patch-gpu_ipc_service_x__util.h) = ae606dc8e128fccd6785de1139cdf18fc1c0259b
-SHA1 (patch-gpu_vulkan_generate__bindings.py) = 8f3f3c182ffdfa8a6cd6552d259699831599abd0
-SHA1 (patch-gpu_vulkan_semaphore__handle.cc) = 4a094dcc70ab8b448582f1ad619777ed0cbbcef0
-SHA1 (patch-gpu_vulkan_vulkan__device__queue.cc) = 1af5e6d53e123fe691ee0ea8f703da11ed18bc16
-SHA1 (patch-gpu_vulkan_vulkan__device__queue.h) = 56abf00976bf8e46c908608f39f808ceb63f2085
-SHA1 (patch-gpu_vulkan_vulkan__function__pointers.cc) = ba86696eaca594e77748d4f6733a4740ac2e7fa2
-SHA1 (patch-gpu_vulkan_vulkan__function__pointers.h) = 12d0a4f58407f17b1381b3bf7d2bf0993e35be2e
-SHA1 (patch-gpu_vulkan_vulkan__image.h) = c642e04264a1b3eb27d03bcb2da4a931395dd7bd
-SHA1 (patch-gpu_vulkan_vulkan__util.cc) = dc3f5918163e0b70c61fcae05e27e78ee56e064e
-SHA1 (patch-headless_BUILD.gn) = f855a198934834bc15cfac9ac0287aa20eafc6ea
-SHA1 (patch-headless_lib_browser_headless__browser__main__parts__posix.cc) = eb4a6ec66612ab8bb93abd6a92eb21c84bf39f38
-SHA1 (patch-headless_lib_browser_headless__content__browser__client.cc) = 013c92e37ca8f318637dc2bcd46b1d1d4e2579da
-SHA1 (patch-headless_lib_browser_headless__content__browser__client.h) = 49ea9e9e21d7afbf2e1b954dd012e34f0e1f72d6
-SHA1 (patch-headless_lib_browser_headless__web__contents__impl.cc) = 7953891834394cc1a80588660d5e067e70140790
-SHA1 (patch-headless_lib_headless__content__main__delegate.cc) = 0eff101525f435aa8c053a8f332b3f3d60c84e27
-SHA1 (patch-ipc_ipc__channel.h) = a8b15ad9974b7eba4e0b2a69fb5a1608e25a4fee
-SHA1 (patch-ipc_ipc__channel__common.cc) = a7bd65b7b112e902d1ba446efd09adde79b7bf98
-SHA1 (patch-ipc_ipc__channel__mojo.cc) = b1023c67881e018d1256b2796fd6bfd1c30f7395
-SHA1 (patch-ipc_ipc__message__utils.cc) = 4ad7ec0681e2fa6176d346bd94ab9e21fa18df25
-SHA1 (patch-ipc_ipc__message__utils.h) = f86af06e434ef5e28f80863a7a3d8b0e00978da5
-SHA1 (patch-media_BUILD.gn) = 4d3d698a483ff305c6987f8a20d34b76889f1a29
-SHA1 (patch-media_audio_BUILD.gn) = 9452d159f4689a48ba44cb5e4b3d447d456c3035
-SHA1 (patch-media_audio_alsa_audio__manager__alsa.cc) = a092dd963f3c7df6b2aa3f03bd2a0e6a7743eb73
-SHA1 (patch-media_audio_audio__input__device.cc) = decc1c3a70e89faf9864df5dcd59fa6d9ad43850
-SHA1 (patch-media_audio_audio__output__proxy__unittest.cc) = 0467ed48ce5fab8259c2567b9ff7229d0d4709a6
-SHA1 (patch-media_audio_pulse_pulse__util.cc) = f27cc903343696ce30756a11b9598f9ca33a0172
-SHA1 (patch-media_audio_sndio_audio__manager__sndio.cc) = 440988c5d976e13738d325a969bd7eeb13e32bd1
-SHA1 (patch-media_audio_sndio_audio__manager__sndio.h) = 066807dbaf6c447b7d708c5b77c78658ee1bcaf7
-SHA1 (patch-media_audio_sndio_sndio__input.cc) = c69121542bff3e078134a25e71cd0768fb9c791b
-SHA1 (patch-media_audio_sndio_sndio__input.h) = 7a8ae41fef8cea6952c33e172b898efedd2a2a9b
-SHA1 (patch-media_audio_sndio_sndio__output.cc) = 4d1727cae67e2d0fb377741d3f0f7ed777f2ac76
-SHA1 (patch-media_audio_sndio_sndio__output.h) = 78ad37daec2cc42b76ee46032918aafb037efbd7
-SHA1 (patch-media_base_audio__latency.cc) = 6d72d56dd0fe85cb65cb037e4dd3c22f51b7f784
-SHA1 (patch-media_base_libaom__thread__wrapper.cc) = 3ed51fdd1084d1061c2bd54d494960fbc1a11768
-SHA1 (patch-media_base_libvpx__thread__wrapper.cc) = d420b2f7ef53386a59186165aad0d110ec992dcc
-SHA1 (patch-media_base_media__switches.cc) = 0e4687024afa729ed88717fd77625e39edc5d04e
-SHA1 (patch-media_base_media__switches.h) = 2331fafb08f901f34f6f8bedc1e29390be80458d
-SHA1 (patch-media_base_video__frame.cc) = e1f12d536bafaa8200ba9e2676a9ea266413006c
-SHA1 (patch-media_base_video__frame.h) = e66d717eacd359d0d5a1021cd68e77b4be8eb4f2
-SHA1 (patch-media_capture_video_create__video__capture__device__factory.cc) = f948eb493992c6cd32f07aa8f9aafa184d0b0748
-SHA1 (patch-media_capture_video_fake__video__capture__device__factory.cc) = 92037370b1aa5b6b517fd01aad3c7d37af652849
-SHA1 (patch-media_capture_video_file__video__capture__device__factory.cc) = bb41178e3100f4a18cb715b03d961a45456f88eb
-SHA1 (patch-media_capture_video_linux_fake__v4l2__impl.cc) = ef6eb582cc71d0cc27619f061432a52a5c24d323
-SHA1 (patch-media_capture_video_linux_fake__v4l2__impl.h) = 1b2a37188ff8f03159d6325f0a5babede27c7ba5
-SHA1 (patch-media_capture_video_linux_v4l2__capture__delegate.cc) = 7cd7155ca8884591c70e54d4a07b65b9bf6983a7
-SHA1 (patch-media_capture_video_linux_v4l2__capture__delegate.h) = d75b2520d4de23a4151a768423f1b350e05ffaae
-SHA1 (patch-media_capture_video_linux_v4l2__capture__device.h) = 9444316ef41f662c4c59ba751e5f7098de14dc9d
-SHA1 (patch-media_capture_video_linux_v4l2__capture__device__impl.cc) = f7eeb7c9d20965cd8fa707510e675da4e64df4d0
-SHA1 (patch-media_capture_video_linux_v4l2__capture__device__impl.h) = 5d8324c3d3b7c251b6cd20dcbcff0ab648aa5148
-SHA1 (patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc) = ba00109a607d58f77b628a7e0d0a5d89c43abcea
-SHA1 (patch-media_capture_video_linux_video__capture__device__factory__v4l2.h) = ab15d4d46397a233694c835087f0b1ddfc8a6a27
-SHA1 (patch-media_capture_video_linux_video__capture__device__linux.cc) = 5743bc037118f0014db4c9e6cc7bedaa68e2a475
-SHA1 (patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc) = 0d80316077ea35f362429298919ef09ff052ba46
-SHA1 (patch-media_capture_video_video__capture__device__client.cc) = 4ce8cc5b6dd45490ce9e0664aa5b542364e5d728
-SHA1 (patch-media_cdm_cdm__paths__unittest.cc) = 8ec11c55bae53f0b2e349d53060967f82c41424e
-SHA1 (patch-media_cdm_library__cdm_cdm__paths.gni) = 3bc0d9b596dcad955d92db998717c5fbd479f428
-SHA1 (patch-media_ffmpeg_scripts_build__ffmpeg.py) = 55036ff5194b84ce71f7d99eb852b63ca759762c
-SHA1 (patch-media_ffmpeg_scripts_robo__lib_config.py) = f0fbee6b0c558a80eaa95ef929cad0687676d91b
-SHA1 (patch-media_gpu_chromeos_gl__image__processor__backend.cc) = 7d8ed103ffdd42cd5a88247ae52bc8f4d21e947f
-SHA1 (patch-media_gpu_chromeos_libyuv__image__processor__backend.cc) = 3011b417276c2061dd1055e1e0731768eae08e37
-SHA1 (patch-media_gpu_chromeos_mailbox__video__frame__converter.cc) = 5c61af674a450d33608728a47a26f55295860c43
-SHA1 (patch-media_gpu_chromeos_platform__video__frame__utils.cc) = e328d77238fd8546d19547bca90ebc03b6a40157
-SHA1 (patch-media_gpu_chromeos_video__decoder__pipeline.cc) = 3f055900ee5fe822bb9e031c59cb6f80f7df8701
-SHA1 (patch-media_gpu_gpu__video__decode__accelerator__factory.cc) = 49cec0ffd49721bbb5e97fabd44cdc14de07a2a2
-SHA1 (patch-media_gpu_gpu__video__encode__accelerator__factory.cc) = f483601bdf8b62795045607262a9076256ddc156
-SHA1 (patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc) = 82f1b42e094abe02d8aedbcd6d55146b87b45ca3
-SHA1 (patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h) = 9a1cc172ce51308cf705e29e1149b57ddce3afa0
-SHA1 (patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc) = d240397d6768cd1deaff9e22bf382291287b7323
-SHA1 (patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h) = ca9a367ade49bd0dbd8e746a81d9a98aec2607e6
-SHA1 (patch-media_gpu_test_raw__video.cc) = 0ccf734c595273a67473cbfa148e465e377c119e
-SHA1 (patch-media_gpu_test_video__frame__file__writer.cc) = 9afd7082098ea928d26b30f0ca7c2551347afc7c
-SHA1 (patch-media_gpu_test_video__frame__helpers.cc) = 82fc682c4f07793b7bcfa069d6b39c0e89c57f61
-SHA1 (patch-media_gpu_test_video__frame__validator.cc) = 337ab14d480d1ad2d04be62a50ac548cbb54f79d
-SHA1 (patch-media_gpu_vaapi_vaapi__video__decoder.cc) = 7eb79e7f8f9d4c90dc830e3b9048023b61943867
-SHA1 (patch-media_gpu_vaapi_vaapi__wrapper.cc) = 12b4d2bd5b8cd9a6bf8a2c80a7f618853c7a4cfe
-SHA1 (patch-media_media__options.gni) = 5da032de2589f29286291653164a0e930a7395a4
-SHA1 (patch-media_mojo_mojom_BUILD.gn) = 70bfd273a2e44c17e847bad9802fd906cc42f5a3
-SHA1 (patch-media_mojo_mojom_video__frame__mojom__traits.cc) = 47998e69020797ff995b4102d5e896a92e32bf16
-SHA1 (patch-media_mojo_mojom_video__frame__mojom__traits.h) = 67e0a32ae92ccf4d623b454bbec5b973b9553249
-SHA1 (patch-media_video_fake__gpu__memory__buffer.cc) = 7d5ef4fc73515b9a38979399db08c527a132f8e9
-SHA1 (patch-media_video_fake__gpu__memory__buffer.h) = f71689a3e37b5f5b0bc3c299441457a6ceca8915
-SHA1 (patch-media_video_gpu__memory__buffer__video__frame__pool.cc) = 956bbdf209090f3a6a1c15d4d6753155d1306e6b
-SHA1 (patch-media_video_video__encode__accelerator__adapter.cc) = 27339cc07b8f5c0d134ff0257f61be8e3c052804
-SHA1 (patch-media_video_video__encode__accelerator__adapter__test.cc) = 023fe50d12b7858d9497355681090967a3772af4
-SHA1 (patch-media_webrtc_audio__processor.cc) = 991967a089e2e9dc667e76dd97ea5cf486784b58
-SHA1 (patch-media_webrtc_helpers.cc) = 691bb69378d207de72827e36bc64c42708366c25
-SHA1 (patch-media_webrtc_helpers__unittests.cc) = fac9f77698f1b910e84847a9f1d1c3e51168b1b5
-SHA1 (patch-mojo_core_BUILD.gn) = d6df268baa14e5f679383c329c306b713e56c917
-SHA1 (patch-mojo_core_channel.cc) = e10ce315c7999987e57c3af4b080684a1dfde7e8
-SHA1 (patch-mojo_core_embedder_features.h) = af999c4104e5a46c2459bc09c851cf69cc145882
-SHA1 (patch-mojo_public_cpp_platform_socket__utils__posix.cc) = fce1612335f6a57b283758bbda3f4a3c24650072
-SHA1 (patch-mojo_public_tools_bindings_mojom.gni) = 501864a1157cb79f442b253cbd4afd48b8bbabcf
-SHA1 (patch-net_BUILD.gn) = ff62ed7c0a1b3af16c1bd0c0ab4a4356959bf613
-SHA1 (patch-net_base_features.cc) = d5394e42f2f482675c540c3085a4e4fbb3a40cac
-SHA1 (patch-net_base_network__change__notifier.cc) = 1e218292f03c1278964f27553e13544caa8bed0c
-SHA1 (patch-net_base_network__change__notifier.h) = c83056c666a3c0cceadffacc452097b218f763a6
-SHA1 (patch-net_base_network__change__notifier__passive.cc) = 8eb02127d30ea40994acf9a6279985b09f1fbe8d
-SHA1 (patch-net_base_network__interfaces__posix.h) = cb96ab047ed4cec5e8cff916b9bf8faa9e8628fc
-SHA1 (patch-net_base_sockaddr__util__posix.cc) = 7a1c396263d91bfda4438137f819897dd0331a26
-SHA1 (patch-net_base_sockaddr__util__posix__unittest.cc) = a704d56d76d6fc85b2ddf825750639a5d359de2d
-SHA1 (patch-net_cert_cert__verify__proc.h) = b870d13fca3f1b4e6288628e6df0d4be251904b2
-SHA1 (patch-net_disk__cache_backend__experiment.h) = 4b5f6b2939deb8100fd95540030cf8da50ea104b
-SHA1 (patch-net_disk__cache_simple_simple__file__tracker.cc) = 3290234bac4dc14e059b820f3b6de93a2c8fc8f8
-SHA1 (patch-net_dns_BUILD.gn) = b53d4026d390854215b00b38825f2df10fc1d453
-SHA1 (patch-net_dns_address__info.cc) = bd8024079316e1061f7ae25f98a0caf2e0c8a05e
-SHA1 (patch-net_dns_address__sorter__posix.cc) = 5621f9b3a7ec602a0b43072991e375b131474c44
-SHA1 (patch-net_dns_dns__config__service__posix.cc) = 2df7968519dede845e50b17fad1966917c817d6e
-SHA1 (patch-net_dns_dns__reloader.cc) = dab2f5551d878385dc546a0213de7fe7acdcb85d
-SHA1 (patch-net_dns_dns__util.cc) = ce44b3b3d95ba31e21f97e94d10c9f88ccff76ff
-SHA1 (patch-net_dns_host__resolver__proc.cc) = edeaf9bd72cb347f82bde1c0908904b402921220
-SHA1 (patch-net_dns_public_BUILD.gn) = bc8025e1b67c18f6846abe6be270da2117877228
-SHA1 (patch-net_dns_public_resolv__reader.cc) = e52a372ad300d26e29615b6e6b41403b91f2acae
-SHA1 (patch-net_dns_public_resolv__reader.h) = e821f5687b3e70d79176dae8aa1a6bc88b422695
-SHA1 (patch-net_dns_public_scoped__res__state.cc) = dcbbdb770fa9d832133ad5d5174526eea7a4c663
-SHA1 (patch-net_dns_public_scoped__res__state.h) = 2564c63818f9a5080d9e9f03aedfd060612b14e6
-SHA1 (patch-net_filter_zstd__source__stream.cc) = a3c3e4a1de9b9d8d78117cfd5a16535b0a0ba0ed
-SHA1 (patch-net_http_http__auth__gssapi__posix.cc) = 1b3b7a99064290138271e34f17f1703aecf992ed
-SHA1 (patch-net_http_http__auth__gssapi__posix.h) = ea467deee84412877e6f52fb5e918ca889a7bfb6
-SHA1 (patch-net_http_http__auth__handler__negotiate.cc) = 6e022d557bd040c3f30b76e68a094c5ff1b0bb8a
-SHA1 (patch-net_http_http__auth__preferences.cc) = 0a3bc10b290e7a17b3a6235ca0912459d9b8694f
-SHA1 (patch-net_http_http__auth__preferences.h) = 4e575727cdf3f6b27671aaa762c42a4359a1a8c3
-SHA1 (patch-net_http_http__network__session.cc) = 592ab9ac1047519714f9cf96bb4f5c5c844c6583
-SHA1 (patch-net_proxy__resolution_proxy__config__service.cc) = cd2b85f6055a90675f0d0b795e81c035b6a9d01d
-SHA1 (patch-net_proxy__resolution_proxy__config__service__linux.cc) = afbcd001c103257af0813c7dbb35f8f5a0f76066
-SHA1 (patch-net_quic_quic__network__transaction__unittest.cc) = abfa8ba876884760fabea9b5daa99e6b86c9b9ff
-SHA1 (patch-net_socket_socks5__client__socket.cc) = 0052c2f31b1da80335d935a19fd3d3c9c323242f
-SHA1 (patch-net_socket_tcp__socket__posix.cc) = 71b9b3078dddf1a2a753a9df692ef78b04ab0c8a
-SHA1 (patch-net_socket_udp__socket__posix.cc) = 191f00ef42515f9643ae3815f1469bd3ad91564d
-SHA1 (patch-net_socket_udp__socket__unittest.cc) = c3319faa02f81dabd35ff152689307fa23827528
-SHA1 (patch-net_third__party_quiche_BUILD.gn) = ec37e7b8b6d528759985e40339a039ec8b41f6aa
-SHA1 (patch-net_tools_cert__verify__tool_cert__verify__tool.cc) = e55c9e99e6b63d17502be450d7fda426adc7a86c
-SHA1 (patch-net_tools_net__watcher_net__watcher.cc) = 5fb4c6d29d95294c7d526ff1021dbf101094818d
-SHA1 (patch-net_traffic__annotation_network__traffic__annotation.h) = d1b660d246726986ac227f442fc5f709a374b389
-SHA1 (patch-net_url__request_url__request__context.cc) = e5e61983f9cea7904a5883698dfe0b9422422030
-SHA1 (patch-net_url__request_url__request__context.h) = a67aadd075c2487d6a10c23c7bb39da86c578900
-SHA1 (patch-net_url__request_url__request__context__builder.cc) = e43618364c408b7a5e017c83ee9749facbfde57e
-SHA1 (patch-net_websockets_websocket__basic__stream__adapters__test.cc) = 32ba80ccc126b089c240be823eae9bfe19eb0159
-SHA1 (patch-pdf_pdfium_pdfium__engine.cc) = e9b4459fabe637fe2a587a8379c7baca3dc3a0b5
-SHA1 (patch-ppapi_tests_test__utils.h) = 588f9a769488ec5f802f812870bd3c1aec347b81
-SHA1 (patch-printing_backend_cups__ipp__helper.cc) = 636ef6174b8e168120155126246820b25fabe7ec
-SHA1 (patch-printing_backend_print__backend__cups.cc) = 99ddb92f09e789cdc240c40b5020b8a58c663415
-SHA1 (patch-printing_mojom_printing__context__mojom__traits.cc) = 6d41c2d6cf803ae1eeaee158f4a31f4bcb18a14f
-SHA1 (patch-printing_mojom_printing__context__mojom__traits.h) = c0dd9f1f2422fae7b6f17ad1d4e142a47dd6179d
-SHA1 (patch-printing_mojom_printing__context__mojom__traits__unittest.cc) = 15dbec43c6db6bb590cd8ac2bf0568eb876b3dbb
-SHA1 (patch-printing_print__settings.cc) = 63ebc0509f54842eab7640a16e2eba2735e41627
-SHA1 (patch-printing_print__settings.h) = 4c1885201b327fbd6de7c9aba82954245cb94556
-SHA1 (patch-printing_print__settings__conversion.cc) = 6f430bc1c5260f6dfbcabd460ddce19a5038b454
-SHA1 (patch-printing_printing__context__linux.cc) = d44edccf97b1b3e3a18cc1221198f9b5c8749f95
-SHA1 (patch-printing_printing__features.cc) = 327786a418981b96e542c6efcc06c264cd4a4040
-SHA1 (patch-printing_printing__features.h) = c6262fe61db5670fe716e86c793904caa5879455
-SHA1 (patch-printing_sandbox_print__backend__sandbox__hook__linux.cc) = 3a57e64598e8d5f71d9c51598b630c02f5181483
-SHA1 (patch-printing_sandbox_print__backend__sandbox__hook__linux.h) = a4adaee3a9de86e3bf24ab004bd4edeb660bfde7
-SHA1 (patch-remoting_base_chromoting__event.cc) = 065922b7d12c3e2a8c4248f02e831fd8dd970e66
-SHA1 (patch-remoting_base_host__settings.cc) = 12650326e561369984f6209a94954ddfb1573bae
-SHA1 (patch-remoting_codec_webrtc__video__encoder__vpx.cc) = 2d3cbe22ab5fef0d4b2b4548c78150b0aad46214
-SHA1 (patch-remoting_host_base_desktop__environment__options.cc) = e7227008ef1eebd81289f3ef1cbfcac45bd2b7e5
-SHA1 (patch-remoting_host_base_switches.cc) = b4c662c43fb1d32ef2606121ebf1318043dccb15
-SHA1 (patch-remoting_host_base_switches.h) = f639bd088c7d901300b11a851748ec8bd5b374e1
-SHA1 (patch-remoting_host_chromoting__host.cc) = 475d366571d3a9c642063df6708c8f8d766d369a
-SHA1 (patch-remoting_host_chromoting__host.h) = c88fb6fcfe1d4263018c84dc0df0da64b2c2d2d9
-SHA1 (patch-remoting_host_chromoting__host__context.cc) = 9089212c815b502d331171d4a0d773e5ed888d16
-SHA1 (patch-remoting_host_chromoting__host__services__client.cc) = 0294a91371a6cebd15df9b91f90a970c4fe7ffd1
-SHA1 (patch-remoting_host_client__session.cc) = c5820a22603e0230f0da146052af51351be02bc0
-SHA1 (patch-remoting_host_crash_crash__file__uploader.cc) = c31c5996d404b74881042a0fdc14f4e5cf68ef37
-SHA1 (patch-remoting_host_evaluate__capability.cc) = 96704a43024d86ed65229ed477335b3962beae64
-SHA1 (patch-remoting_host_host__attributes.cc) = 3c850c788f56044cc9a167b9d3ab8b2508bee26b
-SHA1 (patch-remoting_host_host__details.cc) = e89e2f08fbbd197eef19adbf7ba904ecf8cdd741
-SHA1 (patch-remoting_host_host__main.cc) = afedb4b2075f7464c2a3babf0a861e2317409053
-SHA1 (patch-remoting_host_ipc__constants.cc) = ccdfd648e75049d6e1c23beb3e7dea5b2b465137
-SHA1 (patch-remoting_host_it2me_it2me__native__messaging__host__main.cc) = e4cc495edea185e4b7cfbe38da5d0c74b2c2be00
-SHA1 (patch-remoting_host_me2me__desktop__environment.cc) = fc62cbd7edd87a17ec226aad35f3e8984131191d
-SHA1 (patch-remoting_host_mojo__caller__security__checker.cc) = 199b5cbd25c241380495b843e90651d9129cf197
-SHA1 (patch-remoting_host_policy__watcher.cc) = 4f39b78c38a589b58532e40bc32528ab1f8c3f32
-SHA1 (patch-remoting_host_remote__open__url_remote__open__url__client.cc) = 45efaa223c6d5f113fb68007495edb0184a71799
-SHA1 (patch-remoting_host_remote__open__url_remote__open__url__util.cc) = 27cd965a6bc17e8fee89eedcaafa469c2ce4f3a4
-SHA1 (patch-remoting_host_remote__open__url_url__forwarder__configurator.cc) = b23f0b707a596d3775dd34cda6b0e49162184964
-SHA1 (patch-remoting_host_remoting__me2me__host.cc) = 554aa46370688e4c21c3c017a5289c4cd55736b2
-SHA1 (patch-remoting_host_session__policies__from__dict.cc) = ac6cd4f315682e30a9d5725fe3d8e6602be0b317
-SHA1 (patch-remoting_host_setup_start__host__main.cc) = 4ffa637d08d135d7bf2d9ae0dec61b2dc2dbed2b
-SHA1 (patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc) = ab231be3e1338de472a770f442614d978e383203
-SHA1 (patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc) = 56b2ddd307f296a3648dd0d65b57691e64aa3881
-SHA1 (patch-remoting_protocol_webrtc__video__stream.cc) = 6809e94e551cdebcaace3dd53e56de32b41ecbad
-SHA1 (patch-remoting_signaling_ftl__host__device__id__provider.cc) = 2c6af0d42121ba14119ede1a84d57ba03518cebb
-SHA1 (patch-sandbox_BUILD.gn) = e79ee49b34a5b38b2e8aac390ca39b93920bd8e9
-SHA1 (patch-sandbox_features.gni) = abc0112d0c676c80684ce1bff45cd148e4b92450
-SHA1 (patch-sandbox_linux_BUILD.gn) = c7f579074bcf8b499286d1ccbf9f73e6cfe99ab5
-SHA1 (patch-sandbox_linux_services_init__process__reaper.cc) = 12979691c1f87e3ee1334b355ccf6ead9c785747
-SHA1 (patch-sandbox_linux_services_libc__interceptor.cc) = 4383d771e4c6cd3cf75f96ac313c3c81116ae3c2
-SHA1 (patch-sandbox_policy_BUILD.gn) = 2b551b366aa2d52c82777be688dc714ba8cb5206
-SHA1 (patch-sandbox_policy_features.cc) = 38c2397707b30403115b8196ac7ef0507c71c5b4
-SHA1 (patch-sandbox_policy_freebsd_sandbox__freebsd.cc) = 03682fd78006ef325e1a098b70e3f2bd9fcd4b15
-SHA1 (patch-sandbox_policy_freebsd_sandbox__freebsd.h) = 5fbd49514d83865b70cd270aa8ea70108d076502
-SHA1 (patch-sandbox_policy_mojom_sandbox.mojom) = d011c0e291e4e27b4e8cdc003441b79dfeba774b
-SHA1 (patch-sandbox_policy_netbsd_sandbox__netbsd.cc) = 87de1b29847001f83404c57d94ff40fa4f86d23b
-SHA1 (patch-sandbox_policy_netbsd_sandbox__netbsd.h) = a778bfa1811861943216373ec06f0e6c17ea5c47
-SHA1 (patch-sandbox_policy_openbsd_sandbox__openbsd.cc) = 6479494b919175bb4b3e0d56cf2698e755e9aa36
-SHA1 (patch-sandbox_policy_openbsd_sandbox__openbsd.h) = 18c1c732d7eda2f23d6564b5e57463d24cbfeee2
-SHA1 (patch-sandbox_policy_sandbox.cc) = 8ad3ea4ff2a0a5e8b69b60ebcb1f4ce859eda6ce
-SHA1 (patch-sandbox_policy_sandbox.h) = c5bf01676810c123ea02b7bff42fdf7983d2a566
-SHA1 (patch-sandbox_policy_sandbox__type.cc) = 22b5ed42b888a16c805b1ac5b9ab7b60a4fc8ecf
-SHA1 (patch-sandbox_policy_switches.cc) = c7f7220157be68f0b90c3ce4362583ee480e13d2
-SHA1 (patch-sandbox_policy_switches.h) = 07f5651831310a62028ebcd40a17d0f2370184ae
-SHA1 (patch-services_audio_audio__sandbox__hook__linux.cc) = 7d3ad9748b3ba69b185615d2fda879bea4945d1e
-SHA1 (patch-services_audio_audio__sandbox__hook__linux.h) = ce32eca8297b2c1433e38af0b6de19850429f123
-SHA1 (patch-services_device_BUILD.gn) = 079d4ac0327b8c44b26226f8f802da64a778cfe6
-SHA1 (patch-services_device_geolocation_location__provider__manager.cc) = 6379331196dd174b762d014e930d47ef8adb54d5
-SHA1 (patch-services_device_hid_BUILD.gn) = 72438923336d4ea02f77e01291c4eceee1981849
-SHA1 (patch-services_device_hid_hid__connection__fido.cc) = c972a27210bf8de257e45a80d750e5911b57bfb3
-SHA1 (patch-services_device_hid_hid__connection__fido.h) = 9c5eed37276a27728b9638588f1ca317603b5234
-SHA1 (patch-services_device_hid_hid__connection__freebsd.cc) = e49c2871880ccc5a1823459d7c82069b09520dba
-SHA1 (patch-services_device_hid_hid__connection__freebsd.h) = 3043a880bce930c9cc849e5858e1b2ae32b16d99
-SHA1 (patch-services_device_hid_hid__service.cc) = b3523f7d3f963e6425e55d3a391e1445233603aa
-SHA1 (patch-services_device_hid_hid__service__fido.cc) = 21aa0f05c48e02af49ed54cb28f7037c04fd443d
-SHA1 (patch-services_device_hid_hid__service__fido.h) = 717958f4b1cb1d63b0630b1637890d9e5565a379
-SHA1 (patch-services_device_hid_hid__service__freebsd.cc) = efe99608278cc902e509be7e7dbd50f2dbdf3009
-SHA1 (patch-services_device_hid_hid__service__freebsd.h) = ea0a034ed28e1ecf2ed819a2653cbd19072cfb74
-SHA1 (patch-services_device_hid_hid__service__netbsd.cc) = 93feb3b5e59cbd8ce88aa2f44810c124019e013a
-SHA1 (patch-services_device_hid_hid__service__netbsd.h) = 8354d3b9bce21fdd30cb8ec448af43c8c98cef38
-SHA1 (patch-services_device_public_cpp_device__features.cc) = 07201949acb718d1b313a3c71fa25ebc62dd32dd
-SHA1 (patch-services_device_public_cpp_device__features.h) = 88b0936675687926051b1074c91f411042cafcbf
-SHA1 (patch-services_device_public_cpp_generic__sensor_sensor__reading.h) = c9344a7943a7c87d81423154dd33f7c2abc8e357
-SHA1 (patch-services_device_public_mojom_BUILD.gn) = 4018f56db9cc36b65e15f9837de970d9683712c4
-SHA1 (patch-services_device_serial_BUILD.gn) = 0f1dc190319733c5c1154ea225184da1202b8c38
-SHA1 (patch-services_device_serial_serial__device__enumerator.cc) = 22131216fa2b060fadd05d5d9c84128b1ce7fdd3
-SHA1 (patch-services_device_serial_serial__io__handler__posix.cc) = cc4e1cae2e7014b778e4eeb8afc633089d366689
-SHA1 (patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc) = d3524b5018bffb9cd7cfc6a2a6543c0d914d82f3
-SHA1 (patch-services_device_usb_BUILD.gn) = 22fb76613158fafcf131cdcd2e3ba353996a2c33
-SHA1 (patch-services_device_usb_usb__device__handle__usbfs.cc) = 88d83d55a3fdc746acaaa7cc823d27cfe3d03059
-SHA1 (patch-services_device_usb_usb__device__handle__usbfs.h) = 9a11309553166a3030368fd448d7d9a5311d0cfa
-SHA1 (patch-services_device_usb_usb__service.cc) = 843f0463da5df9163c7505ffc327439312d72b2b
-SHA1 (patch-services_device_usb_usb__service__fake.cc) = 3a86aa36b05b2a23a79adaa12054d57e8675608d
-SHA1 (patch-services_device_usb_usb__service__fake.h) = 93f1377580eae12b093c964da26cee8b8e1cc77f
-SHA1 (patch-services_network_BUILD.gn) = 7d79ca26dd570b7f01c7aeb6e7645b1d438b1ed3
-SHA1 (patch-services_network_network__context.cc) = 85f8466ddbcb715e1c98897928dda3d6e417660a
-SHA1 (patch-services_network_network__context.h) = f97f5a3730057cb12394032bb26d3ad3b38d4d8f
-SHA1 (patch-services_network_network__sandbox__hook__linux.cc) = 4b2cfa3150048d7d897ba57870e2094a975791f4
-SHA1 (patch-services_network_network__sandbox__hook__linux.h) = f0949dea5d6dd392bd9d6dd86e4adf0d9d4f0889
-SHA1 (patch-services_network_network__service.cc) = 80cef8f2b31bdb04739bd1a7493803271cca30cd
-SHA1 (patch-services_network_network__service.h) = 7b112aca46cceb8fc36bb79da887c78c4c69618a
-SHA1 (patch-services_network_public_cpp_BUILD.gn) = 3f46b035492e33f50dc5259afd8c7cf0c37d0dff
-SHA1 (patch-services_network_public_cpp_features.cc) = 88a93bcbf1543ea2ba2797d2d6e232009310d71a
-SHA1 (patch-services_network_public_mojom_BUILD.gn) = 80bdafb2c4d80125f7c405f1e1d79aa8f90d17e7
-SHA1 (patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h) = dbb4bc390f10ef565153416a6fa0a42535b8ab55
-SHA1 (patch-services_on__device__model_on__device__model__service.h) = 6ea2e5d78152f8958b25328b7c6232d6e3421552
-SHA1 (patch-services_on__device__model_pre__sandbox__init.cc) = 7fdb28a6f48a3c2b91c2943809b6637ec53cc0df
-SHA1 (patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc) = 87291cf601299598d77fc64776368e7394e805f5
-SHA1 (patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn) = b8f5e884376f6c779d31d5c48e1c6709410be306
-SHA1 (patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h) = 797443a50c0eb9a1ddbb3b1f4fb8f6938987d184
-SHA1 (patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc) = 0a3a21dee450da4372720ad5ba8bb3f9ff7b2c2d
-SHA1 (patch-services_screen__ai_public_cpp_utilities.cc) = a8801045596dc78ae8ac66b219fbff56f0eabcd5
-SHA1 (patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc) = cbddceeff79b3c4d4c61caeb8c7b841fdb9a8f4f
-SHA1 (patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h) = f3f2eb201718c6f6e1a697e0ef075d79eb262e8e
-SHA1 (patch-services_service__manager_BUILD.gn) = cfecb44aa5db30d771e2e3a5312022220e59e18c
-SHA1 (patch-services_service__manager_public_cpp_service__executable_BUILD.gn) = 7d7ec7d20091b743852ee92e09cfbf931347ea8a
-SHA1 (patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc) = da05881186f87e959a84fc05aec1814dcc62ba1f
-SHA1 (patch-services_tracing_public_cpp_system__metrics__sampler.cc) = 2a362b0b1c807809bfac3b4c70074a59a76ac6d7
-SHA1 (patch-services_video__capture_public_mojom_video__capture__service.mojom) = 035bb1d733cfd20309d7f5bec77dd5029c76f972
-SHA1 (patch-services_video__effects_video__effects__sandbox__hook__linux.cc) = d80802e9ea53a8476690ea62bf02b2fd30758770
-SHA1 (patch-services_video__effects_video__effects__sandbox__hook__linux.h) = a68da27c0a67ee73447c09a2414d79d1686a3b11
-SHA1 (patch-services_viz_public_mojom_BUILD.gn) = 2a1991cab7b4d1be67c3045fdb0abfa2fce56481
-SHA1 (patch-skia_ext_SkMemory__new__handler.cpp) = e7e21085f2e5838b68d1ca0e2b70e496accb533c
-SHA1 (patch-skia_ext_font__utils.cc) = ce269db28ae2ec962cb86d16e8456cac11248a19
-SHA1 (patch-skia_ext_skcolorspace__trfn.cc) = 0d9fb879bdb21f3d50df84f50bbccb8a7f4f0e89
-SHA1 (patch-third__party_abseil-cpp_absl_base_config.h) = 2acd9d7c8146a9bb1576e89e4c1b532e6f2fc78e
-SHA1 (patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc) = fb38300b615c951058a90cda8d78a51a762a0fe7
-SHA1 (patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc) = bce54cfddd10fd8d57cb4ff93e1901643a0717f3
-SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h) = ee6dbb7cb6628708be9279be1a6d701b61e7141a
-SHA1 (patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc) = d58fa34f15ec1a14e7a538d7c638a815dbfa604e
-SHA1 (patch-third__party_afl_src_afl-fuzz.c) = 44b79352e40ca022c61ff79dc23b81d2b387ee07
-SHA1 (patch-third__party_angle_BUILD.gn) = f1075edf5eb14137cf8bbd0c052c61e209434323
-SHA1 (patch-third__party_angle_src_common_platform.h) = 47913f99db34f4ca07aa8e493286669e1aa47e33
-SHA1 (patch-third__party_angle_src_common_platform__helpers.h) = ab9397338c12f9171157085a1d6c4c4eae1152a8
-SHA1 (patch-third__party_angle_src_common_system__utils.cpp) = 6cd41a5fcc1eb06554c69594e4b5dcddbf111583
-SHA1 (patch-third__party_angle_src_common_system__utils__linux.cpp) = 79544b0cf4f81dd0881b6887d5365790ead0b75a
-SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h) = 49bbf047eff6cb3ed5edc6347afb7b34c9e874d2
-SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp) = 9c2f5f590771af9b4913ecc45bb3abafb28b5d16
-SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp) = 3fce316d8dbb298be8c7d699e2153e6b5180376a
-SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp) = 0d26a44993fb4b009fffbb2db65e11bd2dc11e41
-SHA1 (patch-third__party_angle_src_libANGLE_Display.cpp) = 41425adc78e480f96f30fd69bc5642f6eabf1c80
-SHA1 (patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp) = 0977375effd871b73607b26c9ec6b187bee3e421
-SHA1 (patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h) = 1a52b8d8376e817b44e2ab7437fb7741d9b7f1be
-SHA1 (patch-third__party_angle_util_BUILD.gn) = 61bc51ccc1ba0a25d5c0aa7de0972e3dd3e0c37d
-SHA1 (patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc) = 51ec15c0f559fcfa3b635d6f526778fa7e03a135
-SHA1 (patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h) = 92c706584965f27cda2ca8ce90b82c02a2e5d6a7
-SHA1 (patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h) = 9cbc4601e326af3d4b8935e450f55b3c39efc604
-SHA1 (patch-third__party_blink_public_platform_platform.h) = f42b7af16d2a97054e6e370c63c9f13f2b6bddbd
-SHA1 (patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py) = 22e9f92d1fb87274c1e7f2d9bcec6a4fad22c47a
-SHA1 (patch-third__party_blink_renderer_build_scripts_gperf.py) = 5f640f176dd9df422891d50bd101e6b69a43c8b3
-SHA1 (patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py) = c56a12d9ccff6164a09c4e1263bc3f890692ee9a
-SHA1 (patch-third__party_blink_renderer_controller_blink__initializer.cc) = 6bd6f4c27fe337eee1241088115e447baceb270a
-SHA1 (patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc) = e19e3cbe115cf99060cd41a520fb25e511d252a4
-SHA1 (patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h) = d0dbb0e6f87b952a947411b86bf9772841d70d14
-SHA1 (patch-third__party_blink_renderer_core_editing_editing__behavior.cc) = 915413f6509c551d399af25f36fedd3bf6d0e627
-SHA1 (patch-third__party_blink_renderer_core_execution__context_navigator__base.cc) = a3e08d699e4be73ad68f334c45a5304c0f0252f3
-SHA1 (patch-third__party_blink_renderer_core_exported_web__view__impl.cc) = 50fccd5ff69513f3e8516daa163e559d1dad0387
-SHA1 (patch-third__party_blink_renderer_core_frame_web__frame__test.cc) = 0b19098793791d71c607ee2979a0c1bdb750bd6e
-SHA1 (patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc) = 7d4f413138f9e1405dd9a4774786d9b842f590e8
-SHA1 (patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc) = f7efff127ac4cafe9d11581790237fed1c1ba9a8
-SHA1 (patch-third__party_blink_renderer_core_layout_layout__view.cc) = 779dcf800c4af22c233a69e12803ce77c9e44647
-SHA1 (patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc) = ad37b02e7d3c7674612515e06b9f09328caaf715
-SHA1 (patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc) = 481adcb9a921c4ef0e1de52713db09e418e4f877
-SHA1 (patch-third__party_blink_renderer_core_page_context__menu__controller.cc) = 968d94397b9c14e0cef8752f43e9c4b976eb35b4
-SHA1 (patch-third__party_blink_renderer_core_paint_paint__layer.cc) = dabcb8e00a10421ce54c1dad3e8603f28aeea60f
-SHA1 (patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc) = a41cc8ad966f176b1d92735674072ed0ad33b4ea
-SHA1 (patch-third__party_blink_renderer_core_xml_xslt__processor.h) = 1f1c424c76ce30d09a772f0eff840fc5d1723b6c
-SHA1 (patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc) = 186df1bfb64a86ba9324cb6f24f4f01cf5ed6444
-SHA1 (patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc) = fa684a1041fe765b0f77ee0c6620246c5af003f2
-SHA1 (patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc) = 0c82653aa9e16d11a922f9c5d53b5800cc4455a0
-SHA1 (patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc) = 867a8f65c80ca53c70c994fda47d0ef1dac33c27
-SHA1 (patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc) = f39ac66bffe3695353da42265b8b5cf15f016847
-SHA1 (patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc) = 2ed947e3b6ff9fb6bfaebb568d20b2ddca517723
-SHA1 (patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc) = de1eeda534ed29e3424710756bf7536be1700370
-SHA1 (patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc) = ab0bd3e6196a4205e8b73801611a4a0fa175ff7a
-SHA1 (patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc) = 2532c7ad851f7b8be5c6e3812de9241cc2a725a3
-SHA1 (patch-third__party_blink_renderer_platform_BUILD.gn) = c1d2c5473deb5f01118318719ef777c5b567918d
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__cache.cc) = ef69514f4e87b0a7b65a9e8e2cf5dee00add8d7c
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__cache.h) = 605cfb3c06a1e317e489d5199caa42e94e5a5104
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__description.cc) = fe75293a69231b055ae3587c756f7e0fa4a9e84f
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__metrics.cc) = a73dd4653892c3b6e95a8d2bad29d9f48130b9ed
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc) = eb96684062895e4e9ef567c6fd1b9403e16c3282
-SHA1 (patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc) = 68eb6b5711c6199c1bd3bc70f86ea6087282d7d4
-SHA1 (patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc) = f9c5fa97ea75690e1428b55ce885e83aefbca495
-SHA1 (patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc) = da7201f5d431bc031fb36e0a6956ca3c02f34051
-SHA1 (patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc) = 1b8e8c5bfe1f80dc9a2eb92d9885103855abe558
-SHA1 (patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc) = 4bf6ea53d1789183577c720a69a161095fd1dec4
-SHA1 (patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc) = fd168150fe2606c66dfac08e0ad94deb539ded27
-SHA1 (patch-third__party_blink_renderer_platform_runtime__enabled__features.json5) = 2bf1a37867342e07dee76a4c6ca2e10fcd9a5cdb
-SHA1 (patch-third__party_blink_renderer_platform_scheduler_common_thread.cc) = da1a8678f1a91038739952edeea27e9f47c056dd
-SHA1 (patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc) = ea43130f1d66144a7286f3b63ad7a27f646ae8f8
-SHA1 (patch-third__party_blink_renderer_platform_wtf_container__annotations.h) = ca5707f6783a20197a7e5977eaf5f9b9d86de6b4
-SHA1 (patch-third__party_blink_renderer_platform_wtf_math__extras.h) = edc40c964f8cfe1d4e2c013c113463292f73350f
-SHA1 (patch-third__party_blink_renderer_platform_wtf_stack__util.cc) = 7926e84d4995e9c9d34a24b95bcbdd35892c2e50
-SHA1 (patch-third__party_brotli_common_platform.h) = fadbf86e5fd2a5e4ac758ce4301e82615fe4914b
-SHA1 (patch-third__party_cpuinfo_cpuinfo.gni) = 1d052722ff16613c5de2b6d690dacfc9cdd6d750
-SHA1 (patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni) = 0b59e12a476231b9c966d9190d23b660e0d851f8
-SHA1 (patch-third__party_crashpad_crashpad_client_BUILD.gn) = fae9c954441e5b27f5203bef7876480306f2d269
-SHA1 (patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc) = 10283f37672140f70a0c0237a6aed062edfc1b83
-SHA1 (patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc) = fe09f4fe5d45746eb10f92b5daca8018cf2aa9dd
-SHA1 (patch-third__party_crashpad_crashpad_util_misc_address__types.h) = 36d140c24b4db1239d2ec00f2256f95511ea6f89
-SHA1 (patch-third__party_crashpad_crashpad_util_misc_capture__context.h) = 81a08cd3a3da5fd137453defb4bc498bd4696185
-SHA1 (patch-third__party_crashpad_crashpad_util_misc_metrics.cc) = d128b1dcb270f8fa9d352441bbbc49b5a81a741a
-SHA1 (patch-third__party_crashpad_crashpad_util_misc_uuid.cc) = 763a2ce644da674ce42d013861bc84a2dcc7da42
-SHA1 (patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc) = df67dd4f0528a7069189b1b293aaf8bb184fea17
-SHA1 (patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc) = 1a2d9ed4f0b63b960d7adfaba37444ac4d572b36
-SHA1 (patch-third__party_crashpad_crashpad_util_posix_signals.cc) = 9b69bace08d3f7159f265c9006ad6b071c31711c
-SHA1 (patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc) = 9bd424d3f767058255a47dbbb290ef943a22a6c6
-SHA1 (patch-third__party_crc32c_BUILD.gn) = 5f9c0756c786f34cbb19a15da8a843fb44227394
-SHA1 (patch-third__party_dawn_include_dawn_native_VulkanBackend.h) = cd065bf0687ce8cfa49459762419554d9c14014d
-SHA1 (patch-third__party_dawn_src_dawn_common_Platform.h) = 02651feac71807e30c1a497454cd1bbfe309af0c
-SHA1 (patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp) = 18708d5c7d151c32deb6c5969274a7ab9c1bde64
-SHA1 (patch-third__party_ffmpeg_BUILD.gn) = f1cccbe971decce045cc90ca780cff0d9bd4e1a0
-SHA1 (patch-third__party_ffmpeg_libavcodec_x86_cabac.h) = 3ebdc0beaff7cf8f1b7f7a6f86ba73770de7d70b
-SHA1 (patch-third__party_ffmpeg_libavutil_cpu.c) = 29544e515566e2c686deab25acb9daf5653f5b57
-SHA1 (patch-third__party_ffmpeg_libavutil_mem.c) = da1c2697cfe5044404f99ba6e0ccbd829762d0dd
-SHA1 (patch-third__party_ffmpeg_libavutil_random__seed.c) = 20337e782566ad701e977350d9f933200967f695
-SHA1 (patch-third__party_ffmpeg_libavutil_x86_x86inc.asm) = 5ca76823619053b66a59995fc1552ac241fd2c2e
-SHA1 (patch-third__party_fontconfig_include_config.h) = 7499cfe0ee75d785802ba7a0caf91e20e64a5c79
-SHA1 (patch-third__party_fontconfig_src_src_fccompat.c) = e74c2d5aff2b5e26595307c89a971ed4b752b538
-SHA1 (patch-third__party_ipcz_src_BUILD.gn) = a72a233243e3d064c231ca5b1cdca85c68b71936
-SHA1 (patch-third__party_ipcz_src_reference__drivers_random.cc) = 11e5e0aef810700c1a26bb3853abfe28b26a4551
-SHA1 (patch-third__party_ipcz_src_standalone_base_logging.cc) = c1fb4bd59c240da98b6d1f11d2acb30f536b7644
-SHA1 (patch-third__party_leveldatabase_env__chromium.cc) = 9bbabd5ee4014eb57ddecca9990d6210d6ad538d
-SHA1 (patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c) = 513a92b2b59ad71eed2f0820c7c7a17c46fb9956
-SHA1 (patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h) = a034d040ead0f175a8fe22f5031c6b17db107452
-SHA1 (patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h) = e7fb715da956335c0cc73266671b63006d2660f3
-SHA1 (patch-third__party_libc++_src_src_chrono.cpp) = 990e22d9f2d4df89d49554c7db8dd80b112c8db9
-SHA1 (patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp) = 40c340518b2867dd5aa882978038b3c826eb9c6c
-SHA1 (patch-third__party_libc++abi_src_src_cxa__guard__impl.h) = c0584304bb571aca4a250c903acb8942127924a2
-SHA1 (patch-third__party_libdrm_src_xf86drmMode.c) = e98d877cd7ccb22734c30c02359657838d30b43e
-SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h) = c0f937845e31a2a3debc163f6d7169c9c8f6117a
-SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h) = a67b09d82fba92f79c510745f0007897d106cfab
-SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h) = e8a590e6e477696672e9e3d5a37b54c3172db44d
-SHA1 (patch-third__party_libsync_src_include_sync_sync.h) = 6c76bbbcd7f6e9031be675b5934dda00c825b614
-SHA1 (patch-third__party_libsync_src_sync.c) = 219469a80cb63a9e76092aef9c7eb929d1757825
-SHA1 (patch-third__party_libusb_BUILD.gn) = db638b9c12189e7281ba2f0deaa07d28eec0be09
-SHA1 (patch-third__party_libusb_src_libusb_core.c) = d75d286201cbac729eb94a1741e9df8412f0891f
-SHA1 (patch-third__party_libusb_src_libusb_os_threads__posix.c) = 1da825e076a5d5ea0822e2288931304639ac4b52
-SHA1 (patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c) = aaf43676bcc5aedf945758faf4dc0ccac31d28dd
-SHA1 (patch-third__party_lzma__sdk_C_CpuArch.c) = 8cd7ba84ace103b75ca243bbaf1e1bbcb825642c
-SHA1 (patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc) = dd10f9af7fdda52ac7f2c42aaef1f788d87a2627
-SHA1 (patch-third__party_nasm_BUILD.gn) = 7d5b5d80374e53a25d9be57cff88a402f89ab784
-SHA1 (patch-third__party_nasm_config_config-linux.h) = 8b6b36ac5d1661a38e51f0e633fd88f8b40f9b5f
-SHA1 (patch-third__party_node_node.gni) = 72d9d2a8052c4b16fc42e377e6c9da4e973266fa
-SHA1 (patch-third__party_node_node.py) = 97a1d5bcf748303130c7bb25a76d6fb106ce4775
-SHA1 (patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp) = e8914ce6e03d91b8b1ffbd3b78f322ac92791065
-SHA1 (patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp) = c967358f356a7fad992460839502f1afd6cfdd56
-SHA1 (patch-third__party_pdfium_fxjs_fx__date__helpers.cpp) = c0e7ad03b3ebb0235b18fc2ccefbd597cafb3012
-SHA1 (patch-third__party_pdfium_pdfium.gni) = d1d89deb0ed31ee75dff3c1fa9991af5cf17f949
-SHA1 (patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp) = 9d7ac513c41f7f6642a1c389575bf1d2ff8931e6
-SHA1 (patch-third__party_perfetto_include_perfetto_base_build__config.h) = d7af2e4b25ea824803a0c0a62c83adac1de3f5f0
-SHA1 (patch-third__party_perfetto_include_perfetto_base_thread__utils.h) = d872b626cafa80485277579ae66a99463f24f39f
-SHA1 (patch-third__party_perfetto_include_perfetto_base_time.h) = cc3a916f5797293debcd681c5d6da53860b164bd
-SHA1 (patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h) = 32c0019cac535fd5fa0a5a928f13993793fa070a
-SHA1 (patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h) = 6054b01437977fc52f82b44411b115ac2b4c0200
-SHA1 (patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h) = 7aa0826e84fa717f34e67fcd879ab4c260a0b78c
-SHA1 (patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto) = a64857693e2060bb09838074d290cbb60b0746ce
-SHA1 (patch-third__party_perfetto_src_base_clock__snapshots.cc) = cc4e5782a47658a6806798fd06ea984011bb0cc8
-SHA1 (patch-third__party_perfetto_src_base_event__fd.cc) = e8011b194c112d8c231e3368a945862755b58e68
-SHA1 (patch-third__party_perfetto_src_base_periodic__task.cc) = 91ac99ea1b0cb5286b90c3de52b1c6d2afffbc78
-SHA1 (patch-third__party_perfetto_src_base_string__utils.cc) = ce230b9de6b07f41d0ea672e0b2a08b83b0996e5
-SHA1 (patch-third__party_perfetto_src_base_subprocess__posix.cc) = 4119142a384a5f90bff30ebb60ec4c4cce1caa28
-SHA1 (patch-third__party_perfetto_src_base_test_vm__test__utils.cc) = db6061f6f36793647b5249b7dd9ac1aa4d961fa8
-SHA1 (patch-third__party_perfetto_src_base_thread__task__runner.cc) = 145931e868c85fef5a16129131fa7b7ae1607699
-SHA1 (patch-third__party_perfetto_src_base_unix__socket.cc) = d48750c8009fe21989b68769d2c42358fec9ad96
-SHA1 (patch-third__party_perfetto_src_base_utils.cc) = a5d6751693eaf5798c875862fe8c93a21fd45e36
-SHA1 (patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc) = d29c2cb18be8095989ff663af6f1608f585a5c1d
-SHA1 (patch-third__party_perfetto_src_tracing_ipc_memfd.cc) = 570946f9079001f25c6bac3af2d6fbcebe8d5fa0
-SHA1 (patch-third__party_perfetto_src_tracing_platform__posix.cc) = 0b5caacc481d38c148e4e9954c307e76d091e475
-SHA1 (patch-third__party_perfetto_src_tracing_track.cc) = d3840f2692cb32fd8f9f8ed43d31c71a2ceef39b
-SHA1 (patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h) = c57297e1d88e071eeef67e91e0d5e692e9c98f5c
-SHA1 (patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h) = 95bf09a42b53722519a4ad46b383338c299a2502
-SHA1 (patch-third__party_skia_src_ports_SkMemory__malloc.cpp) = ad5e42d384fdd929c472dff2c07b2bff8683ac4a
-SHA1 (patch-third__party_skia_src_ports_SkOSFile__posix.cpp) = dcb76ee45a1c700016a356fa2f205a7a2d82cfff
-SHA1 (patch-third__party_speech-dispatcher_libspeechd__version.h) = 20e7e79c96a97250ab0b9e3b644e4ba21072261b
-SHA1 (patch-third__party_speech-dispatcher_speechd__types.h) = f9c7c0ec8bc1eb0898b4810e6b4d365b2f24ed27
-SHA1 (patch-third__party_sqlite_BUILD.gn) = b2a6d8da2fc6b22d8dea0eeeaa92ae590f52310b
-SHA1 (patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c) = e979d2917aa7e5eef1120aa3c9b88eb049e1c9c1
-SHA1 (patch-third__party_sqlite_src_amalgamation_sqlite3.c) = 148fdbd3862738aad48de6cce1f9ad2b9fb698b8
-SHA1 (patch-third__party_swiftshader_src_Reactor_Debug.cpp) = 0c16afe457678e5039e91d05883349fcc121000b
-SHA1 (patch-third__party_swiftshader_src_System_Configurator.cpp) = 13545b2914c532011c4ae5cf708303f7fed3c25b
-SHA1 (patch-third__party_swiftshader_src_System_Linux_MemFd.cpp) = ced30422ca92c56fae55cdaeebb0412f8f2d161b
-SHA1 (patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp) = 97f511a6d19a0277cbc796f9f61ffd2869fd969b
-SHA1 (patch-third__party_swiftshader_src_WSI_libXCB.cpp) = 4ce6dc595cb55bbe98f82f02146dfae209941e60
-SHA1 (patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h) = 9ce49c0e13d7c19bfd98f364e8e9f6d4f40b8a63
-SHA1 (patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h) = 8285000350fae8198270439af4568782d099c951
-SHA1 (patch-third__party_swiftshader_third__party_marl_src_memory.cpp) = 22e243f7749719f6721570afdf710fa970240b6b
-SHA1 (patch-third__party_swiftshader_third__party_marl_src_thread.cpp) = 7e1df96c4aaff8f84645efac8a1ef8a0887c17da
-SHA1 (patch-third__party_test__fonts_fontconfig_BUILD.gn) = 7223e0306b634175a1cc73ba4c59770cfafce3e8
-SHA1 (patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc) = e0e05bba77444d623f6e67a80a1c46b0810db377
-SHA1 (patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc) = 620a34a7b9570543bf34fb4a910c385c005d52f9
-SHA1 (patch-third__party_tflite_features.gni) = 0ee5f448b96e850e3cc34aec95855fa7df4ba210
-SHA1 (patch-third__party_unrar_src_crypt.cpp) = b3db30a5d702a039364c4fb5b38dd9d1d4731670
-SHA1 (patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h) = 3dce0dfe1ca82de0bfce7ec75f644ddc0d027d4f
-SHA1 (patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp) = 6490d58df48800688d928ddc66031a1abe697e94
-SHA1 (patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h) = 64f8814462c0bcc0ea3ff86222edba7d8979f209
-SHA1 (patch-third__party_wayland_BUILD.gn) = 82e39a60548aef17aa2e1858aa6ac58e75c389bc
-SHA1 (patch-third__party_wayland_include_config.h) = 6d85bad754395ad6467f6b319673bed1f7ba27de
-SHA1 (patch-third__party_webrtc_BUILD.gn) = 8581f73902564959edd991b9421e8cbff59d9d17
-SHA1 (patch-third__party_webrtc_modules_audio__device_BUILD.gn) = fb51a40353e8d03446d882f77fa8a74d45d3cc94
-SHA1 (patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 3aa660890e52d7588cc549ccd98b5cf7b2d344d1
-SHA1 (patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc) = 8339a7bebb642c885c1eefec494647d316ceb303
-SHA1 (patch-third__party_webrtc_rtc__base_byte__order.h) = c0044b2f07883f99fc009af9b713910c471540d3
-SHA1 (patch-third__party_webrtc_rtc__base_ip__address.cc) = 498554d5299e5b965aa955e73e51893342ddb036
-SHA1 (patch-third__party_webrtc_rtc__base_net__test__helpers.cc) = 9155590c2672771d59d3fce2e2bfe86f069c859c
-SHA1 (patch-third__party_webrtc_rtc__base_network.cc) = c162eeab65bf4f9382ec8d05f308ff001dd0284a
-SHA1 (patch-third__party_webrtc_rtc__base_physical__socket__server.cc) = 8ffd78f8eddef017319d6857a8d467c9f3a84267
-SHA1 (patch-third__party_webrtc_rtc__base_physical__socket__server.h) = 0438eb31434c294dc1bde07357bccf00a2223bbd
-SHA1 (patch-third__party_webrtc_rtc__base_platform__thread__types.cc) = e614b57c16e17ec559f989eb156c93646892d122
-SHA1 (patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h) = 9e98bcacac27d7873f606d9282fb4f32963786ce
-SHA1 (patch-third__party_webrtc_system__wrappers_BUILD.gn) = 01328db3e28616d303f288e1af652bf5a3571012
-SHA1 (patch-third__party_widevine_cdm_widevine.gni) = fd37a01632924f6eb50d353a5f74e3ba1abf8266
-SHA1 (patch-third__party_zlib_BUILD.gn) = cb1af5c622ed540b3fac703e2d7738a2faf8e011
-SHA1 (patch-third__party_zlib_cpu__features.c) = e3c22ffa2001b32c6f4fd66f2fe9b70154758242
-SHA1 (patch-tools_code__cache__generator_BUILD.gn) = 76cc84c32b8a02c833ed080e19c9df193d6a418e
-SHA1 (patch-tools_generate__shim__headers_generate__shim__headers.py) = 79710a20dd32589d51aa3147bfbe69b8993fb7eb
-SHA1 (patch-tools_generate__stubs_rules.gni) = 5348554553b33f1f7657dcdd3c4c468e91742857
-SHA1 (patch-tools_gn_build_build__linux.ninja.template) = 674226fcbff6c20c3d6964b82898e3dbbeaa65a4
-SHA1 (patch-tools_gn_build_gen.py) = 4cd3c3a09ca68ded4d12e4585dbcf97595b27c89
-SHA1 (patch-tools_gn_src_base_files_file__posix.cc) = 0491e92067869817b1d5528635038e19f7275844
-SHA1 (patch-tools_gn_src_gn_version.h) = 63cfa4bc938187bdcac64d678e01b37ceb122da3
-SHA1 (patch-tools_gn_src_util_exe__path.cc) = 200fe82702a2f320188ed4355cb79dd16a540bee
-SHA1 (patch-tools_grit_grit_node_base.py) = 9601362c3ae2466c29613d95f7fc94e9ac73501a
-SHA1 (patch-tools_json__schema__compiler_cpp__bundle__generator.py) = f9f853f156ce15d47e79347c72b6cb6de2a5b9cc
-SHA1 (patch-tools_json__schema__compiler_feature__compiler.py) = 263436f965edce1ec6bef62e89cf23e72e652a26
-SHA1 (patch-tools_memory_partition__allocator_inspect__utils.h) = 7c9b0b7f4f9320d193c73a63c968acdac471a2be
-SHA1 (patch-tools_perf_chrome__telemetry__build_BUILD.gn) = 2000aaf67caf9348febf5c8fa198920749e8f2ac
-SHA1 (patch-tools_protoc__wrapper_protoc__wrapper.py) = f64738042e8b70b47475fae5a2e7aced18c41708
-SHA1 (patch-tools_v8__context__snapshot_BUILD.gn) = c5260cf158fc0a15ba8da28588daee2851e43163
-SHA1 (patch-tools_variations_fieldtrial__to__struct.py) = 06bf24c41c50646de3d73bd872ac7c7f3d7269e2
-SHA1 (patch-ui_accessibility_accessibility__features.cc) = afe0133d8ea31ba36aa686fc589582a76efcbe02
-SHA1 (patch-ui_accessibility_accessibility__features.h) = efadf5bc899a6a844e2bdf3caaf0c8f28b2a2901
-SHA1 (patch-ui_accessibility_ax__node.cc) = 55b7906b5416ddd5d0cc72710d1d874d0bb4966c
-SHA1 (patch-ui_accessibility_ax__node.h) = 28df1507fa3667ccca6bdf8988355f9377971ddb
-SHA1 (patch-ui_accessibility_ax__tree.cc) = 6a5af925998f5746602419a5284bb86164f56441
-SHA1 (patch-ui_accessibility_ax__tree.h) = 51e714c3722dde2669a1452b215d32feaf0c7679
-SHA1 (patch-ui_aura_client_drag__drop__client.h) = cea1cad156682557d238ae9314995806dfdc2a12
-SHA1 (patch-ui_aura_screen__ozone.cc) = b4f9ce71159f7b572c6453ed3dccb60ad9a40897
-SHA1 (patch-ui_aura_screen__ozone.h) = 37874488e19deccdaff546c84f05dbca5dde331a
-SHA1 (patch-ui_base_accelerators_accelerator.cc) = ec871aee9082693af335a576f5d1db3a766b09c7
-SHA1 (patch-ui_base_accelerators_command.cc) = 2d9b93f98ae9867443ca3deeafc218b3f6181e40
-SHA1 (patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc) = 979d1e7748f23c83e997068dffd2f63018198751
-SHA1 (patch-ui_base_clipboard_clipboard__constants.cc) = de50e8ba712582caec671055f5a860a0d37f0428
-SHA1 (patch-ui_base_clipboard_clipboard__constants.h) = 25b20c052611c772273c0c5b25269623ee28295a
-SHA1 (patch-ui_base_clipboard_clipboard__non__backed.cc) = bc627f3949d1f3bd6bd6e1ed79fd21c6a43f99ed
-SHA1 (patch-ui_base_cursor_cursor__factory.cc) = 75073eb6fa16f401e547921089348f3e1a104acb
-SHA1 (patch-ui_base_cursor_cursor__factory.h) = 2fc10667695cedd508a72d80396533e684416e2e
-SHA1 (patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc) = f81ee92aef9fb9e76d0fb91001caa303131cdff0
-SHA1 (patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc) = 0c9a87ff4bd63fb50fbd9f60dddc6490e65957ab
-SHA1 (patch-ui_base_ime_dummy__text__input__client.cc) = acbadc51dc93a881f16941152c3dc065169c4b98
-SHA1 (patch-ui_base_ime_dummy__text__input__client.h) = 715ae617f15b47b5b559c9e121443ba32bbc3e4a
-SHA1 (patch-ui_base_ime_fake__text__input__client.cc) = cd522d1ce902d8d9d7aff0a8b0158b4d952ae150
-SHA1 (patch-ui_base_ime_fake__text__input__client.h) = 21e079090ad09b419f7a81d8139e46009eb0bce3
-SHA1 (patch-ui_base_ime_init_input__method__initializer.cc) = a9d1d29f667750166b5446718cffc9b4e86c5709
-SHA1 (patch-ui_base_ime_linux_linux__input__method__context__factory.cc) = 6bca02e8b08813ebcbe419e61fa5f2982a1bdc81
-SHA1 (patch-ui_base_ime_text__input__client.h) = 688cd57f363b35a8b48e1d4a9709f8395856af87
-SHA1 (patch-ui_base_resource_resource__bundle.cc) = fc95c46cb94292c8f5440a8ba4b7b2e578cdcca6
-SHA1 (patch-ui_base_test_skia__gold__pixel__diff.cc) = dd65c778165c20fcac276508f0191fbf8ecc03e9
-SHA1 (patch-ui_base_test_ui__controls.h) = 3ba309dc11ef6a3f78003880fd1576fb9201cb82
-SHA1 (patch-ui_base_ui__base__features.cc) = 1c9c88935d70dbebbf70075f7c03719d40d90c3c
-SHA1 (patch-ui_base_ui__base__features.h) = f95297d04a2bf7b0343fb5d028bd2a59a7291aee
-SHA1 (patch-ui_base_ui__base__switches.cc) = 8ef4caadda246f5d4b8103c05793ad00714a3534
-SHA1 (patch-ui_base_ui__base__switches.h) = 5a7c515219059d6b55dfe62a5740a3dc134eb19a
-SHA1 (patch-ui_base_webui_web__ui__util.cc) = 4fd4fbb15d1e4673fda2e2a505b596b1c73764c3
-SHA1 (patch-ui_base_x_x11__cursor__factory.cc) = baee71333c81257da153d55b7effd5ac8b1f766e
-SHA1 (patch-ui_base_x_x11__cursor__factory.h) = 900a3965a6346e950641d23e0de4e64c486122b5
-SHA1 (patch-ui_base_x_x11__cursor__loader.cc) = 58261d08135b667d08f243607f0bf0d82ca1a76a
-SHA1 (patch-ui_base_x_x11__display__manager.cc) = 4cc89d499b615cf9cfce99560b5649f2ceb3e013
-SHA1 (patch-ui_base_x_x11__shm__image__pool.cc) = bfded3dddd820c8c32402442f850c458e8f48da7
-SHA1 (patch-ui_color_color__id.h) = cf883ad0680ad96ba8172078eaa7cc8004ff72c8
-SHA1 (patch-ui_color_color__provider__utils.cc) = 83b450630f2512212d7e171408f9bb2dd6b86edf
-SHA1 (patch-ui_color_system__theme.h) = 5bc7b4e6791930726ccbd65432d379030e7ea448
-SHA1 (patch-ui_compositor_compositor.cc) = 3b069f6d65b0a9a568fb3eb3fc36f6406ebd4fcf
-SHA1 (patch-ui_compositor_compositor.h) = 9ff1960c7e238ebfa1dc8fffc5d85a4d781a5f12
-SHA1 (patch-ui_compositor_compositor__observer.h) = 64c1e8b20045bf3bb197cfa016d0fe35801ef716
-SHA1 (patch-ui_display_screen.cc) = 7a7731c0aeec65919ed253f4a720c537ac637dde
-SHA1 (patch-ui_display_screen.h) = df9fdb0eb6b513318bbd44f214544f419ed350b1
-SHA1 (patch-ui_events_devices_x11_device__data__manager__x11.cc) = 189d60e2a3bb4afcbda11d16a82d10ec037cf68a
-SHA1 (patch-ui_events_event.cc) = b427e5eca1fe2e9c63dcba5ec998f0b61409af0e
-SHA1 (patch-ui_events_event__switches.cc) = b756c246af5beef52dbc1a5af33ce0e3064943e1
-SHA1 (patch-ui_events_event__switches.h) = eb6d63d95bd22f5d48b18c909c27117d86611514
-SHA1 (patch-ui_events_keycodes_dom_keycode__converter.cc) = 627ce8abe82f7dd88c9defee5b520417c8096297
-SHA1 (patch-ui_events_keycodes_dom_keycode__converter.h) = 356bc75ee450b697d4b6e5f3b71771291bdeecc1
-SHA1 (patch-ui_gfx_BUILD.gn) = 06b09302c0b16512610e2bf789347f614be45f9f
-SHA1 (patch-ui_gfx_canvas__skia.cc) = 96b408e899590464d6eb9e02d01ab9e759b2b8cc
-SHA1 (patch-ui_gfx_font__fallback__linux.cc) = a7ad00e8c5fd14134e25d0b49d3dc96d15cc685e
-SHA1 (patch-ui_gfx_font__render__params.h) = 3b6776ad1ea032b40f12b9bf55401ebde3f19bda
-SHA1 (patch-ui_gfx_font__render__params__linux.cc) = f8237587da03d5ef137c970b403c07e2fe6b285e
-SHA1 (patch-ui_gfx_font__util.cc) = 7e6de8a9836cfa5dd76b99995e9baa936ecaa14a
-SHA1 (patch-ui_gfx_gpu__memory__buffer.cc) = 751e4b38f90ff546089583a6f1a88617876be96c
-SHA1 (patch-ui_gfx_gpu__memory__buffer.h) = 66bc6fb47067d84bea5066edf40e66935065e614
-SHA1 (patch-ui_gfx_linux_dmabuf__uapi.h) = 5dced280ebe4a551a882dc5d16fafe19d112b0ac
-SHA1 (patch-ui_gfx_linux_gbm__wrapper.cc) = 62ccb41c65c311b519fb4e29e9cd660880efaae0
-SHA1 (patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc) = b21b080cba7eb2d18188bb09fd1065bd09d63891
-SHA1 (patch-ui_gfx_mojom_native__handle__types__mojom__traits.h) = 522d86037e57e1a97e48e2e48782c30d4eb51f8b
-SHA1 (patch-ui_gfx_native__pixmap__handle.cc) = afd3a15a4921e962e0dfa6ee863a67da82017023
-SHA1 (patch-ui_gfx_native__pixmap__handle.h) = c6f4e27076cb99497842dd13353c90aa51d18a90
-SHA1 (patch-ui_gfx_native__widget__types.h) = 9decaff6ea2aa9b9160dc6fd0a8419a51db8f285
-SHA1 (patch-ui_gfx_platform__font__skia.cc) = abae566480eae14f462643ea3fa22bbf434ebfd6
-SHA1 (patch-ui_gfx_render__text__api__fuzzer.cc) = 5476cd3f631cc08023b551ca0ddaec127a6c3028
-SHA1 (patch-ui_gfx_render__text__fuzzer.cc) = 739b214256a1cfc9359f5b10ce5d13e57648c767
-SHA1 (patch-ui_gfx_switches.cc) = 3fb4b16330dbc6c857f641b59ae72666803dc695
-SHA1 (patch-ui_gfx_switches.h) = 69fa45afb9fcd6e7759c59529f0d605263bfbac1
-SHA1 (patch-ui_gfx_x_atom__cache.cc) = a735779a01451a819d23c60a5eeb6353e34877fc
-SHA1 (patch-ui_gfx_x_generated__protos_dri3.cc) = f5861c92eba39947e19b7df53a88db0f8534c3f3
-SHA1 (patch-ui_gfx_x_generated__protos_shm.cc) = 23d54dffc0443503da90c0078cc0458e0fd36fa3
-SHA1 (patch-ui_gfx_x_xlib__support.cc) = 8aefc9def428225043a12addd76f34773a87b843
-SHA1 (patch-ui_gl_BUILD.gn) = 27499e13fc6ba695458700cff575c63e3a0edc11
-SHA1 (patch-ui_gl_gl__context.cc) = b40808c0977cd590af6f4a843b4f3e209ad52e3e
-SHA1 (patch-ui_gl_gl__fence.cc) = aac868ba376ec9b25e2e424e275274faf7697d20
-SHA1 (patch-ui_gl_gl__implementation.cc) = 06f0f28bbdc6175f565fd2457df5d77375ebebaa
-SHA1 (patch-ui_gl_gl__switches.cc) = 5f467d4dd3d50f5e138ca90f3ae85e017b2cca25
-SHA1 (patch-ui_gl_sync__control__vsync__provider.cc) = b08a85c883bb509e1d2742b26a393ea9490c9369
-SHA1 (patch-ui_gl_sync__control__vsync__provider.h) = d909811e0a29f1b1d90e99d5f65a5c33a128ecd6
-SHA1 (patch-ui_gtk_gtk__compat.cc) = f8b7472eff5cd6c1bc6d9fa367112e18e140f89d
-SHA1 (patch-ui_gtk_printing_print__dialog__gtk.cc) = a141177309f516cbd3d14b658409fce52ce7f340
-SHA1 (patch-ui_message__center_views_message__popup__view.cc) = 9e4f77495d368913b988fa5d98bda68dff98cde8
-SHA1 (patch-ui_native__theme_features_native__theme__features.cc) = 4314efb311d2a221d8bb613822350b90d809f3ed
-SHA1 (patch-ui_native__theme_native__theme.h) = ccbee7739051a46b317e7512963be1b471d949b0
-SHA1 (patch-ui_native__theme_native__theme__base.cc) = eed06f9a94b4846e0a9571dda13a2b8fa1e73f3d
-SHA1 (patch-ui_ozone_common_egl__util.cc) = 1c0527ec059a86de18de5c4a86a62a8d6c566c98
-SHA1 (patch-ui_ozone_platform_headless_headless__surface__factory.cc) = 442abb390beacf0f870ba1ddfbfa05ef8d244ea1
-SHA1 (patch-ui_ozone_platform_headless_ozone__platform__headless.cc) = aa6d200c9bce71ac0fc2dbda49dfcc135bc1dd27
-SHA1 (patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc) = 89d8a85629d6f7696ef6f6ac4bdad8c9ab5ebfb2
-SHA1 (patch-ui_ozone_platform_wayland_common_wayland__util.cc) = 69e025754ab7c10f26fbed2ed35c3accfae1827a
-SHA1 (patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc) = cc65a479fdfe5bfaa31e08a09d8ec45a9f4e5528
-SHA1 (patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc) = 5b94773ee9ccf9c0ff98f828951f192fac0df6b2
-SHA1 (patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc) = 7fd972d2fb841b9f98821955cff78ac22f970204
-SHA1 (patch-ui_ozone_platform_x11_x11__screen__ozone.cc) = e4058fb8112205c81ea25e7db6cca66ce4e7600f
-SHA1 (patch-ui_ozone_platform_x11_x11__screen__ozone.h) = 4e4e3b0c4fc635409fd23beb97e5397b469a7abc
-SHA1 (patch-ui_ozone_platform_x11_x11__window.cc) = 18a81228a5b6e5d84ae38548134668fc23fed5ca
-SHA1 (patch-ui_ozone_public_ozone__ui__controls__test__helper.h) = 0b88fc9de700aa8ee673cdbede3ae5ebf35b914c
-SHA1 (patch-ui_ozone_test_mock__platform__window__delegate.h) = c3b5dd4787645dfdde509d5f5222e1fc3f6de394
-SHA1 (patch-ui_platform__window_platform__window__delegate.cc) = 64f86a416f3c6f92288401bae4efb9b3d3ff9873
-SHA1 (patch-ui_platform__window_platform__window__delegate.h) = b1d5955c54e50159c4d7583745534cf2cfc6d870
-SHA1 (patch-ui_platform__window_platform__window__init__properties.h) = ac0f744d04a14568c3928f91a90b690aad05ad54
-SHA1 (patch-ui_qt_BUILD.gn) = ff7e4c5b13358a1e2f606de3b16a728b0a095d47
-SHA1 (patch-ui_strings_translations_app__locale__settings__bn.xtb) = 81613d0e08f532906458685f1a1150f859bb98b3
-SHA1 (patch-ui_strings_translations_app__locale__settings__ja.xtb) = b0c72898d2280fbcad3db5ebd5a91d32a44bfaed
-SHA1 (patch-ui_strings_translations_app__locale__settings__ko.xtb) = 23a2c67efc7421900faa673349bc5a70f35eff72
-SHA1 (patch-ui_strings_translations_app__locale__settings__ml.xtb) = 18a0a7ab8761506beb554537fd0efaa7e77015d4
-SHA1 (patch-ui_strings_translations_app__locale__settings__th.xtb) = af3aaf3b77773e888d625cd28d579edd1143827e
-SHA1 (patch-ui_strings_translations_app__locale__settings__zh-CN.xtb) = a6e9740ec1eb3821c49e09134b3096ad29bcdb93
-SHA1 (patch-ui_strings_translations_app__locale__settings__zh-TW.xtb) = bcbda496eca35d9b626ea52cdb44af1235865efe
-SHA1 (patch-ui_views_BUILD.gn) = f93ea99dceb1af497c0edc234fef295d1dcae40e
-SHA1 (patch-ui_views_accessibility_view__accessibility.cc) = 4965069a1ddb724ee97e700b6ce855f6b0e914ab
-SHA1 (patch-ui_views_controls_prefix__selector.cc) = 1f253b1f74272d55f91a4d18b37ef7e819787661
-SHA1 (patch-ui_views_controls_prefix__selector.h) = cc269e597d02993ebcafe0f8882a0233629982f6
-SHA1 (patch-ui_views_controls_textfield_textfield.cc) = fd7a1cfff0755a2c1c3308ac433494ec0509e4bb
-SHA1 (patch-ui_views_controls_textfield_textfield.h) = 8c95b234f11e952ae6be91413ce2dbe2e9373ed3
-SHA1 (patch-ui_views_corewm_tooltip__aura.cc) = 01f283ec6129a777a5d400f99334377e4d5cec7d
-SHA1 (patch-ui_views_examples_widget__example.cc) = 70e3ec0c48734fe5b79fc521761295bd3d3383a8
-SHA1 (patch-ui_views_focus_focus__manager.cc) = 99557f12ba693e827018387be5363b02e88105e0
-SHA1 (patch-ui_views_style_platform__style.cc) = 5c70877335d36d942c26ec26c865e2d07cf3392b
-SHA1 (patch-ui_views_style_platform__style.h) = 572a8d26b0bfc1f05c4092652386d40b732bcd42
-SHA1 (patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc) = d3359fd4b83cd8ca463703710474cead8b953f6b
-SHA1 (patch-ui_views_views__delegate.cc) = b95bfbda47054b7e2bcd902caf736e094b4921f5
-SHA1 (patch-ui_views_views__delegate.h) = c451fa7cd51fd5a2e4986f57a3f663c7ed2dbf05
-SHA1 (patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc) = 25c88abaeda5433634339ce6875f89ff6abeacbf
-SHA1 (patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h) = f19af74488500deb17183f60fac3c14d25a1a992
-SHA1 (patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc) = e3da4e2b9b296fca80e11261652f684460d97389
-SHA1 (patch-ui_views_widget_root__view.cc) = 97d790bd177096d6f7569fc6d2406e22b6de93be
-SHA1 (patch-ui_views_widget_widget.cc) = 6b17e0b2ddc6802da0f590fcb0146285d11f7ed8
-SHA1 (patch-ui_views_widget_widget.h) = 5d9ac2e8adb9f32b5eda6b34aab949f5855904c7
-SHA1 (patch-ui_views_window_custom__frame__view.cc) = 13efc7ee08de55a2dd1f7d3e4158cf9326a44ee4
-SHA1 (patch-ui_views_window_dialog__delegate.cc) = acd14c9c7a0b0e599e76f964c996be7a8dc0216e
-SHA1 (patch-ui_views_window_frame__background.cc) = bba6c5157a294fb9b31c5392a31cd1260d139704
-SHA1 (patch-v8_BUILD.gn) = 02955dafdb4e78920c1eed1a782a23d803df0d7a
-SHA1 (patch-v8_include_v8-internal.h) = b33f15e44e08aa54c67e3283c5220efc90ff717d
-SHA1 (patch-v8_include_v8config.h) = 0f50e8640813d6beda512bdea80760fd8ac94702
-SHA1 (patch-v8_src_api_api.cc) = a30551cb054e176814c1beacc42386c0245423da
-SHA1 (patch-v8_src_base_atomicops.h) = 85fd2da5b5cd6be1fac377121ccab20ef02030b6
-SHA1 (patch-v8_src_base_platform_memory.h) = 6ccafc6271cf34ae61d708807b51b4ee48e2bb33
-SHA1 (patch-v8_src_base_platform_platform-freebsd.cc) = 04b7b92eede0fb92d088c242db22b2a4b3c1a905
-SHA1 (patch-v8_src_base_platform_platform-openbsd.cc) = 7c8f123b951ae528bdc8e7ef4a060565e5fcaa3f
-SHA1 (patch-v8_src_base_platform_platform-posix.cc) = cb7befe54280e819edeeaa94970aa60fba0f2fec
-SHA1 (patch-v8_src_base_strings.h) = 7af7ca0eea276429c0a22281eb6c9b6c0dcbc01e
-SHA1 (patch-v8_src_base_sys-info.cc) = d079f8906264529a98730a406fb9b851f0a173a3
-SHA1 (patch-v8_src_base_utils_random-number-generator.cc) = 7c17289bcc8f0be9e0a88949b59afabb42e1ee70
-SHA1 (patch-v8_src_diagnostics_perf-jit.cc) = 320a3f2de3b04538304d288133b6da04500040c4
-SHA1 (patch-v8_src_diagnostics_perf-jit.h) = f0e3b106f4f4e67920d06d73e28eccfe23cef379
-SHA1 (patch-v8_src_execution_isolate.cc) = a27a005853f85d2af5641a7bf16659c5070d2ca7
-SHA1 (patch-v8_src_flags_flags.cc) = 2459070e9e4b9c76bc222208f4039a3cb0f2494a
-SHA1 (patch-v8_src_libsampler_sampler.cc) = 81cf4fa0cdb1dbddb3321bd2b81fc1135975feb7
-SHA1 (patch-v8_src_sandbox_sandbox.cc) = 53771e14bbb0506b2ac7f84970e38bbc545145b7
-SHA1 (patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc) = 12b36d5516f4c40afb8c2ab1314349408a3cbcea
-SHA1 (patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h) = 00b53acf14c4bd91eff7565f7e2a3b45204af281
-SHA1 (patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc) = f5e933869f6b0e4bc56de2896f26f6d0e25a8ff3
-SHA1 (patch-v8_src_trap-handler_handler-inside-posix.cc) = 38537b0b1fab594d128e68b855f8aa8f029443e3
-SHA1 (patch-v8_src_trap-handler_handler-inside-posix.h) = b4ade1e436620b94e9e8411c338eb9193ceaa13a
-SHA1 (patch-v8_src_trap-handler_trap-handler.h) = a589ed5bec41e92ccd08557d3fbdf5e4017fa31f
-SHA1 (patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h) = 06ce3a46bb17bf92d47b3d6b72276ad2c4d87e12
-SHA1 (patch-v8_tools_run-paxctl.py) = 0138ae36bf253cb348004363bd260a50506f2b18
-SHA1 (patch-v8_tools_run.py) = dc86c4fdcd285140923467be40d6d18d832b68d6
diff --git a/chromium-next/files/chromium-browser.desktop b/chromium-next/files/chromium-browser.desktop
deleted file mode 100644
index 163a834091..0000000000
--- a/chromium-next/files/chromium-browser.desktop
+++ /dev/null
@@ -1,220 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Chromium Web Browser
-# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
-# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
-GenericName=Web Browser
-GenericName[ar]=متصفح الشبكة
-GenericName[bg]=Уеб браузър
-GenericName[ca]=Navegador web
-GenericName[cs]=WWW prohlížeč
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής ιστού
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[gu]=વેબ બ્રાઉઝર
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
-GenericName[ko]=웹 브라우저
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Tīmekļa pārlūks
-GenericName[ml]=വെബ് ബ്രൌസര്‍
-GenericName[mr]=वेब ब्राऊजर
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador da Internet
-GenericName[ro]=Navigator de Internet
-GenericName[ru]=Веб-браузер
-GenericName[sl]=Spletni brskalnik
-GenericName[sv]=Webbläsare
-GenericName[ta]=இணைய உலாவி
-GenericName[th]=เว็บเบราว์เซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_HK]=網頁瀏覽器
-GenericName[zh_TW]=網頁瀏覽器
-# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[fil]=Web Browser
-GenericName[hr]=Web preglednik
-GenericName[id]=Browser Web
-GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
-GenericName[sk]=WWW prehliadač
-GenericName[sr]=Интернет прегледник
-GenericName[te]=మహాతల అన్వేషి
-GenericName[vi]=Bộ duyệt Web
-# Gnome and KDE 3 uses Comment.
-Comment=Access the Internet
-Comment[ar]=الدخول إلى الإنترنت
-Comment[bg]=Достъп до интернет
-Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
-Comment[ca]=Accedeix a Internet
-Comment[cs]=Přístup k internetu
-Comment[da]=Få adgang til internettet
-Comment[de]=Internetzugriff
-Comment[el]=Πρόσβαση στο Διαδίκτυο
-Comment[en_GB]=Access the Internet
-Comment[es]=Accede a Internet.
-Comment[et]=Pääs Internetti
-Comment[fi]=Käytä internetiä
-Comment[fil]=I-access ang Internet
-Comment[fr]=Accéder à Internet
-Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
-Comment[he]=גישה אל האינטרנט
-Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
-Comment[hr]=Pristup Internetu
-Comment[hu]=Internetelérés
-Comment[id]=Akses Internet
-Comment[it]=Accesso a Internet
-Comment[ja]=インターネットにアクセス
-Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
-Comment[ko]=인터넷 연결
-Comment[lt]=Interneto prieiga
-Comment[lv]=Piekļūt internetam
-Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
-Comment[mr]=इंटरनेटमध्ये प्रवेश करा
-Comment[nb]=Gå til Internett
-Comment[nl]=Verbinding maken met internet
-Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
-Comment[pl]=Skorzystaj z internetu
-Comment[pt]=Aceder à Internet
-Comment[pt_BR]=Acessar a internet
-Comment[ro]=Accesaţi Internetul
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prístup do siete Internet
-Comment[sl]=Dostop do interneta
-Comment[sr]=Приступите Интернету
-Comment[sv]=Gå ut på Internet
-Comment[ta]=இணையத்தை அணுகுதல்
-Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
-Comment[th]=เข้าถึงอินเทอร์เน็ต
-Comment[tr]=İnternet'e erişin
-Comment[uk]=Доступ до Інтернету
-Comment[vi]=Truy cập Internet
-Comment[zh_CN]=访问互联网
-Comment[zh_HK]=連線到網際網路
-Comment[zh_TW]=連線到網際網路
-Exec=chromium %U
-Terminal=false
-Icon=chromium
-Type=Application
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
-Actions=NewWindow;NewPrivateWindow;
-
-[Desktop Action NewWindow]
-Name=New Window
-Name[am]=አዲስ መስኮት
-Name[ar]=نافذة جديدة
-Name[bg]=Нов прозорец
-Name[bn]=নতুন উইন্ডো
-Name[ca]=Finestra nova
-Name[cs]=Nové okno
-Name[da]=Nyt vindue
-Name[de]=Neues Fenster
-Name[el]=Νέο Παράθυρο
-Name[en_GB]=New Window
-Name[es]=Nueva ventana
-Name[et]=Uus aken
-Name[fa]=پنجره جدید
-Name[fi]=Uusi ikkuna
-Name[fil]=New Window
-Name[fr]=Nouvelle fenêtre
-Name[gu]=નવી વિંડો
-Name[hi]=नई विंडो
-Name[hr]=Novi prozor
-Name[hu]=Új ablak
-Name[id]=Jendela Baru
-Name[it]=Nuova finestra
-Name[iw]=חלון חדש
-Name[ja]=新規ウインドウ
-Name[kn]=ಹೊಸ ವಿಂಡೊ
-Name[ko]=새 창
-Name[lt]=Naujas langas
-Name[lv]=Jauns logs
-Name[ml]=പുതിയ വിന്‍ഡോ
-Name[mr]=नवीन विंडो
-Name[nl]=Nieuw venster
-Name[no]=Nytt vindu
-Name[pl]=Nowe okno
-Name[pt]=Nova janela
-Name[pt_BR]=Nova janela
-Name[ro]=Fereastră nouă
-Name[ru]=Новое окно
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[sr]=Нови прозор
-Name[sv]=Nytt fönster
-Name[sw]=Dirisha Jipya
-Name[ta]=புதிய சாளரம்
-Name[te]=క్రొత్త విండో
-Name[th]=หน้าต่างใหม่
-Name[tr]=Yeni Pencere
-Name[uk]=Нове вікно
-Name[vi]=Cửa sổ Mới
-Name[zh_CN]=新建窗口
-Name[zh_TW]=開新視窗
-Exec=chromium
-
-[Desktop Action NewPrivateWindow]
-Name=New Incognito Window
-Name[ar]=نافذة جديدة للتصفح المتخفي
-Name[bg]=Нов прозорец „инкогнито“
-Name[bn]=নতুন ছদ্মবেশী উইন্ডো
-Name[ca]=Finestra d'incògnit nova
-Name[cs]=Nové anonymní okno
-Name[da]=Nyt inkognitovindue
-Name[de]=Neues Inkognito-Fenster
-Name[el]=Νέο παράθυρο για ανώνυμη περιήγηση
-Name[en_GB]=New Incognito window
-Name[es]=Nueva ventana de incógnito
-Name[et]=Uus inkognito aken
-Name[fa]=پنجره جدید حالت ناشناس
-Name[fi]=Uusi incognito-ikkuna
-Name[fil]=Bagong Incognito window
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[gu]=નવી છુપી વિંડો
-Name[hi]=नई गुप्त विंडो
-Name[hr]=Novi anoniman prozor
-Name[hu]=Új Inkognitóablak
-Name[id]=Jendela Penyamaran baru
-Name[it]=Nuova finestra di navigazione in incognito
-Name[iw]=חלון חדש לגלישה בסתר
-Name[ja]=新しいシークレット ウィンドウ
-Name[kn]=ಹೊಸ ಅಜ್ಞಾತ ವಿಂಡೋ
-Name[ko]=새 시크릿 창
-Name[lt]=Naujas inkognito langas
-Name[lv]=Jauns inkognito režīma logs
-Name[ml]=പുതിയ വേഷ പ്രച്ഛന്ന വിന്‍ഡോ
-Name[mr]=नवीन गुप्त विंडो
-Name[nl]=Nieuw incognitovenster
-Name[no]=Nytt inkognitovindu
-Name[pl]=Nowe okno incognito
-Name[pt]=Nova janela de navegação anónima
-Name[pt_BR]=Nova janela anônima
-Name[ro]=Fereastră nouă incognito
-Name[ru]=Новое окно в режиме инкогнито
-Name[sk]=Nové okno inkognito
-Name[sl]=Novo okno brez beleženja zgodovine
-Name[sr]=Нови прозор за прегледање без архивирања
-Name[sv]=Nytt inkognitofönster
-Name[ta]=புதிய மறைநிலைச் சாளரம்
-Name[te]=క్రొత్త అజ్ఞాత విండో
-Name[th]=หน้าต่างใหม่ที่ไม่ระบุตัวตน
-Name[tr]=Yeni Gizli pencere
-Name[uk]=Нове вікно в режимі анонімного перегляду
-Name[vi]=Cửa sổ ẩn danh mới
-Name[zh_CN]=新建隐身窗口
-Name[zh_TW]=新增無痕式視窗
-Exec=chromium --incognito
diff --git a/chromium-next/files/chromium.sh.in b/chromium-next/files/chromium.sh.in
deleted file mode 100644
index 4626e08328..0000000000
--- a/chromium-next/files/chromium.sh.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-DATASIZE="716800"
-OPENFILES="400"
-
-xm_log() {
-	echo -n "$@\nDo you want to run Chromium anyway?\n\
-(If you don't increase these limits, Chromium might fail to work properly.)" | \
-		@X11BASE@/bin/xmessage -file - -center -buttons yes:0,no:1 -default no
-}
-
-if [ $(ulimit -Sd) -lt ${DATASIZE} ]; then
-	ulimit -Sd ${DATASIZE} || \
-		xm_log "Cannot increase datasize-cur to at least ${DATASIZE}"
-		[ $? -eq 0 ] || exit
-fi
-
-if [ $(ulimit -Sn) -lt ${OPENFILES} ]; then
-	ulimit -Sn ${OPENFILES} || \
-		xm_log "Cannot increase openfiles-cur to at least ${OPENFILES}"
-		[ $? -eq 0 ] || exit
-fi
-
-#
-# Temporary workaround for the case when chromium crashes and leaves
-# the SingletonLock, which prevents chromium to start up.
-#
-if [ -h ${HOME}/.config/chromium/SingletonLock ]; then
-	_pid=`readlink ${HOME}/.config/chromium/SingletonLock | cut -d '-' -f 2`
-	kill -0 ${_pid} 2>/dev/null
-	if [ $? -gt 0 ]; then
-		rm ${HOME}/.config/chromium/SingletonLock
-	fi
-fi
-
-#
-# Issue #395446
-# https://code.google.com/p/chromium/issues/detail?id=395446
-#
-[ -z ${LANG} ] && _l=en_US.UTF-8 || _l=${LANG}
-
-#
-# Workaround to dbus
-# https://bugs.chromium.org/p/chromium/issues/detail?id=918234
-#
-[ -z ${DBUS_SESSION_BUS_ADDRESS} ] && export DBUS_SESSION_BUS_ADDRESS="autolaunch:"
-
-#
-# Workaround to pulseaudio
-# Chromium is failing to start a new pulseaudio server,
-# however can use an already started.
-#
-BUILT_WITH_PULSE=@PULSE@
-if [ "$BUILT_WITH_PULSE" = "yes" ]; then
-	pgrep -x pulseaudio || pulseaudio --start --log-target=syslog --exit-idle-time=-1
-fi
-
-# Always use our versions of ffmpeg libs.
-# This also makes RPMs find the compatibly-named library symlinks.
-if [ -n "$LD_LIBRARY_PATH" ]; then
-	LD_LIBRARY_PATH="@PREFIX@/lib/chromium:@PREFIX@/lib/chromium/lib:$LD_LIBRARY_PATH"
-else
-	LD_LIBRARY_PATH="@PREFIX@/lib/chromium:@PREFIX@/lib/chromium/lib"
-fi
-export LD_LIBRARY_PATH
-
-[ -d ~/Downloads ] || mkdir -m 0700 ~/Downloads
-[ -d ~/.config ] || mkdir -m 0700 ~/.config
-[ -f ~/.config/user-dirs.dirs ] || \
-	echo 'XDG_DOWNLOAD_DIR="$HOME/Downloads"' > ~/.config/user-dirs.dirs
-
-# WebAssembly can be disabled by setting CHROMIUM_ENABLE_WASM=0 in your environment.
-[ "${CHROMIUM_ENABLE_WASM:-1}" != "1" ] && \
-	_NOWASM="--disable-features=WebAssembly,AsmJsToWebAssembly,WebAssemblyStreaming --js-flags=--noexpose-wasm"
-
-# User settings
-[ -f ~/.config/chromium-flags.conf ] || echo 'CHROMIUM_FLAGS=""' > ~/.config/chromium-flags.conf
-. ~/.config/chromium-flags.conf
-
-LANG=${_l} exec "@PREFIX@/lib/chromium/chrome" ${_NOWASM} ${CHROMIUM_FLAGS} "${@}"
diff --git a/chromium-next/options.mk b/chromium-next/options.mk
deleted file mode 100644
index c8d5dde95c..0000000000
--- a/chromium-next/options.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: options.mk,v 1.32 2016/08/20 11:17:32 ryoon Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.chromium
-PKG_OPTIONS_REQUIRED_GROUPS=	audio
-PKG_OPTIONS_GROUP.audio=	alsa pulseaudio sunaudio
-PKG_SUPPORTED_OPTIONS+=		debug
-
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=		sunaudio
-.else
-PKG_SUGGESTED_OPTIONS+=		pulseaudio
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Msunaudio)
-GN_ARGS+=	use_audioio=true
-.else
-GN_ARGS+=	use_audioio=false
-.endif
-
-.if !empty(PKG_OPTIONS:Malsa)
-GN_ARGS+=	use_alsa=true
-.include "../../audio/alsa-lib/buildlink3.mk"
-.else
-GN_ARGS+=	use_alsa=false
-.endif
-
-.if !empty(PKG_OPTIONS:Mpulseaudio)
-WITH_PA=	yes
-GN_ARGS+=	use_pulseaudio=true
-.include "../../audio/pulseaudio/buildlink3.mk"
-.else
-WITH_PA=	no
-GN_ARGS+=	use_pulseaudio=false
-.endif
-
-.if !empty(PKG_OPTIONS:Mdebug)
-BUILDTYPE=		Debug
-GN_ARGS+=		is_debug=true
-GN_ARGS+=		symbol_level=1
-GN_BOOTSTRAP_FLAGS+=	--debug
-GN_VERBOSE=		#-v
-INSTALL_UNSTRIPPED=	yes
-.else
-BUILDTYPE=		Release
-GN_ARGS+=		is_official_build=true
-GN_ARGS+=		is_component_build=false
-GN_ARGS+=		is_debug=false
-GN_ARGS+=		blink_symbol_level=0
-GN_ARGS+=		symbol_level=0
-GN_VERBOSE=		# empty
-.endif
diff --git a/chromium-next/patches/patch-BUILD.gn b/chromium-next/patches/patch-BUILD.gn
deleted file mode 100644
index 358a7a2c05..0000000000
--- a/chromium-next/patches/patch-BUILD.gn
+++ /dev/null
@@ -1,104 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ BUILD.gn
-@@ -71,7 +71,7 @@ declare_args() {
-   root_extra_deps = []
- }
- 
--if (is_official_build) {
-+if (is_official_build && !is_bsd) {
-   # An official (maximally optimized!) component (optimized for build times)
-   # build doesn't make sense and usually doesn't work.
-   assert(!is_component_build)
-@@ -103,7 +103,6 @@ group("gn_all") {
-       "//codelabs",
-       "//components:components_unittests",
-       "//components/gwp_asan:gwp_asan_unittests",
--      "//infra/orchestrator:orchestrator_all",
-       "//net:net_unittests",
-       "//sandbox:sandbox_unittests",
-       "//services:services_unittests",
-@@ -449,7 +448,7 @@ group("gn_all") {
-       }
-     }
- 
--    if (is_linux || is_chromeos || is_android) {
-+    if ((is_linux && !is_bsd) || is_chromeos || is_android) {
-       deps += [
-         "//third_party/breakpad:breakpad_unittests",
-         "//third_party/breakpad:core-2-minidump",
-@@ -636,6 +635,15 @@ group("gn_all") {
-       }
-     }
- 
-+    if (is_bsd) {
-+      deps -= [
-+        "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)",
-+        "//third_party/breakpad:microdump_stackwalk($host_system_allocator_toolchain)",
-+        "//third_party/breakpad:minidump_dump($host_system_allocator_toolchain)",
-+        "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)",
-+      ]
-+    }
-+
-     if (is_mac) {
-       deps += [
-         "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)",
-@@ -684,7 +692,7 @@ group("gn_all") {
-       }
-     }
- 
--    if (!is_fuchsia) {
-+    if (!is_fuchsia && !is_bsd) {
-       # The official builders use this binary from the default toolchain's
-       # output directory after building in order to upload the symbols of that
-       # binary. They build the binary like `ninja symupload` which requires the
-@@ -719,7 +727,7 @@ group("gn_all") {
-       ]
-     }
- 
--    if (is_mac || is_win || is_android || is_linux || is_chromeos) {
-+    if (!is_bsd && (is_mac || is_win || is_android || is_linux || is_chromeos)) {
-       deps += [
-         "//third_party/crashpad/crashpad:crashpad_tests",
-         "//third_party/crashpad/crashpad/handler:crashpad_handler",
-@@ -1128,7 +1136,7 @@ if (use_blink && !is_cronet_build) {
-       "//third_party/blink/public:all_blink",
-     ]
- 
--    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos) {
-+    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
-       deps += [
-         ":chrome_wpt_tests",
-         ":headless_shell_wpt",
-@@ -1275,7 +1283,7 @@ if (use_blink && !is_cronet_build) {
-       data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
-     }
- 
--    if (!is_win && !is_android) {
-+    if (!is_win && !is_android && !is_bsd) {
-       # Using the default toolchain for this tool, as it's run during tests not
-       # during the build. This places a symlink in the root_build_dir for scrips
-       # to use.
-@@ -1289,7 +1297,7 @@ if (use_blink && !is_cronet_build) {
-       data_deps += [ "//third_party/breakpad:dump_syms" ]
-     }
- 
--    if (is_linux || is_chromeos) {
-+    if ((is_linux && !is_bsd) || is_chromeos) {
-       # Using the default toolchain for this tool, as it's run during tests not
-       # during the build. This places a symlink in the root_build_dir for scrips
-       # to use.
-@@ -1760,7 +1768,7 @@ group("chromium_builder_perf") {
-       data_deps += [ "//chrome/test:performance_browser_tests" ]
-     }
- 
--    if (!is_win) {
-+    if (!is_win && !is_bsd) {
-       data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)" ]
-     }
-   }
diff --git a/chromium-next/patches/patch-apps_ui_views_app__window__frame__view.cc b/chromium-next/patches/patch-apps_ui_views_app__window__frame__view.cc
deleted file mode 100644
index a51cdf7df3..0000000000
--- a/chromium-next/patches/patch-apps_ui_views_app__window__frame__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- apps/ui/views/app_window_frame_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ apps/ui/views/app_window_frame_view.cc
-@@ -146,7 +146,7 @@ gfx::Rect AppWindowFrameView::GetBoundsF
- gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
-     const gfx::Rect& client_bounds) const {
-   gfx::Rect window_bounds = client_bounds;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Get the difference between the widget's client area bounds and window
-   // bounds, and grow |window_bounds| by that amount.
-   gfx::Insets native_frame_insets =
diff --git a/chromium-next/patches/patch-ash_display_mirror__window__controller.cc b/chromium-next/patches/patch-ash_display_mirror__window__controller.cc
deleted file mode 100644
index 0ffff694cc..0000000000
--- a/chromium-next/patches/patch-ash_display_mirror__window__controller.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ash/display/mirror_window_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ash/display/mirror_window_controller.cc
-@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindo
-       if (!base::Contains(display_info_list, iter->first,
-                           &display::ManagedDisplayInfo::id)) {
-         CloseAndDeleteHost(iter->second, true);
-+#if defined(__llvm__)
-+        mirroring_host_info_map_.erase(iter++);
-+#else
-         iter = mirroring_host_info_map_.erase(iter);
-+#endif
-       } else {
-         ++iter;
-       }
diff --git a/chromium-next/patches/patch-base_BUILD.gn b/chromium-next/patches/patch-base_BUILD.gn
deleted file mode 100644
index 122c133d67..0000000000
--- a/chromium-next/patches/patch-base_BUILD.gn
+++ /dev/null
@@ -1,172 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/BUILD.gn
-@@ -944,7 +944,7 @@ component("base") {
-     #"system/sys_info_openbsd.cc",
-   ]
- 
--  if (is_apple || current_os == "freebsd" || current_os == "openbsd") {
-+  if (is_apple || current_os == "freebsd" || current_os == "openbsd" || current_os == "netbsd") {
-     sources += [
-       "posix/sysctl.cc",
-       "posix/sysctl.h",
-@@ -1104,11 +1104,26 @@ component("base") {
-   # Needed for <atomic> if using newer C++ library than sysroot, except if
-   # building inside the cros_sdk environment - use host_toolchain as a
-   # more robust check for this.
--  if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
-+  if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos && !is_bsd)) &&
-       host_toolchain != "//build/toolchain/cros:host") {
-     libs += [ "atomic" ]
-   }
- 
-+  # *BSD needs libkvm
-+  if (is_bsd) {
-+    libs += [
-+      "kvm",
-+      "epoll-shim",
-+    ]
-+  }
-+
-+  if (is_freebsd) {
-+    libs += [
-+      "execinfo",
-+      "util",
-+    ]
-+  }
-+
-   if (use_allocator_shim) {
-     if (is_apple) {
-       sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1128,7 +1143,7 @@ component("base") {
- 
-   # Allow more direct string conversions on platforms with native utf8
-   # strings
--  if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) {
-+  if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) {
-     defines += [ "SYSTEM_NATIVE_UTF8" ]
-   }
- 
-@@ -2152,6 +2167,29 @@ component("base") {
-     ]
-   }
- 
-+  if (is_openbsd) {
-+    sources += [
-+      "process/process_handle_openbsd.cc",
-+      "process/process_iterator_openbsd.cc",
-+      "process/process_metrics_openbsd.cc",
-+      "system/sys_info_openbsd.cc",
-+    ]
-+  } else if (is_freebsd) {
-+    sources += [
-+      "process/process_handle_freebsd.cc",
-+      "process/process_iterator_freebsd.cc",
-+      "process/process_metrics_freebsd.cc",
-+      "system/sys_info_freebsd.cc",
-+    ]
-+  }  else if (is_netbsd) {
-+    sources += [
-+      "process/process_handle_netbsd.cc",
-+      "process/process_iterator_netbsd.cc",
-+      "process/process_metrics_netbsd.cc",
-+      "system/sys_info_netbsd.cc",
-+    ]
-+  }
-+
-   # iOS
-   if (is_ios) {
-     sources += [
-@@ -2312,6 +2350,33 @@ component("base") {
-     }
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "files/file_path_watcher_inotify.cc",
-+      "files/scoped_file_linux.cc",
-+      "process/set_process_title_linux.cc",
-+      "process/set_process_title_linux.h",
-+      "system/sys_info_linux.cc",
-+      "process/process_iterator_linux.cc",
-+      "process/process_linux.cc",
-+      "process/process_metrics_linux.cc",
-+      "process/process_handle_linux.cc",
-+      "profiler/stack_copier_signal.cc",
-+      "profiler/stack_copier_signal.h",
-+      "profiler/thread_delegate_posix.cc",
-+      "profiler/thread_delegate_posix.h",
-+      "threading/platform_thread_linux.cc",
-+      "stack_canary_linux.cc",
-+      "stack_canary_linux.h",
-+    ]
-+    sources += [
-+      "files/file_path_watcher_kqueue.cc",
-+      "files/file_path_watcher_kqueue.h",
-+      "files/file_path_watcher_bsd.cc",
-+      "threading/platform_thread_bsd.cc",
-+    ]
-+  }
-+
-   if (use_blink) {
-     sources += [
-       "files/file_path_watcher.cc",
-@@ -2690,7 +2755,7 @@ buildflag_header("protected_memory_build
-   header = "protected_memory_buildflags.h"
-   header_dir = "base/memory"
- 
--  protected_memory_enabled = !is_component_build && is_clang &&
-+  protected_memory_enabled = !is_openbsd && !is_component_build && is_clang &&
-                              (is_win || is_linux || is_android || is_mac)
- 
-   flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ]
-@@ -3163,7 +3228,7 @@ if (is_apple) {
-   }
- }
- 
--if (!is_nacl && (is_linux || is_chromeos)) {
-+if (!is_nacl && !is_bsd && (is_linux || is_chromeos)) {
-   # This test must compile with -fstack-protector-all
-   source_set("stack_canary_linux_unittests") {
-     testonly = true
-@@ -3851,7 +3916,7 @@ test("base_unittests") {
-     ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if (!is_bsd && (is_linux || is_chromeos)) {
-     sources += [
-       "debug/proc_maps_linux_unittest.cc",
-       "files/scoped_file_linux_unittest.cc",
-@@ -3879,7 +3944,7 @@ test("base_unittests") {
-       "posix/file_descriptor_shuffle_unittest.cc",
-       "posix/unix_domain_socket_unittest.cc",
-     ]
--    if (!is_nacl && !is_apple) {
-+    if (!is_nacl && !is_apple && !is_bsd) {
-       sources += [
-         "profiler/stack_base_address_posix_unittest.cc",
-         "profiler/stack_copier_signal_unittest.cc",
-@@ -3890,7 +3955,7 @@ test("base_unittests") {
- 
-   # Allow more direct string conversions on platforms with native utf8
-   # strings
--  if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) {
-+  if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) {
-     defines += [ "SYSTEM_NATIVE_UTF8" ]
-   }
- 
-@@ -4080,7 +4145,7 @@ test("base_unittests") {
-     deps += [ ":base_profiler_test_support_library" ]
-   }
- 
--  if (is_fuchsia || is_linux || is_chromeos) {
-+  if ((is_fuchsia || is_linux || is_chromeos) && !is_bsd) {
-     sources += [
-       "debug/elf_reader_unittest.cc",
-       "debug/test_elf_image_builder.cc",
diff --git a/chromium-next/patches/patch-base_allocator_dispatcher_tls.h b/chromium-next/patches/patch-base_allocator_dispatcher_tls.h
deleted file mode 100644
index ccaf5fde55..0000000000
--- a/chromium-next/patches/patch-base_allocator_dispatcher_tls.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/dispatcher/tls.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/dispatcher/tls.h
-@@ -81,7 +81,7 @@ struct BASE_EXPORT MMapAllocator {
-   constexpr static size_t AllocationChunkSize = 16384;
- #elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)
-   constexpr static size_t AllocationChunkSize = 16384;
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
-   constexpr static size_t AllocationChunkSize = 16384;
- #else
-   constexpr static size_t AllocationChunkSize = 4096;
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_partition__alloc.gni b/chromium-next/patches/patch-base_allocator_partition__allocator_partition__alloc.gni
deleted file mode 100644
index c9a60256dd..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -89,7 +89,7 @@ if (is_nacl) {
- # TODO(crbug.com/329199197): Clean this up when experiments are complete.
- use_large_empty_slot_span_ring = true
- 
--has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan &&
-+has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && !is_bsd &&
-                      !is_hwasan && (is_linux || is_android)
- 
- declare_args() {
-@@ -348,7 +348,7 @@ declare_args() {
- declare_args() {
-   # Shadow metadata is still under development and only supports Linux
-   # for now.
--  enable_shadow_metadata = is_linux && has_64_bit_pointers
-+  enable_shadow_metadata = !is_bsd && is_linux && has_64_bit_pointers
- }
- 
- declare_args() {
-@@ -491,7 +491,7 @@ assert(!use_asan_backup_ref_ptr || use_r
- # dependencies that use partition_allocator are compiled in AOSP against a
- # version of glibc that does not include pkeys syscall numbers.
- is_pkeys_available =
--    (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build
-+    !is_bsd && (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build
- declare_args() {
-   enable_pkeys = is_pkeys_available
- }
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
deleted file mode 100644
index a363f502f0..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -886,7 +886,7 @@ if (is_clang_or_gcc) {
-         configs -= [ partition_alloc_enable_arc_config ]
-       }
-     }
--    if (is_chromeos || is_linux) {
-+    if ((is_chromeos || is_linux) && !is_bsd) {
-       shim_headers += [
-         "shim/allocator_shim_override_cpp_symbols.h",
-         "shim/allocator_shim_override_glibc_weak_symbols.h",
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
deleted file mode 100644
index 4e53297665..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
-@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
- 
- #if PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)
- 
--  #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
-+  #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !PA_BUILDFLAG(IS_BSD)
- 
-     // We shouldn't allocate system pages at all for sanitizer builds. However,
-     // we do, and if random hint addresses interfere with address ranges
-@@ -125,7 +125,7 @@ AslrMask(uintptr_t bits) {
-         return AslrAddress(0x20000000ULL);
-       }
-     #elif PA_BUILDFLAG(PA_ARCH_CPU_ARM64)
--      #if PA_BUILDFLAG(IS_LINUX)
-+      #if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)
- 
-       // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on
-       // page size and number of levels of translation pages used. We use
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
deleted file mode 100644
index f11e14c65e..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h
-@@ -269,7 +269,7 @@ bool DecommitAndZeroSystemPages(void* ad
- // recommitted. Do not assume that this will not change over time.
- constexpr PA_COMPONENT_EXPORT(
-     PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
--#if PA_BUILDFLAG(IS_APPLE)
-+#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD)
-   return false;
- #else
-   return true;
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
deleted file mode 100644
index b24cb9b3db..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
-@@ -26,8 +26,8 @@
- #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
- 
- #elif (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \
--    (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) ||       \
--    (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64))
-+    ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) ||       \
-+    ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64))
- // This should work for all POSIX (if needed), but currently all other
- // supported OS/architecture combinations use either hard-coded values
- // (such as x86) or have means to determine these values without needing
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
deleted file mode 100644
index f055e0421a..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc
-@@ -39,7 +39,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTas
- 
- #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) ||                                        \
-     (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && \
--     __has_include(<sys/ifunc.h>))
-+     __has_include(<sys/ifunc.h>) && !PA_BUILDFLAG(IS_BSD))
- struct __ifunc_arg_t;
- 
- #include "partition_alloc/aarch64_support.h"
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
deleted file mode 100644
index 3c2d62a88d..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
-@@ -309,8 +309,12 @@ bool TryRecommitSystemPagesInternal(
- 
- void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
-   void* ptr = reinterpret_cast<void*>(address);
--#if PA_BUILDFLAG(IS_APPLE)
-+#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD)
-+#if PA_BUILDFLAG(IS_BSD)
-+  int ret = madvise(ptr, length, MADV_FREE);
-+#else
-   int ret = madvise(ptr, length, MADV_FREE_REUSABLE);
-+#endif
-   if (ret) {
-     // MADV_FREE_REUSABLE sometimes fails, so fall back to MADV_DONTNEED.
-     ret = madvise(ptr, length, MADV_DONTNEED);
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
deleted file mode 100644
index 3d42307b0c..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc
-@@ -19,7 +19,7 @@
- #include "partition_alloc/partition_alloc_check.h"
- 
- #if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || \
--    PA_BUILDFLAG(IS_ANDROID)
-+    PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_BSD)
- #include <inttypes.h>
- #endif
- 
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
deleted file mode 100644
index d6119b9bbb..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
-@@ -13,11 +13,11 @@
- #include "partition_alloc/partition_alloc_base/posix/eintr_wrapper.h"
- #include "partition_alloc/partition_alloc_base/strings/safe_sprintf.h"
- 
--#if !PA_BUILDFLAG(IS_ANDROID) && !PA_BUILDFLAG(IS_APPLE)
-+#if !PA_BUILDFLAG(IS_ANDROID) && !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_BSD)
- #include <link.h>  // For ElfW() macro.
- #endif
- 
--#if PA_BUILDFLAG(IS_APPLE)
-+#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD)
- #include <dlfcn.h>
- #endif
- 
-@@ -25,7 +25,7 @@ namespace partition_alloc::internal::bas
- 
- namespace {
- 
--#if !PA_BUILDFLAG(IS_APPLE)
-+#if !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_BSD)
- 
- // On Android the 'open' function has two versions:
- // int open(const char *pathname, int flags);
-@@ -369,7 +369,7 @@ void PrintStackTraceInternal(const void*
- }
- #endif  // !PA_BUILDFLAG(IS_APPLE)
- 
--#if PA_BUILDFLAG(IS_APPLE)
-+#if PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_BSD)
- // Since /proc/self/maps is not available, use dladdr() to obtain module
- // names and offsets inside the modules from the given addresses.
- void PrintStackTraceInternal(const void* const* trace, size_t size) {
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
deleted file mode 100644
index af00fd3d6f..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc
-@@ -102,6 +102,10 @@ void RandBytes(void* output, size_t outp
-   if (getentropy(output, output_length) == 0) {
-     return;
-   }
-+#elif PA_BUILDFLAG(IS_BSD)
-+  if (getentropy(output, output_length) == 0) {
-+    return;
-+  }
- #endif
-   // If getrandom(2) above returned with an error and the /dev/urandom fallback
-   // took place on Linux/ChromeOS bots, they would fail with a CHECK in
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
deleted file mode 100644
index d5c481540c..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h
-@@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId;
- typedef zx_handle_t PlatformThreadId;
- #elif PA_BUILDFLAG(IS_APPLE)
- typedef mach_port_t PlatformThreadId;
-+#elif PA_BUILDFLAG(IS_BSD)
-+typedef uint64_t PlatformThreadId;
- #elif PA_BUILDFLAG(IS_POSIX)
- typedef pid_t PlatformThreadId;
- #endif
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
deleted file mode 100644
index 8830d5b587..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h
-@@ -10,7 +10,7 @@
- 
- namespace partition_alloc::internal::base::internal {
- 
--#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
-+#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
- // Current thread id is cached in thread local storage for performance reasons.
- // In some rare cases it's important to invalidate that cache explicitly (e.g.
- // after going through clone() syscall which does not call pthread_atfork()
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
deleted file mode 100644
index 305ca61a3a..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
-@@ -18,7 +18,7 @@
- #include "partition_alloc/partition_alloc_base/logging.h"
- #include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h"
- 
--#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
-+#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
- #include <sys/syscall.h>
- #include <atomic>
- #endif
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
deleted file mode 100644
index cc36a40f15..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
-@@ -51,8 +51,8 @@ static_assert(sizeof(void*) != 8, "");
- // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
- // features such as futex(2).
- #define PA_CONFIG_HAS_LINUX_KERNEL()                      \
--  (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || \
--   PA_BUILDFLAG(IS_ANDROID))
-+  ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || \
-+   PA_BUILDFLAG(IS_ANDROID)) && !PA_BUILDFLAG(IS_NETBSD))
- 
- // If defined, enables zeroing memory on Free() with roughly 1% probability.
- // This applies only to normal buckets, as direct-map allocations are always
-@@ -170,7 +170,7 @@ constexpr bool kUseLazyCommit = false;
- // This may be required on more platforms in the future.
- #define PA_CONFIG_HAS_ATFORK_HANDLER()                 \
-   (PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_LINUX) || \
--   PA_BUILDFLAG(IS_CHROMEOS))
-+   PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD))
- 
- // Enable shadow metadata.
- //
-@@ -233,7 +233,7 @@ constexpr bool kUseLazyCommit = false;
- // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead
- // to larger slot spans.
- #if PA_BUILDFLAG(IS_LINUX) || \
--    (PA_BUILDFLAG(IS_APPLE) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64))
-+    (PA_BUILDFLAG(IS_APPLE) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || PA_BUILDFLAG(IS_BSD)
- #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1
- #else
- #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
deleted file mode 100644
index d67d170abb..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
-@@ -327,7 +327,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandle
- // 8GB for each of the glued pools).
- #if PA_BUILDFLAG(HAS_64_BIT_POINTERS)
- #if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_IOS) || \
--    PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION)
-+    PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) || PA_BUILDFLAG(IS_BSD)
- constexpr size_t kPoolMaxSize = 8 * kGiB;
- #else
- constexpr size_t kPoolMaxSize = 16 * kGiB;
-@@ -444,7 +444,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDir
- // TODO(casey.smalley%arm.com@localhost): under 64k pages we can end up in a situation
- // where a normal slot span will be large enough to contain multiple items,
- // but the address will go over the final partition page after being aligned.
--#if PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)
-+#if (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)
- constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 4;
- #else
- constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 2;
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
deleted file mode 100644
index 34ddd94717..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h
-@@ -28,9 +28,13 @@ namespace internal {
- // the second one 16. We could technically return something different for
- // malloc() and operator new(), but this would complicate things, and most of
- // our allocations are presumably coming from operator new() anyway.
-+#if defined(__i386__) && defined(OS_FREEBSD)
-+constexpr size_t kAlignment = 8;
-+#else
- constexpr size_t kAlignment =
-     std::max(alignof(max_align_t),
-              static_cast<size_t>(__STDCPP_DEFAULT_NEW_ALIGNMENT__));
-+#endif
- static_assert(kAlignment <= 16,
-               "PartitionAlloc doesn't support a fundamental alignment larger "
-               "than 16 bytes.");
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
deleted file mode 100644
index 734fb8b7c2..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
-@@ -44,7 +44,7 @@
- #include "wow64apiset.h"
- #endif
- 
--#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
-+#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
- #include <pthread.h>
- #if PA_CONFIG(ENABLE_SHADOW_METADATA)
- #include <sys/mman.h>
-@@ -297,7 +297,7 @@ void PartitionAllocMallocInitOnce() {
-     return;
-   }
- 
--#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
-+#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)
-   // When fork() is called, only the current thread continues to execute in the
-   // child process. If the lock is held, but *not* by this thread when fork() is
-   // called, we have a deadlock.
-@@ -1117,7 +1117,7 @@ void PartitionRoot::Init(PartitionOption
-     // apple OSes.
-     PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
-              (internal::SystemPageSize() == (size_t{1} << 14)));
--#elif PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)
-+#elif (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)
-     // Check runtime pagesize. Though the code is currently the same, it is
-     // not merged with the IS_APPLE case above as a 1 << 16 case is only
-     // supported on Linux on AArch64.
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
deleted file mode 100644
index 70d1124ab5..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc
-@@ -17,7 +17,16 @@
- #endif
- 
- #if PA_CONFIG(HAS_LINUX_KERNEL)
-+#if defined(OS_OPENBSD) || defined(OS_NETBSD)
-+#include <sys/time.h>
-+#include <sys/futex.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/types.h>
-+#include <sys/thr.h>
-+#include <sys/umtx.h>
-+#else
- #include <linux/futex.h>
-+#endif
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-@@ -106,8 +115,19 @@ void SpinningMutex::FutexWait() {
-   // |kLockedContended| anymore. Note that even without spurious wakeups, the
-   // value of |state_| is not guaranteed when this returns, as another thread
-   // may get the lock before we get to run.
-+#if defined(OS_FREEBSD)
-+  int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE,
-+                    kLockedContended, nullptr, nullptr);
-+#elif defined(OS_OPENBSD)
-+  int err = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
-+                    kLockedContended, nullptr, nullptr);
-+#elif defined(OS_NETBSD)
-+  int err = syscall(SYS___futex, reinterpret_cast<int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
-+                     kLockedContended, nullptr, nullptr, 0, 0);
-+#else
-   int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
-                     kLockedContended, nullptr, nullptr, 0);
-+#endif
- 
-   if (err) {
-     // These are programming error, check them.
-@@ -119,8 +139,19 @@ void SpinningMutex::FutexWait() {
- 
- void SpinningMutex::FutexWake() {
-   int saved_errno = errno;
-+#if defined(OS_FREEBSD)
-+  long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE,
-+                         1 /* wake up a single waiter */, nullptr, nullptr);
-+#elif defined(OS_OPENBSD)
-+  long retval = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAKE | FUTEX_PRIVATE_FLAG,
-+                        1 /* wake up a single waiter */, nullptr, nullptr);
-+#elif defined(OS_NETBSD)
-+  long retval = syscall(SYS___futex, reinterpret_cast<int *>(&state_), FUTEX_WAKE | FUTEX_PRIVATE_FLAG,
-+                         1 /* wake up a single waiter */, nullptr, nullptr, 0, 0);
-+#else
-   long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG,
-                         1 /* wake up a single waiter */, nullptr, nullptr, 0);
-+#endif
-   PA_CHECK(retval != -1);
-   errno = saved_errno;
- }
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
deleted file mode 100644
index d15565b4d6..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc
-@@ -18,6 +18,10 @@
- #include <pthread.h>
- #endif
- 
-+#if PA_BUILDFLAG(IS_BSD) && !PA_BUILDFLAG(IS_NETBSD)
-+#include <pthread_np.h>
-+#endif
-+
- #if PA_BUILDFLAG(PA_LIBC_GLIBC)
- extern "C" void* __libc_stack_end;
- #endif
-@@ -50,6 +54,36 @@ void* GetStackTop() {
-   return pthread_get_stackaddr_np(pthread_self());
- }
- 
-+#elif PA_BUILDFLAG(IS_OPENBSD)
-+
-+void* GetStackTop() {
-+  stack_t ss;
-+  if (pthread_stackseg_np(pthread_self(), &ss) != 0)
-+    return nullptr;
-+  return reinterpret_cast<uint8_t*>(ss.ss_sp);
-+}
-+
-+#elif PA_BUILDFLAG(IS_FREEBSD) || PA_BUILDFLAG(IS_NETBSD)
-+
-+void* GetStackTop() {
-+   pthread_attr_t attr;
-+   int error = pthread_attr_init(&attr);
-+   if (error) {
-+     return nullptr;
-+   }
-+   error = pthread_attr_get_np(pthread_self(), &attr);
-+   if (!error) {
-+     void* base;
-+     size_t size;
-+     error = pthread_attr_getstack(&attr, &base, &size);
-+     PA_CHECK(!error);
-+     pthread_attr_destroy(&attr);
-+     return reinterpret_cast<uint8_t*>(base) + size;
-+   }
-+  pthread_attr_destroy(&attr);
-+  return nullptr;
-+}
-+
- #elif PA_BUILDFLAG(IS_POSIX) || PA_BUILDFLAG(IS_FUCHSIA)
- 
- void* GetStackTop() {
diff --git a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc b/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
deleted file mode 100644
index 8e591bae6d..0000000000
--- a/chromium-next/patches/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc
-@@ -16,7 +16,7 @@
- #include "partition_alloc/partition_alloc_check.h"
- #include "partition_alloc/thread_isolation/thread_isolation.h"
- 
--#if !PA_BUILDFLAG(IS_LINUX) && !PA_BUILDFLAG(IS_CHROMEOS)
-+#if !PA_BUILDFLAG(IS_LINUX) && !PA_BUILDFLAG(IS_CHROMEOS) && !PA_BUILDFLAG(IS_BSD)
- #error "This pkey code is currently only supported on Linux and ChromeOS"
- #endif
- 
diff --git a/chromium-next/patches/patch-base_atomicops.h b/chromium-next/patches/patch-base_atomicops.h
deleted file mode 100644
index f9606f027f..0000000000
--- a/chromium-next/patches/patch-base_atomicops.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/atomicops.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/atomicops.h
-@@ -74,7 +74,11 @@ typedef intptr_t Atomic64;
- 
- // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
- // Atomic64 routines below, depending on your architecture.
-+#if !defined(OS_OPENBSD) && defined(__i386__)
-+typedef Atomic32 AtomicWord;
-+#else
- typedef intptr_t AtomicWord;
-+#endif
- 
- // Atomically execute:
- //      result = *ptr;
diff --git a/chromium-next/patches/patch-base_base__paths__posix.cc b/chromium-next/patches/patch-base_base__paths__posix.cc
deleted file mode 100644
index 090736136d..0000000000
--- a/chromium-next/patches/patch-base_base__paths__posix.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/base_paths_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/base_paths_posix.cc
-@@ -15,6 +15,7 @@
- #include <ostream>
- #include <string>
- 
-+#include "base/command_line.h"
- #include "base/environment.h"
- #include "base/files/file_path.h"
- #include "base/files/file_util.h"
-@@ -26,9 +27,13 @@
- #include "base/process/process_metrics.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_FREEBSD)
-+#if BUILDFLAG(IS_BSD)
- #include <sys/param.h>
- #include <sys/sysctl.h>
-+#if BUILDFLAG(IS_OPENBSD)
-+#include <kvm.h>
-+#define MAXTOKENS 2
-+#endif
- #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX)
- #include <stdlib.h>
- #endif
-@@ -47,13 +52,21 @@ bool PathProviderPosix(int key, FilePath
-       *result = bin_dir;
-       return true;
- #elif BUILDFLAG(IS_FREEBSD)
--      int name[] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
--      std::optional<std::string> bin_dir = StringSysctl(name, std::size(name));
-+      std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 });
-       if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
-         NOTREACHED() << "Unable to resolve path.";
-       }
-       *result = FilePath(bin_dir.value());
-       return true;
-+#elif BUILDFLAG(IS_NETBSD)
-+      std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_PATHNAME });
-+      if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
-+        NOTREACHED() << "Unable to resolve path.";
-+        return false;
-+      }
-+      *result = FilePath(bin_dir.value());
-+      VLOG(1) << "PathProviderPosix result: " << bin_dir.value();
-+      return true;
- #elif BUILDFLAG(IS_SOLARIS)
-       char bin_dir[PATH_MAX + 1];
-       if (realpath(getexecname(), bin_dir) == NULL) {
-@@ -62,14 +75,65 @@ bool PathProviderPosix(int key, FilePath
-       *result = FilePath(bin_dir);
-       return true;
- #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)
--      // There is currently no way to get the executable path on OpenBSD
--      char* cpath;
--      if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) {
--        *result = FilePath(cpath);
--      } else {
--        *result = FilePath("/usr/local/chrome/chrome");
-+      char *cpath;
-+#if !BUILDFLAG(IS_AIX)
-+      struct kinfo_file *files;
-+      kvm_t *kd = NULL;
-+      char errbuf[_POSIX2_LINE_MAX];
-+      static char retval[PATH_MAX];
-+      int cnt;
-+      struct stat sb;
-+      pid_t cpid = getpid();
-+      bool ret = false;
-+
-+      const base::CommandLine* command_line =
-+          base::CommandLine::ForCurrentProcess();
-+
-+      VLOG(1) << "PathProviderPosix argv: " << command_line->argv()[0];
-+
-+      if (realpath(command_line->argv()[0].c_str(), retval) == NULL)
-+        goto out;
-+
-+      if (stat(command_line->argv()[0].c_str(), &sb) < 0)
-+        goto out;
-+
-+      if (!command_line->HasSwitch("no-sandbox")) {
-+        ret = true;
-+        *result = FilePath(retval);
-+        VLOG(1) << "PathProviderPosix (sandbox) result: " << retval;
-+        goto out;
-       }
--      return true;
-+
-+      if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES, errbuf)) == NULL)
-+        goto out;
-+
-+      if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, cpid,
-+                                sizeof(struct kinfo_file), &cnt)) == NULL)
-+        goto out;
-+
-+      for (int i = 0; i < cnt; i++) {
-+        if (files[i].fd_fd == KERN_FILE_TEXT &&
-+            files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) &&
-+            files[i].va_fileid == sb.st_ino) {
-+          ret = true;
-+          *result = FilePath(retval);
-+          VLOG(1) << "PathProviderPosix result: " << retval;
-+        }
-+      }
-+out:
-+      if (kd)
-+        kvm_close(kd);
-+      if (!ret) {
-+#endif
-+        if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
-+          *result = FilePath(cpath);
-+        else
-+          *result = FilePath("@PREFIX@/lib/chromium/chrome");
-+        return true;
-+#if !BUILDFLAG(IS_AIX)
-+      }
-+      return ret;
-+#endif
- #endif
-     }
-     case DIR_SRC_TEST_DATA_ROOT: {
diff --git a/chromium-next/patches/patch-base_compiler__specific.h b/chromium-next/patches/patch-base_compiler__specific.h
deleted file mode 100644
index 0d92c069f9..0000000000
--- a/chromium-next/patches/patch-base_compiler__specific.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/compiler_specific.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/compiler_specific.h
-@@ -729,6 +729,7 @@ inline constexpr bool AnalyzerAssumeTrue
- #if __has_cpp_attribute(clang::preserve_most) &&             \
-     (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \
-     !defined(COMPONENT_BUILD) &&                             \
-+    !BUILDFLAG(IS_OPENBSD) &&                                \
-     !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64))
- #define PRESERVE_MOST [[clang::preserve_most]]
- #else
diff --git a/chromium-next/patches/patch-base_debug_debugger__posix.cc b/chromium-next/patches/patch-base_debug_debugger__posix.cc
deleted file mode 100644
index 7ef89446e1..0000000000
--- a/chromium-next/patches/patch-base_debug_debugger__posix.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/debug/debugger_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/debug/debugger_posix.cc
-@@ -41,6 +41,10 @@
- #include <sys/sysctl.h>
- #endif
- 
-+#if BUILDFLAG(IS_OPENBSD)
-+#include <sys/proc.h>
-+#endif
-+
- #if BUILDFLAG(IS_FREEBSD)
- #include <sys/user.h>
- #endif
-@@ -86,6 +90,7 @@ bool BeingDebugged() {
- 
-   // Initialize mib, which tells sysctl what info we want.  In this case,
-   // we're looking for information about a specific process ID.
-+#if !BUILDFLAG(IS_NETBSD)
-   int mib[] = {CTL_KERN,
-                KERN_PROC,
-                KERN_PROC_PID,
-@@ -96,37 +101,75 @@ bool BeingDebugged() {
-                0
- #endif
-   };
-+#else
-+  int mib[] = {CTL_KERN,
-+               KERN_PROC2,
-+               KERN_PROC_PID,
-+               getpid(),
-+               sizeof(struct kinfo_proc2),
-+               1
-+  };
-+#endif
- 
-   // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
-   // binary interfaces may change.
-+#if BUILDFLAG(IS_OPENBSD)
-+  struct kinfo_proc *info;
-+  size_t info_size;
-+#elif BUILDFLAG(IS_NETBSD)
-+  struct kinfo_proc2 info;
-+  size_t info_size = sizeof(info);
-+#else
-   struct kinfo_proc info;
-   size_t info_size = sizeof(info);
-+#endif
- 
- #if BUILDFLAG(IS_OPENBSD)
-   if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) {
-     return -1;
-   }
- 
--  mib[5] = (info_size / sizeof(struct kinfo_proc));
-+  mib[5] = static_cast<int>((info_size / sizeof(struct kinfo_proc)));
-+  if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL) {
-+    is_set = true;
-+    being_debugged = false;
-+    return being_debugged;
-+  }
-+
-+  int sysctl_result = sysctl(mib, std::size(mib), info, &info_size, NULL, 0);
-+#elif BUILDFLAG(IS_NETBSD)
-+  if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
-+    return -1;
-+
-+  mib[5] = (info_size / sizeof(struct kinfo_proc2));
- #endif
- 
-+#if !BUILDFLAG(IS_OPENBSD)
-   int sysctl_result = sysctl(mib, std::size(mib), &info, &info_size, NULL, 0);
-+#endif
-   DCHECK_EQ(sysctl_result, 0);
-   if (sysctl_result != 0) {
-     is_set = true;
-     being_debugged = false;
--    return being_debugged;
-+    goto out;
-   }
- 
-   // This process is being debugged if the P_TRACED flag is set.
-   is_set = true;
- #if BUILDFLAG(IS_FREEBSD)
-   being_debugged = (info.ki_flag & P_TRACED) != 0;
--#elif BUILDFLAG(IS_BSD)
-+#elif BUILDFLAG(IS_OPENBSD)
-+  being_debugged = (info->p_psflags & PS_TRACED) != 0;
-+#elif BUILDFLAG(IS_NETBSD)
-   being_debugged = (info.p_flag & P_TRACED) != 0;
- #else
-   being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
- #endif
-+
-+out:
-+#if BUILDFLAG(IS_OPENBSD)
-+  free(info);
-+#endif
-   return being_debugged;
- }
- 
diff --git a/chromium-next/patches/patch-base_debug_elf__reader.cc b/chromium-next/patches/patch-base_debug_elf__reader.cc
deleted file mode 100644
index d8fed16c01..0000000000
--- a/chromium-next/patches/patch-base_debug_elf__reader.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/debug/elf_reader.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/debug/elf_reader.cc
-@@ -49,6 +49,10 @@ using Xword = Elf64_Xword;
- 
- constexpr char kGnuNoteName[] = "GNU";
- 
-+#ifndef NT_GNU_BUILD_ID
-+#define NT_GNU_BUILD_ID 3
-+#endif
-+
- // Returns a pointer to the header of the ELF binary mapped into memory, or a
- // null pointer if the header is invalid. Here and below |elf_mapped_base| is a
- // pointer to the start of the ELF image.
diff --git a/chromium-next/patches/patch-base_debug_proc__maps__linux.cc b/chromium-next/patches/patch-base_debug_proc__maps__linux.cc
deleted file mode 100644
index d489e27cb4..0000000000
--- a/chromium-next/patches/patch-base_debug_proc__maps__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/debug/proc_maps_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/debug/proc_maps_linux.cc
-@@ -22,7 +22,7 @@
- #include "base/strings/string_split.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include <inttypes.h>
- #endif
- 
diff --git a/chromium-next/patches/patch-base_debug_stack__trace.cc b/chromium-next/patches/patch-base_debug_stack__trace.cc
deleted file mode 100644
index b88849de2d..0000000000
--- a/chromium-next/patches/patch-base_debug_stack__trace.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/debug/stack_trace.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/debug/stack_trace.cc
-@@ -268,7 +268,7 @@ bool StackTrace::WillSymbolizeToStreamFo
-   // Symbols are not expected to be reliable when gn args specifies
-   // symbol_level=0.
-   return false;
--#elif defined(__UCLIBC__) || defined(_AIX)
-+#elif defined(__UCLIBC__) || defined(_AIX) || BUILDFLAG(IS_BSD)
-   // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
-   // See https://crbug.com/706728
-   return false;
-@@ -321,7 +321,9 @@ void StackTrace::OutputToStreamWithPrefi
-     }
-     return;
-   }
-+#if !BUILDFLAG(IS_BSD)
-   OutputToStreamWithPrefixImpl(os, prefix_string);
-+#endif
- }
- 
- std::string StackTrace::ToString() const {
-@@ -330,7 +332,7 @@ std::string StackTrace::ToString() const
- 
- std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const {
-   std::stringstream stream;
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
-   OutputToStreamWithPrefix(&stream, prefix_string);
- #endif
-   return stream.str();
-@@ -354,7 +356,7 @@ bool StackTrace::ShouldSuppressOutput() 
- }
- 
- std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
-   s.OutputToStream(&os);
- #else
-   os << "StackTrace::OutputToStream not implemented.";
diff --git a/chromium-next/patches/patch-base_debug_stack__trace__posix.cc b/chromium-next/patches/patch-base_debug_stack__trace__posix.cc
deleted file mode 100644
index 0698f8e85a..0000000000
--- a/chromium-next/patches/patch-base_debug_stack__trace__posix.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/debug/stack_trace_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/debug/stack_trace_posix.cc
-@@ -50,8 +50,8 @@
- // Surprisingly, uClibc defines __GLIBC__ in some build configs, but
- // execinfo.h and backtrace(3) are really only present in glibc and in macOS
- // libc.
--#if BUILDFLAG(IS_APPLE) || \
--    (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX))
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_NETBSD) || \
-+    (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX) && !BUILDFLAG(IS_BSD))
- #define HAVE_BACKTRACE
- #include <execinfo.h>
- #endif
-@@ -69,8 +69,10 @@
- #include <AvailabilityMacros.h>
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-+#if !BUILDFLAG(IS_BSD)
- #include <sys/prctl.h>
-+#endif
- 
- #include "base/debug/proc_maps_linux.h"
- #endif
-@@ -329,7 +331,7 @@ void PrintToStderr(const char* output) {
-   std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) {
-   // We have seen rare cases on AMD linux where the default signal handler
-   // either does not run or a thread (Probably an AMD driver thread) prevents
-@@ -346,7 +348,11 @@ void AlarmSignalHandler(int signal, sigi
-       "Warning: Default signal handler failed to terminate process.\n");
-   PrintToStderr("Calling exit_group() directly to prevent timeout.\n");
-   // See: https://man7.org/linux/man-pages/man2/exit_group.2.html
-+#if BUILDFLAG(IS_BSD) 
-+  _exit(EXIT_FAILURE);
-+#else
-   syscall(SYS_exit_group, EXIT_FAILURE);
-+#endif
- }
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
-         // BUILDFLAG(IS_CHROMEOS)
-@@ -552,7 +558,7 @@ void StackDumpSignalHandler(int signal, 
-     _exit(EXIT_FAILURE);
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Set an alarm to trigger in case the default handler does not terminate
-   // the process. See 'AlarmSignalHandler' for more details.
-   struct sigaction action;
-@@ -577,6 +583,7 @@ void StackDumpSignalHandler(int signal, 
-   // signals that do not re-raise autonomously), such as signals delivered via
-   // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
-   // otherwise be lost when re-raising the signal via raise().
-+#if !BUILDFLAG(IS_BSD)
-   long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
-                         info->si_signo, info);
-   if (retval == 0) {
-@@ -591,6 +598,7 @@ void StackDumpSignalHandler(int signal, 
-   if (errno != EPERM) {
-     _exit(EXIT_FAILURE);
-   }
-+#endif
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
-         // BUILDFLAG(IS_CHROMEOS)
- 
-@@ -783,6 +791,7 @@ class SandboxSymbolizeHelper {
-     return -1;
-   }
- 
-+#if !BUILDFLAG(IS_BSD)
-   // This class is copied from
-   // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h.
-   // It aims at ensuring the process is dumpable before opening /proc/self/mem.
-@@ -875,11 +884,15 @@ class SandboxSymbolizeHelper {
-       r.base = cur_base;
-     }
-   }
-+#endif
- 
-   // Parses /proc/self/maps in order to compile a list of all object file names
-   // for the modules that are loaded in the current process.
-   // Returns true on success.
-   bool CacheMemoryRegions() {
-+#if BUILDFLAG(IS_BSD)
-+    return false;
-+#else
-     // Reads /proc/self/maps.
-     std::string contents;
-     if (!ReadProcMaps(&contents)) {
-@@ -897,6 +910,7 @@ class SandboxSymbolizeHelper {
- 
-     is_initialized_ = true;
-     return true;
-+#endif
-   }
- 
-   // Opens all object files and caches their file descriptors.
diff --git a/chromium-next/patches/patch-base_files_dir__reader__linux.h b/chromium-next/patches/patch-base_files_dir__reader__linux.h
deleted file mode 100644
index 059e11c35c..0000000000
--- a/chromium-next/patches/patch-base_files_dir__reader__linux.h
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/dir_reader_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/dir_reader_linux.h
-@@ -21,10 +21,16 @@
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
- 
-+#include "build/build_config.h"
-+
- // See the comments in dir_reader_posix.h about this.
- 
- namespace base {
- 
-+#if BUILDFLAG(IS_BSD)
-+#include <dirent.h>
-+typedef struct dirent linux_dirent;
-+#else
- struct linux_dirent {
-   uint64_t d_ino;
-   int64_t d_off;
-@@ -32,6 +38,7 @@ struct linux_dirent {
-   unsigned char d_type;
-   char d_name[0];
- };
-+#endif
- 
- class DirReaderLinux {
-  public:
-@@ -66,7 +73,11 @@ class DirReaderLinux {
-       return true;
-     }
- 
-+#if BUILDFLAG(IS_BSD)
-+    const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_));
-+#else
-     const long r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
-+#endif
-     if (r == 0) {
-       return false;
-     }
diff --git a/chromium-next/patches/patch-base_files_dir__reader__posix.h b/chromium-next/patches/patch-base_files_dir__reader__posix.h
deleted file mode 100644
index 524ed2d622..0000000000
--- a/chromium-next/patches/patch-base_files_dir__reader__posix.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/dir_reader_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/dir_reader_posix.h
-@@ -17,7 +17,7 @@
- // seems worse than falling back to enumerating all file descriptors so we will
- // probably never implement this on the Mac.
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "base/files/dir_reader_linux.h"
- #else
- #include "base/files/dir_reader_fallback.h"
-@@ -25,7 +25,7 @@
- 
- namespace base {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- typedef DirReaderLinux DirReaderPosix;
- #else
- typedef DirReaderFallback DirReaderPosix;
diff --git a/chromium-next/patches/patch-base_files_drive__info.h b/chromium-next/patches/patch-base_files_drive__info.h
deleted file mode 100644
index abaed8e3c3..0000000000
--- a/chromium-next/patches/patch-base_files_drive__info.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/drive_info.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/drive_info.h
-@@ -48,7 +48,7 @@ struct BASE_EXPORT DriveInfo {
-   std::optional<bool> has_seek_penalty;
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Whether the drive is a removable drive.
-   //
-   // Note on macOS: that SSDs that are connected over USB that you can eject
diff --git a/chromium-next/patches/patch-base_files_drive__info__posix.cc b/chromium-next/patches/patch-base_files_drive__info__posix.cc
deleted file mode 100644
index f72a8eb28a..0000000000
--- a/chromium-next/patches/patch-base_files_drive__info__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/drive_info_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/drive_info_posix.cc
-@@ -24,7 +24,7 @@ namespace base {
- 
- std::optional<DriveInfo> GetFileDriveInfo(const FilePath& file_path) {
-   DriveInfo drive_info;
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   drive_info.has_seek_penalty = false;
-   return drive_info;
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium-next/patches/patch-base_files_file__path__watcher.h b/chromium-next/patches/patch-base_files_file__path__watcher.h
deleted file mode 100644
index b13848746d..0000000000
--- a/chromium-next/patches/patch-base_files_file__path__watcher.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/file_path_watcher.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/file_path_watcher.h
-@@ -105,7 +105,7 @@ class BASE_EXPORT FilePathWatcher {
-     Type type = Type::kNonRecursive;
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     // The callback will return the full path to a changed file instead of
-     // the watched path supplied as |path| when Watch is called.
-     // So the full path can be different from the watched path when a folder is
diff --git a/chromium-next/patches/patch-base_files_file__path__watcher__bsd.cc b/chromium-next/patches/patch-base_files_file__path__watcher__bsd.cc
deleted file mode 100644
index 057d90c03e..0000000000
--- a/chromium-next/patches/patch-base_files_file__path__watcher__bsd.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/file_path_watcher_bsd.cc.orig	2025-05-08 12:01:57.631260751 +0000
-+++ base/files/file_path_watcher_bsd.cc
-@@ -0,0 +1,54 @@
-+// Copyright 2021 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include <memory>
-+
-+#include "base/files/file_path_watcher.h"
-+#include "base/files/file_path_watcher_kqueue.h"
-+#include "base/memory/ptr_util.h"
-+#include "build/build_config.h"
-+
-+namespace base {
-+
-+namespace {
-+
-+class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
-+ public:
-+  FilePathWatcherImpl() = default;
-+  FilePathWatcherImpl(const FilePathWatcherImpl&) = delete;
-+  FilePathWatcherImpl& operator=(const FilePathWatcherImpl&) = delete;
-+  ~FilePathWatcherImpl() override = default;
-+
-+  bool Watch(const FilePath& path,
-+             Type type,
-+             const FilePathWatcher::Callback& callback) override {
-+    DCHECK(!impl_.get());
-+    if (type == Type::kRecursive) {
-+      if (!FilePathWatcher::RecursiveWatchAvailable())
-+        return false;
-+    } else {
-+      impl_ = std::make_unique<FilePathWatcherKQueue>();
-+    }
-+    DCHECK(impl_.get());
-+    return impl_->Watch(path, type, callback);
-+  }
-+
-+  void Cancel() override {
-+    if (impl_.get())
-+      impl_->Cancel();
-+    set_cancelled();
-+  }
-+
-+ private:
-+  std::unique_ptr<PlatformDelegate> impl_;
-+};
-+
-+}  // namespace
-+
-+FilePathWatcher::FilePathWatcher() {
-+  DETACH_FROM_SEQUENCE(sequence_checker_);
-+  impl_ = std::make_unique<FilePathWatcherImpl>();
-+}
-+
-+}  // namespace base
diff --git a/chromium-next/patches/patch-base_files_file__path__watcher__kqueue.h b/chromium-next/patches/patch-base_files_file__path__watcher__kqueue.h
deleted file mode 100644
index 67092b4171..0000000000
--- a/chromium-next/patches/patch-base_files_file__path__watcher__kqueue.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/file_path_watcher_kqueue.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/file_path_watcher_kqueue.h
-@@ -5,6 +5,7 @@
- #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
- #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
- 
-+#include <sys/time.h>
- #include <sys/event.h>
- 
- #include <memory>
diff --git a/chromium-next/patches/patch-base_files_file__path__watcher__unittest.cc b/chromium-next/patches/patch-base_files_file__path__watcher__unittest.cc
deleted file mode 100644
index 9825694850..0000000000
--- a/chromium-next/patches/patch-base_files_file__path__watcher__unittest.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/file_path_watcher_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/file_path_watcher_unittest.cc
-@@ -902,7 +902,7 @@ TEST_F(FilePathWatcherTest, WatchDirecto
-   }
-   delegate.RunUntilEventsMatch(event_expecter);
- 
--#if !BUILDFLAG(IS_APPLE)
-+#if !BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD)
-   ASSERT_TRUE(WriteFile(file1, "content v2"));
-   // Mac implementation does not detect files modified in a directory.
-   // TODO(crbug.com/40263777): Expect that no events are fired on Mac.
-@@ -1848,7 +1848,7 @@ namespace {
- 
- enum Permission { Read, Write, Execute };
- 
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
- bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
-   struct stat stat_buf;
- 
-@@ -1882,7 +1882,7 @@ bool ChangeFilePermissions(const FilePat
- 
- }  // namespace
- 
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD)
- // Linux implementation of FilePathWatcher doesn't catch attribute changes.
- // http://crbug.com/78043
- // Windows implementation of FilePathWatcher catches attribute changes that
diff --git a/chromium-next/patches/patch-base_files_file__util__posix.cc b/chromium-next/patches/patch-base_files_file__util__posix.cc
deleted file mode 100644
index f6af01fd04..0000000000
--- a/chromium-next/patches/patch-base_files_file__util__posix.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/file_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/file_util_posix.cc
-@@ -934,6 +934,7 @@ bool CreateNewTempDirectory(const FilePa
- bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) {
-   ScopedBlockingCall scoped_blocking_call(
-       FROM_HERE, BlockingType::MAY_BLOCK);  // For call to mkdir().
-+  const FilePath kFileSystemRoot("/");
- 
-   // Avoid checking subdirs if directory already exists.
-   if (DirectoryExists(full_path)) {
-@@ -943,8 +944,8 @@ bool CreateDirectoryAndGetError(const Fi
-   // Collect a list of all missing directories.
-   std::vector<FilePath> missing_subpaths({full_path});
-   FilePath last_path = full_path;
--  for (FilePath path = full_path.DirName(); path.value() != last_path.value();
--       path = path.DirName()) {
-+  for (FilePath path = full_path.DirName(); (path.value() != last_path.value() &&
-+       (path != kFileSystemRoot)); path = path.DirName()) {
-     if (DirectoryExists(path)) {
-       break;
-     }
-@@ -962,21 +963,14 @@ bool CreateDirectoryAndGetError(const Fi
-     }
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--    if (mkdir(subpath.value().c_str(), mode) == 0) {
--      continue;
--    }
--    // Mkdir failed, but it might have failed with EEXIST, or some other error
--    // due to the directory appearing out of thin air. This can occur if
--    // two processes are trying to create the same file system tree at the same
--    // time. Check to see if it exists and make sure it is a directory.
--    int saved_errno = errno;
--    if (!DirectoryExists(subpath)) {
--      if (error) {
-+    if ((mkdir(subpath.value().c_str(), mode) == -1) &&
-+        ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
-+      int saved_errno = errno;
-+      if (error)
-         *error = File::OSErrorToFileError(saved_errno);
--      }
--      errno = saved_errno;
-       return false;
-     }
-+    errno = 0;
-   }
-   return true;
- }
diff --git a/chromium-next/patches/patch-base_files_file__util__unittest.cc b/chromium-next/patches/patch-base_files_file__util__unittest.cc
deleted file mode 100644
index 4d7af1f3c1..0000000000
--- a/chromium-next/patches/patch-base_files_file__util__unittest.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/file_util_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/file_util_unittest.cc
-@@ -3920,7 +3920,7 @@ TEST_F(FileUtilTest, ReadFileToStringWit
- }
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
- TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
-   FilePath file_path("/proc/cpuinfo");
-   std::string data = "temp";
-@@ -4505,6 +4505,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnly
- 
- #endif  // BUILDFLAG(IS_ANDROID)
- 
-+#if BUILDFLAG(IS_OPENBSD)
-+TEST_F(FileUtilTest, CreateDirectoryInUnveiledPath) {
-+  FilePath dir = PathService::CheckedGet(DIR_GEN_TEST_DATA_ROOT);
-+  dir = dir.Append(FILE_PATH_LITERAL("base"));
-+  dir = dir.Append(FILE_PATH_LITERAL("test"));
-+  dir = dir.Append(FILE_PATH_LITERAL("unveil"));
-+  unveil(dir.value().c_str(), "rwc");
-+  EXPECT_TRUE(CreateDirectory(dir));
-+  dir = dir.Append(FILE_PATH_LITERAL("test"));
-+  EXPECT_FALSE(CreateDirectory(dir));
-+}
-+#endif
-+
- #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
-     defined(ARCH_CPU_32_BITS)
- // TODO(crbug.com/327582285): Re-enable these tests. They may be failing due to
-@@ -4671,7 +4684,7 @@ TEST(FileUtilMultiThreadedTest, MultiThr
-                 NULL);
- #else
-     size_t bytes_written =
--        ::write(::fileno(output_file.get()), content.c_str(), content.length());
-+        ::write(fileno(output_file.get()), content.c_str(), content.length());
- #endif
-     EXPECT_EQ(content.length(), bytes_written);
-     ::fflush(output_file.get());
diff --git a/chromium-next/patches/patch-base_files_important__file__writer__cleaner.cc b/chromium-next/patches/patch-base_files_important__file__writer__cleaner.cc
deleted file mode 100644
index ef37736be1..0000000000
--- a/chromium-next/patches/patch-base_files_important__file__writer__cleaner.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/important_file_writer_cleaner.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/important_file_writer_cleaner.cc
-@@ -25,7 +25,8 @@ namespace base {
- namespace {
- 
- base::Time GetUpperBoundTime() {
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA)
-+// needed because of .CreationTime() pledge
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // If process creation time is not available then use instance creation
-   // time as the upper-bound for old files. Modification times may be
-   // rounded-down to coarse-grained increments, e.g. FAT has 2s granularity,
diff --git a/chromium-next/patches/patch-base_files_scoped__file.cc b/chromium-next/patches/patch-base_files_scoped__file.cc
deleted file mode 100644
index af0515291c..0000000000
--- a/chromium-next/patches/patch-base_files_scoped__file.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/scoped_file.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/files/scoped_file.cc
-@@ -32,7 +32,7 @@ void ScopedFDCloseTraits::Free(int fd) {
-   int ret = IGNORE_EINTR(close(fd));
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
--    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   // NB: Some file descriptors can return errors from close() e.g. network
-   // filesystems such as NFS and Linux input devices. On Linux, macOS, and
-   // Fuchsia's POSIX layer, errors from close other than EBADF do not indicate
diff --git a/chromium-next/patches/patch-base_functional_unretained__traits.h b/chromium-next/patches/patch-base_functional_unretained__traits.h
deleted file mode 100644
index 70c9f733bf..0000000000
--- a/chromium-next/patches/patch-base_functional_unretained__traits.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/functional/unretained_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/functional/unretained_traits.h
-@@ -90,7 +90,7 @@ struct SupportsUnretainedImpl {
- // official builds, and then in non-test code as well.
- #if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \
-     (!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) &&        \
--     (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)))
-+     (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)))
-       static_assert(v,
-                     "Argument requires unretained storage, but type is not "
-                     "fully defined. This prevents determining whether "
diff --git a/chromium-next/patches/patch-base_i18n_icu__util.cc b/chromium-next/patches/patch-base_i18n_icu__util.cc
deleted file mode 100644
index 78e26a5be7..0000000000
--- a/chromium-next/patches/patch-base_i18n_icu__util.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/i18n/icu_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/i18n/icu_util.cc
-@@ -53,7 +53,7 @@
- #include "third_party/icu/source/common/unicode/unistr.h"
- #endif
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
- #include "third_party/icu/source/i18n/unicode/timezone.h"
- #endif
-@@ -329,7 +329,7 @@ void InitializeIcuTimeZone() {
-       FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
-   icu::TimeZone::adoptDefault(
-       icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
--#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
-+#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
-   // To respond to the time zone change properly, the default time zone
-   // cache in ICU has to be populated on starting up.
-   // See TimeZoneMonitorLinux::NotifyClientsFromImpl().
diff --git a/chromium-next/patches/patch-base_linux__util.cc b/chromium-next/patches/patch-base_linux__util.cc
deleted file mode 100644
index 398a92eaea..0000000000
--- a/chromium-next/patches/patch-base_linux__util.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/linux_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/linux_util.cc
-@@ -163,10 +163,14 @@ void SetLinuxDistro(const std::string& d
- }
- 
- bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {
-+#if BUILDFLAG(IS_BSD)
-+  return false;
-+#else
-   // 25 > strlen("/proc//task") + strlen(base::NumberToString(INT_MAX)) + 1 = 22
-   char buf[25];
-   strings::SafeSPrintf(buf, "/proc/%d/task", pid);
-   return GetThreadsFromProcessDir(buf, tids);
-+#endif
- }
- 
- bool GetThreadsForCurrentProcess(std::vector<pid_t>* tids) {
diff --git a/chromium-next/patches/patch-base_logging__unittest.cc b/chromium-next/patches/patch-base_logging__unittest.cc
deleted file mode 100644
index e50cfd4ab3..0000000000
--- a/chromium-next/patches/patch-base_logging__unittest.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/logging_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/logging_unittest.cc
-@@ -40,7 +40,7 @@
- #include "base/posix/eintr_wrapper.h"
- #endif  // BUILDFLAG(IS_POSIX)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD)
- #include <ucontext.h>
- #endif
- 
-@@ -586,14 +586,18 @@ void CheckCrashTestSighandler(int, sigin
-   // need the arch-specific boilerplate below, which is inspired by breakpad.
-   // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
-   uintptr_t crash_addr = 0;
--#if BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
-   crash_addr = reinterpret_cast<uintptr_t>(info->si_addr);
- #else  // OS_*
-   ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr);
- #if defined(ARCH_CPU_X86)
-   crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_EIP]);
- #elif defined(ARCH_CPU_X86_64)
-+#if BUILDFLAG(IS_OPENBSD)
-+  crash_addr = static_cast<uintptr_t>(context->sc_rip);
-+#else
-   crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_RIP]);
-+#endif
- #elif defined(ARCH_CPU_ARMEL)
-   crash_addr = static_cast<uintptr_t>(context->uc_mcontext.arm_pc);
- #elif defined(ARCH_CPU_ARM64)
diff --git a/chromium-next/patches/patch-base_memory_discardable__memory.cc b/chromium-next/patches/patch-base_memory_discardable__memory.cc
deleted file mode 100644
index a0b3aa7d6e..0000000000
--- a/chromium-next/patches/patch-base_memory_discardable__memory.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/memory/discardable_memory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/memory/discardable_memory.cc
-@@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_POSIX)
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kDiscardableMemoryBackingTrial,
-              "DiscardableMemoryBackingTrial",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -44,7 +44,7 @@ BASE_FEATURE_ENUM_PARAM(DiscardableMemor
- 
- namespace {
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- DiscardableMemoryBacking GetBackingForFieldTrial() {
-   DiscardableMemoryTrialGroup trial_group =
-@@ -63,7 +63,7 @@ DiscardableMemoryBacking GetBackingForFi
- 
- }  // namespace
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- // Probe capabilities of this device to determine whether we should participate
- // in the discardable memory backing trial.
-@@ -95,7 +95,7 @@ DiscardableMemory::DiscardableMemory() =
- DiscardableMemory::~DiscardableMemory() = default;
- 
- DiscardableMemoryBacking GetDiscardableMemoryBacking() {
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (DiscardableMemoryBackingFieldTrialIsEnabled()) {
-     return GetBackingForFieldTrial();
-   }
diff --git a/chromium-next/patches/patch-base_memory_discardable__memory__internal.h b/chromium-next/patches/patch-base_memory_discardable__memory__internal.h
deleted file mode 100644
index 507bcfd171..0000000000
--- a/chromium-next/patches/patch-base_memory_discardable__memory__internal.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/memory/discardable_memory_internal.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/memory/discardable_memory_internal.h
-@@ -12,7 +12,7 @@
- #include "base/metrics/field_trial_params.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- namespace base {
- 
diff --git a/chromium-next/patches/patch-base_memory_madv__free__discardable__memory__posix.cc b/chromium-next/patches/patch-base_memory_madv__free__discardable__memory__posix.cc
deleted file mode 100644
index 7a0da2171a..0000000000
--- a/chromium-next/patches/patch-base_memory_madv__free__discardable__memory__posix.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/memory/madv_free_discardable_memory_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/memory/madv_free_discardable_memory_posix.cc
-@@ -305,6 +305,10 @@ void MadvFreeDiscardableMemoryPosix::Set
- 
- bool MadvFreeDiscardableMemoryPosix::IsResident() const {
-   DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
-+// XXX mincore
-+#if BUILDFLAG(IS_BSD)
-+  return false;
-+#else
- #if BUILDFLAG(IS_APPLE)
-   std::vector<char> vec(allocated_pages_);
- #else
-@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsR
-     }
-   }
-   return true;
-+#endif
- }
- 
- bool MadvFreeDiscardableMemoryPosix::IsDiscarded() const {
diff --git a/chromium-next/patches/patch-base_memory_platform__shared__memory__region.h b/chromium-next/patches/patch-base_memory_platform__shared__memory__region.h
deleted file mode 100644
index 8fd4aea91b..0000000000
--- a/chromium-next/patches/patch-base_memory_platform__shared__memory__region.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/memory/platform_shared_memory_region.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/memory/platform_shared_memory_region.h
-@@ -18,7 +18,7 @@
- #include "base/unguessable_token.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- namespace content {
- class SandboxIPCHandler;
- }
-@@ -85,7 +85,7 @@ class BASE_EXPORT PlatformSharedMemoryRe
-     kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
-   };
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Structure to limit access to executable region creation.
-   struct ExecutableRegion {
-    private:
-@@ -217,7 +217,7 @@ class BASE_EXPORT PlatformSharedMemoryRe
-                            CheckPlatformHandlePermissionsCorrespondToMode);
-   static PlatformSharedMemoryRegion Create(Mode mode,
-                                            size_t size
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-                                            ,
-                                            bool executable = false
- #endif
diff --git a/chromium-next/patches/patch-base_memory_platform__shared__memory__region__posix.cc b/chromium-next/patches/patch-base_memory_platform__shared__memory__region__posix.cc
deleted file mode 100644
index 50657466e3..0000000000
--- a/chromium-next/patches/patch-base_memory_platform__shared__memory__region__posix.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/memory/platform_shared_memory_region_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/memory/platform_shared_memory_region_posix.cc
-@@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expec
- 
- }  // namespace
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
-   PlatformSharedMemoryRegion region =
-@@ -175,7 +175,7 @@ bool PlatformSharedMemoryRegion::Convert
- // static
- PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
-                                                               size_t size
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-                                                               ,
-                                                               bool executable
- #endif
-@@ -204,7 +204,7 @@ PlatformSharedMemoryRegion PlatformShare
-   // flag.
-   FilePath directory;
-   if (!GetShmemTempDir(
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-           executable,
- #else
-           false /* executable */,
diff --git a/chromium-next/patches/patch-base_memory_protected__memory.h b/chromium-next/patches/patch-base_memory_protected__memory.h
deleted file mode 100644
index 55cc71b8a0..0000000000
--- a/chromium-next/patches/patch-base_memory_protected__memory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/memory/protected_memory.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/memory/protected_memory.h
-@@ -120,12 +120,12 @@ __declspec(selectany) char __stop_protec
- 
- #define DECLARE_PROTECTED_DATA constinit
- #define DEFINE_PROTECTED_DATA constinit __declspec(allocate("prot$mem"))
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- // This value is used to align the writers variable. That variable needs to be
- // aligned to ensure that the protected memory section starts on a page
- // boundary.
- #if (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \
--    (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64))
-+    ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64))
- // arm64 supports 4kb, 16kb, and 64kb pages. Set to the largest of 64kb as that
- // will guarantee the section is page aligned regardless of the choice.
- inline constexpr int kProtectedMemoryAlignment = 65536;
-@@ -340,7 +340,7 @@ class BASE_EXPORT AutoWritableMemoryBase
-     // where an attacker could overwrite it with a large value and invoke code
-     // that constructs and destructs an AutoWritableMemory. After such a call
-     // protected memory would still be set writable because writers > 0.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-     // On Linux, the protected memory section is not automatically page aligned.
-     // This means that attempts to reset the protected memory region to readonly
-     // will set some of the preceding section that is on the same page readonly
-@@ -354,7 +354,7 @@ class BASE_EXPORT AutoWritableMemoryBase
- #endif
-     static inline size_t writers GUARDED_BY(writers_lock()) = 0;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-     // On Linux, there is no guarantee the section following the protected
-     // memory section is page aligned. This can result in attempts to change
-     // the access permissions of the end of the protected memory section
-@@ -412,7 +412,7 @@ class BASE_EXPORT AutoWritableMemoryInit
-     // the variable to something large before the section was read-only.
-     WriterData::writers = 0;
-     CHECK(SetProtectedSectionReadOnly());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-     // Set the protected_memory_section_buffer to true to ensure the buffer
-     // section is created. If a variable is declared but not used the memory
-     // section won't be created.
diff --git a/chromium-next/patches/patch-base_memory_protected__memory__posix.cc b/chromium-next/patches/patch-base_memory_protected__memory__posix.cc
deleted file mode 100644
index f8b5a275e4..0000000000
--- a/chromium-next/patches/patch-base_memory_protected__memory__posix.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/memory/protected_memory_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/memory/protected_memory_posix.cc
-@@ -6,7 +6,7 @@
- 
- #include <sys/mman.h>
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include <sys/resource.h>
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -34,7 +34,7 @@ bool SetMemory(void* start, void* end, i
- }  // namespace
- 
- namespace internal {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- void CheckMemoryReadOnly(const void* ptr) {
-   const uintptr_t page_start =
-       bits::AlignDown(reinterpret_cast<uintptr_t>(ptr), GetPageSize());
diff --git a/chromium-next/patches/patch-base_message__loop_message__pump__epoll.cc b/chromium-next/patches/patch-base_message__loop_message__pump__epoll.cc
deleted file mode 100644
index ab55f850df..0000000000
--- a/chromium-next/patches/patch-base_message__loop_message__pump__epoll.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/message_loop/message_pump_epoll.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/message_loop/message_pump_epoll.cc
-@@ -47,7 +47,7 @@ std::atomic_bool g_use_batched_version =
- std::atomic_bool g_use_poll = false;
- 
- constexpr std::pair<uint32_t, short int> kEpollToPollEvents[] = {
--    {EPOLLIN, POLLIN},   {EPOLLOUT, POLLOUT}, {EPOLLRDHUP, POLLRDHUP},
-+    {EPOLLIN, POLLIN},   {EPOLLOUT, POLLOUT},
-     {EPOLLPRI, POLLPRI}, {EPOLLERR, POLLERR}, {EPOLLHUP, POLLHUP}};
- 
- void SetEventsForPoll(const uint32_t epoll_events, struct pollfd* poll_entry) {
diff --git a/chromium-next/patches/patch-base_message__loop_message__pump__epoll.h b/chromium-next/patches/patch-base_message__loop_message__pump__epoll.h
deleted file mode 100644
index af5753f4d0..0000000000
--- a/chromium-next/patches/patch-base_message__loop_message__pump__epoll.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/message_loop/message_pump_epoll.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/message_loop/message_pump_epoll.h
-@@ -51,7 +51,11 @@ namespace base {
- // every call, don't do it when we have too many FDs.
- BASE_FEATURE(kUsePollForMessagePumpEpoll,
-              "UsePollForMessagePumpEpoll",
-+#if BUILDFLAG(IS_BSD)
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+#else
-              base::FEATURE_DISABLED_BY_DEFAULT);
-+#endif
- 
- // A MessagePump implementation suitable for I/O message loops on Linux-based
- // systems with epoll API support.
diff --git a/chromium-next/patches/patch-base_message__loop_message__pump__glib.cc b/chromium-next/patches/patch-base_message__loop_message__pump__glib.cc
deleted file mode 100644
index 679ec01788..0000000000
--- a/chromium-next/patches/patch-base_message__loop_message__pump__glib.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/message_loop/message_pump_glib.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/message_loop/message_pump_glib.cc
-@@ -8,6 +8,15 @@
- #include <glib.h>
- #include <math.h>
- 
-+#if BUILDFLAG(IS_BSD)
-+#if BUILDFLAG(IS_NETBSD)
-+#include <lwp.h>
-+#else
-+#include <pthread.h>
-+#include <pthread_np.h>
-+#endif
-+#endif
-+
- #include "base/logging.h"
- #include "base/memory/raw_ptr.h"
- #include "base/notreached.h"
-@@ -52,9 +61,19 @@ int GetTimeIntervalMilliseconds(TimeTick
- }
- 
- bool RunningOnMainThread() {
-+#if BUILDFLAG(IS_BSD)
-+#if BUILDFLAG(IS_NETBSD)
-+  auto pid = getpid();
-+  auto tid = _lwp_self();
-+  return pid > 0 && tid > 0 && pid == tid;
-+#else
-+  return pthread_main_np();
-+#endif
-+#else
-   auto pid = getpid();
-   auto tid = PlatformThread::CurrentId().raw();
-   return pid > 0 && tid > 0 && pid == tid;
-+#endif
- }
- 
- // A brief refresher on GLib:
diff --git a/chromium-next/patches/patch-base_native__library__posix.cc b/chromium-next/patches/patch-base_native__library__posix.cc
deleted file mode 100644
index e6d08b51b3..0000000000
--- a/chromium-next/patches/patch-base_native__library__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/native_library_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/native_library_posix.cc
-@@ -34,7 +34,7 @@ NativeLibrary LoadNativeLibraryWithOptio
-   // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
-   // and http://crbug.com/40794.
-   int flags = RTLD_LAZY;
--#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND)
-+#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND) || BUILDFLAG(IS_BSD)
-   // Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires
-   // further investigation, as it might vary across versions. Crash here to
-   // warn developers that they're trying to rely on uncertain behavior.
diff --git a/chromium-next/patches/patch-base_native__library__unittest.cc b/chromium-next/patches/patch-base_native__library__unittest.cc
deleted file mode 100644
index 7fe5da0044..0000000000
--- a/chromium-next/patches/patch-base_native__library__unittest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/native_library_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/native_library_unittest.cc
-@@ -135,7 +135,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
- // versions with respect to symbol resolution scope.
- // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
- #if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \
--    !defined(MEMORY_SANITIZER)
-+    !defined(MEMORY_SANITIZER) && !BUILDFLAG(IS_BSD)
- 
- // Verifies that the |prefer_own_symbols| option satisfies its guarantee that
- // a loaded library will always prefer local symbol resolution before
diff --git a/chromium-next/patches/patch-base_posix_can__lower__nice__to.cc b/chromium-next/patches/patch-base_posix_can__lower__nice__to.cc
deleted file mode 100644
index 5515f9f161..0000000000
--- a/chromium-next/patches/patch-base_posix_can__lower__nice__to.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/posix/can_lower_nice_to.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/posix/can_lower_nice_to.cc
-@@ -11,8 +11,12 @@
- 
- #include "build/build_config.h"
- 
-+#if BUILDFLAG(IS_FREEBSD)
-+#include <sys/param.h>
-+#endif
-+
- // Not defined on AIX by default.
--#if BUILDFLAG(IS_AIX)
-+#if BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
- #if defined(RLIMIT_NICE)
- #error Assumption about OS_AIX is incorrect
- #endif
diff --git a/chromium-next/patches/patch-base_posix_file__descriptor__shuffle.h b/chromium-next/patches/patch-base_posix_file__descriptor__shuffle.h
deleted file mode 100644
index 762eabf8cd..0000000000
--- a/chromium-next/patches/patch-base_posix_file__descriptor__shuffle.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/posix/file_descriptor_shuffle.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/posix/file_descriptor_shuffle.h
-@@ -26,6 +26,8 @@
- #include "base/base_export.h"
- #include "base/compiler_specific.h"
- 
-+#undef close
-+
- namespace base {
- 
- // A Delegate which performs the actions required to perform an injective
diff --git a/chromium-next/patches/patch-base_posix_sysctl.cc b/chromium-next/patches/patch-base_posix_sysctl.cc
deleted file mode 100644
index 031863dfa1..0000000000
--- a/chromium-next/patches/patch-base_posix_sysctl.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/posix/sysctl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/posix/sysctl.cc
-@@ -4,6 +4,7 @@
- 
- #include "base/posix/sysctl.h"
- 
-+#include <sys/types.h>
- #include <sys/sysctl.h>
- 
- #include <initializer_list>
-@@ -16,17 +17,17 @@
- #include "build/build_config.h"
- 
- namespace {
--
-+// NetBSD has sysctl_func macro in sys/sysctl.h, workaround: sysctl_func -> sysctl_func2
- std::optional<std::string> StringSysctlImpl(
--    base::FunctionRef<int(char* /*out*/, size_t* /*out_len*/)> sysctl_func) {
-+    base::FunctionRef<int(char* /*out*/, size_t* /*out_len*/)> sysctl_func2) {
-   size_t buf_len;
--  int result = sysctl_func(nullptr, &buf_len);
-+  int result = sysctl_func2(nullptr, &buf_len);
-   if (result < 0 || buf_len < 1) {
-     return std::nullopt;
-   }
- 
-   std::string value(buf_len - 1, '\0');
--  result = sysctl_func(&value[0], &buf_len);
-+  result = sysctl_func2(&value[0], &buf_len);
-   if (result < 0) {
-     return std::nullopt;
-   }
diff --git a/chromium-next/patches/patch-base_posix_unix__domain__socket.cc b/chromium-next/patches/patch-base_posix_unix__domain__socket.cc
deleted file mode 100644
index 42a3c9cbd6..0000000000
--- a/chromium-next/patches/patch-base_posix_unix__domain__socket.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/posix/unix_domain_socket.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/posix/unix_domain_socket.cc
-@@ -47,7 +47,7 @@ bool CreateSocketPair(ScopedFD* one, Sco
- 
- // static
- bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
--#if !BUILDFLAG(IS_APPLE)
-+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
-   const int enable = 1;
-   return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
- #else
-@@ -73,7 +73,7 @@ bool UnixDomainSocket::SendMsg(int fd,
- 
-     struct cmsghdr* cmsg;
-     msg.msg_control = control_buffer;
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-     msg.msg_controllen = checked_cast<socklen_t>(control_len);
- #else
-     msg.msg_controllen = control_len;
-@@ -81,7 +81,7 @@ bool UnixDomainSocket::SendMsg(int fd,
-     cmsg = CMSG_FIRSTHDR(&msg);
-     cmsg->cmsg_level = SOL_SOCKET;
-     cmsg->cmsg_type = SCM_RIGHTS;
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-     cmsg->cmsg_len = checked_cast<u_int>(CMSG_LEN(sizeof(int) * fds.size()));
- #else
-     cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size());
-@@ -133,7 +133,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
- 
-   const size_t kControlBufferSize =
-       CMSG_SPACE(sizeof(int) * kMaxFileDescriptors)
--#if !BUILDFLAG(IS_APPLE)
-+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
-       // macOS does not support ucred.
-       // macOS supports xucred, but this structure is insufficient.
-       + CMSG_SPACE(sizeof(struct ucred))
-@@ -162,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
-         wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
-         wire_fds_len = payload_len / sizeof(int);
-       }
--#if !BUILDFLAG(IS_APPLE)
-+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
-       // macOS does not support SCM_CREDENTIALS.
-       if (cmsg->cmsg_level == SOL_SOCKET &&
-           cmsg->cmsg_type == SCM_CREDENTIALS) {
-@@ -199,6 +199,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
-     if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0) {
-       pid = -1;
-     }
-+#elif BUILDFLAG(IS_BSD)
-+    NOTIMPLEMENTED();
-+    pid = -1;
- #else
-     // |pid| will legitimately be -1 if we read EOF, so only DCHECK if we
-     // actually received a message.  Unfortunately, Linux allows sending zero
diff --git a/chromium-next/patches/patch-base_posix_unix__domain__socket__unittest.cc b/chromium-next/patches/patch-base_posix_unix__domain__socket__unittest.cc
deleted file mode 100644
index e7d4bd78f9..0000000000
--- a/chromium-next/patches/patch-base_posix_unix__domain__socket__unittest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/posix/unix_domain_socket_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/posix/unix_domain_socket_unittest.cc
-@@ -15,6 +15,8 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include <signal.h>
-+
- #include "base/files/file_util.h"
- #include "base/files/scoped_file.h"
- #include "base/functional/bind.h"
diff --git a/chromium-next/patches/patch-base_process_internal__linux.h b/chromium-next/patches/patch-base_process_internal__linux.h
deleted file mode 100644
index 60ea7e8cde..0000000000
--- a/chromium-next/patches/patch-base_process_internal__linux.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/internal_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/internal_linux.h
-@@ -144,6 +144,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t 
- // arguments to the lambda.
- template <typename Lambda>
- void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) {
-+#if BUILDFLAG(IS_BSD)
-+  return;
-+#else
-   // Iterate through the different threads tracked in /proc/<pid>/task.
-   FilePath fd_path = GetProcPidDir(process).Append("task");
- 
-@@ -167,6 +170,7 @@ void ForEachProcessTask(base::ProcessHan
-     FilePath task_path = fd_path.Append(tid_str);
-     lambda(tid, task_path);
-   }
-+#endif
- }
- 
- }  // namespace internal
diff --git a/chromium-next/patches/patch-base_process_kill.h b/chromium-next/patches/patch-base_process_kill.h
deleted file mode 100644
index 3571d020ef..0000000000
--- a/chromium-next/patches/patch-base_process_kill.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/kill.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/kill.h
-@@ -123,7 +123,7 @@ BASE_EXPORT TerminationStatus GetTermina
- BASE_EXPORT TerminationStatus
- GetKnownDeadTerminationStatus(ProcessHandle handle, int* exit_code);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Spawns a thread to wait asynchronously for the child |process| to exit
- // and then reaps it.
- BASE_EXPORT void EnsureProcessGetsReaped(Process process);
diff --git a/chromium-next/patches/patch-base_process_kill__posix.cc b/chromium-next/patches/patch-base_process_kill__posix.cc
deleted file mode 100644
index 55c27df169..0000000000
--- a/chromium-next/patches/patch-base_process_kill__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/kill_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/kill_posix.cc
-@@ -161,7 +161,7 @@ void EnsureProcessTerminated(Process pro
-       0, new BackgroundReaper(std::move(process), Seconds(2)));
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void EnsureProcessGetsReaped(Process process) {
-   DCHECK(!process.is_current());
- 
diff --git a/chromium-next/patches/patch-base_process_launch.h b/chromium-next/patches/patch-base_process_launch.h
deleted file mode 100644
index 5276ec8a1d..0000000000
--- a/chromium-next/patches/patch-base_process_launch.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/launch.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/launch.h
-@@ -7,6 +7,13 @@
- #ifndef BASE_PROCESS_LAUNCH_H_
- #define BASE_PROCESS_LAUNCH_H_
- 
-+#if defined(__NetBSD__)
-+#define _NETBSD_SOURCE 1
-+#ifndef PTHREAD_STACK_MIN
-+#define PTHREAD_STACK_MIN 4096
-+#endif
-+#endif
-+
- #include <limits.h>
- #include <stddef.h>
- 
-@@ -241,7 +248,7 @@ struct BASE_EXPORT LaunchOptions {
-   bool clear_environment = false;
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // If non-zero, start the process using clone(), using flags as provided.
-   // Unlike in clone, clone_flags may not contain a custom termination signal
-   // that is sent to the parent when the child dies. The termination signal will
diff --git a/chromium-next/patches/patch-base_process_launch__posix.cc b/chromium-next/patches/patch-base_process_launch__posix.cc
deleted file mode 100644
index 9b0ddabfbf..0000000000
--- a/chromium-next/patches/patch-base_process_launch__posix.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/launch_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/launch_posix.cc
-@@ -62,6 +62,9 @@
- #error "macOS should use launch_mac.cc"
- #endif
- 
-+#if defined(OS_FREEBSD)
-+#pragma weak environ
-+#endif
- extern char** environ;
- 
- namespace base {
-@@ -219,6 +222,8 @@ static const char kFDDir[] = "/dev/fd";
- static const char kFDDir[] = "/dev/fd";
- #elif BUILDFLAG(IS_OPENBSD)
- static const char kFDDir[] = "/dev/fd";
-+#elif BUILDFLAG(IS_NETBSD)
-+static const char kFDDir[] = "/dev/fd";
- #elif BUILDFLAG(IS_ANDROID)
- static const char kFDDir[] = "/proc/self/fd";
- #endif
diff --git a/chromium-next/patches/patch-base_process_memory__linux.cc b/chromium-next/patches/patch-base_process_memory__linux.cc
deleted file mode 100644
index 48fc21d4bf..0000000000
--- a/chromium-next/patches/patch-base_process_memory__linux.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/memory_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/memory_linux.cc
-@@ -28,6 +28,7 @@ void __libc_free(void*);
- 
- namespace base {
- 
-+#if !BUILDFLAG(IS_BSD)
- namespace {
- 
- void ReleaseReservationOrTerminate() {
-@@ -38,12 +39,14 @@ void ReleaseReservationOrTerminate() {
- }
- 
- }  // namespace
-+#endif
- 
- void EnableTerminationOnHeapCorruption() {
-   // On Linux, there nothing to do AFAIK.
- }
- 
- void EnableTerminationOnOutOfMemory() {
-+#if !BUILDFLAG(IS_BSD)
-   // Set the new-out of memory handler.
-   std::set_new_handler(&ReleaseReservationOrTerminate);
-   // If we're using glibc's allocator, the above functions will override
-@@ -52,8 +55,10 @@ void EnableTerminationOnOutOfMemory() {
- #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
-   allocator_shim::SetCallNewHandlerOnMallocFailure(true);
- #endif
-+#endif
- }
- 
-+#if !BUILDFLAG(IS_BSD)
- // ScopedAllowBlocking() has private constructor and it can only be used in
- // friend classes/functions. Declaring a class is easier in this situation to
- // avoid adding more dependency to thread_restrictions.h because of the
-@@ -111,6 +116,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScor
- bool AdjustOOMScore(ProcessId process, int score) {
-   return AdjustOOMScoreHelper::AdjustOOMScore(process, score);
- }
-+#endif
- 
- bool UncheckedMalloc(size_t size, void** result) {
- #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
diff --git a/chromium-next/patches/patch-base_process_process__handle.cc b/chromium-next/patches/patch-base_process_process__handle.cc
deleted file mode 100644
index 3401fa7ff1..0000000000
--- a/chromium-next/patches/patch-base_process_process__handle.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_handle.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_handle.cc
-@@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() {
-              : UniqueProcId(GetCurrentProcId());
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
- 
- void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) {
-   DCHECK(pid_outside_of_namespace != kNullProcessId);
diff --git a/chromium-next/patches/patch-base_process_process__handle.h b/chromium-next/patches/patch-base_process_process__handle.h
deleted file mode 100644
index 009d240d15..0000000000
--- a/chromium-next/patches/patch-base_process_process__handle.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_handle.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_handle.h
-@@ -86,7 +86,7 @@ BASE_EXPORT ProcessId GetCurrentProcId()
- // processes may be reused.
- BASE_EXPORT UniqueProcId GetUniqueIdForProcess();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // When a process is started in a different PID namespace from the browser
- // process, this function must be called with the process's PID in the browser's
- // PID namespace in order to initialize its unique ID. Not thread safe.
diff --git a/chromium-next/patches/patch-base_process_process__handle__freebsd.cc b/chromium-next/patches/patch-base_process_process__handle__freebsd.cc
deleted file mode 100644
index 02e320284a..0000000000
--- a/chromium-next/patches/patch-base_process_process__handle__freebsd.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_handle_freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_handle_freebsd.cc
-@@ -3,6 +3,7 @@
- // found in the LICENSE file.
- 
- #include "base/process/process_handle.h"
-+#include "base/files/file_util.h"
- 
- #include <limits.h>
- #include <stddef.h>
-@@ -20,11 +21,14 @@ namespace base {
- 
- ProcessId GetParentProcessId(ProcessHandle process) {
-   struct kinfo_proc info;
--  size_t length;
-+  size_t length = sizeof(struct kinfo_proc);
-   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process};
- 
-   if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
-     return -1;
-+
-+  if (length < sizeof(struct kinfo_proc))
-+    return -1;
-   }
- 
-   return info.ki_ppid;
diff --git a/chromium-next/patches/patch-base_process_process__handle__netbsd.cc b/chromium-next/patches/patch-base_process_process__handle__netbsd.cc
deleted file mode 100644
index cb7914cdbb..0000000000
--- a/chromium-next/patches/patch-base_process_process__handle__netbsd.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_handle_netbsd.cc.orig	2025-05-08 12:01:57.636629943 +0000
-+++ base/process/process_handle_netbsd.cc
-@@ -0,0 +1,56 @@
-+// Copyright 2011 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/process/process_handle.h"
-+#include "base/files/file_util.h"
-+
-+#include <stddef.h>
-+#include <sys/param.h>
-+#include <sys/proc.h>
-+#include <sys/sysctl.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#include <optional>
-+
-+#include "base/files/file_path.h"
-+#include "base/posix/sysctl.h"
-+
-+namespace base {
-+
-+ProcessId GetParentProcessId(ProcessHandle process) {
-+  struct kinfo_proc2 *info;
-+  size_t length;
-+  pid_t ppid;
-+  int mib[] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, process,
-+                sizeof(struct kinfo_proc2), 1 };
-+
-+  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
-+    return -1;
-+  }
-+
-+  info = (struct kinfo_proc2 *)malloc(length);
-+
-+  mib[5] = static_cast<int>((length / sizeof(struct kinfo_proc2)));
-+
-+  if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) {
-+    ppid = -1;
-+    goto out;
-+  }
-+
-+  ppid = info->p_ppid;
-+
-+out:
-+  free(info);
-+  return ppid;
-+}
-+
-+FilePath GetProcessExecutablePath(ProcessHandle process) {
-+  std::optional<std::string> pathname =
-+      base::StringSysctl({CTL_KERN, KERN_PROC_ARGS, process, KERN_PROC_PATHNAME});
-+
-+  return FilePath(pathname.value_or(std::string{}));
-+}
-+
-+}  // namespace base
diff --git a/chromium-next/patches/patch-base_process_process__handle__openbsd.cc b/chromium-next/patches/patch-base_process_process__handle__openbsd.cc
deleted file mode 100644
index 6b17ebe5a6..0000000000
--- a/chromium-next/patches/patch-base_process_process__handle__openbsd.cc
+++ /dev/null
@@ -1,145 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_handle_openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_handle_openbsd.cc
-@@ -3,17 +3,25 @@
- // found in the LICENSE file.
- 
- #include "base/process/process_handle.h"
-+#include "base/files/file_util.h"
- 
- #include <stddef.h>
-+#include <stdlib.h>
-+#include <sys/param.h>
-+#include <sys/proc.h>
-+#include <sys/stat.h>
- #include <sys/sysctl.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include <kvm.h>
-+
- namespace base {
- 
- ProcessId GetParentProcessId(ProcessHandle process) {
--  struct kinfo_proc info;
-+  struct kinfo_proc *info;
-   size_t length;
-+  pid_t ppid;
-   int mib[] = {
-       CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc),
-       0};
-@@ -22,37 +30,87 @@ ProcessId GetParentProcessId(ProcessHand
-     return -1;
-   }
- 
--  mib[5] = (length / sizeof(struct kinfo_proc));
-+  info = (struct kinfo_proc *)malloc(length);
- 
--  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
--    return -1;
-+  mib[5] = static_cast<int>((length / sizeof(struct kinfo_proc)));
-+
-+  if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) {
-+    ppid = -1;
-+    goto out;
-   }
- 
--  return info.p_ppid;
-+  ppid = info->p_ppid;
-+
-+out:
-+  free(info);
-+  return ppid;
- }
- 
- FilePath GetProcessExecutablePath(ProcessHandle process) {
--  struct kinfo_proc kp;
-+  struct kinfo_file *files;
-+  kvm_t *kd = NULL;
-+  char errbuf[_POSIX2_LINE_MAX];
-+  char **retvalargs, *cpath, retval[PATH_MAX];
-+  int cnt;
-   size_t len;
--  int mib[] = {
--      CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc),
--      0};
--
--  if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1) {
--    return FilePath();
--  }
--  mib[5] = (len / sizeof(struct kinfo_proc));
--  if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0) {
--    return FilePath();
--  }
--  if ((kp.p_flag & P_SYSTEM) != 0) {
--    return FilePath();
--  }
--  if (strcmp(kp.p_comm, "chrome") == 0) {
--    return FilePath(kp.p_comm);
-+  char *tokens[2];
-+  struct stat sb;
-+  FilePath result;
-+
-+  int mib[] = { CTL_KERN, KERN_PROC_ARGS, process, KERN_PROC_ARGV };
-+
-+  if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
-+    result = FilePath(cpath);
-+  else
-+    result = FilePath("@PREFIX@/lib/chromium/chrome");
-+
-+  if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) != -1) {
-+    retvalargs = static_cast<char**>(malloc(len));
-+    if (!retvalargs)
-+      return result;
-+
-+    if (sysctl(mib, std::size(mib), retvalargs, &len, NULL, 0) < 0) {
-+      free(retvalargs);
-+      return result;
-+    }
-+
-+    if ((*tokens = strtok(retvalargs[0], ":")) == NULL) {
-+      free(retvalargs);
-+      return result;
-+    }
-+
-+    free(retvalargs);
-+
-+    if (tokens[0] == NULL)
-+      return result;
-+
-+    if (realpath(tokens[0], retval) == NULL)
-+      return result;
-+
-+    if (stat(retval, &sb) < 0)
-+      return result;
-+
-+    if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES,
-+         errbuf)) == NULL)
-+      return result;
-+
-+    if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process,
-+        sizeof(struct kinfo_file), &cnt)) == NULL) {
-+      kvm_close(kd);
-+      return result;
-+    }
-+
-+    for (int i = 0; i < cnt; i++) {
-+      if (files[i].fd_fd == KERN_FILE_TEXT &&
-+          files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) &&
-+          files[i].va_fileid == sb.st_ino) {
-+            kvm_close(kd);
-+            result = FilePath(retval);
-+      }
-+    }
-   }
- 
--  return FilePath();
-+  return result;
- }
- 
- }  // namespace base
diff --git a/chromium-next/patches/patch-base_process_process__iterator.h b/chromium-next/patches/patch-base_process_process__iterator.h
deleted file mode 100644
index 9704f805b4..0000000000
--- a/chromium-next/patches/patch-base_process_process__iterator.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_iterator.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_iterator.h
-@@ -25,7 +25,7 @@
- #include <windows.h>
- 
- #include <tlhelp32.h>
--#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD)
-+#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
- #include <sys/sysctl.h>
- #elif BUILDFLAG(IS_FREEBSD)
- #include <sys/user.h>
-@@ -117,7 +117,11 @@ class BASE_EXPORT ProcessIterator {
-   HANDLE snapshot_;
-   bool started_iteration_ = false;
- #elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-+# if BUILDFLAG(IS_NETBSD)
-+  std::vector<kinfo_proc2> kinfo_procs_;
-+# else
-   std::vector<kinfo_proc> kinfo_procs_;
-+# endif
-   size_t index_of_kinfo_proc_ = 0;
- #elif BUILDFLAG(IS_POSIX)
-   struct DIRClose {
diff --git a/chromium-next/patches/patch-base_process_process__iterator__freebsd.cc b/chromium-next/patches/patch-base_process_process__iterator__freebsd.cc
deleted file mode 100644
index 8ed35a00e1..0000000000
--- a/chromium-next/patches/patch-base_process_process__iterator__freebsd.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_iterator_freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_iterator_freebsd.cc
-@@ -18,7 +18,7 @@ namespace base {
- 
- ProcessIterator::ProcessIterator(const ProcessFilter* filter)
-     : filter_(filter) {
--  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid()};
-+  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid()};
- 
-   bool done = false;
-   int try_num = 1;
-@@ -37,7 +37,7 @@ ProcessIterator::ProcessIterator(const P
-       num_of_kinfo_proc += 16;
-       kinfo_procs_.resize(num_of_kinfo_proc);
-       len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
--      if (sysctl(mib, std::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) {
-+      if (sysctl(mib, std::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) {
-         // If we get a mem error, it just means we need a bigger buffer, so
-         // loop around again.  Anything else is a real error and give up.
-         if (errno != ENOMEM) {
-@@ -47,7 +47,7 @@ ProcessIterator::ProcessIterator(const P
-         }
-       } else {
-         // Got the list, just make sure we're sized exactly right
--        size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+        num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-         kinfo_procs_.resize(num_of_kinfo_proc);
-         done = true;
-       }
-@@ -68,19 +68,14 @@ bool ProcessIterator::CheckForNextProces
-   for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
-     size_t length;
-     struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
--    int mib[] = {CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid};
-+    int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid };
- 
-     if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB)) {
-       continue;
-     }
- 
--    length = 0;
--    if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
--      LOG(ERROR) << "failed to figure out the buffer size for a command line";
--      continue;
--    }
--
--    data.resize(length);
-+    data.resize(ARG_MAX);
-+    length = ARG_MAX;
- 
-     if (sysctl(mib, std::size(mib), &data[0], &length, NULL, 0) < 0) {
-       LOG(ERROR) << "failed to fetch a commandline";
diff --git a/chromium-next/patches/patch-base_process_process__iterator__netbsd.cc b/chromium-next/patches/patch-base_process_process__iterator__netbsd.cc
deleted file mode 100644
index 12ef185400..0000000000
--- a/chromium-next/patches/patch-base_process_process__iterator__netbsd.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_iterator_netbsd.cc.orig	2025-05-08 12:01:57.637133193 +0000
-+++ base/process/process_iterator_netbsd.cc
-@@ -0,0 +1,134 @@
-+// Copyright 2013 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/process/process_iterator.h"
-+
-+#include <errno.h>
-+#include <stddef.h>
-+#include <unistd.h>
-+#include <sys/param.h>
-+#include <sys/proc.h>
-+#include <sys/sysctl.h>
-+
-+#include "base/logging.h"
-+#include "base/strings/string_split.h"
-+#include "base/strings/string_util.h"
-+
-+namespace base {
-+
-+ProcessIterator::ProcessIterator(const ProcessFilter* filter)
-+    : filter_(filter) {
-+  int mib[] = { CTL_KERN, KERN_PROC2, KERN_PROC_UID, static_cast<int>(getuid()),
-+                sizeof(struct kinfo_proc2), 1 };
-+
-+  bool done = false;
-+  int try_num = 1;
-+  const int max_tries = 10;
-+  size_t num_of_kinfo_proc;
-+
-+  do {
-+    size_t len = 0;
-+    if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) < 0) {
-+      DLOG(ERROR) << "failed to get the size needed for the process list";
-+      kinfo_procs_.resize(0);
-+      done = true;
-+    } else {
-+      num_of_kinfo_proc = len / sizeof(struct kinfo_proc2);
-+      // Leave some spare room for process table growth (more could show up
-+      // between when we check and now)
-+      num_of_kinfo_proc += 16;
-+      kinfo_procs_.resize(num_of_kinfo_proc);
-+      len = num_of_kinfo_proc * sizeof(struct kinfo_proc2);
-+      if (sysctl(mib, std::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) {
-+        // If we get a mem error, it just means we need a bigger buffer, so
-+        // loop around again.  Anything else is a real error and give up.
-+        if (errno != ENOMEM) {
-+          DLOG(ERROR) << "failed to get the process list";
-+          kinfo_procs_.resize(0);
-+          done = true;
-+        }
-+      } else {
-+        // Got the list, just make sure we're sized exactly right
-+        num_of_kinfo_proc = len / sizeof(struct kinfo_proc2);
-+        kinfo_procs_.resize(num_of_kinfo_proc);
-+        done = true;
-+      }
-+    }
-+  } while (!done && (try_num++ < max_tries));
-+
-+  if (!done) {
-+    DLOG(ERROR) << "failed to collect the process list in a few tries";
-+    kinfo_procs_.resize(0);
-+  }
-+}
-+
-+ProcessIterator::~ProcessIterator() = default;
-+
-+bool ProcessIterator::CheckForNextProcess() {
-+  std::string data;
-+  for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
-+    kinfo_proc2& kinfo = kinfo_procs_[index_of_kinfo_proc_];
-+
-+    // Skip processes just awaiting collection
-+    if ((kinfo.p_pid > 0) && (kinfo.p_stat == SZOMB)) {
-+      continue;
-+    }
-+
-+    int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.p_pid };
-+
-+    // Find out what size buffer we need.
-+    size_t data_len = 0;
-+    if (sysctl(mib, std::size(mib), NULL, &data_len, NULL, 0) < 0) {
-+      DVPLOG(1) << "failed to figure out the buffer size for a commandline";
-+      continue;
-+    }
-+
-+    data.resize(data_len);
-+    if (sysctl(mib, std::size(mib), &data[0], &data_len, NULL, 0) < 0) {
-+      DVPLOG(1) << "failed to fetch a commandline";
-+      continue;
-+    }
-+
-+    // |data| contains all the command line parameters of the process, separated
-+    // by blocks of one or more null characters. We tokenize |data| into a
-+    // vector of strings using '\0' as a delimiter and populate
-+    // |entry_.cmd_line_args_|.
-+    std::string delimiters;
-+    delimiters.push_back('\0');
-+    entry_.cmd_line_args_ = SplitString(data, delimiters, KEEP_WHITESPACE,
-+                                        SPLIT_WANT_NONEMPTY);
-+
-+    // |data| starts with the full executable path followed by a null character.
-+    // We search for the first instance of '\0' and extract everything before it
-+    // to populate |entry_.exe_file_|.
-+    size_t exec_name_end = data.find('\0');
-+    if (exec_name_end == std::string::npos) {
-+      DLOG(ERROR) << "command line data didn't match expected format";
-+      continue;
-+    }
-+
-+    entry_.pid_ = kinfo.p_pid;
-+    entry_.ppid_ = kinfo.p_ppid;
-+    entry_.gid_ = kinfo.p__pgid;
-+    size_t last_slash = data.rfind('/', exec_name_end);
-+    if (last_slash == std::string::npos) {
-+      entry_.exe_file_.assign(data, 0, exec_name_end);
-+    } else {
-+      entry_.exe_file_.assign(data, last_slash + 1,
-+                              exec_name_end - last_slash - 1);
-+    }
-+    // Start w/ the next entry next time through
-+    ++index_of_kinfo_proc_;
-+    // Done
-+    return true;
-+  }
-+  return false;
-+}
-+
-+bool NamedProcessIterator::IncludeEntry() {
-+  return (executable_name_ == entry().exe_file() &&
-+          ProcessIterator::IncludeEntry());
-+}
-+
-+}  // namespace base
diff --git a/chromium-next/patches/patch-base_process_process__iterator__openbsd.cc b/chromium-next/patches/patch-base_process_process__iterator__openbsd.cc
deleted file mode 100644
index 1a3ca609e5..0000000000
--- a/chromium-next/patches/patch-base_process_process__iterator__openbsd.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_iterator_openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_iterator_openbsd.cc
-@@ -6,6 +6,9 @@
- 
- #include <errno.h>
- #include <stddef.h>
-+#include <unistd.h>
-+#include <sys/param.h>
-+#include <sys/proc.h>
- #include <sys/sysctl.h>
- 
- #include "base/logging.h"
-@@ -17,12 +20,13 @@ namespace base {
- ProcessIterator::ProcessIterator(const ProcessFilter* filter)
-     : filter_(filter) {
-   int mib[] = {
--      CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc),
--      0};
-+      CTL_KERN, KERN_PROC, KERN_PROC_UID, static_cast<int>(getuid()),
-+      sizeof(struct kinfo_proc), 0 };
- 
-   bool done = false;
-   int try_num = 1;
-   const int max_tries = 10;
-+  size_t num_of_kinfo_proc;
- 
-   do {
-     size_t len = 0;
-@@ -31,7 +35,7 @@ ProcessIterator::ProcessIterator(const P
-       kinfo_procs_.resize(0);
-       done = true;
-     } else {
--      size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+      num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-       // Leave some spare room for process table growth (more could show up
-       // between when we check and now)
-       num_of_kinfo_proc += 16;
-@@ -47,7 +51,7 @@ ProcessIterator::ProcessIterator(const P
-         }
-       } else {
-         // Got the list, just make sure we're sized exactly right
--        size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+        num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-         kinfo_procs_.resize(num_of_kinfo_proc);
-         done = true;
-       }
diff --git a/chromium-next/patches/patch-base_process_process__metrics.cc b/chromium-next/patches/patch-base_process_process__metrics.cc
deleted file mode 100644
index 2b5eed7e5f..0000000000
--- a/chromium-next/patches/patch-base_process_process__metrics.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_metrics.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_metrics.cc
-@@ -17,7 +17,7 @@ namespace base {
- namespace {
- 
- #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
- int CalculateEventsPerSecond(uint64_t event_count,
-                              uint64_t* last_event_count,
-                              base::TimeTicks* last_calculated) {
-@@ -54,7 +54,7 @@ SystemMetrics SystemMetrics::Sample() {
-   SystemMetrics system_metrics;
- 
-   system_metrics.committed_memory_ = GetSystemCommitCharge();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   GetSystemMemoryInfo(&system_metrics.memory_info_);
-   GetVmStatInfo(&system_metrics.vmstat_info_);
-   GetSystemDiskInfo(&system_metrics.disk_info_);
-@@ -73,7 +73,7 @@ Value::Dict SystemMetrics::ToDict() cons
-   Value::Dict res;
- 
-   res.Set("committed_memory", static_cast<int>(committed_memory_));
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   Value::Dict meminfo = memory_info_.ToDict();
-   meminfo.Merge(vmstat_info_.ToDict());
-   res.Set("meminfo", std::move(meminfo));
-@@ -100,7 +100,6 @@ std::unique_ptr<ProcessMetrics> ProcessM
- #endif  // !BUILDFLAG(IS_MAC)
- }
- 
--#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX)
- double ProcessMetrics::GetPlatformIndependentCPUUsage(
-     TimeDelta cumulative_cpu) {
-   TimeTicks time = TimeTicks::Now();
-@@ -130,10 +129,9 @@ ProcessMetrics::GetPlatformIndependentCP
-     return GetPlatformIndependentCPUUsage(cpu_usage);
-   });
- }
--#endif
- 
- #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
- int ProcessMetrics::CalculateIdleWakeupsPerSecond(
-     uint64_t absolute_idle_wakeups) {
-   return CalculateEventsPerSecond(absolute_idle_wakeups,
diff --git a/chromium-next/patches/patch-base_process_process__metrics.h b/chromium-next/patches/patch-base_process_process__metrics.h
deleted file mode 100644
index f89c197933..0000000000
--- a/chromium-next/patches/patch-base_process_process__metrics.h
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_metrics.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_metrics.h
-@@ -39,7 +39,7 @@
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
- #include <string>
- #include <utility>
- #include <vector>
-@@ -49,7 +49,7 @@
- 
- namespace base {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- // Minor and major page fault counts since the process creation.
- // Both counts are process-wide, and exclude child processes.
- //
-@@ -179,7 +179,7 @@ class BASE_EXPORT ProcessMetrics {
-   base::expected<TimeDelta, ProcessCPUUsageError> GetCumulativeCPUUsage();
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-   // Emits the cumulative CPU usage for all currently active threads since they
-   // were started into the output parameter (replacing its current contents).
-   // Threads that have already terminated will not be reported. Thus, the sum of
-@@ -224,7 +224,7 @@ class BASE_EXPORT ProcessMetrics {
-   int GetOpenFdSoftLimit() const;
- #endif  // BUILDFLAG(IS_POSIX)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   // Minor and major page fault count as reported by /proc/[pid]/stat.
-   // Returns true for success.
-   bool GetPageFaultCounts(PageFaultCounts* counts) const;
-@@ -242,7 +242,7 @@ class BASE_EXPORT ProcessMetrics {
- #endif  // !BUILDFLAG(IS_MAC)
- 
- #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-   int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
- #endif
- #if BUILDFLAG(IS_APPLE)
-@@ -264,12 +264,10 @@ class BASE_EXPORT ProcessMetrics {
-   // Used to store the previous times and CPU usage counts so we can
-   // compute the CPU usage between calls.
-   TimeTicks last_cpu_time_;
--#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX)
-   TimeDelta last_cumulative_cpu_;
--#endif
- 
- #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-   // Same thing for idle wakeups.
-   TimeTicks last_idle_wakeups_time_;
-   uint64_t last_absolute_idle_wakeups_;
-@@ -310,7 +308,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsig
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||      \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // Data about system-wide memory consumption. Values are in KB. Available on
- // Windows, Mac, Linux, Android and Chrome OS.
- //
-@@ -345,7 +343,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-   // This provides an estimate of available memory as described here:
-   // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
-   // NOTE: this is ONLY valid in kernels 3.14 and up.  Its value will always
-@@ -360,7 +358,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
- #endif
- 
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   int buffers = 0;
-   int cached = 0;
-   int active_anon = 0;
-@@ -397,7 +395,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
-         // BUILDFLAG(IS_FUCHSIA)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
- // Parse the data found in /proc/<pid>/stat and return the sum of the
- // CPU-related ticks.  Returns -1 on parse error.
- // Exposed for testing.
-@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics {
-   FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
- 
-   size_t committed_memory_;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   SystemMemoryInfoKB memory_info_;
-   VmStatInfo vmstat_info_;
-   SystemDiskInfo disk_info_;
diff --git a/chromium-next/patches/patch-base_process_process__metrics__freebsd.cc b/chromium-next/patches/patch-base_process_process__metrics__freebsd.cc
deleted file mode 100644
index d7daa41cdc..0000000000
--- a/chromium-next/patches/patch-base_process_process__metrics__freebsd.cc
+++ /dev/null
@@ -1,287 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_metrics_freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_metrics_freebsd.cc
-@@ -3,18 +3,37 @@
- // found in the LICENSE file.
- 
- #include "base/process/process_metrics.h"
-+#include "base/notreached.h"
- 
- #include <stddef.h>
-+#include <sys/types.h>
- #include <sys/sysctl.h>
- #include <sys/user.h>
- #include <unistd.h>
- 
-+#include <fcntl.h> /* O_RDONLY */
-+#include <kvm.h>
-+#include <libutil.h>
-+
- #include "base/memory/ptr_util.h"
-+#include "base/values.h"
- 
- namespace base {
-+namespace {
-+int GetPageShift() {
-+  int pagesize = getpagesize();
-+  int pageshift = 0;
-+
-+  while (pagesize > 1) {
-+    pageshift++;
-+    pagesize >>= 1;
-+  }
-+
-+  return pageshift;
-+}
-+}
- 
--ProcessMetrics::ProcessMetrics(ProcessHandle process)
--    : process_(process), last_cpu_(0) {}
-+ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
- 
- // static
- std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-@@ -22,22 +41,54 @@ std::unique_ptr<ProcessMetrics> ProcessM
-   return WrapUnique(new ProcessMetrics(process));
- }
- 
--base::expected<double, ProcessCPUUsageError>
--ProcessMetrics::GetPlatformIndependentCPUUsage() {
--  struct kinfo_proc info;
--  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_};
--  size_t length = sizeof(info);
-+base::expected<ProcessMemoryInfo, ProcessUsageError>
-+ProcessMetrics::GetMemoryInfo() const {
-+  ProcessMemoryInfo memory_info;
-+  kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open");
-+  struct kinfo_proc *pp;
-+  int nproc;
- 
--  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
--    return base::unexpected(ProcessCPUUsageError::kSystemError);
-+  if (kd == nullptr) {
-+    return base::unexpected(ProcessUsageError::kSystemError);
-+  }
-+
-+  if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) {
-+    kvm_close(kd);
-+    return base::unexpected(ProcessUsageError::kProcessNotFound);
-+  }
-+
-+  if (nproc > 0) {
-+    memory_info.resident_set_bytes = pp->ki_rssize << GetPageShift();
-+  } else {
-+    kvm_close(kd);
-+    return base::unexpected(ProcessUsageError::kProcessNotFound);
-   }
- 
--  return base::ok(double{info.ki_pctcpu} / FSCALE * 100.0);
-+  kvm_close(kd);
-+  return memory_info;
- }
- 
- base::expected<TimeDelta, ProcessCPUUsageError>
- ProcessMetrics::GetCumulativeCPUUsage() {
--  NOTREACHED();
-+  struct kinfo_proc info;
-+  size_t length = sizeof(struct kinfo_proc);
-+  struct timeval tv;
-+
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
-+
-+  if (process_ == 0) {
-+    return base::unexpected(ProcessCPUUsageError::kSystemError);
-+  }
-+
-+  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
-+    return base::unexpected(ProcessCPUUsageError::kSystemError);
-+  }
-+
-+  if (length == 0) {
-+    return base::unexpected(ProcessCPUUsageError::kProcessNotFound);
-+  }
-+
-+  return base::ok(Microseconds(info.ki_runtime));
- }
- 
- size_t GetSystemCommitCharge() {
-@@ -66,4 +117,174 @@ size_t GetSystemCommitCharge() {
-   return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize);
- }
- 
-+int64_t GetNumberOfThreads(ProcessHandle process) {
-+  // Taken from FreeBSD top (usr.bin/top/machine.c)
-+
-+  kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open");
-+  if (kd == NULL)
-+    return 0;
-+
-+  struct kinfo_proc* pbase;
-+  int nproc;
-+  pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc);
-+  if (pbase == NULL)
-+    return 0;
-+
-+  if (kvm_close(kd) == -1)
-+    return 0;
-+
-+  return nproc;
-+}
-+
-+bool GetSystemMemoryInfo(SystemMemoryInfoKB *meminfo) {
-+  unsigned int mem_total, mem_free, swap_total, swap_used;
-+  size_t length;
-+  int pagesizeKB;
-+
-+  pagesizeKB = getpagesize() / 1024;
-+
-+  length = sizeof(mem_total);
-+  if (sysctlbyname("vm.stats.vm.v_page_count", &mem_total,
-+      &length, NULL, 0) != 0 || length != sizeof(mem_total))
-+    return false;
-+
-+  length = sizeof(mem_free);
-+  if (sysctlbyname("vm.stats.vm.v_free_count", &mem_free, &length, NULL, 0)
-+      != 0 || length != sizeof(mem_free))
-+    return false;
-+
-+  length = sizeof(swap_total);
-+  if (sysctlbyname("vm.swap_size", &swap_total, &length, NULL, 0)
-+      != 0 || length != sizeof(swap_total))
-+    return false;
-+
-+  length = sizeof(swap_used);
-+  if (sysctlbyname("vm.swap_anon_use", &swap_used, &length, NULL, 0)
-+      != 0 || length != sizeof(swap_used))
-+    return false;
-+
-+  meminfo->total = mem_total * pagesizeKB;
-+  meminfo->free = mem_free * pagesizeKB;
-+  meminfo->swap_total = swap_total * pagesizeKB;
-+  meminfo->swap_free = (swap_total - swap_used) * pagesizeKB;
-+
-+  return true;
-+}
-+
-+int ProcessMetrics::GetOpenFdCount() const {
-+  struct kinfo_file * kif;
-+  int cnt;
-+
-+  if ((kif = kinfo_getfile(process_, &cnt)) == NULL)
-+    return -1;
-+
-+  free(kif);
-+
-+  return cnt;
-+}
-+
-+int ProcessMetrics::GetOpenFdSoftLimit() const {
-+  size_t length;
-+  int total_count = 0;
-+  int mib[] = { CTL_KERN, KERN_MAXFILESPERPROC };
-+
-+  length = sizeof(total_count);
-+
-+  if (sysctl(mib, std::size(mib), &total_count, &length, NULL, 0) < 0) {
-+    total_count = -1;
-+  }
-+
-+  return total_count;
-+}
-+
-+int ProcessMetrics::GetIdleWakeupsPerSecond() {
-+  NOTIMPLEMENTED();
-+  return 0;
-+}
-+
-+bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) {
-+  NOTIMPLEMENTED();
-+  return false;
-+}
-+
-+bool GetVmStatInfo(VmStatInfo* vmstat) {
-+  NOTIMPLEMENTED();
-+  return false;
-+}
-+
-+SystemDiskInfo::SystemDiskInfo() {
-+  reads = 0;
-+  reads_merged = 0;
-+  sectors_read = 0;
-+  read_time = 0;
-+  writes = 0;
-+  writes_merged = 0;
-+  sectors_written = 0;
-+  write_time = 0;
-+  io = 0;
-+  io_time = 0;
-+  weighted_io_time = 0;
-+}
-+
-+SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default;
-+
-+SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default;
-+
-+Value::Dict SystemDiskInfo::ToDict() const {
-+  Value::Dict res;
-+
-+  // Write out uint64_t variables as doubles.
-+  // Note: this may discard some precision, but for JS there's no other option.
-+  res.Set("reads", static_cast<double>(reads));
-+  res.Set("reads_merged", static_cast<double>(reads_merged));
-+  res.Set("sectors_read", static_cast<double>(sectors_read));
-+  res.Set("read_time", static_cast<double>(read_time));
-+  res.Set("writes", static_cast<double>(writes));
-+  res.Set("writes_merged", static_cast<double>(writes_merged));
-+  res.Set("sectors_written", static_cast<double>(sectors_written));
-+  res.Set("write_time", static_cast<double>(write_time));
-+  res.Set("io", static_cast<double>(io));
-+  res.Set("io_time", static_cast<double>(io_time));
-+  res.Set("weighted_io_time", static_cast<double>(weighted_io_time));
-+
-+  NOTIMPLEMENTED();
-+
-+  return res;
-+}
-+
-+Value::Dict SystemMemoryInfoKB::ToDict() const {
-+  Value::Dict res;
-+  res.Set("total", total);
-+  res.Set("free", free);
-+  res.Set("available", available);
-+  res.Set("buffers", buffers);
-+  res.Set("cached", cached);
-+  res.Set("active_anon", active_anon);
-+  res.Set("inactive_anon", inactive_anon);
-+  res.Set("active_file", active_file);
-+  res.Set("inactive_file", inactive_file);
-+  res.Set("swap_total", swap_total);
-+  res.Set("swap_free", swap_free);
-+  res.Set("swap_used", swap_total - swap_free);
-+  res.Set("dirty", dirty);
-+  res.Set("reclaimable", reclaimable);
-+
-+  NOTIMPLEMENTED();
-+
-+  return res;
-+}
-+
-+Value::Dict VmStatInfo::ToDict() const {
-+  Value::Dict res;
-+  // TODO(crbug.com/1334256): Make base::Value able to hold uint64_t and remove
-+  // casts below.
-+  res.Set("pswpin", static_cast<int>(pswpin));
-+  res.Set("pswpout", static_cast<int>(pswpout));
-+  res.Set("pgmajfault", static_cast<int>(pgmajfault));
-+
-+  NOTIMPLEMENTED();
-+
-+  return res;
-+}
-+
- }  // namespace base
diff --git a/chromium-next/patches/patch-base_process_process__metrics__netbsd.cc b/chromium-next/patches/patch-base_process_process__metrics__netbsd.cc
deleted file mode 100644
index 02f25c8b3d..0000000000
--- a/chromium-next/patches/patch-base_process_process__metrics__netbsd.cc
+++ /dev/null
@@ -1,237 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_metrics_netbsd.cc.orig	2025-05-08 12:01:57.637816950 +0000
-+++ base/process/process_metrics_netbsd.cc
-@@ -0,0 +1,228 @@
-+// Copyright 2013 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/process/process_metrics.h"
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/vmmeter.h>
-+
-+#include "base/files/dir_reader_posix.h" // DirReaderPosix
-+#include "base/process/internal_linux.h" // GetProcPidDir()
-+#include "base/memory/ptr_util.h"
-+#include "base/types/expected.h"
-+#include "base/values.h"
-+#include "base/notreached.h"
-+
-+namespace base {
-+
-+ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
-+
-+base::expected<ProcessMemoryInfo, ProcessUsageError>
-+ProcessMetrics::GetMemoryInfo() const {
-+  ProcessMemoryInfo memory_info;
-+  struct kinfo_proc2 info;
-+  size_t length = sizeof(struct kinfo_proc2);
-+
-+  int mib[] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, process_,
-+                sizeof(struct kinfo_proc2), 1 };
-+
-+  if (process_ == 0) {
-+    return base::unexpected(ProcessUsageError::kSystemError);
-+  }
-+
-+  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
-+    return base::unexpected(ProcessUsageError::kSystemError);
-+  }
-+
-+  if (length == 0) {
-+    return base::unexpected(ProcessUsageError::kProcessNotFound);
-+  }
-+
-+  memory_info.resident_set_bytes =
-+    checked_cast<uint64_t>(info.p_vm_rssize * getpagesize());
-+
-+  return memory_info;
-+}
-+
-+base::expected<TimeDelta, ProcessCPUUsageError>
-+ProcessMetrics::GetCumulativeCPUUsage() {
-+  struct kinfo_proc2 info;
-+  size_t length = sizeof(struct kinfo_proc2);
-+  struct timeval tv;
-+
-+  int mib[] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, process_,
-+                sizeof(struct kinfo_proc2), 1 };
-+
-+  if (process_ == 0) {
-+    return base::unexpected(ProcessCPUUsageError::kSystemError);
-+  }
-+
-+  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
-+    return base::unexpected(ProcessCPUUsageError::kSystemError);
-+  }
-+
-+  if (length == 0) {
-+    return base::unexpected(ProcessCPUUsageError::kProcessNotFound);
-+  }
-+
-+  tv.tv_sec = info.p_rtime_sec;
-+  tv.tv_usec = info.p_rtime_usec;
-+
-+  return base::ok(Microseconds(TimeValToMicroseconds(tv)));
-+}
-+
-+// static
-+std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-+    ProcessHandle process) {
-+  return WrapUnique(new ProcessMetrics(process));
-+}
-+
-+size_t GetSystemCommitCharge() {
-+  int mib[] = { CTL_VM, VM_METER };
-+  size_t pagesize;
-+  struct vmtotal vmtotal;
-+  unsigned long mem_total, mem_free, mem_inactive;
-+  size_t len = sizeof(vmtotal);
-+
-+  if (sysctl(mib, std::size(mib), &vmtotal, &len, NULL, 0) < 0) {
-+    return 0;
-+  }
-+
-+  mem_total = vmtotal.t_vm;
-+  mem_free = vmtotal.t_free;
-+  mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
-+
-+  pagesize = checked_cast<size_t>(getpagesize());
-+
-+  return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize);
-+}
-+
-+int ProcessMetrics::GetOpenFdCount() const {
-+  // Use /proc/<pid>/fd to count the number of entries there.
-+  FilePath fd_path = internal::GetProcPidDir(process_).Append("fd");
-+
-+  DirReaderPosix dir_reader(fd_path.value().c_str());
-+  if (!dir_reader.IsValid()) {
-+    return -1;
-+  }
-+
-+  int total_count = 0;
-+  for (; dir_reader.Next();) {
-+    const char* name = dir_reader.name();
-+    if (strcmp(name, ".") != 0 && strcmp(name, "..") != 0) {
-+      ++total_count;
-+    }
-+  }
-+
-+  return total_count;
-+}
-+
-+int ProcessMetrics::GetOpenFdSoftLimit() const {
-+  return getdtablesize();
-+//  return GetMaxFds();
-+}
-+
-+bool ProcessMetrics::GetPageFaultCounts(PageFaultCounts* counts) const {
-+  NOTIMPLEMENTED();
-+  return false;
-+}
-+
-+bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
-+  NOTIMPLEMENTED_LOG_ONCE();
-+  return false;
-+}
-+
-+bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) {
-+  NOTIMPLEMENTED();
-+  return false;
-+}
-+
-+bool GetVmStatInfo(VmStatInfo* vmstat) {
-+  NOTIMPLEMENTED();
-+  return false;
-+}
-+
-+int ProcessMetrics::GetIdleWakeupsPerSecond() {
-+  NOTIMPLEMENTED();
-+  return 0;
-+}
-+
-+Value::Dict SystemMemoryInfoKB::ToDict() const {
-+  Value::Dict res;
-+  res.Set("total", total);
-+  res.Set("free", free);
-+  res.Set("available", available);
-+  res.Set("buffers", buffers);
-+  res.Set("cached", cached);
-+  res.Set("active_anon", active_anon);
-+  res.Set("inactive_anon", inactive_anon);
-+  res.Set("active_file", active_file);
-+  res.Set("inactive_file", inactive_file);
-+  res.Set("swap_total", swap_total);
-+  res.Set("swap_free", swap_free);
-+  res.Set("swap_used", swap_total - swap_free);
-+  res.Set("dirty", dirty);
-+  res.Set("reclaimable", reclaimable);
-+
-+  NOTIMPLEMENTED();
-+
-+  return res;
-+}
-+
-+Value::Dict VmStatInfo::ToDict() const {
-+  Value::Dict res;
-+  res.Set("pswpin", static_cast<int>(pswpin));
-+  res.Set("pswpout", static_cast<int>(pswpout));
-+  res.Set("pgmajfault", static_cast<int>(pgmajfault));
-+
-+  NOTIMPLEMENTED();
-+
-+  return res;
-+}
-+
-+SystemDiskInfo::SystemDiskInfo() {
-+  reads = 0;
-+  reads_merged = 0;
-+  sectors_read = 0;
-+  read_time = 0;
-+  writes = 0;
-+  writes_merged = 0;
-+  sectors_written = 0;
-+  write_time = 0;
-+  io = 0;
-+  io_time = 0;
-+  weighted_io_time = 0;
-+}
-+
-+SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo&) = default;
-+
-+SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default;
-+
-+Value::Dict SystemDiskInfo::ToDict() const {
-+  Value::Dict res;
-+
-+  // Write out uint64_t variables as doubles.
-+  // Note: this may discard some precision, but for JS there's no other option.
-+  res.Set("reads", static_cast<double>(reads));
-+  res.Set("reads_merged", static_cast<double>(reads_merged));
-+  res.Set("sectors_read", static_cast<double>(sectors_read));
-+  res.Set("read_time", static_cast<double>(read_time));
-+  res.Set("writes", static_cast<double>(writes));
-+  res.Set("writes_merged", static_cast<double>(writes_merged));
-+  res.Set("sectors_written", static_cast<double>(sectors_written));
-+  res.Set("write_time", static_cast<double>(write_time));
-+  res.Set("io", static_cast<double>(io));
-+  res.Set("io_time", static_cast<double>(io_time));
-+  res.Set("weighted_io_time", static_cast<double>(weighted_io_time));
-+
-+  NOTIMPLEMENTED();
-+
-+  return res;
-+}
-+
-+}  // namespace base
diff --git a/chromium-next/patches/patch-base_process_process__metrics__openbsd.cc b/chromium-next/patches/patch-base_process_process__metrics__openbsd.cc
deleted file mode 100644
index 4128de2816..0000000000
--- a/chromium-next/patches/patch-base_process_process__metrics__openbsd.cc
+++ /dev/null
@@ -1,247 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_metrics_openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_metrics_openbsd.cc
-@@ -6,73 +6,85 @@
- 
- #include <stddef.h>
- #include <stdint.h>
-+#include <fcntl.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-+#include <sys/vmmeter.h>
-+
-+#include <kvm.h>
- 
- #include "base/memory/ptr_util.h"
- #include "base/types/expected.h"
-+#include "base/values.h"
-+#include "base/notreached.h"
- 
- namespace base {
- 
--namespace {
-+ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
- 
--base::expected<int, ProcessCPUUsageError> GetProcessCPU(pid_t pid) {
-+base::expected<ProcessMemoryInfo, ProcessUsageError>
-+ProcessMetrics::GetMemoryInfo() const {
-+  ProcessMemoryInfo memory_info;
-   struct kinfo_proc info;
--  size_t length;
--  int mib[] = {
--      CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, sizeof(struct kinfo_proc), 0};
-+  size_t length = sizeof(struct kinfo_proc);
- 
--  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
--    return base::unexpected(ProcessCPUUsageError::kSystemError);
--  }
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
-+                sizeof(struct kinfo_proc), 1 };
- 
--  mib[5] = (length / sizeof(struct kinfo_proc));
-+  if (process_ == 0) {
-+    return base::unexpected(ProcessUsageError::kSystemError);
-+  }
- 
-   if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
--    return base::unexpected(ProcessCPUUsageError::kSystemError);
-+    return base::unexpected(ProcessUsageError::kSystemError);
-   }
- 
--  return base::ok(info.p_pctcpu);
--}
-+  if (length == 0) {
-+    return base::unexpected(ProcessUsageError::kProcessNotFound);
-+  }
- 
--}  // namespace
-+  memory_info.resident_set_bytes =
-+    checked_cast<uint64_t>(info.p_vm_rssize * getpagesize());
- 
--// static
--std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
--    ProcessHandle process) {
--  return WrapUnique(new ProcessMetrics(process));
-+  return memory_info;
- }
- 
--base::expected<double, ProcessCPUUsageError>
--ProcessMetrics::GetPlatformIndependentCPUUsage() {
--  TimeTicks time = TimeTicks::Now();
-+base::expected<TimeDelta, ProcessCPUUsageError>
-+ProcessMetrics::GetCumulativeCPUUsage() {
-+  struct kinfo_proc info;
-+  size_t length = sizeof(struct kinfo_proc);
-+  struct timeval tv;
-+
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
-+                sizeof(struct kinfo_proc), 1 };
- 
--  if (last_cpu_time_.is_zero()) {
--    // First call, just set the last values.
--    last_cpu_time_ = time;
--    return base::ok(0.0);
-+  if (process_ == 0) {
-+    return base::unexpected(ProcessCPUUsageError::kSystemError);
-   }
- 
--  const base::expected<int, ProcessCPUUsageError> cpu = GetProcessCPU(process_);
--  if (!cpu.has_value()) {
--    return base::unexpected(cpu.error());
-+  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
-+    return base::unexpected(ProcessCPUUsageError::kSystemError);
-   }
- 
--  last_cpu_time_ = time;
--  return base::ok(double{cpu.value()} / FSCALE * 100.0);
--}
-+  if (length == 0) {
-+    return base::unexpected(ProcessCPUUsageError::kProcessNotFound);
-+  }
- 
--base::expected<TimeDelta, ProcessCPUUsageError>
--ProcessMetrics::GetCumulativeCPUUsage() {
--  NOTREACHED();
-+  tv.tv_sec = info.p_rtime_sec;
-+  tv.tv_usec = info.p_rtime_usec;
-+
-+  return base::ok(Microseconds(TimeValToMicroseconds(tv)));
- }
- 
--ProcessMetrics::ProcessMetrics(ProcessHandle process)
--    : process_(process), last_cpu_(0) {}
-+// static
-+std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-+    ProcessHandle process) {
-+  return WrapUnique(new ProcessMetrics(process));
-+}
- 
- size_t GetSystemCommitCharge() {
-   int mib[] = {CTL_VM, VM_METER};
--  int pagesize;
-+  size_t pagesize;
-   struct vmtotal vmtotal;
-   unsigned long mem_total, mem_free, mem_inactive;
-   size_t len = sizeof(vmtotal);
-@@ -85,9 +97,115 @@ size_t GetSystemCommitCharge() {
-   mem_free = vmtotal.t_free;
-   mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
- 
--  pagesize = getpagesize();
-+  pagesize = checked_cast<size_t>(getpagesize());
- 
-   return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize);
- }
- 
-+int ProcessMetrics::GetOpenFdCount() const {
-+  return (process_ == getpid()) ? getdtablecount() : -1;
-+}
-+
-+int ProcessMetrics::GetOpenFdSoftLimit() const {
-+  return getdtablesize();
-+}
-+
-+bool ProcessMetrics::GetPageFaultCounts(PageFaultCounts* counts) const {
-+  NOTIMPLEMENTED();
-+  return false;
-+}
-+
-+bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
-+  NOTIMPLEMENTED_LOG_ONCE();
-+  return false;
-+}
-+
-+bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) {
-+  NOTIMPLEMENTED();
-+  return false;
-+}
-+
-+bool GetVmStatInfo(VmStatInfo* vmstat) {
-+  NOTIMPLEMENTED();
-+  return false;
-+}
-+
-+int ProcessMetrics::GetIdleWakeupsPerSecond() {
-+  NOTIMPLEMENTED();
-+  return 0;
-+}
-+
-+Value::Dict SystemMemoryInfoKB::ToDict() const {
-+  Value::Dict res;
-+  res.Set("total", total);
-+  res.Set("free", free);
-+  res.Set("available", available);
-+  res.Set("buffers", buffers);
-+  res.Set("cached", cached);
-+  res.Set("active_anon", active_anon);
-+  res.Set("inactive_anon", inactive_anon);
-+  res.Set("active_file", active_file);
-+  res.Set("inactive_file", inactive_file);
-+  res.Set("swap_total", swap_total);
-+  res.Set("swap_free", swap_free);
-+  res.Set("swap_used", swap_total - swap_free);
-+  res.Set("dirty", dirty);
-+  res.Set("reclaimable", reclaimable);
-+
-+  NOTIMPLEMENTED();
-+
-+  return res;
-+}
-+
-+Value::Dict VmStatInfo::ToDict() const {
-+  Value::Dict res;
-+  res.Set("pswpin", static_cast<int>(pswpin));
-+  res.Set("pswpout", static_cast<int>(pswpout));
-+  res.Set("pgmajfault", static_cast<int>(pgmajfault));
-+
-+  NOTIMPLEMENTED();
-+
-+  return res;
-+}
-+
-+SystemDiskInfo::SystemDiskInfo() {
-+  reads = 0;
-+  reads_merged = 0;
-+  sectors_read = 0;
-+  read_time = 0;
-+  writes = 0;
-+  writes_merged = 0;
-+  sectors_written = 0;
-+  write_time = 0;
-+  io = 0;
-+  io_time = 0;
-+  weighted_io_time = 0;
-+}
-+
-+SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo&) = default;
-+
-+SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default;
-+
-+Value::Dict SystemDiskInfo::ToDict() const {
-+  Value::Dict res;
-+
-+  // Write out uint64_t variables as doubles.
-+  // Note: this may discard some precision, but for JS there's no other option.
-+  res.Set("reads", static_cast<double>(reads));
-+  res.Set("reads_merged", static_cast<double>(reads_merged));
-+  res.Set("sectors_read", static_cast<double>(sectors_read));
-+  res.Set("read_time", static_cast<double>(read_time));
-+  res.Set("writes", static_cast<double>(writes));
-+  res.Set("writes_merged", static_cast<double>(writes_merged));
-+  res.Set("sectors_written", static_cast<double>(sectors_written));
-+  res.Set("write_time", static_cast<double>(write_time));
-+  res.Set("io", static_cast<double>(io));
-+  res.Set("io_time", static_cast<double>(io_time));
-+  res.Set("weighted_io_time", static_cast<double>(weighted_io_time));
-+
-+  NOTIMPLEMENTED();
-+
-+  return res;
-+}
-+
- }  // namespace base
diff --git a/chromium-next/patches/patch-base_process_process__metrics__posix.cc b/chromium-next/patches/patch-base_process_process__metrics__posix.cc
deleted file mode 100644
index c4d4b6ffea..0000000000
--- a/chromium-next/patches/patch-base_process_process__metrics__posix.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_metrics_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_metrics_posix.cc
-@@ -21,6 +21,8 @@
- 
- #if BUILDFLAG(IS_APPLE)
- #include <malloc/malloc.h>
-+#elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
-+#include <stdlib.h>
- #else
- #include <malloc.h>
- #endif
-@@ -136,7 +138,7 @@ size_t ProcessMetrics::GetMallocUsage() 
-   return stats.size_in_use;
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-   return GetMallocUsageMallinfo();
--#elif BUILDFLAG(IS_FUCHSIA)
-+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
-   return 0;
- #endif
diff --git a/chromium-next/patches/patch-base_process_process__metrics__unittest.cc b/chromium-next/patches/patch-base_process_process__metrics__unittest.cc
deleted file mode 100644
index 13d6045e55..0000000000
--- a/chromium-next/patches/patch-base_process_process__metrics__unittest.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_metrics_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_metrics_unittest.cc
-@@ -61,7 +61,8 @@
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || \
-+    BUILDFLAG(IS_BSD)
- #define ENABLE_CPU_TESTS 1
- #else
- #define ENABLE_CPU_TESTS 0
diff --git a/chromium-next/patches/patch-base_process_process__posix.cc b/chromium-next/patches/patch-base_process_process__posix.cc
deleted file mode 100644
index 524de90f26..0000000000
--- a/chromium-next/patches/patch-base_process_process__posix.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_posix.cc
-@@ -23,10 +23,15 @@
- #include "base/trace_event/base_tracing.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include <sys/event.h>
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#include <sys/types.h>
-+#include <sys/sysctl.h> 
-+#endif
-+
- #if BUILDFLAG(CLANG_PROFILING)
- #include "base/test/clang_profiling.h"
- #endif
-@@ -100,7 +105,7 @@ bool WaitpidWithTimeout(base::ProcessHan
- }
- #endif
- 
--#if BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- // Using kqueue on Mac so that we can wait on non-child processes.
- // We can't use kqueues on child processes because we need to reap
- // our own children using wait.
-@@ -379,7 +384,7 @@ bool Process::WaitForExitWithTimeoutImpl
-   const bool exited = (parent_pid < 0);
- 
-   if (!exited && parent_pid != our_pid) {
--#if BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     // On Mac we can wait on non child processes.
-     return WaitForSingleNonChildProcess(handle, timeout);
- #else
-@@ -416,7 +421,56 @@ void Process::Exited(int exit_code) cons
- 
- int Process::GetOSPriority() const {
-   DCHECK(IsValid());
-+// avoid pledge(2) violation
-+#if BUILDFLAG(IS_BSD)
-+  return 0;
-+#else
-   return getpriority(PRIO_PROCESS, static_cast<id_t>(process_));
-+#endif
-+}
-+
-+Time Process::CreationTime() const {
-+// avoid ps pledge in the network process
-+#if !BUILDFLAG(IS_BSD)
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(),
-+               sizeof(struct kinfo_proc), 0 };
-+  struct kinfo_proc *info = nullptr;
-+  size_t info_size;
-+#endif
-+  Time ct = Time();
-+
-+#if !BUILDFLAG(IS_BSD)
-+  if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
-+    goto out;
-+
-+  mib[5] = (info_size / sizeof(struct kinfo_proc));
-+  if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL)
-+    goto out;
-+
-+  if (sysctl(mib, std::size(mib), info, &info_size, NULL, 0) < 0)
-+    goto out;
-+
-+  ct = Time::FromTimeT(info->p_ustart_sec);
-+
-+out:
-+  if (info)
-+    free(info);
-+#endif
-+  return ct;
-+}
-+
-+#if BUILDFLAG(IS_BSD)
-+Process::Priority Process::GetPriority() const {
-+  return Priority::kUserBlocking;
- }
- 
-+bool Process::SetPriority(Priority priority) {
-+  return false;
-+}
-+
-+bool Process::CanSetPriority() {
-+  return false;
-+}
-+#endif
-+
- }  // namespace base
diff --git a/chromium-next/patches/patch-base_process_process__unittest.cc b/chromium-next/patches/patch-base_process_process__unittest.cc
deleted file mode 100644
index 9262be5469..0000000000
--- a/chromium-next/patches/patch-base_process_process__unittest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/process/process_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/process/process_unittest.cc
-@@ -202,7 +202,7 @@ TEST_F(ProcessTest, CreationTimeOtherPro
-   // was spawned and a time recorded after it was spawned. However, since the
-   // base::Time and process creation clocks don't match, tolerate some error.
-   constexpr base::TimeDelta kTolerance =
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // On Linux, process creation time is relative to boot time which has a
-       // 1-second resolution. Tolerate 1 second for the imprecise boot time and
-       // 100 ms for the imprecise clock.
diff --git a/chromium-next/patches/patch-base_profiler_module__cache.cc b/chromium-next/patches/patch-base_profiler_module__cache.cc
deleted file mode 100644
index 8da4f55f63..0000000000
--- a/chromium-next/patches/patch-base_profiler_module__cache.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/profiler/module_cache.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/profiler/module_cache.cc
-@@ -38,7 +38,7 @@ std::string TransformModuleIDToSymbolSer
-   // Android and Linux Chrome builds use the "breakpad" format to index their
-   // build id, so we transform the build id for these platforms. All other
-   // platforms keep their symbols indexed by the original build ID.
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Linux ELF module IDs are 160bit integers, which we need to mangle
-   // down to 128bit integers to match the id that Breakpad outputs.
-   // Example on version '66.0.3359.170' x64:
diff --git a/chromium-next/patches/patch-base_profiler_sampling__profiler__thread__token.cc b/chromium-next/patches/patch-base_profiler_sampling__profiler__thread__token.cc
deleted file mode 100644
index c32ee112d7..0000000000
--- a/chromium-next/patches/patch-base_profiler_sampling__profiler__thread__token.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/profiler/sampling_profiler_thread_token.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/profiler/sampling_profiler_thread_token.cc
-@@ -6,7 +6,7 @@
- 
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <pthread.h>
- 
- #include "base/profiler/stack_base_address_posix.h"
-@@ -18,7 +18,7 @@ SamplingProfilerThreadToken GetSamplingP
-   PlatformThreadId id = PlatformThread::CurrentId();
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
-   return {id, pthread_self()};
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   std::optional<uintptr_t> maybe_stack_base =
-       GetThreadStackBaseAddress(id, pthread_self());
-   return {id, maybe_stack_base};
diff --git a/chromium-next/patches/patch-base_profiler_sampling__profiler__thread__token.h b/chromium-next/patches/patch-base_profiler_sampling__profiler__thread__token.h
deleted file mode 100644
index 2da56f6c89..0000000000
--- a/chromium-next/patches/patch-base_profiler_sampling__profiler__thread__token.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/profiler/sampling_profiler_thread_token.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/profiler/sampling_profiler_thread_token.h
-@@ -13,7 +13,7 @@
- 
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
- #include <pthread.h>
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <stdint.h>
- #endif
- 
-@@ -27,7 +27,7 @@ struct SamplingProfilerThreadToken {
-   PlatformThreadId id;
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
-   pthread_t pthread_id;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Due to the sandbox, we can only retrieve the stack base address for the
-   // current thread. We must grab it during
-   // GetSamplingProfilerCurrentThreadToken() and not try to get it later.
diff --git a/chromium-next/patches/patch-base_profiler_stack__base__address__posix.cc b/chromium-next/patches/patch-base_profiler_stack__base__address__posix.cc
deleted file mode 100644
index ea99ded9c1..0000000000
--- a/chromium-next/patches/patch-base_profiler_stack__base__address__posix.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/profiler/stack_base_address_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/profiler/stack_base_address_posix.cc
-@@ -18,6 +18,14 @@
- #include "base/files/scoped_file.h"
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#if BUILDFLAG(IS_NETBSD)
-+#include <pthread.h>
-+#else
-+#include <pthread_np.h>
-+#endif
-+#endif
-+
- #if BUILDFLAG(IS_CHROMEOS)
- extern "C" void* __libc_stack_end;
- #endif
-@@ -49,7 +57,21 @@ std::optional<uintptr_t> GetAndroidMainT
- 
- #if !BUILDFLAG(IS_LINUX)
- uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) {
-+#if BUILDFLAG(IS_OPENBSD)
-+  stack_t ss;
-+  void *address;
-+  size_t size;
-+  if (pthread_stackseg_np(pthread_id, &ss) != 0)
-+    return 0;
-+  size = ss.ss_size;
-+  address = (void*)((size_t) ss.ss_sp - ss.ss_size);
-+#else
-   pthread_attr_t attr;
-+#if BUILDFLAG(IS_FREEBSD)
-+  int result;
-+  pthread_attr_init(&attr);
-+  pthread_attr_get_np(pthread_id, &attr);
-+#else
-   // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox
-   // and pthread_id refers to a different thread, due to the use of
-   // sched_getaffinity().
-@@ -62,12 +84,14 @@ uintptr_t GetThreadStackBaseAddressImpl(
-                       << logging::SystemErrorCodeToString(result);
-   // See crbug.com/617730 for limitations of this approach on Linux-like
-   // systems.
-+#endif
-   void* address;
-   size_t size;
-   result = pthread_attr_getstack(&attr, &address, &size);
-   CHECK_EQ(result, 0) << "pthread_attr_getstack returned "
-                       << logging::SystemErrorCodeToString(result);
-   pthread_attr_destroy(&attr);
-+#endif
-   const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
-   return base_address;
- }
-@@ -84,7 +108,7 @@ std::optional<uintptr_t> GetThreadStackB
-   // trying to work around the problem.
-   return std::nullopt;
- #else
--  const bool is_main_thread = id.raw() == GetCurrentProcId();
-+  const bool is_main_thread = id.raw() == (checked_cast<uint64_t>(GetCurrentProcId()));
-   if (is_main_thread) {
- #if BUILDFLAG(IS_ANDROID)
-     // The implementation of pthread_getattr_np() in Bionic reads proc/self/maps
diff --git a/chromium-next/patches/patch-base_profiler_stack__sampling__profiler__test__util.cc b/chromium-next/patches/patch-base_profiler_stack__sampling__profiler__test__util.cc
deleted file mode 100644
index c37aecee26..0000000000
--- a/chromium-next/patches/patch-base_profiler_stack__sampling__profiler__test__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/profiler/stack_sampling_profiler_test_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/profiler/stack_sampling_profiler_test_util.cc
-@@ -50,7 +50,7 @@
- // Fortunately, it provides _alloca, which functions identically.
- #include <malloc.h>
- #define alloca _alloca
--#else
-+#elif !BUILDFLAG(IS_BSD)
- #include <alloca.h>
- #endif
- 
diff --git a/chromium-next/patches/patch-base_profiler_stack__sampling__profiler__unittest.cc b/chromium-next/patches/patch-base_profiler_stack__sampling__profiler__unittest.cc
deleted file mode 100644
index e098757f28..0000000000
--- a/chromium-next/patches/patch-base_profiler_stack__sampling__profiler__unittest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/profiler/stack_sampling_profiler_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/profiler/stack_sampling_profiler_unittest.cc
-@@ -47,7 +47,7 @@
- 
- #include <intrin.h>
- #include <malloc.h>
--#else
-+#elif !BUILDFLAG(IS_BSD)
- #include <alloca.h>
- #endif
- 
diff --git a/chromium-next/patches/patch-base_profiler_thread__delegate__posix.cc b/chromium-next/patches/patch-base_profiler_thread__delegate__posix.cc
deleted file mode 100644
index 97e1b6e29e..0000000000
--- a/chromium-next/patches/patch-base_profiler_thread__delegate__posix.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/profiler/thread_delegate_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/profiler/thread_delegate_posix.cc
-@@ -15,7 +15,7 @@
- #include "base/process/process_handle.h"
- #include "build/build_config.h"
- 
--#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- #include "base/profiler/stack_base_address_posix.h"
- #endif
- 
-@@ -24,7 +24,7 @@ namespace base {
- std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create(
-     SamplingProfilerThreadToken thread_token) {
-   std::optional<uintptr_t> base_address;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   base_address = thread_token.stack_base_address;
- #else
-   base_address =
diff --git a/chromium-next/patches/patch-base_rand__util.h b/chromium-next/patches/patch-base_rand__util.h
deleted file mode 100644
index 9ffbc0e897..0000000000
--- a/chromium-next/patches/patch-base_rand__util.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/rand_util.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/rand_util.h
-@@ -213,7 +213,7 @@ void RandomShuffle(Itr first, Itr last) 
-   std::shuffle(first, last, RandomBitGenerator());
- }
- 
--#if BUILDFLAG(IS_POSIX)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_BSD)
- BASE_EXPORT int GetUrandomFD();
- #endif
- 
diff --git a/chromium-next/patches/patch-base_rand__util__posix.cc b/chromium-next/patches/patch-base_rand__util__posix.cc
deleted file mode 100644
index baa54af747..0000000000
--- a/chromium-next/patches/patch-base_rand__util__posix.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/rand_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/rand_util_posix.cc
-@@ -29,7 +29,7 @@
- #include "base/time/time.h"
- #include "build/build_config.h"
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- #include "third_party/lss/linux_syscall_support.h"
- #elif BUILDFLAG(IS_MAC)
- // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK.
-@@ -45,6 +45,7 @@ namespace base {
- 
- namespace {
- 
-+#if !BUILDFLAG(IS_BSD)
- #if BUILDFLAG(IS_AIX)
- // AIX has no 64-bit support for O_CLOEXEC.
- static constexpr int kOpenFlags = O_RDONLY;
-@@ -69,10 +70,11 @@ class URandomFd {
-  private:
-   const int fd_;
- };
-+#endif
- 
- #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
-      BUILDFLAG(IS_ANDROID)) &&                        \
--    !BUILDFLAG(IS_NACL)
-+    !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- 
- bool KernelSupportsGetRandom() {
-   return base::SysInfo::KernelVersionNumber::Current() >=
-@@ -129,6 +131,7 @@ bool UseBoringSSLForRandBytes() {
- namespace {
- 
- void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) {
-+#if !BUILDFLAG(IS_BSD)
- #if !BUILDFLAG(IS_NACL)
-   // The BoringSSL experiment takes priority over everything else.
-   if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
-@@ -163,6 +166,9 @@ void RandBytesInternal(span<uint8_t> out
-   const int urandom_fd = GetUrandomFD();
-   const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
-   CHECK(success);
-+#else
-+  arc4random_buf(output.data(), output.size());
-+#endif
- }
- 
- }  // namespace
-@@ -182,9 +188,11 @@ void RandBytes(span<uint8_t> output) {
-   RandBytesInternal(output, /*avoid_allocation=*/false);
- }
- 
-+#if !BUILDFLAG(IS_BSD)
- int GetUrandomFD() {
-   static NoDestructor<URandomFd> urandom_fd;
-   return urandom_fd->fd();
- }
-+#endif
- 
- }  // namespace base
diff --git a/chromium-next/patches/patch-base_strings_safe__sprintf__unittest.cc b/chromium-next/patches/patch-base_strings_safe__sprintf__unittest.cc
deleted file mode 100644
index 0eaaf29156..0000000000
--- a/chromium-next/patches/patch-base_strings_safe__sprintf__unittest.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/strings/safe_sprintf_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/strings/safe_sprintf_unittest.cc
-@@ -743,6 +743,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
- #endif
- }
- 
-+#if !BUILDFLAG(IS_BSD)
- TEST(SafeSPrintfTest, EmitNULL) {
-   char buf[40];
- #if defined(__GNUC__)
-@@ -759,6 +760,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
- #pragma GCC diagnostic pop
- #endif
- }
-+#endif
- 
- TEST(SafeSPrintfTest, PointerSize) {
-   // The internal data representation is a 64bit value, independent of the
diff --git a/chromium-next/patches/patch-base_synchronization_cancelable__event.h b/chromium-next/patches/patch-base_synchronization_cancelable__event.h
deleted file mode 100644
index 0fbdd61af9..0000000000
--- a/chromium-next/patches/patch-base_synchronization_cancelable__event.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/synchronization/cancelable_event.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/synchronization/cancelable_event.h
-@@ -11,7 +11,7 @@
- 
- #if BUILDFLAG(IS_WIN)
- #include <windows.h>
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <semaphore.h>
- #else
- #include "base/synchronization/waitable_event.h"
-@@ -49,7 +49,7 @@ class BASE_EXPORT CancelableEvent {
- 
- #if BUILDFLAG(IS_WIN)
-   using NativeHandle = HANDLE;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   using NativeHandle = sem_t;
- #else
-   using NativeHandle = WaitableEvent;
diff --git a/chromium-next/patches/patch-base_synchronization_lock__impl.h b/chromium-next/patches/patch-base_synchronization_lock__impl.h
deleted file mode 100644
index a83e9fd81f..0000000000
--- a/chromium-next/patches/patch-base_synchronization_lock__impl.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/synchronization/lock_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/synchronization/lock_impl.h
-@@ -110,6 +110,10 @@ void LockImpl::Unlock() {
- }
- 
- #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_FREEBSD)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
-+#endif
- 
- #if DCHECK_IS_ON()
- BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -130,6 +134,9 @@ void LockImpl::Unlock() {
-   dcheck_unlock_result(rv);
- #endif
- }
-+#if BUILDFLAG(IS_FREEBSD)
-+#pragma GCC diagnostic pop
-+#endif
- #endif
- 
- // This is an implementation used for AutoLock templated on the lock type.
diff --git a/chromium-next/patches/patch-base_syslog__logging.cc b/chromium-next/patches/patch-base_syslog__logging.cc
deleted file mode 100644
index becb819abf..0000000000
--- a/chromium-next/patches/patch-base_syslog__logging.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/syslog_logging.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/syslog_logging.cc
-@@ -17,7 +17,7 @@
- #include "base/strings/string_util.h"
- #include "base/win/scoped_handle.h"
- #include "base/win/win_util.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
- // base::LOG_INFO, base::LOG_WARNING.
- #include <syslog.h>
-@@ -151,7 +151,7 @@ EventLogMessage::~EventLogMessage() {
-   if (user_sid != nullptr) {
-     ::LocalFree(user_sid);
-   }
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   const char kEventSource[] = "chrome";
-   openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER);
-   // We can't use the defined names for the logging severity from syslog.h
diff --git a/chromium-next/patches/patch-base_system_sys__info.cc b/chromium-next/patches/patch-base_system_sys__info.cc
deleted file mode 100644
index 242cd01d35..0000000000
--- a/chromium-next/patches/patch-base_system_sys__info.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/system/sys_info.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/system/sys_info.cc
-@@ -224,7 +224,7 @@ std::string SysInfo::SocManufacturer() {
- #endif
- 
- void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   constexpr base::TaskTraits kTraits = {base::MayBlock()};
- #else
-   constexpr base::TaskTraits kTraits = {};
diff --git a/chromium-next/patches/patch-base_system_sys__info.h b/chromium-next/patches/patch-base_system_sys__info.h
deleted file mode 100644
index f425ce7a19..0000000000
--- a/chromium-next/patches/patch-base_system_sys__info.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/system/sys_info.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/system/sys_info.h
-@@ -355,6 +355,8 @@ class BASE_EXPORT SysInfo {
-   static void ResetCpuSecurityMitigationsEnabledForTesting();
- #endif
- 
-+  static uint64_t MaxSharedMemorySize();
-+
-  private:
-   friend class test::ScopedAmountOfPhysicalMemoryOverride;
-   FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-@@ -367,7 +369,7 @@ class BASE_EXPORT SysInfo {
-   static HardwareInfo GetHardwareInfoSync();
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-   static uint64_t AmountOfAvailablePhysicalMemory(
-       const SystemMemoryInfoKB& meminfo);
- #endif
diff --git a/chromium-next/patches/patch-base_system_sys__info__freebsd.cc b/chromium-next/patches/patch-base_system_sys__info__freebsd.cc
deleted file mode 100644
index 81ff181583..0000000000
--- a/chromium-next/patches/patch-base_system_sys__info__freebsd.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/system/sys_info_freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/system/sys_info_freebsd.cc
-@@ -9,28 +9,103 @@
- #include <sys/sysctl.h>
- 
- #include "base/notreached.h"
-+#include "base/process/process_metrics.h"
-+#include "base/strings/string_util.h"
- 
- namespace base {
- 
--int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
--  int pages, page_size;
-+int SysInfo::NumberOfProcessors() {
-+  int mib[] = {CTL_HW, HW_NCPU};
-+  int ncpu;
-+  size_t size = sizeof(ncpu);
-+  if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
-+    NOTREACHED();
-+    return 1;
-+  }
-+  return ncpu;
-+}
-+  
-+uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
-+  int pages, page_size, r = 0;
-   size_t size = sizeof(pages);
--  sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
--  sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
--  if (pages == -1 || page_size == -1) {
-+
-+  if (r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
-+  if (r == 0)   
-+    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
-+
-+  if (r == -1) {
-+    NOTREACHED();
-+  }
-+
-+  return static_cast<uint64_t>(pages) * page_size;
-+}
-+
-+uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
-+  int page_size, r = 0;
-+  unsigned int pgfree, pginact, pgcache;
-+  size_t size = sizeof(page_size);
-+  size_t szpg = sizeof(pgfree);
-+ 
-+  if (r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
-+  if (r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0);
-+  if (r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0);
-+  if (r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
-+
-+  if (r == -1) {
-     NOTREACHED();
-+    return 0;
-   }
--  return static_cast<int64_t>(pages) * page_size;
-+
-+  return static_cast<uint64_t>((pgfree + pginact + pgcache) * page_size);
-+}
-+
-+// static
-+uint64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) {
-+  uint64_t res_kb = info.available != 0
-+                       ? info.available - info.active_file
-+                       : info.free + info.reclaimable + info.inactive_file;
-+  return res_kb * 1024;
-+}
-+
-+// static
-+std::string SysInfo::CPUModelName() {
-+  int mib[] = { CTL_HW, HW_MODEL };
-+  char name[256];
-+  size_t size = std::size(name);
-+
-+  if (sysctl(mib, std::size(mib), &name, &size, NULL, 0) == 0) {
-+    return name;
-+  }
-+
-+  return std::string();
- }
- 
- // static
- uint64_t SysInfo::MaxSharedMemorySize() {
-   size_t limit;
-   size_t size = sizeof(limit);
-+
-   if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
-     NOTREACHED();
-   }
-   return static_cast<uint64_t>(limit);
- }
- 
-+SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
-+  HardwareInfo info;
-+
-+  info.manufacturer = "FreeBSD";
-+  info.model = HardwareModelName();
-+
-+  DCHECK(IsStringUTF8(info.manufacturer));
-+  DCHECK(IsStringUTF8(info.model));
-+
-+  return info;
-+}
-+
- }  // namespace base
diff --git a/chromium-next/patches/patch-base_system_sys__info__netbsd.cc b/chromium-next/patches/patch-base_system_sys__info__netbsd.cc
deleted file mode 100644
index 843181338d..0000000000
--- a/chromium-next/patches/patch-base_system_sys__info__netbsd.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/system/sys_info_netbsd.cc.orig	2025-05-08 12:01:57.641212361 +0000
-+++ base/system/sys_info_netbsd.cc
-@@ -0,0 +1,89 @@
-+// Copyright 2011 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/system/sys_info.h"
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+#include <sys/param.h>
-+#include <sys/shm.h>
-+#include <sys/sysctl.h>
-+
-+#include "base/notreached.h"
-+#include "base/posix/sysctl.h"
-+#include "base/strings/string_util.h"
-+
-+namespace {
-+
-+uint64_t AmountOfMemory(int pages_name) {
-+  long pages = sysconf(pages_name);
-+  long page_size = sysconf(_SC_PAGESIZE);
-+  if (pages < 0 || page_size < 0) {
-+    return 0;
-+  }
-+  return static_cast<uint64_t>(pages) * static_cast<uint64_t>(page_size);
-+}
-+
-+}  // namespace
-+
-+namespace base {
-+
-+// static
-+int SysInfo::NumberOfProcessors() {
-+  int mib[] = {CTL_HW, HW_NCPU};
-+  int ncpu;
-+  size_t size = sizeof(ncpu);
-+  if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
-+    NOTREACHED();
-+  }
-+  return ncpu;
-+}
-+
-+// static
-+uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
-+  return AmountOfMemory(_SC_PHYS_PAGES);
-+}
-+
-+// static
-+uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
-+  return AmountOfMemory(_SC_PHYS_PAGES);
-+}
-+
-+// static
-+uint64_t SysInfo::MaxSharedMemorySize() {
-+  int mib[] = {CTL_KERN, KERN_SYSVIPC, KERN_SYSVIPC_SHMMAX};
-+  size_t limit;
-+  size_t size = sizeof(limit);
-+  if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) {
-+    NOTREACHED();
-+  }
-+  return static_cast<uint64_t>(limit);
-+}
-+
-+// static
-+std::string SysInfo::CPUModelName() {
-+  int mib[] = { CTL_HW, HW_MODEL };
-+  char name[256];
-+  size_t size = std::size(name);
-+
-+  if (sysctl(mib, std::size(mib), &name, &size, NULL, 0) == 0) {
-+    return name;
-+  }
-+
-+  return std::string();
-+}
-+
-+// static
-+SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
-+  HardwareInfo info;
-+  // Set the manufacturer to "NetBSD" and the model to
-+  // an empty string.
-+  info.manufacturer = "NetBSD";
-+  info.model = HardwareModelName();
-+  DCHECK(IsStringUTF8(info.manufacturer));
-+  DCHECK(IsStringUTF8(info.model));
-+  return info;
-+}
-+
-+}  // namespace base
diff --git a/chromium-next/patches/patch-base_system_sys__info__openbsd.cc b/chromium-next/patches/patch-base_system_sys__info__openbsd.cc
deleted file mode 100644
index ed13af98dd..0000000000
--- a/chromium-next/patches/patch-base_system_sys__info__openbsd.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/system/sys_info_openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/system/sys_info_openbsd.cc
-@@ -12,6 +12,7 @@
- 
- #include "base/notreached.h"
- #include "base/posix/sysctl.h"
-+#include "base/strings/string_util.h"
- 
- namespace {
- 
-@@ -28,9 +29,14 @@ uint64_t AmountOfMemory(int pages_name) 
- 
- namespace base {
- 
-+// pledge(2)
-+uint64_t aofpmem = 0;
-+uint64_t shmmax = 0;
-+char cpumodel[256];
-+
- // static
- int SysInfo::NumberOfProcessors() {
--  int mib[] = {CTL_HW, HW_NCPU};
-+  int mib[] = {CTL_HW, HW_NCPUONLINE};
-   int ncpu;
-   size_t size = sizeof(ncpu);
-   if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
-@@ -41,7 +47,23 @@ int SysInfo::NumberOfProcessors() {
- 
- // static
- uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
--  return AmountOfMemory(_SC_PHYS_PAGES);
-+  // pledge(2)
-+  if (!aofpmem)
-+    aofpmem = AmountOfMemory(_SC_PHYS_PAGES);
-+  return aofpmem;
-+}
-+
-+// static
-+std::string SysInfo::CPUModelName() {
-+  int mib[] = {CTL_HW, HW_MODEL};
-+  size_t len = std::size(cpumodel);
-+  
-+  if (cpumodel[0] == '\0') {
-+    if (sysctl(mib, std::size(mib), cpumodel, &len, NULL, 0) < 0)
-+      return std::string();
-+  }
-+ 
-+  return std::string(cpumodel, len - 1);
- }
- 
- // static
-@@ -56,15 +78,27 @@ uint64_t SysInfo::MaxSharedMemorySize() 
-   int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX};
-   size_t limit;
-   size_t size = sizeof(limit);
-+  // pledge(2)
-+  if (shmmax)
-+    goto out;
-   if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) {
-     NOTREACHED();
-   }
--  return static_cast<uint64_t>(limit);
-+  shmmax = static_cast<uint64_t>(limit);
-+out:
-+  return shmmax;
- }
- 
- // static
--std::string SysInfo::CPUModelName() {
--  return StringSysctl({CTL_HW, HW_MODEL}).value();
-+SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
-+  HardwareInfo info;
-+  // Set the manufacturer to "OpenBSD" and the model to
-+  // an empty string.
-+  info.manufacturer = "OpenBSD";
-+  info.model = HardwareModelName();
-+  DCHECK(IsStringUTF8(info.manufacturer));
-+  DCHECK(IsStringUTF8(info.model));
-+  return info;
- }
- 
- }  // namespace base
diff --git a/chromium-next/patches/patch-base_system_sys__info__posix.cc b/chromium-next/patches/patch-base_system_sys__info__posix.cc
deleted file mode 100644
index a06b85a564..0000000000
--- a/chromium-next/patches/patch-base_system_sys__info__posix.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/system/sys_info_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/system/sys_info_posix.cc
-@@ -143,7 +143,7 @@ void GetKernelVersionNumbers(int32_t* ma
- 
- namespace base {
- 
--#if !BUILDFLAG(IS_OPENBSD)
-+#if !BUILDFLAG(IS_BSD)
- // static
- int SysInfo::NumberOfProcessors() {
- #if BUILDFLAG(IS_MAC)
-@@ -199,7 +199,7 @@ int SysInfo::NumberOfProcessors() {
- 
-   return cached_num_cpus;
- }
--#endif  // !BUILDFLAG(IS_OPENBSD)
-+#endif  // !BUILDFLAG(IS_BSD)
- 
- // static
- uint64_t SysInfo::AmountOfVirtualMemory() {
-@@ -285,6 +285,8 @@ std::string SysInfo::OperatingSystemArch
-     arch = "x86";
-   } else if (arch == "amd64") {
-     arch = "x86_64";
-+  } else if (arch == "arm64") {
-+    arch = "aarch64";
-   } else if (std::string(info.sysname) == "AIX") {
-     arch = "ppc64";
-   }
diff --git a/chromium-next/patches/patch-base_system_sys__info__unittest.cc b/chromium-next/patches/patch-base_system_sys__info__unittest.cc
deleted file mode 100644
index eb784c39e8..0000000000
--- a/chromium-next/patches/patch-base_system_sys__info__unittest.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/system/sys_info_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/system/sys_info_unittest.cc
-@@ -265,12 +265,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
-   EXPECT_TRUE(IsStringUTF8(hardware_info->model));
-   bool empty_result_expected =
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
-       false;
- #else
-       true;
- #endif
-   EXPECT_EQ(hardware_info->manufacturer.empty(), empty_result_expected);
-+#if BUILDFLAG(IS_BSD)
-+  empty_result_expected = true;
-+#endif
-   EXPECT_EQ(hardware_info->model.empty(), empty_result_expected);
- }
- 
diff --git a/chromium-next/patches/patch-base_task_thread__pool_environment__config__unittest.cc b/chromium-next/patches/patch-base_task_thread__pool_environment__config__unittest.cc
deleted file mode 100644
index 58d6b5e9ea..0000000000
--- a/chromium-next/patches/patch-base_task_thread__pool_environment__config__unittest.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/task/thread_pool/environment_config_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/task/thread_pool/environment_config_unittest.cc
-@@ -21,7 +21,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUse
-             base::FeatureList::IsEnabled(
-                 FeatureControllingBackgroundPriorityWorkerThreads()));
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
-   EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread());
- #else
- #error Platform doesn't match any block
-@@ -30,7 +30,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUse
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID)
-   EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread());
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
-   EXPECT_FALSE(CanUseUtilityThreadTypeForWorkerThread());
- #else
- #error Platform doesn't match any block
diff --git a/chromium-next/patches/patch-base_test_launcher_test__launcher.cc b/chromium-next/patches/patch-base_test_launcher_test__launcher.cc
deleted file mode 100644
index 85ff065094..0000000000
--- a/chromium-next/patches/patch-base_test_launcher_test__launcher.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/test/launcher/test_launcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/test/launcher/test_launcher.cc
-@@ -73,6 +73,7 @@
- #include "testing/gtest/include/gtest/gtest.h"
- 
- #if BUILDFLAG(IS_POSIX)
-+#include <signal.h>
- #include <fcntl.h>
- 
- #include "base/files/file_descriptor_watcher_posix.h"
-@@ -1836,6 +1837,10 @@ bool TestLauncher::Init(CommandLine* com
-   results_tracker_.AddGlobalTag("OS_OPENBSD");
- #endif
- 
-+#if BUILDFLAG(IS_NETBSD)
-+  results_tracker_.AddGlobalTag("OS_NETBSD");
-+#endif
-+
- #if BUILDFLAG(IS_POSIX)
-   results_tracker_.AddGlobalTag("OS_POSIX");
- #endif
diff --git a/chromium-next/patches/patch-base_test_test__file__util__linux.cc b/chromium-next/patches/patch-base_test_test__file__util__linux.cc
deleted file mode 100644
index 3967037f95..0000000000
--- a/chromium-next/patches/patch-base_test_test__file__util__linux.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/test/test_file_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/test/test_file_util_linux.cc
-@@ -56,9 +56,11 @@ bool EvictFileFromSystemCache(const File
-   if (fdatasync(fd.get()) != 0) {
-     return false;
-   }
-+#if !BUILDFLAG(IS_BSD)
-   if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) {
-     return false;
-   }
-+#endif
-   return true;
- }
- 
diff --git a/chromium-next/patches/patch-base_test_test__file__util__posix.cc b/chromium-next/patches/patch-base_test_test__file__util__posix.cc
deleted file mode 100644
index 500e9bd1d6..0000000000
--- a/chromium-next/patches/patch-base_test_test__file__util__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/test/test_file_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/test/test_file_util_posix.cc
-@@ -93,7 +93,7 @@ void SyncPageCacheToDisk() {
- }
- 
- #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
--    !BUILDFLAG(IS_ANDROID)
-+    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
- bool EvictFileFromSystemCache(const FilePath& file) {
-   // There doesn't seem to be a POSIX way to cool the disk cache.
-   NOTIMPLEMENTED();
diff --git a/chromium-next/patches/patch-base_threading_platform__thread.h b/chromium-next/patches/patch-base_threading_platform__thread.h
deleted file mode 100644
index 42754e5b3e..0000000000
--- a/chromium-next/patches/patch-base_threading_platform__thread.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/threading/platform_thread.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/threading/platform_thread.h
-@@ -55,6 +55,8 @@ class BASE_EXPORT PlatformThreadId {
-   using UnderlyingType = zx_koid_t;
- #elif BUILDFLAG(IS_APPLE)
-   using UnderlyingType = uint64_t;
-+#elif BUILDFLAG(IS_BSD)
-+  using UnderlyingType = uint64_t;
- #elif BUILDFLAG(IS_POSIX)
-   using UnderlyingType = pid_t;
- #endif
diff --git a/chromium-next/patches/patch-base_threading_platform__thread__bsd.cc b/chromium-next/patches/patch-base_threading_platform__thread__bsd.cc
deleted file mode 100644
index 6b6c3a391f..0000000000
--- a/chromium-next/patches/patch-base_threading_platform__thread__bsd.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/threading/platform_thread_bsd.cc.orig	2025-05-08 12:01:57.642507726 +0000
-+++ base/threading/platform_thread_bsd.cc
-@@ -0,0 +1,31 @@
-+// Copyright 2023 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+// Description: These are stubs for *BSD.
-+
-+#include "base/threading/platform_thread.h"
-+
-+namespace base {
-+namespace internal {
-+
-+bool CanSetThreadTypeToRealtimeAudio() {
-+  return false;
-+}
-+
-+bool SetCurrentThreadTypeForPlatform(ThreadType thread_type,
-+                                MessagePumpType pump_type_hint) {
-+  return false;
-+}
-+
-+std::optional<ThreadPriorityForTest>
-+GetCurrentThreadPriorityForPlatformForTest() {
-+  return std::nullopt;
-+}
-+}  // namespace internal
-+
-+// static
-+void PlatformThreadBase::SetName(const std::string& name) {
-+  SetNameCommon(name);
-+}
-+
-+}  // namespace base
diff --git a/chromium-next/patches/patch-base_threading_platform__thread__internal__posix.cc b/chromium-next/patches/patch-base_threading_platform__thread__internal__posix.cc
deleted file mode 100644
index 9f51e151e1..0000000000
--- a/chromium-next/patches/patch-base_threading_platform__thread__internal__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/threading/platform_thread_internal_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/threading/platform_thread_internal_posix.cc
-@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadP
- }
- 
- int GetCurrentThreadNiceValue() {
--#if BUILDFLAG(IS_NACL)
-+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
-   NOTIMPLEMENTED();
-   return 0;
- #else
diff --git a/chromium-next/patches/patch-base_threading_platform__thread__posix.cc b/chromium-next/patches/patch-base_threading_platform__thread__posix.cc
deleted file mode 100644
index 62487415a5..0000000000
--- a/chromium-next/patches/patch-base_threading_platform__thread__posix.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/threading/platform_thread_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/threading/platform_thread_posix.cc
-@@ -79,11 +79,11 @@ void* ThreadFunc(void* params) {
-       base::DisallowSingleton();
-     }
- 
--#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
-+#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD)
-     partition_alloc::internal::StackTopRegistry::Get().NotifyThreadCreated();
- #endif
- 
--#if !BUILDFLAG(IS_NACL)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- #if BUILDFLAG(IS_APPLE)
-     PlatformThread::SetCurrentThreadRealtimePeriodValue(
-         delegate->GetRealtimePeriod());
-@@ -272,6 +272,8 @@ PlatformThreadId PlatformThreadBase::Cur
-   return PlatformThreadId(reinterpret_cast<int32_t>(pthread_self()));
- #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX)
-   return PlatformThreadId(pthread_self());
-+#elif BUILDFLAG(IS_BSD)
-+  return PlatformThreadId(reinterpret_cast<uint64_t>(pthread_self()));
- #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX)
-   return PlatformThreadId(reinterpret_cast<int64_t>(pthread_self()));
- #endif
-@@ -365,7 +367,7 @@ void PlatformThreadBase::Detach(Platform
- 
- // static
- bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
--#if BUILDFLAG(IS_NACL)
-+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
-   return false;
- #else
-   if (from >= to) {
-@@ -386,6 +388,9 @@ void SetCurrentThreadTypeImpl(ThreadType
-                               MessagePumpType pump_type_hint) {
- #if BUILDFLAG(IS_NACL)
-   NOTIMPLEMENTED();
-+// avoid pledge(2) violation
-+#elif BUILDFLAG(IS_BSD)
-+   NOTIMPLEMENTED();
- #else
-   if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) {
-     return;
-@@ -409,7 +414,7 @@ void SetCurrentThreadTypeImpl(ThreadType
- 
- // static
- ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {
--#if BUILDFLAG(IS_NACL)
-+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
-   NOTIMPLEMENTED();
-   return ThreadPriorityForTest::kNormal;
- #else
diff --git a/chromium-next/patches/patch-base_threading_platform__thread__unittest.cc b/chromium-next/patches/patch-base_threading_platform__thread__unittest.cc
deleted file mode 100644
index 09d7a47da3..0000000000
--- a/chromium-next/patches/patch-base_threading_platform__thread__unittest.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/threading/platform_thread_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/threading/platform_thread_unittest.cc
-@@ -36,7 +36,7 @@
- #include "base/time/time.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <pthread.h>
- #include <sys/syscall.h>
- #include <sys/types.h>
-@@ -370,7 +370,7 @@ TEST(PlatformThreadTest,
- // and hardcodes what we know. Please inform scheduler-dev%chromium.org@localhost if this
- // proprerty changes for a given platform.
- TEST(PlatformThreadTest, CanChangeThreadType) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
-   // able to increase priority to any level unless we are root (euid == 0).
-   bool kCanIncreasePriority = false;
-@@ -435,7 +435,7 @@ TEST(PlatformThreadTest, SetCurrentThrea
- #if BUILDFLAG(IS_APPLE)
-   TestPriorityResultingFromThreadType(ThreadType::kResourceEfficient,
-                                       ThreadPriorityForTest::kUtility);
--#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   TestPriorityResultingFromThreadType(
-       ThreadType::kResourceEfficient,
-       ThreadPriorityForTest::kResourceEfficient);
-@@ -624,12 +624,16 @@ INSTANTIATE_TEST_SUITE_P(
- 
- #endif  // BUILDFLAG(IS_APPLE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- namespace {
- 
- bool IsTidCacheCorrect() {
-+#if BUILDFLAG(IS_BSD)
-+  return PlatformThread::CurrentId().raw() == reinterpret_cast<int64_t>(pthread_self());
-+#else
-   return PlatformThread::CurrentId().raw() == syscall(__NR_gettid);
-+#endif
- }
- 
- void* CheckTidCacheCorrectWrapper(void*) {
diff --git a/chromium-next/patches/patch-base_time_time__now__posix.cc b/chromium-next/patches/patch-base_time_time__now__posix.cc
deleted file mode 100644
index 4f21aabaea..0000000000
--- a/chromium-next/patches/patch-base_time_time__now__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/time/time_now_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/time/time_now_posix.cc
-@@ -27,7 +27,7 @@
- #endif
- 
- // NaCl doesn't support CLOCK_MONOTONIC_COARSE.
--#if BUILDFLAG(IS_NACL)
-+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
- #define TIMETICKS_LOW_RESOLUTION_CLOCK CLOCK_MONOTONIC
- #else
- #define TIMETICKS_LOW_RESOLUTION_CLOCK CLOCK_MONOTONIC_COARSE
diff --git a/chromium-next/patches/patch-base_trace__event_malloc__dump__provider.cc b/chromium-next/patches/patch-base_trace__event_malloc__dump__provider.cc
deleted file mode 100644
index f667ffb266..0000000000
--- a/chromium-next/patches/patch-base_trace__event_malloc__dump__provider.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/trace_event/malloc_dump_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/trace_event/malloc_dump_provider.cc
-@@ -31,6 +31,8 @@
- 
- #if BUILDFLAG(IS_APPLE)
- #include <malloc/malloc.h>
-+#elif BUILDFLAG(IS_BSD)
-+#include <stdlib.h>
- #else
- #include <malloc.h>
- #endif
-@@ -180,7 +182,7 @@ void ReportAppleAllocStats(size_t* total
- 
- #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
-     (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) &&    \
--     !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA))
-+     !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD))
- void ReportMallinfoStats(ProcessMemoryDump* pmd,
-                          size_t* total_virtual_size,
-                          size_t* resident_size,
-@@ -370,6 +372,9 @@ bool MallocDumpProvider::OnMemoryDump(co
-                      &allocated_objects_count);
- #elif BUILDFLAG(IS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
-+#elif BUILDFLAG(IS_BSD)
-+  total_virtual_size = 0;
-+  allocated_objects_size = 0;
- #else
-   ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
-                       &allocated_objects_size, &allocated_objects_count);
diff --git a/chromium-next/patches/patch-base_trace__event_memory__dump__manager.cc b/chromium-next/patches/patch-base_trace__event_memory__dump__manager.cc
deleted file mode 100644
index e69f5d425f..0000000000
--- a/chromium-next/patches/patch-base_trace__event_memory__dump__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/trace_event/memory_dump_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/trace_event/memory_dump_manager.cc
-@@ -78,7 +78,7 @@ const char* const MemoryDumpManager::kSy
- #if defined(MALLOC_MEMORY_TRACING_SUPPORTED)
-     MallocDumpProvider::kAllocatedObjects;
- #else
--    nullptr;
-+    "";
- #endif
- 
- // static
diff --git a/chromium-next/patches/patch-base_trace__event_process__memory__dump.cc b/chromium-next/patches/patch-base_trace__event_process__memory__dump.cc
deleted file mode 100644
index 20a9bf11ce..0000000000
--- a/chromium-next/patches/patch-base_trace__event_process__memory__dump.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/trace_event/process_memory_dump.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/trace_event/process_memory_dump.cc
-@@ -119,7 +119,7 @@ std::optional<size_t> ProcessMemoryDump:
- #if BUILDFLAG(IS_WIN)
-   auto vec =
-       base::HeapArray<PSAPI_WORKING_SET_EX_INFORMATION>::WithSize(max_vec_size);
--#elif BUILDFLAG(IS_APPLE)
-+#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   auto vec = base::HeapArray<char>::WithSize(max_vec_size);
- #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
-   auto vec = base::HeapArray<unsigned char>::WithSize(max_vec_size);
-@@ -143,7 +143,7 @@ std::optional<size_t> ProcessMemoryDump:
-     for (size_t i = 0; i < page_count; i++) {
-       resident_page_count += vec[i].VirtualAttributes.Valid;
-     }
--#elif BUILDFLAG(IS_FUCHSIA)
-+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/42050620): Implement counting resident bytes.
-     // For now, log and avoid unused variable warnings.
-     NOTIMPLEMENTED_LOG_ONCE();
diff --git a/chromium-next/patches/patch-base_tracing_trace__time.cc b/chromium-next/patches/patch-base_tracing_trace__time.cc
deleted file mode 100644
index facd8815c1..0000000000
--- a/chromium-next/patches/patch-base_tracing_trace__time.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/tracing/trace_time.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/tracing/trace_time.cc
-@@ -8,12 +8,18 @@
- #include "build/build_config.h"
- #include "third_party/perfetto/include/perfetto/base/time.h"
- 
-+#if BUILDFLAG(IS_FREEBSD)
-+#define CLOCK_BOOTTIME CLOCK_UPTIME
-+#elif BUILDFLAG(IS_NETBSD)
-+#define CLOCK_BOOTTIME CLOCK_MONOTONIC
-+#endif
-+
- namespace base::tracing {
- 
- int64_t TraceBootTicksNow() {
-   // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   struct timespec ts;
-   int res = clock_gettime(CLOCK_BOOTTIME, &ts);
-   if (res != -1) {
diff --git a/chromium-next/patches/patch-base_tracing_trace__time.h b/chromium-next/patches/patch-base_tracing_trace__time.h
deleted file mode 100644
index fa7dfe11bd..0000000000
--- a/chromium-next/patches/patch-base_tracing_trace__time.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/tracing/trace_time.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/tracing/trace_time.h
-@@ -12,7 +12,7 @@ namespace base {
- namespace tracing {
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153
- // about efforts to unify base::TimeTicks across all platforms.
- constexpr perfetto::protos::pbzero::BuiltinClock kTraceClockId =
diff --git a/chromium-next/patches/patch-base_version__info_version__info.h b/chromium-next/patches/patch-base_version__info_version__info.h
deleted file mode 100644
index 1e5b28d0c9..0000000000
--- a/chromium-next/patches/patch-base_version__info_version__info.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/version_info/version_info.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ base/version_info/version_info.h
-@@ -74,6 +74,8 @@ constexpr std::string_view GetOSType() {
-   return "FreeBSD";
- #elif BUILDFLAG(IS_OPENBSD)
-   return "OpenBSD";
-+#elif BUILDFLAG(IS_NETBSD)
-+  return "NetBSD";
- #elif BUILDFLAG(IS_SOLARIS)
-   return "Solaris";
- #elif BUILDFLAG(IS_FUCHSIA)
diff --git a/chromium-next/patches/patch-build_config_BUILD.gn b/chromium-next/patches/patch-build_config_BUILD.gn
deleted file mode 100644
index 6f94119c90..0000000000
--- a/chromium-next/patches/patch-build_config_BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/BUILD.gn
-@@ -215,6 +215,10 @@ config("default_libs") {
-     # Targets should choose to explicitly link frameworks they require. Since
-     # linking can have run-time side effects, nothing should be listed here.
-     libs = []
-+  } else if (is_bsd) {
-+    libs = [
-+      "pthread",
-+    ]
-   } else if (is_linux || is_chromeos) {
-     libs = [
-       "dl",
diff --git a/chromium-next/patches/patch-build_config_BUILDCONFIG.gn b/chromium-next/patches/patch-build_config_BUILDCONFIG.gn
deleted file mode 100644
index c0eb432e52..0000000000
--- a/chromium-next/patches/patch-build_config_BUILDCONFIG.gn
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/BUILDCONFIG.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/BUILDCONFIG.gn
-@@ -136,7 +136,8 @@ declare_args() {
-   is_official_build = false
- 
-   # Set to true when compiling with the Clang compiler.
--  is_clang = current_os != "linux" ||
-+  is_clang = current_os != "linux" || current_os == "openbsd" ||
-+             current_os == "freebsd" || current_os == "netbsd" ||
-              (current_cpu != "s390x" && current_cpu != "s390" &&
-               current_cpu != "ppc64" && current_cpu != "ppc" &&
-               current_cpu != "mips" && current_cpu != "mips64" &&
-@@ -235,6 +236,12 @@ if (host_toolchain == "") {
-     host_toolchain = "//build/toolchain/aix:$host_cpu"
-   } else if (host_os == "zos") {
-     host_toolchain = "//build/toolchain/zos:$host_cpu"
-+  } else if (host_os == "openbsd") {
-+    host_toolchain = "//build/toolchain/openbsd:clang_$host_cpu"
-+  } else if (host_os == "freebsd") {
-+    host_toolchain = "//build/toolchain/freebsd:clang_$host_cpu"
-+  } else if (host_os == "netbsd") {
-+    host_toolchain = "//build/toolchain/netbsd:clang_$host_cpu"
-   } else {
-     assert(false, "Unsupported host_os: $host_os")
-   }
-@@ -279,6 +286,8 @@ if (target_os == "android") {
-   _default_toolchain = "//build/toolchain/aix:$target_cpu"
- } else if (target_os == "zos") {
-   _default_toolchain = "//build/toolchain/zos:$target_cpu"
-+} else if (target_os == "openbsd" || target_os == "freebsd" || target_os == "netbsd") {
-+  _default_toolchain = host_toolchain
- } else {
-   assert(false, "Unsupported target_os: $target_os")
- }
-@@ -313,7 +322,12 @@ is_android = current_os == "android"
- is_chromeos = current_os == "chromeos"
- is_fuchsia = current_os == "fuchsia"
- is_ios = current_os == "ios"
--is_linux = current_os == "linux"
-+is_linux = current_os == "linux" || current_os == "openbsd" ||
-+           current_os == "freebsd" || current_os == "netbsd"
-+is_openbsd = current_os == "openbsd"
-+is_freebsd = current_os == "freebsd"
-+is_netbsd = current_os == "netbsd"
-+is_bsd = current_os == "openbsd" || current_os == "freebsd" || current_os == "netbsd"
- is_mac = current_os == "mac"
- is_nacl = current_os == "nacl"
- is_wasm = current_os == "emscripten"
diff --git a/chromium-next/patches/patch-build_config_clang_BUILD.gn b/chromium-next/patches/patch-build_config_clang_BUILD.gn
deleted file mode 100644
index 88c6880359..0000000000
--- a/chromium-next/patches/patch-build_config_clang_BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/clang/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/clang/BUILD.gn
-@@ -252,7 +252,12 @@ template("clang_lib") {
- 
- # Adds a dependency on the Clang runtime library clang_rt.builtins.
- clang_lib("compiler_builtins") {
--  if (is_mac) {
-+  if (is_bsd) {
-+    # Since there's no Rust in the toolchain, there's no concern that we'll use
-+    # the Rust stdlib's intrinsics here.
-+    #
-+    # Don't define libname which makes this target do nothing.
-+  } else if (is_mac) {
-     libname = "osx"
-   } else if (is_ios) {
-     if (target_platform == "iphoneos") {
diff --git a/chromium-next/patches/patch-build_config_compiler_BUILD.gn b/chromium-next/patches/patch-build_config_compiler_BUILD.gn
deleted file mode 100644
index cb9ccb053f..0000000000
--- a/chromium-next/patches/patch-build_config_compiler_BUILD.gn
+++ /dev/null
@@ -1,155 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/compiler/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/compiler/BUILD.gn
-@@ -197,7 +197,7 @@ declare_args() {
-   # This greatly reduces the size of debug builds, at the cost of
-   # debugging information which is required by some specialized
-   # debugging tools.
--  simple_template_names = is_clang && !is_nacl && !is_win && !is_apple
-+  simple_template_names = is_clang && !is_nacl && !is_win && !is_apple && !is_bsd
- }
- 
- declare_args() {
-@@ -254,13 +254,16 @@ config("default_include_dirs") {
- # Compiler instrumentation can introduce dependencies in DSOs to symbols in
- # the executable they are loaded into, so they are unresolved at link-time.
- config("no_unresolved_symbols") {
--  if (!using_sanitizer &&
-+  if (!using_sanitizer && !is_bsd &&
-       (is_linux || is_chromeos || is_android || is_fuchsia)) {
-     ldflags = [
-       "-Wl,-z,defs",
-       "-Wl,--as-needed",
-     ]
-   }
-+  if (current_cpu == "x86" && is_openbsd) {
-+    ldflags = [ "-Wl,-z,notext", "-Wl,--strip-all" ]
-+  }
- }
- 
- # compiler ---------------------------------------------------------------------
-@@ -508,6 +511,10 @@ config("compiler") {
-     }
-   }
- 
-+  if (is_openbsd) {
-+    ldflags += [ "-Wl,-z,wxneeded" ]
-+  }
-+
-   # Linux-specific compiler flags setup.
-   # ------------------------------------
-   if (use_icf && (!is_apple || use_lld)) {
-@@ -567,7 +574,7 @@ config("compiler") {
-     ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
-   }
- 
--  if (is_clang && !is_nacl) {
-+  if (is_clang && !is_nacl && !is_bsd) {
-     cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
-     if (save_reproducers_on_lld_crash && use_lld) {
-       ldflags += [
-@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") {
-         ]
-       }
-     } else if (current_cpu == "arm") {
--      if (is_clang && !is_android && !is_nacl && !is_chromeos_device) {
-+      if (is_clang && !is_android && !is_nacl && !is_chromeos_device && !is_bsd) {
-         cflags += [ "--target=arm-linux-gnueabihf" ]
-         ldflags += [ "--target=arm-linux-gnueabihf" ]
-       }
-@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") {
-       }
-     } else if (current_cpu == "arm64") {
-       if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
--          !is_chromeos_device) {
-+          !is_chromeos_device && !is_bsd) {
-         cflags += [ "--target=aarch64-linux-gnu" ]
-         ldflags += [ "--target=aarch64-linux-gnu" ]
-       }
-@@ -1561,7 +1568,7 @@ config("compiler_deterministic") {
-     # different build directory like "out/feature_a" and "out/feature_b" if
-     # we build same files with same compile flag.
-     # Other paths are already given in relative, no need to normalize them.
--    if (is_nacl) {
-+    if (is_nacl || is_bsd) {
-       # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
-       cflags += [
-         "-Xclang",
-@@ -1619,7 +1626,7 @@ config("compiler_deterministic") {
- }
- 
- config("clang_revision") {
--  if (is_clang && clang_base_path == default_clang_base_path &&
-+  if (is_clang && !is_bsd && clang_base_path == default_clang_base_path &&
-       current_os != "zos") {
-     update_args = [
-       "--print-revision",
-@@ -1652,7 +1659,7 @@ config("clang_revision") {
- # e.g. by setting in the the project's .gn file.
- config("clang_warning_suppression") {
-   # Some build configs use older versions of clang that don't support WSMs
--  if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
-+  if (!is_bsd && !is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
-       !llvm_android_mainline && is_clang &&
-       clang_warning_suppression_file != "") {
-     from_build_root =
-@@ -1965,7 +1972,7 @@ config("default_warnings") {
-       "-Wno-unneeded-internal-declaration",
-     ]
- 
--    if (!is_nacl || is_nacl_saigo) {
-+    if (!is_bsd && !is_nacl || is_nacl_saigo) {
-       if (is_win) {
-         # TODO(thakis): https://crbug.com/617318
-         # Currently RBE can not handle case sensitiveness for windows well.
-@@ -1985,9 +1992,6 @@ config("default_warnings") {
- 
-         # TODO(crbug.com/40284799): Fix and re-enable.
-         "-Wno-thread-safety-reference-return",
--
--        # TODO(crbug.com/376641662): Fix and re-enable.
--        "-Wno-nontrivial-memcall",
-       ]
- 
-       cflags_cc += [
-@@ -2326,7 +2330,7 @@ config("export_dynamic") {
- # 2. Remove the thin_archive config, so that the .a file actually contains all
- #    .o files, instead of just references to .o files in the build directoy
- config("thin_archive") {
--  if ((is_apple && use_lld) || (is_linux && !is_clang) || current_os == "aix") {
-+  if ((is_apple && use_lld) || (is_linux && !is_clang) || current_os == "aix" || (is_netbsd)) {
-     # The macOS and iOS linker ld64.ldd doesn't support thin archive without
-     # symbol table, gcc on linux also throws the error `archive has no index`.
-     # AIX does support -s option, not -S option.
-@@ -2776,7 +2780,7 @@ config("afdo_optimize_size") {
- # There are some targeted places that AFDO regresses, so we provide a separate
- # config to allow AFDO to be disabled per-target.
- config("afdo") {
--  if (is_clang) {
-+  if (is_clang && !is_bsd) {
-     cflags = []
-     if (clang_emit_debug_info_for_profiling) {
-       # Add the following flags to generate debug info for profiling.
-@@ -2803,7 +2807,7 @@ config("afdo") {
-       cflags += [ "-Wno-backend-plugin" ]
-       inputs = [ _clang_sample_profile ]
-     }
--  } else if (auto_profile_path != "" && is_a_target_toolchain) {
-+  } else if (auto_profile_path != "" && is_a_target_toolchain && !is_bsd) {
-     cflags = [ "-fauto-profile=${auto_profile_path}" ]
-     inputs = [ auto_profile_path ]
-   }
-@@ -2980,7 +2984,7 @@ config("symbols") {
-     cflags += [ "-gomit-unreferenced-methods" ]
-   }
- 
--  if (is_clang && (!is_nacl || is_nacl_saigo)) {
-+  if (is_clang && (!is_nacl || is_nacl_saigo) && !is_bsd) {
-     if (is_apple) {
-       # TODO(crbug.com/40117949): Investigate missing debug info on mac.
-       # Make sure we don't use constructor homing on mac.
diff --git a/chromium-next/patches/patch-build_config_gcc_BUILD.gn b/chromium-next/patches/patch-build_config_gcc_BUILD.gn
deleted file mode 100644
index 92bf43d4fa..0000000000
--- a/chromium-next/patches/patch-build_config_gcc_BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/gcc/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/gcc/BUILD.gn
-@@ -32,7 +32,9 @@ declare_args() {
- # See http://gcc.gnu.org/wiki/Visibility
- config("symbol_visibility_hidden") {
-   cflags = [ "-fvisibility=hidden" ]
--  rustflags = [ "-Zdefault-visibility=hidden" ]
-+  if (!is_bsd) {
-+    rustflags = [ "-Zdefault-visibility=hidden" ]
-+  }
- 
-   # Visibility attribute is not supported on AIX.
-   if (current_os != "aix") {
diff --git a/chromium-next/patches/patch-build_config_linux_BUILD.gn b/chromium-next/patches/patch-build_config_linux_BUILD.gn
deleted file mode 100644
index 568e98e2b6..0000000000
--- a/chromium-next/patches/patch-build_config_linux_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/linux/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/linux/BUILD.gn
-@@ -41,7 +41,7 @@ config("runtime_library") {
-   }
- 
-   if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") &&
--      (!use_custom_libcxx || current_cpu == "mipsel")) {
-+      (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) {
-     libs = [ "atomic" ]
-   }
- }
diff --git a/chromium-next/patches/patch-build_config_linux_libdrm_BUILD.gn b/chromium-next/patches/patch-build_config_linux_libdrm_BUILD.gn
deleted file mode 100644
index 22292f4328..0000000000
--- a/chromium-next/patches/patch-build_config_linux_libdrm_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/linux/libdrm/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/linux/libdrm/BUILD.gn
-@@ -15,7 +15,7 @@ declare_args() {
- }
- 
- if (use_system_libdrm) {
--  assert(!is_linux, "System libdrm is not supported in linux")
-+#  assert(!is_linux, "System libdrm is not supported in linux")
-   pkg_config("libdrm_config") {
-     packages = [ "libdrm" ]
-   }
diff --git a/chromium-next/patches/patch-build_config_linux_pkg-config.py b/chromium-next/patches/patch-build_config_linux_pkg-config.py
deleted file mode 100644
index 6314c68b3d..0000000000
--- a/chromium-next/patches/patch-build_config_linux_pkg-config.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/linux/pkg-config.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/linux/pkg-config.py
-@@ -108,7 +108,7 @@ def main():
-   # If this is run on non-Linux platforms, just return nothing and indicate
-   # success. This allows us to "kind of emulate" a Linux build from other
-   # platforms.
--  if "linux" not in sys.platform:
-+  if not sys.platform.startswith(tuple(['linux', 'openbsd', 'freebsd', 'netbsd'])):
-     print("[[],[],[],[],[]]")
-     return 0
- 
diff --git a/chromium-next/patches/patch-build_config_ozone.gni b/chromium-next/patches/patch-build_config_ozone.gni
deleted file mode 100644
index 81371efbdc..0000000000
--- a/chromium-next/patches/patch-build_config_ozone.gni
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/ozone.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/ozone.gni
-@@ -80,7 +80,19 @@ declare_args() {
-       ozone_platform = "x11"
-       ozone_platform_drm = true
-       ozone_platform_x11 = true
--    } else if (is_linux) {
-+    } else if (is_linux && !is_bsd) {
-+      ozone_platform = "x11"
-+      ozone_platform_wayland = true
-+      ozone_platform_x11 = true
-+    } else if (is_openbsd) {
-+      ozone_platform = "x11"
-+      ozone_platform_wayland = false
-+      ozone_platform_x11 = true
-+    } else if (is_netbsd) {
-+      ozone_platform = "x11"
-+      ozone_platform_wayland = false
-+      ozone_platform_x11 = true
-+    } else if (is_freebsd) {
-       ozone_platform = "x11"
-       ozone_platform_wayland = true
-       ozone_platform_x11 = true
diff --git a/chromium-next/patches/patch-build_config_rust.gni b/chromium-next/patches/patch-build_config_rust.gni
deleted file mode 100644
index 6f8fe51732..0000000000
--- a/chromium-next/patches/patch-build_config_rust.gni
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/rust.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/rust.gni
-@@ -178,7 +178,7 @@ if (is_linux || is_chromeos) {
-     rust_abi_target = "aarch64-unknown-linux-gnu"
-     cargo_target_abi = ""
-   } else if (current_cpu == "x86") {
--    rust_abi_target = "i686-unknown-linux-gnu"
-+    rust_abi_target = "i586-unknown-linux-gnu"
-     cargo_target_abi = ""
-   } else if (current_cpu == "x64") {
-     rust_abi_target = "x86_64-unknown-linux-gnu"
-@@ -346,6 +346,10 @@ if (is_linux || is_chromeos) {
-   }
- }
- 
-+if (is_bsd) {
-+  rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os)
-+}
-+
- assert(!toolchain_has_rust || rust_abi_target != "")
- 
- # This variable is passed to the Rust libstd build.
diff --git a/chromium-next/patches/patch-build_config_v8__target__cpu.gni b/chromium-next/patches/patch-build_config_v8__target__cpu.gni
deleted file mode 100644
index 4fc4114a2f..0000000000
--- a/chromium-next/patches/patch-build_config_v8__target__cpu.gni
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/config/v8_target_cpu.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/config/v8_target_cpu.gni
-@@ -36,6 +36,10 @@ declare_args() {
- if (v8_target_cpu == "") {
-   if (current_toolchain == "//build/toolchain/linux:clang_x64_v8_arm64") {
-     v8_target_cpu = "arm64"
-+  } else if (current_toolchain == "//build/toolchain/openbsd:clang_arm64") {
-+    v8_target_cpu = "arm64"
-+  } else if (current_toolchain == "//build/toolchain/freebsd:clang_arm64") {
-+    v8_target_cpu = "arm64"
-   } else if (current_toolchain == "//build/toolchain/linux:clang_x86_v8_arm") {
-     v8_target_cpu = "arm"
-   } else if (current_toolchain ==
diff --git a/chromium-next/patches/patch-build_detect__host__arch.py b/chromium-next/patches/patch-build_detect__host__arch.py
deleted file mode 100644
index 7e0d26ddf7..0000000000
--- a/chromium-next/patches/patch-build_detect__host__arch.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/detect_host_arch.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/detect_host_arch.py
-@@ -20,6 +20,8 @@ def HostArch():
-     host_arch = 'ia32'
-   elif host_arch in ['x86_64', 'amd64']:
-     host_arch = 'x64'
-+  elif host_arch.startswith('arm64'):
-+    host_arch = 'arm64'
-   elif host_arch.startswith('arm'):
-     host_arch = 'arm'
-   elif host_arch.startswith('aarch64'):
diff --git a/chromium-next/patches/patch-build_gn__run__binary.py b/chromium-next/patches/patch-build_gn__run__binary.py
deleted file mode 100644
index 7d417b2527..0000000000
--- a/chromium-next/patches/patch-build_gn__run__binary.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/gn_run_binary.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/gn_run_binary.py
-@@ -23,7 +23,7 @@ if not os.path.isabs(path):
- # The rest of the arguments are passed directly to the executable.
- args = [path] + sys.argv[2:]
- 
--ret = subprocess.call(args)
-+ret = subprocess.call(args, env={"CHROME_EXE_PATH":"@WRKSRC@/out/Release/chrome","LD_LIBRARY_PATH":"@WRKSRC@/out/Release"})
- if ret != 0:
-   if ret <= -100:
-     # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to
diff --git a/chromium-next/patches/patch-build_linux_chrome.map b/chromium-next/patches/patch-build_linux_chrome.map
deleted file mode 100644
index f13cd05183..0000000000
--- a/chromium-next/patches/patch-build_linux_chrome.map
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/linux/chrome.map.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/linux/chrome.map
-@@ -20,6 +20,10 @@ global:
-   # Program entry point.
-   _start;
- 
-+  # FreeBSD specific variables.
-+  __progname;
-+  environ;
-+
-   # Memory allocation symbols.  We want chrome and any libraries to
-   # share the same heap, so it is correct to export these symbols.
-   aligned_alloc;
diff --git a/chromium-next/patches/patch-build_linux_strip__binary.py b/chromium-next/patches/patch-build_linux_strip__binary.py
deleted file mode 100644
index 6657eb90bc..0000000000
--- a/chromium-next/patches/patch-build_linux_strip__binary.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/linux/strip_binary.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/linux/strip_binary.py
-@@ -10,6 +10,7 @@ import sys
- 
- 
- def main():
-+  return 0
-   argparser = argparse.ArgumentParser(description='eu-strip binary.')
- 
-   argparser.add_argument('--eu-strip-binary-path', help='eu-strip path.')
diff --git a/chromium-next/patches/patch-build_linux_unbundle_icu.gn b/chromium-next/patches/patch-build_linux_unbundle_icu.gn
deleted file mode 100644
index 2fb9ea598e..0000000000
--- a/chromium-next/patches/patch-build_linux_unbundle_icu.gn
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/linux/unbundle/icu.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/linux/unbundle/icu.gn
-@@ -17,6 +17,15 @@ config("icu_config") {
-     "USING_SYSTEM_ICU=1",
-     "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
- 
-+    # As of icu 73 C++ nullptr, char16_t, override, final and noexcept are used
-+    # instead of defines. These definitions can be removed when the bundled icu
-+    # gets updated to 73. For more details, see:
-+    # https://unicode-org.atlassian.net/browse/ICU-21833 and
-+    # https://github.com/unicode-org/icu/commit/28643799377ecf654564f6f31854b02788cebe33
-+    "U_FINAL=final",
-+    "U_NOEXCEPT=noexcept",
-+    "U_OVERRIDE=override",
-+
-     # U_EXPORT (defined in unicode/platform.h) is used to set public visibility
-     # on classes through the U_COMMON_API and U_I18N_API macros (among others).
-     # When linking against the system ICU library, we want its symbols to have
-@@ -34,6 +43,9 @@ config("icu_config") {
-     # to define U_IMPORT to have the same value as U_EXPORT. For more details,
-     # please see: https://crbug.com/822820
-     "U_IMPORT=U_EXPORT",
-+
-+    # Unbreak with icu 76 where private symbols are picked up
-+    "U_HIDE_DRAFT_API",
-   ]
- }
- 
-@@ -53,6 +65,14 @@ source_set("icui18n") {
-   ]
- }
- 
-+source_set("icui18n_hidden_visibility") {
-+  deps = [ ":icui18n_shim" ]
-+  public_configs = [
-+    ":icu_config",
-+    ":system_icui18n",
-+  ]
-+}
-+
- source_set("icuuc") {
-   deps = [ ":icuuc_shim" ]
-   public_configs = [
diff --git a/chromium-next/patches/patch-build_linux_unbundle_libusb.gn b/chromium-next/patches/patch-build_linux_unbundle_libusb.gn
deleted file mode 100644
index b3a242896f..0000000000
--- a/chromium-next/patches/patch-build_linux_unbundle_libusb.gn
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/linux/unbundle/libusb.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/linux/unbundle/libusb.gn
-@@ -1,3 +1,27 @@
-+# Copyright 2016 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_libusb") {
-+  packages = [ "libusb-1.0" ]
-+}
-+
-+shim_headers("libusb_shim") {
-+  root_path = "src/libusb"
-+  headers = [
-+    "libusb.h",
-+  ]
-+}
-+
-+source_set("libusb") {
-+  deps = [
-+    ":libusb_shim",
-+  ]
-+  public_configs = [ ":system_libusb" ]
-+}
- import("//build/config/linux/pkg_config.gni")
- import("//build/shim_headers.gni")
- 
diff --git a/chromium-next/patches/patch-build_nocompile.gni b/chromium-next/patches/patch-build_nocompile.gni
deleted file mode 100644
index 23e21789ec..0000000000
--- a/chromium-next/patches/patch-build_nocompile.gni
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/nocompile.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/nocompile.gni
-@@ -55,7 +55,7 @@ if (is_win) {
- }
- 
- declare_args() {
--  enable_nocompile_tests = is_clang && !is_nacl
-+  enable_nocompile_tests = is_clang && !is_nacl && !is_bsd
- }
- 
- if (enable_nocompile_tests) {
diff --git a/chromium-next/patches/patch-build_rust_rust__bindgen.gni b/chromium-next/patches/patch-build_rust_rust__bindgen.gni
deleted file mode 100644
index 1014a3b101..0000000000
--- a/chromium-next/patches/patch-build_rust_rust__bindgen.gni
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/rust/rust_bindgen.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/rust/rust_bindgen.gni
-@@ -12,14 +12,14 @@ if (is_win) {
-   import("//build/toolchain/win/win_toolchain_data.gni")
- }
- 
--_bindgen_path = "${rust_bindgen_root}/bin/bindgen"
-+_bindgen_path = "@PREFIX@/bin/bindgen"
- if (host_os == "win") {
-   _bindgen_path = "${_bindgen_path}.exe"
- }
- 
- # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
- # ../lib.
--_libclang_path = rust_bindgen_root
-+_libclang_path = "@PREFIX@"
- if (host_os == "win") {
-   _libclang_path += "/bin"
- } else {
diff --git a/chromium-next/patches/patch-build_rust_rust__bindgen__generator.gni b/chromium-next/patches/patch-build_rust_rust__bindgen__generator.gni
deleted file mode 100644
index 61319393cc..0000000000
--- a/chromium-next/patches/patch-build_rust_rust__bindgen__generator.gni
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/rust/rust_bindgen_generator.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/rust/rust_bindgen_generator.gni
-@@ -11,14 +11,14 @@ if (is_win) {
-   import("//build/toolchain/win/win_toolchain_data.gni")
- }
- 
--_bindgen_path = "${rust_bindgen_root}/bin/bindgen"
-+_bindgen_path = "@PREFIX@/bin/bindgen"
- if (host_os == "win") {
-   _bindgen_path = "${_bindgen_path}.exe"
- }
- 
- # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
- # ../lib.
--_libclang_path = rust_bindgen_root
-+_libclang_path = "@PREFIX@"
- if (host_os == "win") {
-   _libclang_path += "/bin"
- } else {
diff --git a/chromium-next/patches/patch-build_rust_std_BUILD.gn b/chromium-next/patches/patch-build_rust_std_BUILD.gn
deleted file mode 100644
index 746356ecf3..0000000000
--- a/chromium-next/patches/patch-build_rust_std_BUILD.gn
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/rust/std/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/rust/std/BUILD.gn
-@@ -89,13 +89,20 @@ if (toolchain_has_rust) {
-     # These are no longer present in the Windows toolchain.
-     stdlib_files += [
-       "addr2line",
--      "adler2",
-       "gimli",
-       "libc",
-       "memchr",
-       "miniz_oxide",
-       "object",
-     ]
-+
-+    rust_revision_pieces = string_split(rustc_revision, " ")
-+    rust_version_pieces = string_split(rust_revision_pieces[1], ".")
-+    if (rust_version_pieces[1] == "85") {
-+      stdlib_files += [ "adler" ]
-+    } else {
-+      stdlib_files += [ "adler2" ]
-+    }
-   }
- 
-   if (toolchain_for_rust_host_build_tools) {
-@@ -115,7 +122,6 @@ if (toolchain_has_rust) {
-   # don't need to pass to the C++ linker because they're used for specialized
-   # purposes.
-   skip_stdlib_files = [
--    "profiler_builtins",
-     "rustc_std_workspace_alloc",
-     "rustc_std_workspace_core",
-     "rustc_std_workspace_std",
diff --git a/chromium-next/patches/patch-build_toolchain_freebsd_BUILD.gn b/chromium-next/patches/patch-build_toolchain_freebsd_BUILD.gn
deleted file mode 100644
index e7186df8a4..0000000000
--- a/chromium-next/patches/patch-build_toolchain_freebsd_BUILD.gn
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/toolchain/freebsd/BUILD.gn.orig	2025-05-08 12:01:57.646767031 +0000
-+++ build/toolchain/freebsd/BUILD.gn
-@@ -0,0 +1,66 @@
-+# Copyright 2013 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/sysroot.gni")
-+import("//build/toolchain/gcc_toolchain.gni")
-+
-+clang_toolchain("clang_x86") {
-+  toolchain_args = {
-+    current_cpu = "x86"
-+    current_os = "freebsd"
-+  }
-+}
-+
-+gcc_toolchain("x86") {
-+  cc = "gcc"
-+  cxx = "g++"
-+
-+  readelf = "readelf"
-+  nm = "nm"
-+  ar = "ar"
-+  ld = cxx
-+
-+  toolchain_args = {
-+    current_cpu = "x86"
-+    current_os = "freebsd"
-+    is_clang = false
-+  }
-+}
-+
-+clang_toolchain("clang_x64") {
-+  toolchain_args = {
-+    current_cpu = "x64"
-+    current_os = "freebsd"
-+  }
-+}
-+
-+gcc_toolchain("x64") {
-+  cc = "gcc"
-+  cxx = "g++"
-+
-+  readelf = "readelf"
-+  nm = "nm"
-+  ar = "ar"
-+  ld = cxx
-+
-+  toolchain_args = {
-+    current_cpu = "x64"
-+    current_os = "freebsd"
-+    is_clang = false
-+  }
-+}
-+
-+clang_toolchain("clang_arm") {
-+  toolchain_args = {
-+    current_cpu = "arm64"
-+    current_os = "freebsd"
-+  }
-+}
-+
-+clang_toolchain("clang_arm64") {
-+  toolchain_args = {
-+    current_cpu = "arm64"
-+    current_os = "freebsd"
-+  }
-+}
diff --git a/chromium-next/patches/patch-build_toolchain_gcc__solink__wrapper.py b/chromium-next/patches/patch-build_toolchain_gcc__solink__wrapper.py
deleted file mode 100644
index 9f737d0033..0000000000
--- a/chromium-next/patches/patch-build_toolchain_gcc__solink__wrapper.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/toolchain/gcc_solink_wrapper.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/toolchain/gcc_solink_wrapper.py
-@@ -39,7 +39,7 @@ def CollectDynSym(args):
-   """Replaces: nm --format=posix -g -D -p $sofile | cut -f1-2 -d' '"""
-   toc = ''
-   nm = subprocess.Popen(wrapper_utils.CommandToRun(
--      [args.nm, '--format=posix', '-g', '-D', '-p', args.sofile]),
-+      [args.nm, '-g', '-D', '-p', args.sofile]),
-                         stdout=subprocess.PIPE,
-                         bufsize=-1,
-                         universal_newlines=True)
diff --git a/chromium-next/patches/patch-build_toolchain_gcc__toolchain.gni b/chromium-next/patches/patch-build_toolchain_gcc__toolchain.gni
deleted file mode 100644
index 07ff8737b6..0000000000
--- a/chromium-next/patches/patch-build_toolchain_gcc__toolchain.gni
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/toolchain/gcc_toolchain.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/toolchain/gcc_toolchain.gni
-@@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation
-       "enable_resource_allowlist_generation=true does not work for target_os=$target_os")
- }
- 
-+declare_args() {
-+  extra_cflags = ""
-+  extra_cppflags = ""
-+  extra_cxxflags = ""
-+  extra_ldflags = ""
-+}
-+
- # This template defines a toolchain for something that works like gcc
- # (including clang).
- #
-@@ -609,7 +616,7 @@ template("single_gcc_toolchain") {
-       # We need to specify link groups, at least, for single pass linkers. I.e.
-       # Rust libraries are alpha-sorted instead of by dependencies so they fail
-       # to link if not properly ordered or grouped.
--      link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" $start_group_flag @\"$rspfile\" $end_group_flag {{solibs}} {{libs}} $start_group_flag {{rlibs}} $end_group_flag"
-+      link_command = "$ld $start_group_flag {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" @\"$rspfile\" {{solibs}} {{libs}} {{rlibs}} $end_group_flag"
- 
-       # Generate a map file to be used for binary size analysis.
-       # Map file adds ~10% to the link time on a z620.
-@@ -896,22 +903,12 @@ template("gcc_toolchain") {
- # actually just be doing a native compile.
- template("clang_toolchain") {
-   gcc_toolchain(target_name) {
--    _path = "$clang_base_path/bin"
--    _is_path_absolute = get_path_info(_path, "abspath") == _path
--
--    # Preserve absolute paths for tools like distcc.
--    if (_is_path_absolute && filter_include([ _path ], [ "//*" ]) == []) {
--      prefix = _path
--    } else {
--      prefix = rebase_path(_path, root_build_dir)
--    }
--
--    cc = "${prefix}/clang"
--    cxx = "${prefix}/clang++"
-+    cc = "cc"
-+    cxx = "c++"
-     ld = cxx
--    readelf = "${prefix}/llvm-readelf"
--    ar = "${prefix}/llvm-ar"
--    nm = "${prefix}/llvm-nm"
-+    readelf = "readelf"
-+    ar = "ar"
-+    nm = "nm"
- 
-     forward_variables_from(invoker, "*", [ "toolchain_args" ])
- 
diff --git a/chromium-next/patches/patch-build_toolchain_netbsd_BUILD.gn b/chromium-next/patches/patch-build_toolchain_netbsd_BUILD.gn
deleted file mode 100644
index c9e04ce605..0000000000
--- a/chromium-next/patches/patch-build_toolchain_netbsd_BUILD.gn
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/toolchain/netbsd/BUILD.gn.orig	2025-05-08 12:01:57.647255101 +0000
-+++ build/toolchain/netbsd/BUILD.gn
-@@ -0,0 +1,66 @@
-+# Copyright 2013 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/sysroot.gni")
-+import("//build/toolchain/gcc_toolchain.gni")
-+
-+clang_toolchain("clang_x86") {
-+  toolchain_args = {
-+    current_cpu = "x86"
-+    current_os = "netbsd"
-+  }
-+}
-+
-+gcc_toolchain("x86") {
-+  cc = "gcc"
-+  cxx = "g++"
-+
-+  readelf = "readelf"
-+  nm = "nm"
-+  ar = "ar"
-+  ld = cxx
-+
-+  toolchain_args = {
-+    current_cpu = "x86"
-+    current_os = "netbsd"
-+    is_clang = false
-+  }
-+}
-+
-+clang_toolchain("clang_x64") {
-+  toolchain_args = {
-+    current_cpu = "x64"
-+    current_os = "netbsd"
-+  }
-+}
-+
-+gcc_toolchain("x64") {
-+  cc = "gcc"
-+  cxx = "g++"
-+
-+  readelf = "readelf"
-+  nm = "nm"
-+  ar = "ar"
-+  ld = cxx
-+
-+  toolchain_args = {
-+    current_cpu = "x64"
-+    current_os = "netbsd"
-+    is_clang = false
-+  }
-+}
-+
-+clang_toolchain("clang_arm") {
-+  toolchain_args = {
-+    current_cpu = "arm64"
-+    current_os = "netbsd"
-+  }
-+}
-+
-+clang_toolchain("clang_arm64") {
-+  toolchain_args = {
-+    current_cpu = "arm64"
-+    current_os = "netbsd"
-+  }
-+}
diff --git a/chromium-next/patches/patch-build_toolchain_openbsd_BUILD.gn b/chromium-next/patches/patch-build_toolchain_openbsd_BUILD.gn
deleted file mode 100644
index 0a4e630ec9..0000000000
--- a/chromium-next/patches/patch-build_toolchain_openbsd_BUILD.gn
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/toolchain/openbsd/BUILD.gn.orig	2025-05-08 12:01:57.647441991 +0000
-+++ build/toolchain/openbsd/BUILD.gn
-@@ -0,0 +1,66 @@
-+# Copyright 2013 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/sysroot.gni")
-+import("//build/toolchain/gcc_toolchain.gni")
-+
-+clang_toolchain("clang_x86") {
-+  toolchain_args = {
-+    current_cpu = "x86"
-+    current_os = "openbsd"
-+  }
-+}
-+
-+gcc_toolchain("x86") {
-+  cc = "gcc"
-+  cxx = "g++"
-+
-+  readelf = "readelf"
-+  nm = "nm"
-+  ar = "ar"
-+  ld = cxx
-+
-+  toolchain_args = {
-+    current_cpu = "x86"
-+    current_os = "openbsd"
-+    is_clang = false
-+  }
-+}
-+
-+clang_toolchain("clang_x64") {
-+  toolchain_args = {
-+    current_cpu = "x64"
-+    current_os = "openbsd"
-+  }
-+}
-+
-+gcc_toolchain("x64") {
-+  cc = "gcc"
-+  cxx = "g++"
-+
-+  readelf = "readelf"
-+  nm = "nm"
-+  ar = "ar"
-+  ld = cxx
-+
-+  toolchain_args = {
-+    current_cpu = "x64"
-+    current_os = "openbsd"
-+    is_clang = false
-+  }
-+}
-+
-+clang_toolchain("clang_arm") {
-+  toolchain_args = {
-+    current_cpu = "arm64"
-+    current_os = "openbsd"
-+  }
-+}
-+
-+clang_toolchain("clang_arm64") {
-+  toolchain_args = {
-+    current_cpu = "arm64"
-+    current_os = "openbsd"
-+  }
-+}
diff --git a/chromium-next/patches/patch-build_toolchain_toolchain.gni b/chromium-next/patches/patch-build_toolchain_toolchain.gni
deleted file mode 100644
index b44d4d829d..0000000000
--- a/chromium-next/patches/patch-build_toolchain_toolchain.gni
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/toolchain/toolchain.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ build/toolchain/toolchain.gni
-@@ -75,7 +75,7 @@ if (host_os == "mac") {
-   host_shlib_extension = ".dylib"
- } else if (host_os == "win") {
-   host_shlib_extension = ".dll"
--} else if (host_os == "linux" || host_os == "aix" || host_os == "zos") {
-+} else if (is_posix) {
-   host_shlib_extension = ".so"
- } else {
-   assert(false, "Host platform not supported")
diff --git a/chromium-next/patches/patch-cc_base_features.cc b/chromium-next/patches/patch-cc_base_features.cc
deleted file mode 100644
index 2d87ee3277..0000000000
--- a/chromium-next/patches/patch-cc_base_features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- cc/base/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ cc/base/features.cc
-@@ -48,7 +48,7 @@ const base::FeatureParam<int> kDeferImpl
- // be using a separate flag to control the launch on GL.
- BASE_FEATURE(kUseDMSAAForTiles,
-              "UseDMSAAForTiles",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium-next/patches/patch-chrome_app_chrome__command__ids.h b/chromium-next/patches/patch-chrome_app_chrome__command__ids.h
deleted file mode 100644
index 306c86ba88..0000000000
--- a/chromium-next/patches/patch-chrome_app_chrome__command__ids.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/app/chrome_command_ids.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/app/chrome_command_ids.h
-@@ -72,11 +72,11 @@
- #define IDC_TOGGLE_MULTITASK_MENU       34050
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define IDC_USE_SYSTEM_TITLE_BAR        34051
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define IDC_RESTORE_WINDOW              34052
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_app_chrome__main.cc b/chromium-next/patches/patch-chrome_app_chrome__main.cc
deleted file mode 100644
index 8efda13ca4..0000000000
--- a/chromium-next/patches/patch-chrome_app_chrome__main.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/app/chrome_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/app/chrome_main.cc
-@@ -28,11 +28,11 @@
- #include "chrome/app/chrome_main_mac.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/base_switches.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/app/chrome_main_linux.h"
- #endif
- 
-@@ -57,7 +57,7 @@
- // sometime after old headless code is removed from Chrome.
- // See https://crbug.com/373672160.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #define ENABLE_OLD_HEADLESS_INFO
- #endif
- 
-@@ -115,7 +115,7 @@ int ChromeMain(int argc, const char** ar
- #error Unknown platform.
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   PossiblyDetermineFallbackChromeChannel(argv[0]);
- #endif
- 
-@@ -181,7 +181,7 @@ int ChromeMain(int argc, const char** ar
-   SetUpBundleOverrides();
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   AppendExtraArgumentsToCommandLine(command_line);
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_app_chrome__main__delegate.cc b/chromium-next/patches/patch-chrome_app_chrome__main__delegate.cc
deleted file mode 100644
index 27c72246cf..0000000000
--- a/chromium-next/patches/patch-chrome_app_chrome__main__delegate.cc
+++ /dev/null
@@ -1,153 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/app/chrome_main_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/app/chrome_main_delegate.cc
-@@ -147,7 +147,7 @@
- #include "components/webui/about/credit_utils.h"
- #endif
- 
--#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
- #include "components/nacl/common/nacl_paths.h"
- #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
- #endif
-@@ -188,17 +188,17 @@
- #include "v8/include/v8.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) 
- #include "base/environment.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/nix/scoped_xdg_activation_token_injector.h"
- #include "ui/linux/display_server_utils.h"
- #endif
- 
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/policy/policy_path_parser.h"
- #include "components/crash/core/app/crashpad.h"
- #endif
-@@ -316,7 +316,7 @@ void AdjustLinuxOOMScore(const std::stri
- // and resources loaded.
- bool SubprocessNeedsResourceBundle(const std::string& process_type) {
-   return
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // The zygote process opens the resources for the renderers.
-       process_type == switches::kZygoteProcess ||
- #endif
-@@ -399,7 +399,7 @@ bool HandleVersionSwitches(const base::C
-   return false;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Show the man page if --help or -h is on the command line.
- void HandleHelpSwitches(const base::CommandLine& command_line) {
-   if (command_line.HasSwitch(switches::kHelp) ||
-@@ -411,7 +411,7 @@ void HandleHelpSwitches(const base::Comm
- }
- #endif  // BUILDFLAG(IS_LINUX)
- 
--#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
-+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
- void SIGTERMProfilingShutdown(int signal) {
-   content::Profiling::Stop();
-   struct sigaction sigact;
-@@ -493,7 +493,7 @@ std::optional<int> AcquireProcessSinglet
-   // process can be exited.
-   ChromeProcessSingleton::CreateInstance(user_data_dir);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Read the xdg-activation token and set it in the command line for the
-   // duration of the notification in order to ensure this is propagated to an
-   // already running browser process if it exists.
-@@ -571,7 +571,7 @@ void InitializeUserDataDir(base::Command
-   std::string process_type =
-       command_line->GetSwitchValueASCII(switches::kProcessType);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // On Linux, Chrome does not support running multiple copies under different
-   // DISPLAYs, so the profile directory can be specified in the environment to
-   // support the virtual desktop use-case.
-@@ -667,7 +667,7 @@ void RecordMainStartupMetrics(const Star
- #endif
- 
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Record the startup process creation time on supported platforms. On Android
-   // this is recorded in ChromeMainDelegateAndroid.
-   startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
-@@ -826,7 +826,7 @@ std::optional<int> ChromeMainDelegate::P
- #if BUILDFLAG(IS_OZONE)
-   // Initialize Ozone platform and add required feature flags as per platform's
-   // properties.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess());
- #endif
-   ui::OzonePlatform::PreEarlyInitialization();
-@@ -983,7 +983,7 @@ void ChromeMainDelegate::CommonEarlyInit
-   const bool is_canary_dev = IsCanaryDev();
-   const bool emit_crashes =
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-       is_canary_dev;
- #else
-       false;
-@@ -1131,7 +1131,7 @@ std::optional<int> ChromeMainDelegate::B
-     return 0;  // Got a --credits switch; exit with a success error code.
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // This will directly exit if the user asked for help.
-   HandleHelpSwitches(command_line);
- #endif
-@@ -1156,7 +1156,7 @@ std::optional<int> ChromeMainDelegate::B
-   ash::RegisterPathProvider();
-   chromeos::dbus_paths::RegisterPathProvider();
- #endif
--#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
-   nacl::RegisterPathProvider();
- #endif
- 
-@@ -1444,7 +1444,7 @@ void ChromeMainDelegate::PreSandboxStart
-     CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
-   }
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
-   // Zygote needs to call InitCrashReporter() in RunZygote().
-   if (process_type != switches::kZygoteProcess &&
-       !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) {
-@@ -1532,13 +1532,13 @@ std::variant<int, content::MainFunctionP
- #else
- 
- #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \
--                          !BUILDFLAG(IS_CHROMEOS))
-+                          !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD))
-   static const MainFunction kMainFunctions[] = {
- #if BUILDFLAG(IS_MAC)
-       {switches::kRelauncherProcess, mac_relauncher::internal::RelauncherMain},
-       {switches::kCodeSignCloneCleanupProcess,
-        code_sign_clone_manager::internal::ChromeCodeSignCloneCleanupMain},
--#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-       // This entry is not needed on Linux, where the NaCl loader
-       // process is launched via nacl_helper instead.
-       {switches::kNaClLoaderProcess, NaClMain},
diff --git a/chromium-next/patches/patch-chrome_browser_BUILD.gn b/chromium-next/patches/patch-chrome_browser_BUILD.gn
deleted file mode 100644
index fc51e05802..0000000000
--- a/chromium-next/patches/patch-chrome_browser_BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/BUILD.gn
-@@ -6866,6 +6866,13 @@ static_library("browser") {
-           [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ]
-     }
- 
-+    if (is_bsd) {
-+      sources -= [
-+        "metrics/bluetooth_metrics_provider.cc",
-+        "metrics/bluetooth_metrics_provider.h",
-+      ]
-+    }
-+
-     if (use_dbus) {
-       sources += [
-         "dbus_memory_pressure_evaluator_linux.cc",
diff --git a/chromium-next/patches/patch-chrome_browser_about__flags.cc b/chromium-next/patches/patch-chrome_browser_about__flags.cc
deleted file mode 100644
index eb0dc186b0..0000000000
--- a/chromium-next/patches/patch-chrome_browser_about__flags.cc
+++ /dev/null
@@ -1,390 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/about_flags.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/about_flags.cc
-@@ -260,7 +260,7 @@
- #include "extensions/common/extension_features.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)  
- #include "base/allocator/buildflags.h"
- #endif
- 
-@@ -349,7 +349,7 @@
- #include "device/vr/public/cpp/switches.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "ui/ozone/public/ozone_switches.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -359,7 +359,7 @@
- #include "chrome/browser/win/mica_titlebar.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/contextual_cueing/contextual_cueing_features.h"  // nogncheck
- #include "chrome/browser/enterprise/profile_management/profile_management_features.h"
- #include "chrome/browser/enterprise/webstore/features.h"
-@@ -371,7 +371,7 @@
- #include "components/user_education/common/user_education_features.h"  // nogncheck
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/ui_features.h"
- #include "ui/base/ui_base_features.h"
- #endif
-@@ -423,7 +423,7 @@ const FeatureEntry::Choice kPullToRefres
- #endif  // USE_AURA
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- const FeatureEntry::FeatureParam kLocalNetworkAccessChecksBlock[] = {
-     {"LocalNetworkAccessChecksWarn", "false"}};
-@@ -539,7 +539,7 @@ const FeatureEntry::FeatureVariation kDX
-     {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
-     {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
-     {flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -852,6 +852,31 @@ const FeatureEntry::FeatureVariation
-          std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
-          nullptr}};
- 
-+#if BUILDFLAG(IS_BSD)
-+const FeatureEntry::FeatureParam kAudioBackendPulseAudio[] = {
-+        { "audio-backend", "pulseaudio" }};
-+const FeatureEntry::FeatureParam kAudioBackendSndio[] = {
-+        { "audio-backend", "sndio" }};
-+const FeatureEntry::FeatureParam kAudioBackendAudioIO[] = {
-+        { "audio-backend", "audioio" }};
-+const FeatureEntry::FeatureParam kAudioBackendAlsa[] = {
-+        { "audio-backend", "alsa" }};
-+const FeatureEntry::FeatureVariation
-+    kAudioBackendVariations[] = {
-+        {"using PulseAudio by default if available", kAudioBackendPulseAudio,
-+         std::size(kAudioBackendPulseAudio),
-+         nullptr},
-+        {"using sndio by default if available", kAudioBackendSndio,
-+         std::size(kAudioBackendSndio),
-+         nullptr},
-+        {"using audioio by default if available", kAudioBackendAudioIO,
-+         std::size(kAudioBackendAudioIO),
-+         nullptr},
-+        {"using ALSA by default if available", kAudioBackendAlsa,
-+         std::size(kAudioBackendAlsa),
-+         nullptr}};
-+#endif
-+
- const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
-     {"UIClipboardMaximumAge", "60"}};
- const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
-@@ -1227,7 +1252,7 @@ constexpr FeatureEntry::FeatureVariation
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
-     {"AtKeywordAcceleration", "true"},
- };
-@@ -1265,7 +1290,7 @@ const FeatureEntry::FeatureVariation kRe
- };
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- 
- // A limited number of combinations of the rich autocompletion params.
- const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = {
-@@ -3555,7 +3580,7 @@ const FeatureEntry::FeatureVariation
- #endif  // BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
-     {{"link_capturing_state", "on_by_default"}};
- const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
-@@ -4059,7 +4084,7 @@ const FeatureEntry::FeatureVariation kSk
-      std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr},
- };
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
-     {"TranslationAPIAcceptLanguagesCheck", "false"},
-     {"TranslationAPILimitLanguagePackCount", "false"}};
-@@ -4125,7 +4150,7 @@ const FeatureEntry::FeatureVariation
-          1, nullptr},
- };
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
-     {"BackoffTime", "0h"},
-     {"BackoffMultiplierBase", "0.0"},
-@@ -4992,7 +5017,7 @@ const FeatureEntry kFeatureEntries[] = {
-     },
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {
-         "fluent-overlay-scrollbars",
-         flag_descriptions::kFluentOverlayScrollbarsName,
-@@ -5279,7 +5304,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kEnableIsolatedWebAppDevModeName,
-      flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)},
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"enable-iwa-key-distribution-component",
-      flag_descriptions::kEnableIwaKeyDistributionComponentName,
-      flag_descriptions::kEnableIwaKeyDistributionComponentDescription,
-@@ -5500,7 +5525,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kWebShare)},
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"pulseaudio-loopback-for-cast",
-      flag_descriptions::kPulseaudioLoopbackForCastName,
-      flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
-@@ -5541,6 +5566,16 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kWaylandSessionManagementName,
-      flag_descriptions::kWaylandSessionManagementDescription, kOsLinux,
-      FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)},
-+
-+#if BUILDFLAG(IS_BSD)
-+    {"audio-backend",
-+     flag_descriptions::kAudioBackendName,
-+     flag_descriptions::kAudioBackendDescription, kOsLinux,
-+     FEATURE_WITH_PARAMS_VALUE_TYPE(
-+         media::kAudioBackend,
-+         kAudioBackendVariations,
-+         "AudioBackend")},
-+#endif
- #endif  // BUILDFLAG(IS_LINUX)
- 
- #if BUILDFLAG(ENABLE_VR)
-@@ -6427,7 +6462,7 @@ const FeatureEntry kFeatureEntries[] = {
-                                     "MlUrlScoring")},
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     {"omnibox-domain-suggestions",
-      flag_descriptions::kOmniboxDomainSuggestionsName,
-      flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
-@@ -6697,7 +6732,7 @@ const FeatureEntry kFeatureEntries[] = {
-                                     kNumSrpZpsRelatedSearches,
-                                     "PowerTools")},
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
-      flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
-      FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
-@@ -7189,7 +7224,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     {"cups-ipp-printing-backend",
-      flag_descriptions::kCupsIppPrintingBackendName,
-      flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
-@@ -7437,7 +7472,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)},
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     {"wasm-tts-component-updater-enabled",
-      flag_descriptions::kWasmTtsComponentUpdaterEnabledName,
-      flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop,
-@@ -8109,7 +8144,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)},
- #endif  // !BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"enable-network-service-sandbox",
-      flag_descriptions::kEnableNetworkServiceSandboxName,
-      flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -8774,7 +8809,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)},
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
-      flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux,
-      FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)},
-@@ -8799,7 +8834,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
-      FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     {
-         "ui-debug-tools",
-         flag_descriptions::kUIDebugToolsName,
-@@ -9275,7 +9310,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)},
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"media-session-enter-picture-in-picture",
-      flag_descriptions::kMediaSessionEnterPictureInPictureName,
-      flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
-@@ -9924,7 +9959,7 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsDesktop | kOsAndroid,
-      FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
-      flag_descriptions::kCameraMicEffectsDescription,
-      static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10048,7 +10083,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)},
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     {"third-party-profile-management",
-      flag_descriptions::kThirdPartyProfileManagementName,
-      flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -10077,7 +10112,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"enable-user-navigation-capturing-pwa",
-      flag_descriptions::kPwaNavigationCapturingName,
-      flag_descriptions::kPwaNavigationCapturingDescription,
-@@ -10817,7 +10852,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kCanvasHibernationDescription, kOsAll,
-      FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)},
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"enable-history-sync-optin",
-      flag_descriptions::kEnableHistorySyncOptinName,
-      flag_descriptions::kEnableHistorySyncOptinDescription,
-@@ -10920,7 +10955,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)},
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     {"supervised-profile-safe-search",
-      flag_descriptions::kSupervisedProfileSafeSearchName,
-      flag_descriptions::kSupervisedProfileSafeSearchDescription,
-@@ -11167,7 +11202,7 @@ const FeatureEntry kFeatureEntries[] = {
-          segmentation_platform::features::kSegmentationSurveyPage)},
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"autofill-enable-buy-now-pay-later",
-      flag_descriptions::kAutofillEnableBuyNowPayLaterName,
-      flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop,
-@@ -11282,7 +11317,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(
-          autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)},
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"translation-api", flag_descriptions::kTranslationAPIName,
-      flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux,
-      FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI,
-@@ -11319,7 +11354,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(
-          password_manager::features::kPasswordFormClientsideClassifier)},
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"contextual-cueing", flag_descriptions::kContextualCueingName,
-      flag_descriptions::kContextualCueingDescription,
-      kOsLinux | kOsMac | kOsWin,
-@@ -11653,7 +11688,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)},
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName,
-      flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux,
-      FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)},
-@@ -11703,7 +11738,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"autofill-enable-amount-extraction-desktop",
-      flag_descriptions::kAutofillEnableAmountExtractionDesktopName,
-      flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription,
-@@ -11723,7 +11758,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)},
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"autofill-enable-amount-extraction-allowlist-desktop",
-      flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName,
-      flag_descriptions::
-@@ -11834,7 +11869,7 @@ const FeatureEntry kFeatureEntries[] = {
-          apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)},
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     {"chrome-web-store-navigation-throttle",
-      flag_descriptions::kChromeWebStoreNavigationThrottleName,
-      flag_descriptions::kChromeWebStoreNavigationThrottleDescription,
-@@ -11869,7 +11904,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif  // BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"autofill-enable-amount-extraction-desktop-logging",
-      flag_descriptions::kAutofillEnableAmountExtractionDesktopLoggingName,
-      flag_descriptions::
-@@ -11899,7 +11934,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kEnableWebAppUpdateTokenParsingDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kWebAppEnableUpdateTokenParsing)},
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"root-scrollbar-follows-browser-theme",
-      flag_descriptions::kRootScrollbarFollowsTheme,
-      flag_descriptions::kRootScrollbarFollowsThemeDescription,
-@@ -11921,7 +11956,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif  // BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"local-network-access-check",
-      flag_descriptions::kLocalNetworkAccessChecksName,
-      flag_descriptions::kLocalNetworkAccessChecksDescription, kOsDesktop,
diff --git a/chromium-next/patches/patch-chrome_browser_accessibility_page__colors.cc b/chromium-next/patches/patch-chrome_browser_accessibility_page__colors.cc
deleted file mode 100644
index ba8b09d89e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_accessibility_page__colors.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/accessibility/page_colors.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/accessibility/page_colors.cc
-@@ -12,7 +12,7 @@
- #include "components/sync_preferences/pref_service_syncable.h"
- #include "ui/native_theme/native_theme.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #include "ui/linux/linux_ui_factory.h"
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -55,7 +55,7 @@ void PageColors::Init() {
- 
- void PageColors::OnPageColorsChanged() {
-   auto* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Allow the Linux native theme to update its state for page colors.
-   if (auto* linux_ui_theme = ui::GetDefaultLinuxUiTheme()) {
-     if (auto* linux_native_theme = linux_ui_theme->GetNativeTheme()) {
diff --git a/chromium-next/patches/patch-chrome_browser_after__startup__task__utils.cc b/chromium-next/patches/patch-chrome_browser_after__startup__task__utils.cc
deleted file mode 100644
index 3ecedad904..0000000000
--- a/chromium-next/patches/patch-chrome_browser_after__startup__task__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/after_startup_task_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/after_startup_task_utils.cc
-@@ -112,7 +112,7 @@ void SetBrowserStartupIsComplete() {
-                        TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count);
-   GetStartupCompleteFlag().Set();
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Process::Current().CreationTime() is not available on all platforms.
-   const base::Time process_creation_time =
-       base::Process::Current().CreationTime();
diff --git a/chromium-next/patches/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc b/chromium-next/patches/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
deleted file mode 100644
index 1093aa1ea6..0000000000
--- a/chromium-next/patches/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/apps/app_service/publishers/extension_apps.cc
-@@ -23,7 +23,7 @@ ExtensionApps::ExtensionApps(AppServiceP
- ExtensionApps::~ExtensionApps() = default;
- 
- bool ExtensionApps::Accepts(const extensions::Extension* extension) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (extensions::IsExtensionUnsupportedDeprecatedApp(profile(),
-                                                       extension->id())) {
-     return false;
diff --git a/chromium-next/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/chromium-next/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
deleted file mode 100644
index c543435c9f..0000000000
--- a/chromium-next/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/apps/platform_apps/platform_app_launch.cc
-@@ -19,7 +19,7 @@
- #include "extensions/common/constants.h"
- #include "extensions/common/extension.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/browser.h"
- #include "chrome/browser/ui/browser_navigator.h"
- #include "chrome/browser/ui/browser_window.h"
-@@ -86,7 +86,7 @@ bool OpenExtensionApplicationWindow(Prof
-   if (launch_container == LaunchContainer::kLaunchContainerTab)
-     return false;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (OpenDeprecatedApplicationPrompt(profile, app_id)) {
-     return false;
-   }
-@@ -118,7 +118,7 @@ content::WebContents* OpenExtensionAppli
-   if (launch_container != apps::LaunchContainer::kLaunchContainerTab)
-     return nullptr;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (OpenDeprecatedApplicationPrompt(profile, app_id)) {
-     return nullptr;
-   }
-@@ -134,7 +134,7 @@ content::WebContents* OpenExtensionAppli
-   return app_tab;
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool OpenDeprecatedApplicationPrompt(Profile* profile,
-                                      const std::string& app_id) {
-   if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id))
-@@ -170,7 +170,7 @@ bool OpenExtensionApplicationWithReenabl
-   if (!GetPlatformApp(profile, app_id))
-     return false;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (OpenDeprecatedApplicationPrompt(profile, app_id)) {
-     return false;
-   }
-@@ -192,7 +192,7 @@ content::WebContents* OpenExtensionAppSh
-                                          ->enabled_extensions()
-                                          .GetAppByURL(url);
-   if (app) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     if (OpenDeprecatedApplicationPrompt(profile, app->id())) {
-       return nullptr;
-     }
-@@ -215,7 +215,7 @@ void RecordExtensionAppLaunchOnTabRestor
-   if (!extension)
-     return;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (OpenDeprecatedApplicationPrompt(profile, extension->id())) {
-     return;
-   }
diff --git a/chromium-next/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/chromium-next/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
deleted file mode 100644
index 5c02d83be7..0000000000
--- a/chromium-next/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/apps/platform_apps/platform_app_launch.h
-@@ -38,7 +38,7 @@ bool OpenExtensionApplicationWindow(Prof
- content::WebContents* OpenExtensionApplicationTab(Profile* profile,
-                                                   const std::string& app_id);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and
- // Chrome Apps are deprecated on the |profile|. Returns true if that was the
- // case, or false otherwise.
diff --git a/chromium-next/patches/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/chromium-next/patches/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
deleted file mode 100644
index 98a3d81bb9..0000000000
--- a/chromium-next/patches/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -88,7 +88,7 @@ ChromeAutocompleteSchemeClassifier::GetI
-       return metrics::OmniboxInputType::QUERY;
- 
-     case ExternalProtocolHandler::UNKNOWN: {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // Linux impl of GetApplicationNameForScheme doesn't distinguish
-       // between URL schemes with handers and those without. This will
-       // make the default behaviour be search on Linux.
diff --git a/chromium-next/patches/patch-chrome_browser_background_extensions_background__mode__manager.cc b/chromium-next/patches/patch-chrome_browser_background_extensions_background__mode__manager.cc
deleted file mode 100644
index 88504da4de..0000000000
--- a/chromium-next/patches/patch-chrome_browser_background_extensions_background__mode__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/background/extensions/background_mode_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/background/extensions/background_mode_manager.cc
-@@ -893,7 +893,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
-   }
- 
-   return family->CreateExact(size).AsImageSkia();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-       IDR_PRODUCT_LOGO_128);
- #elif BUILDFLAG(IS_MAC)
diff --git a/chromium-next/patches/patch-chrome_browser_background_extensions_background__mode__optimizer.cc b/chromium-next/patches/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
deleted file mode 100644
index 4f323c5413..0000000000
--- a/chromium-next/patches/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/background/extensions/background_mode_optimizer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/background/extensions/background_mode_optimizer.cc
-@@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer>
-     return nullptr;
-   }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) {
-     // Private ctor.
-     return base::WrapUnique(new BackgroundModeOptimizer());
diff --git a/chromium-next/patches/patch-chrome_browser_background_glic_glic__status__icon.cc b/chromium-next/patches/patch-chrome_browser_background_glic_glic__status__icon.cc
deleted file mode 100644
index 2bfd565bcd..0000000000
--- a/chromium-next/patches/patch-chrome_browser_background_glic_glic__status__icon.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/background/glic/glic_status_icon.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/background/glic/glic_status_icon.cc
-@@ -86,7 +86,7 @@ GlicStatusIcon::GlicStatusIcon(GlicContr
-   if (!status_icon_) {
-     return;
-   }
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   //  Set a vector icon for proper themeing on Linux.
-   status_icon_->SetIcon(
-       GlicVectorIconManager::GetVectorIcon(IDR_GLIC_BUTTON_VECTOR_ICON));
-@@ -128,7 +128,7 @@ GlicStatusIcon::~GlicStatusIcon() {
- 
-   context_menu_ = nullptr;
-   if (status_icon_) {
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-     status_icon_->RemoveObserver(this);
- #endif
-     std::unique_ptr<StatusIcon> removed_icon =
-@@ -234,7 +234,7 @@ void GlicStatusIcon::UpdateHotkey(const 
- }
- 
- void GlicStatusIcon::UpdateVisibilityOfExitInContextMenu() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (context_menu_) {
-     context_menu_->SetCommandIdVisible(IDC_GLIC_STATUS_ICON_MENU_EXIT,
-                                        BrowserList::GetInstance()->empty());
-@@ -272,7 +272,7 @@ std::unique_ptr<StatusIconMenuModel> Gli
-   menu->AddItem(
-       IDC_GLIC_STATUS_ICON_MENU_REMOVE_ICON,
-       l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_REMOVE_ICON));
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   menu->AddItem(IDC_GLIC_STATUS_ICON_MENU_EXIT,
-                 l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_EXIT));
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_browser__features.cc b/chromium-next/patches/patch-chrome_browser_browser__features.cc
deleted file mode 100644
index 7654493288..0000000000
--- a/chromium-next/patches/patch-chrome_browser_browser__features.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/browser_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/browser_features.cc
-@@ -75,7 +75,7 @@ BASE_FEATURE(kClearUserDataUponProfileDe
-              "ClearUserDataUponProfileDestruction",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Enables usage of os_crypt_async::SecretPortalKeyProvider.  Once
- // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be
- // disabled without losing data.
-@@ -94,7 +94,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyPro
- // the browser exits.
- BASE_FEATURE(kDestroyProfileOnBrowserClose,
-              "DestroyProfileOnBrowserClose",
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -227,7 +227,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlo
-              "SandboxExternalProtocolBlockedWarning",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // If true, encrypt new data with the key provided by SecretPortalKeyProvider.
- // Otherwise, it will only decrypt existing data.
- BASE_FEATURE(kSecretPortalKeyProviderUseForEncryption,
diff --git a/chromium-next/patches/patch-chrome_browser_browser__features.h b/chromium-next/patches/patch-chrome_browser_browser__features.h
deleted file mode 100644
index 6a986c89f3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_browser__features.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/browser_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/browser_features.h
-@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTranspa
- BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
- BASE_DECLARE_FEATURE(kClearUserDataUponProfileDestruction);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kDbusSecretPortal);
- BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProvider);
- #endif
-@@ -100,7 +100,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServ
- BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked);
- BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kSecretPortalKeyProviderUseForEncryption);
- BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProviderForEncryption);
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_browser__process__impl.cc b/chromium-next/patches/patch-chrome_browser_browser__process__impl.cc
deleted file mode 100644
index ed17757a7d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_browser__process__impl.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/browser_process_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/browser_process_impl.cc
-@@ -259,7 +259,7 @@
- #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/browser_features.h"
- #include "components/os_crypt/async/browser/fallback_linux_key_provider.h"
- #include "components/os_crypt/async/browser/freedesktop_secret_key_provider.h"
-@@ -271,7 +271,7 @@
- #include "chrome/browser/safe_browsing/safe_browsing_service.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // How often to check if the persistent instance of Chrome needs to restart
- // to install an update.
- static const int kUpdateCheckIntervalHours = 6;
-@@ -1145,7 +1145,7 @@ void BrowserProcessImpl::RegisterPrefs(P
-                                 GoogleUpdateSettings::GetCollectStatsConsent());
-   registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry);
- #endif
- }
-@@ -1413,7 +1413,7 @@ void BrowserProcessImpl::PreMainMessageL
-           local_state())));
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-   if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) !=
-       "basic") {
-@@ -1682,7 +1682,7 @@ void BrowserProcessImpl::Unpin() {
- }
- 
- // Mac is currently not supported.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- bool BrowserProcessImpl::IsRunningInBackground() const {
-   // Check if browser is in the background.
diff --git a/chromium-next/patches/patch-chrome_browser_browser__process__impl.h b/chromium-next/patches/patch-chrome_browser_browser__process__impl.h
deleted file mode 100644
index 5e1f0b6108..0000000000
--- a/chromium-next/patches/patch-chrome_browser_browser__process__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/browser_process_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/browser_process_impl.h
-@@ -408,7 +408,7 @@ class BrowserProcessImpl : public Browse
- 
-   std::unique_ptr<BatteryMetrics> battery_metrics_;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::RepeatingTimer autoupdate_timer_;
- 
-   // Gets called by autoupdate timer to see if browser needs restart and can be
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__field__trials.cc b/chromium-next/patches/patch-chrome_browser_chrome__browser__field__trials.cc
deleted file mode 100644
index 6d39fa8db3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__field__trials.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_field_trials.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_field_trials.cc
-@@ -37,7 +37,7 @@
- #include "chromeos/ash/services/multidevice_setup/public/cpp/first_run_field_trial.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/nix/xdg_util.h"
- #include "ui/base/ui_base_features.h"
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -117,7 +117,7 @@ void ChromeBrowserFieldTrials::RegisterS
- #endif  // BUILDFLAG(IS_ANDROID)
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // On Linux/Desktop platform variants, such as ozone/wayland, some features
- // might need to be disabled as per OzonePlatform's runtime properties.
- // OzonePlatform selection and initialization, in turn, depend on Chrome flags
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__field__trials.h b/chromium-next/patches/patch-chrome_browser_chrome__browser__field__trials.h
deleted file mode 100644
index 51118fd20a..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__field__trials.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_field_trials.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_field_trials.h
-@@ -33,7 +33,7 @@ class ChromeBrowserFieldTrials : public 
-       const variations::EntropyProviders& entropy_providers,
-       base::FeatureList* feature_list) override;
-   void RegisterSyntheticTrials() override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void RegisterFeatureOverrides(base::FeatureList* feature_list) override;
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__interface__binders.cc b/chromium-next/patches/patch-chrome_browser_chrome__browser__interface__binders.cc
deleted file mode 100644
index 4d4a3daf01..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_interface_binders.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -77,7 +77,7 @@
- #endif  // BUILDFLAG(ENABLE_UNHANDLED_TAP)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/screen_ai/screen_ai_service_router.h"
- #include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
- #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
-@@ -358,7 +358,7 @@ void BindMediaFoundationPreferences(
- #endif  // BUILDFLAG(IS_WIN)
- 
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- void BindScreenAIAnnotator(
-     content::RenderFrameHost* frame_host,
-     mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) {
-@@ -500,7 +500,7 @@ void PopulateChromeFrameBinders(
- #endif  // BUILDFLAG(ENABLE_SPEECH_SERVICE)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
-       !render_frame_host->GetParentOrOuterDocument()) {
-     // The service binder will reject non-primary main frames, but we still need
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__interface__binders__webui.cc b/chromium-next/patches/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
deleted file mode 100644
index 854499b7e7..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_interface_binders_webui.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_interface_binders_webui.cc
-@@ -47,7 +47,7 @@
- #include "content/public/browser/web_ui_controller_interface_binder.h"
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
- #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
- #include "chrome/browser/ui/webui/discards/discards.mojom.h"
-@@ -56,7 +56,7 @@
- #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
- #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
- #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin.mojom.h"
-@@ -445,7 +445,7 @@ void PopulateChromeWebUIFrameBinders(
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   RegisterWebUIControllerInterfaceBinder<
-       connectors_internals::mojom::PageHandler,
-       enterprise_connectors::ConnectorsInternalsUI>(map);
-@@ -456,7 +456,7 @@ void PopulateChromeWebUIFrameBinders(
-                                          policy::DlpInternalsUI>(map);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   RegisterWebUIControllerInterfaceBinder<
-       app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
- 
-@@ -583,14 +583,14 @@ void PopulateChromeWebUIFrameBinders(
-         HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
-   }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   RegisterWebUIControllerInterfaceBinder<whats_new::mojom::PageHandlerFactory,
-                                          WhatsNewUI>(map);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-   RegisterWebUIControllerInterfaceBinder<
-       browser_command::mojom::CommandHandlerFactory,
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       WhatsNewUI,
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-       NewTabPageUI>(map);
-@@ -1123,7 +1123,7 @@ void PopulateChromeWebUIFrameBinders(
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider,
-                                          DiscardsUI>(map);
- 
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__main.cc b/chromium-next/patches/patch-chrome_browser_chrome__browser__main.cc
deleted file mode 100644
index d27c96874a..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__main.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_main.cc
-@@ -149,7 +149,7 @@
- #endif
- 
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "sql/database.h"
- #endif
- 
-@@ -175,11 +175,11 @@
- #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/first_run/upgrade_util_linux.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/headless/headless_mode_metrics.h"  // nogncheck
- #include "chrome/browser/headless/headless_mode_util.h"     // nogncheck
- #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
-@@ -190,7 +190,7 @@
- #include "ui/gfx/switches.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/first_run/upgrade_util.h"
- #endif
- 
-@@ -268,7 +268,7 @@
- #include "chrome/browser/chrome_process_singleton.h"
- #include "chrome/browser/ui/startup/startup_browser_creator.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/nix/xdg_util.h"
- #endif
- #endif  // BUILDFLAG(ENABLE_PROCESS_SINGLETON)
-@@ -291,7 +291,7 @@
- 
- namespace {
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
-     FILE_PATH_LITERAL("Media History");
- 
-@@ -442,7 +442,7 @@ void ProcessSingletonNotificationCallbac
-   }
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Set the global activation token sent as a command line switch by another
-   // browser process. This also removes the switch after use to prevent any side
-   // effects of leaving it in the command line after this point.
-@@ -1016,7 +1016,7 @@ int ChromeBrowserMainParts::PreCreateThr
-       browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
-     }
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     // 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 .
-@@ -1061,7 +1061,7 @@ int ChromeBrowserMainParts::PreCreateThr
- 
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   metrics::DesktopSessionDurationTracker::Initialize();
-   ProfileActivityMetricsRecorder::Initialize();
-   TouchModeStatsTracker::Initialize(
-@@ -1257,7 +1257,7 @@ void ChromeBrowserMainParts::PostProfile
- #endif  // BUILDFLAG(IS_WIN)
- 
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // Delete the media history database if it still exists.
-   // TODO(crbug.com/40177301): Remove this.
-   base::ThreadPool::PostTask(
-@@ -1305,7 +1305,7 @@ void ChromeBrowserMainParts::PostProfile
-       *UrlLanguageHistogramFactory::GetForBrowserContext(profile));
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (headless::IsHeadlessMode()) {
-     headless::ReportHeadlessActionMetrics();
-   }
-@@ -1414,7 +1414,7 @@ int ChromeBrowserMainParts::PreMainMessa
-   // In headless mode provide alternate SelectFileDialog factory overriding
-   // any platform specific SelectFileDialog implementation that may have been
-   // set.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (headless::IsHeadlessMode()) {
-     headless::HeadlessSelectFileDialogFactory::SetUp();
-   }
-@@ -1959,7 +1959,7 @@ bool ChromeBrowserMainParts::ProcessSing
- 
-   // Drop the request if headless mode is in effect or the request is from
-   // a headless Chrome process.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (headless::IsHeadlessMode() ||
-       command_line.HasSwitch(switches::kHeadless)) {
-     return false;
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/chromium-next/patches/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
deleted file mode 100644
index f3bbca0147..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
-@@ -58,7 +58,7 @@ void ChromeBrowserMainExtraPartsLinux::P
- 
- // static
- void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* const command_line = base::CommandLine::ForCurrentProcess();
-   auto env = base::Environment::Create();
-   std::string desktop_startup_id;
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc b/chromium-next/patches/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
deleted file mode 100644
index a10a219ac1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc
-@@ -28,7 +28,7 @@ void ChromeBrowserMainExtraPartsOzone::P
- }
- 
- void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() {
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
- #endif
- }
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__linux.cc b/chromium-next/patches/patch-chrome_browser_chrome__browser__main__linux.cc
deleted file mode 100644
index 5a66809f1f..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__linux.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_main_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_main_linux.cc
-@@ -24,7 +24,7 @@
- #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
- #include "ui/base/l10n/l10n_util.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/ozone/public/ozone_platform.h"
- #endif
- 
-@@ -65,7 +65,9 @@ void ChromeBrowserMainPartsLinux::PostCr
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- #if !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_BSD)
-   bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
-+#endif
- 
-   // Set up crypt config. This needs to be done before anything starts the
-   // network service, as the raw encryption key needs to be shared with the
-@@ -91,7 +93,7 @@ void ChromeBrowserMainPartsLinux::PostCr
-   ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
-   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
-   ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
-@@ -129,7 +131,7 @@ void ChromeBrowserMainPartsLinux::PostBr
- #endif  // BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
- 
- void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
--#if BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // No-op; per PostBrowserStart() comment, this is done elsewhere.
- #else
-   bluez::BluezDBusManager::Shutdown();
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__linux.h b/chromium-next/patches/patch-chrome_browser_chrome__browser__main__linux.h
deleted file mode 100644
index 25fe51e030..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__linux.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_main_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_main_linux.h
-@@ -31,7 +31,7 @@ class ChromeBrowserMainPartsLinux : publ
- 
-   // ChromeBrowserMainPartsPosix overrides.
-   void PostCreateMainMessageLoop() override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void PostMainMessageLoopRun() override;
- #endif
-   void PreProfileInit() override;
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__posix.cc b/chromium-next/patches/patch-chrome_browser_chrome__browser__main__posix.cc
deleted file mode 100644
index be864d3668..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__browser__main__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_browser_main_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_browser_main_posix.cc
-@@ -81,7 +81,7 @@ void ExitHandler::ExitWhenPossibleOnUITh
-     // ExitHandler takes care of deleting itself.
-     new ExitHandler();
-   } else {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     switch (signal) {
-       case SIGINT:
-       case SIGHUP:
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__content__browser__client.cc b/chromium-next/patches/patch-chrome_browser_chrome__content__browser__client.cc
deleted file mode 100644
index 8e61bf210e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__content__browser__client.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_content_browser_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -506,7 +506,7 @@
- #include "components/user_manager/user_manager.h"
- #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
- #include "storage/browser/file_system/external_mount_points.h"
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/chrome_browser_main_linux.h"
- #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
- #elif BUILDFLAG(IS_ANDROID)
-@@ -622,11 +622,11 @@
- #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
- #endif  //  !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/crash/core/app/crash_switches.h"
- #include "components/crash/core/app/crashpad.h"
- #endif
-@@ -637,7 +637,7 @@
- #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
- #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
- #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
-@@ -646,7 +646,7 @@
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
-         // BUILDFLAG(IS_CHROMEOS)
-@@ -655,7 +655,7 @@
- #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
- #elif BUILDFLAG(IS_OZONE)
- #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1549,7 +1549,7 @@ void ChromeContentBrowserClient::Registe
-   registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache,
-                                 false);
- #endif  // BUILDFLAG(IS_CHROMEOS)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
-                                 true);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1758,7 +1758,7 @@ ChromeContentBrowserClient::CreateBrowse
- #elif BUILDFLAG(IS_CHROMEOS)
-   main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>(
-       is_integration_test, &startup_data_);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
-       is_integration_test, &startup_data_);
- #elif BUILDFLAG(IS_ANDROID)
-@@ -1787,7 +1787,7 @@ ChromeContentBrowserClient::CreateBrowse
-     // Construct additional browser parts. Stages are called in the order in
-     // which they are added.
- #if defined(TOOLKIT_VIEWS)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   main_parts->AddParts(
-       std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
- #else
-@@ -1804,7 +1804,7 @@ ChromeContentBrowserClient::CreateBrowse
-   main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>());
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
- #elif BUILDFLAG(IS_OZONE)
-   main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1823,7 +1823,7 @@ ChromeContentBrowserClient::CreateBrowse
- 
-   chrome::AddMetricsExtraParts(main_parts.get());
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   main_parts->AddParts(
-       std::make_unique<
-           enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2706,7 +2706,9 @@ void MaybeAppendBlinkSettingsSwitchForFi
- void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
-     base::CommandLine* command_line,
-     int child_process_id) {
-+#ifdef notyet
-   crash_keys::AppendStringAnnotationsCommandLineSwitch(command_line);
-+#endif
- #if BUILDFLAG(IS_MAC)
-   std::unique_ptr<metrics::ClientInfo> client_info =
-       GoogleUpdateSettings::LoadMetricsClientInfo();
-@@ -2715,7 +2717,7 @@ void ChromeContentBrowserClient::AppendE
-                                     client_info->client_id);
-   }
- #elif BUILDFLAG(IS_POSIX)
--#if !BUILDFLAG(IS_ANDROID)
-+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
-   pid_t pid;
-   if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
-     command_line->AppendSwitchASCII(
-@@ -3080,7 +3082,7 @@ void ChromeContentBrowserClient::AppendE
-     }
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
-   // Opt into a hardened stack canary mitigation if it hasn't already been
-   // force-disabled.
-   if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4030,7 +4032,7 @@ bool UpdatePreferredColorScheme(WebPrefe
-   return old_preferred_color_scheme != web_prefs->preferred_color_scheme;
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Sets the `root_scrollbar_theme_color` web pref if the user has enabled a
- // custom colored frame for the UI.
- void UpdateRootScrollbarThemeColor(Profile* profile,
-@@ -4657,7 +4659,7 @@ void ChromeContentBrowserClient::Overrid
- 
-   UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(),
-                              web_contents, GetWebTheme());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs);
- #endif  //  BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
- 
-@@ -4973,7 +4975,7 @@ void ChromeContentBrowserClient::GetAddi
-   }
- }
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
- void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
-     const base::CommandLine& command_line,
-     int child_process_id,
-@@ -5485,7 +5487,7 @@ ChromeContentBrowserClient::CreateThrott
-         &throttles);
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   MaybeAddThrottle(
-       WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
-       &throttles);
-@@ -5502,7 +5504,7 @@ ChromeContentBrowserClient::CreateThrott
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
-                        MaybeCreateThrottleFor(handle),
-                    &throttles);
-@@ -5543,7 +5545,7 @@ ChromeContentBrowserClient::CreateThrott
-   }
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
-                        MaybeCreateThrottleFor(handle),
-                    &throttles);
-@@ -7496,7 +7498,7 @@ bool ChromeContentBrowserClient::ShouldS
- bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
- // This enterprise policy is supported on Android, but the feature will not be
- // launched there.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   // This is possibly called before `g_browser_process` is initialized.
-   PrefService* local_state;
-   if (g_browser_process) {
diff --git a/chromium-next/patches/patch-chrome_browser_chrome__content__browser__client.h b/chromium-next/patches/patch-chrome_browser_chrome__content__browser__client.h
deleted file mode 100644
index d2dd4807de..0000000000
--- a/chromium-next/patches/patch-chrome_browser_chrome__content__browser__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/chrome_content_browser_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/chrome_content_browser_client.h
-@@ -555,7 +555,7 @@ class ChromeContentBrowserClient : publi
-   bool IsPluginAllowedToUseDevChannelAPIs(
-       content::BrowserContext* browser_context,
-       const GURL& url) override;
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
-   void GetAdditionalMappedFilesForChildProcess(
-       const base::CommandLine& command_line,
-       int child_process_id,
diff --git a/chromium-next/patches/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc b/chromium-next/patches/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
deleted file mode 100644
index 1d7f8ad832..0000000000
--- a/chromium-next/patches/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc
-@@ -102,7 +102,7 @@ MessagingBackendServiceFactory::BuildSer
-   // This configuration object allows us to control platform specific behavior.
-   MessagingBackendConfiguration configuration;
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   configuration.clear_chip_on_tab_selection = false;
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc b/chromium-next/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
deleted file mode 100644
index d8d1669c7b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/component_updater/iwa_key_distribution_component_installer.cc
-@@ -64,7 +64,7 @@ component_updater::OnDemandUpdater::Prio
- 
- namespace component_updater {
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kIwaKeyDistributionComponent,
-              "IwaKeyDistributionComponent",
- #if BUILDFLAG(IS_CHROMEOS)
-@@ -89,7 +89,7 @@ bool IwaKeyDistributionComponentInstalle
-   // the main IWA feature.
- #if BUILDFLAG(IS_WIN)
-   return base::FeatureList::IsEnabled(features::kIsolatedWebApps);
--#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(kIwaKeyDistributionComponent);
- #else
-   return false;
diff --git a/chromium-next/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h b/chromium-next/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h
deleted file mode 100644
index 4cb79886ef..0000000000
--- a/chromium-next/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/component_updater/iwa_key_distribution_component_installer.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/component_updater/iwa_key_distribution_component_installer.h
-@@ -27,7 +27,7 @@ class IwaKeyDistributionInfoProvider;
- 
- namespace component_updater {
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kIwaKeyDistributionComponent);
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chrome_browser_component__updater_registration.cc b/chromium-next/patches/patch-chrome_browser_component__updater_registration.cc
deleted file mode 100644
index 9ddd443c0e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_component__updater_registration.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/component_updater/registration.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/component_updater/registration.cc
-@@ -101,7 +101,7 @@
- #endif  // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/component_updater/installer_policies/amount_extraction_heuristic_regexes_component_installer.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
-@@ -114,7 +114,7 @@
- #include "chrome/browser/component_updater/lacros_component_remover.h"
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/component_updater/wasm_tts_engine_component_installer.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -261,12 +261,12 @@ void RegisterComponentsForUpdate() {
-   RegisterCookieReadinessListComponent(cus);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   RegisterAmountExtractionHeuristicRegexesComponent(cus);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (features::IsWasmTtsComponentUpdaterEnabled()) {
-     RegisterWasmTtsEngineComponent(cus);
-   }
diff --git a/chromium-next/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc b/chromium-next/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
deleted file mode 100644
index 97dc371da1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/component_updater/wasm_tts_engine_component_installer.cc
-@@ -8,7 +8,7 @@
- #include "base/functional/callback.h"
- #include "base/logging.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/accessibility/embedded_a11y_extension_loader.h"
- #include "chrome/common/extensions/extension_constants.h"
- #include "components/crx_file/id_util.h"
-@@ -70,7 +70,7 @@ void WasmTtsEngineComponentInstallerPoli
-   VLOG(1) << "Component ready, version " << version.GetString() << " in "
-           << install_dir.value();
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (features::IsWasmTtsComponentUpdaterEnabled() &&
-       !features::IsWasmTtsEngineAutoInstallDisabled()) {
-     EmbeddedA11yExtensionLoader::GetInstance()->Init();
-@@ -121,7 +121,7 @@ void RegisterWasmTtsEngineComponent(Comp
-   installer->Register(cus, base::OnceClosure());
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::string WasmTtsEngineComponentInstallerPolicy::GetId() {
-   return crx_file::id_util::GenerateIdFromHash((kWasmTtsEnginePublicKeySHA256));
- }
diff --git a/chromium-next/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h b/chromium-next/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
deleted file mode 100644
index e9d2337f42..0000000000
--- a/chromium-next/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/component_updater/wasm_tts_engine_component_installer.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/component_updater/wasm_tts_engine_component_installer.h
-@@ -27,7 +27,7 @@ class WasmTtsEngineComponentInstallerPol
-   WasmTtsEngineComponentInstallerPolicy& operator=(
-       const WasmTtsEngineComponentInstallerPolicy&) = delete;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   static std::string GetId();
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/chromium-next/patches/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
deleted file mode 100644
index 0dfa75336e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
-@@ -41,7 +41,7 @@
- #include "third_party/widevine/cdm/buildflags.h"
- #include "third_party/widevine/cdm/widevine_cdm_common.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/path_service.h"
- #include "chrome/common/chrome_paths.h"
- #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
-@@ -73,7 +73,7 @@ static_assert(std::size(kWidevineSha2Has
- const char ImageLoaderComponentName[] = "WidevineCdm";
- #endif
- 
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
- // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
- // zygote is locked down. As a result there is no need to register the CDM
- // with Chrome as it can't be used until Chrome is restarted.
-@@ -101,7 +101,7 @@ void RegisterWidevineCdmWithChrome(const
- }
- #endif  // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
- // zygote is locked down. To locate the Widevine CDM at startup, a hint file
- // is used. Update the hint file with the new Widevine CDM path.
-@@ -392,7 +392,7 @@ void WidevineCdmComponentInstallerPolicy
-     return;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   VLOG(1) << "Updating hint file with Widevine CDM " << cdm_version;
- 
-   // This is running on a thread that allows IO, so simply update the hint file.
diff --git a/chromium-next/patches/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc b/chromium-next/patches/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
deleted file mode 100644
index 2ddaa5f187..0000000000
--- a/chromium-next/patches/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc
-@@ -68,7 +68,7 @@ void ChromeProtocolHandlerRegistryDelega
- // If true default protocol handlers will be removed if the OS level
- // registration for a protocol is no longer Chrome.
- bool ChromeProtocolHandlerRegistryDelegate::ShouldRemoveHandlersNotInOS() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // We don't do this on Linux as the OS registration there is not reliable,
-   // and Chrome OS doesn't have any notion of OS registration.
-   // TODO(benwells): When Linux support is more reliable remove this
diff --git a/chromium-next/patches/patch-chrome_browser_defaults.cc b/chromium-next/patches/patch-chrome_browser_defaults.cc
deleted file mode 100644
index 3de3b46767..0000000000
--- a/chromium-next/patches/patch-chrome_browser_defaults.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/defaults.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/defaults.cc
-@@ -31,7 +31,7 @@ const bool kAlwaysCreateTabbedBrowserOnS
- const bool kShowHelpMenuItemIcon = false;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const bool kScrollEventChangesTab = true;
- #else
- const bool kScrollEventChangesTab = false;
diff --git a/chromium-next/patches/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/chromium-next/patches/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
deleted file mode 100644
index 5c18161caa..0000000000
--- a/chromium-next/patches/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
-@@ -26,7 +26,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> 
- #if BUILDFLAG(IS_CHROMEOS)
-   return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
-       local_state);
--#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);
- #else
-   NOTREACHED();
diff --git a/chromium-next/patches/patch-chrome_browser_devtools_features.cc b/chromium-next/patches/patch-chrome_browser_devtools_features.cc
deleted file mode 100644
index d58cd12383..0000000000
--- a/chromium-next/patches/patch-chrome_browser_devtools_features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/devtools/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/devtools/features.cc
-@@ -157,7 +157,7 @@ BASE_FEATURE(kDevToolsAiGeneratedTimelin
-              "DevToolsAiGeneratedTimelineLabels",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // If enabled, DevTools does not accept remote debugging connections unless
- // using a non-default user data dir via the --user-data-dir switch.
- BASE_FEATURE(kDevToolsDebuggingRestrictions,
diff --git a/chromium-next/patches/patch-chrome_browser_devtools_features.h b/chromium-next/patches/patch-chrome_browser_devtools_features.h
deleted file mode 100644
index acbae5b433..0000000000
--- a/chromium-next/patches/patch-chrome_browser_devtools_features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/devtools/features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/devtools/features.h
-@@ -89,7 +89,7 @@ BASE_DECLARE_FEATURE(kDevToolsCssValueTr
- 
- BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabels);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kDevToolsDebuggingRestrictions);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chrome_browser_devtools_remote__debugging__server.cc b/chromium-next/patches/patch-chrome_browser_devtools_remote__debugging__server.cc
deleted file mode 100644
index 6d68c578ec..0000000000
--- a/chromium-next/patches/patch-chrome_browser_devtools_remote__debugging__server.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/devtools/remote_debugging_server.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/devtools/remote_debugging_server.cc
-@@ -109,7 +109,7 @@ IsRemoteDebuggingAllowed(const std::opti
-         RemoteDebuggingServer::NotStartedReason::kDisabledByPolicy);
-   }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(features::kDevToolsDebuggingRestrictions) &&
-       is_default_user_data_dir.value_or(true)) {
-     return base::unexpected(
diff --git a/chromium-next/patches/patch-chrome_browser_diagnostics_diagnostics__writer.h b/chromium-next/patches/patch-chrome_browser_diagnostics_diagnostics__writer.h
deleted file mode 100644
index d5d8bfa7af..0000000000
--- a/chromium-next/patches/patch-chrome_browser_diagnostics_diagnostics__writer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/diagnostics/diagnostics_writer.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/diagnostics/diagnostics_writer.h
-@@ -16,6 +16,8 @@ namespace diagnostics {
- // Console base class used internally.
- class SimpleConsole;
- 
-+#undef MACHINE
-+
- class DiagnosticsWriter : public DiagnosticsModel::Observer {
-  public:
-   // The type of formatting done by this writer.
diff --git a/chromium-next/patches/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/chromium-next/patches/patch-chrome_browser_download_chrome__download__manager__delegate.cc
deleted file mode 100644
index f4f2646c57..0000000000
--- a/chromium-next/patches/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1864,7 +1864,7 @@ void ChromeDownloadManagerDelegate::OnDo
- bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
-     const base::FilePath& path) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
-     return !download_prefs_->ShouldOpenPdfInSystemReader();
-   }
-@@ -2000,7 +2000,7 @@ void ChromeDownloadManagerDelegate::Chec
-     content::CheckDownloadAllowedCallback check_download_allowed_cb) {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   // Don't download pdf if it is a file URL, as that might cause an infinite
-   // download loop if Chrome is not the system pdf viewer.
-   if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
-@@ -2082,7 +2082,7 @@ void ChromeDownloadManagerDelegate::Chec
-   DCHECK(download_item->IsSavePackageDownload());
- 
- #if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--     BUILDFLAG(IS_MAC)) &&                                                 \
-+     BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) &&                                                 \
-     BUILDFLAG(SAFE_BROWSING_AVAILABLE)
-   std::optional<enterprise_connectors::AnalysisSettings> settings =
-       safe_browsing::ShouldUploadBinaryForDeepScanning(download_item);
diff --git a/chromium-next/patches/patch-chrome_browser_download_download__commands.cc b/chromium-next/patches/patch-chrome_browser_download_download__commands.cc
deleted file mode 100644
index f80800d40b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_download_download__commands.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/download/download_commands.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/download/download_commands.cc
-@@ -27,7 +27,7 @@
- #include "ui/base/clipboard/scoped_clipboard_writer.h"
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/browser.h"
- #include "chrome/browser/ui/browser_finder.h"
- #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
-@@ -177,7 +177,7 @@ void DownloadCommands::ExecuteCommand(Co
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- Browser* DownloadCommands::GetBrowser() const {
-   if (!model_)
diff --git a/chromium-next/patches/patch-chrome_browser_download_download__commands.h b/chromium-next/patches/patch-chrome_browser_download_download__commands.h
deleted file mode 100644
index 4472c60dc3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_download_download__commands.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/download/download_commands.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/download/download_commands.h
-@@ -66,7 +66,7 @@ class DownloadCommands {
-   void ExecuteCommand(Command command);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   bool IsDownloadPdf() const;
-   bool CanOpenPdfInSystemViewer() const;
-   Browser* GetBrowser() const;
diff --git a/chromium-next/patches/patch-chrome_browser_download_download__file__picker.cc b/chromium-next/patches/patch-chrome_browser_download_download__file__picker.cc
deleted file mode 100644
index ff8931bd80..0000000000
--- a/chromium-next/patches/patch-chrome_browser_download_download__file__picker.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/download/download_file_picker.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/download/download_file_picker.cc
-@@ -18,7 +18,7 @@
- #include "content/public/browser/web_contents.h"
- #include "ui/shell_dialogs/selected_file_info.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/browser_list.h"
- #include "chrome/browser/ui/browser_window.h"
- #include "ui/aura/window.h"
-@@ -83,7 +83,7 @@ DownloadFilePicker::DownloadFilePicker(d
-   // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc).
-   // and windows.Here we make owning_window host to browser current active
-   // window if it is null. https://crbug.com/1301898
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (!owning_window || !owning_window->GetHost()) {
-     owning_window = BrowserList::GetInstance()
-                         ->GetLastActive()
diff --git a/chromium-next/patches/patch-chrome_browser_download_download__item__model.cc b/chromium-next/patches/patch-chrome_browser_download_download__item__model.cc
deleted file mode 100644
index a6eb7f9e85..0000000000
--- a/chromium-next/patches/patch-chrome_browser_download_download__item__model.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/download/download_item_model.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/download/download_item_model.cc
-@@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked
-              download_crx_util::IsExtensionDownload(*download_);
-     case DownloadCommands::ALWAYS_OPEN_TYPE:
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       if (download_commands->CanOpenPdfInSystemViewer()) {
-         DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
-         return prefs->ShouldOpenPdfInSystemReader();
-@@ -820,7 +820,7 @@ void DownloadItemModel::ExecuteCommand(D
-                                          DownloadCommands::ALWAYS_OPEN_TYPE);
-       DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       if (download_commands->CanOpenPdfInSystemViewer()) {
-         prefs->SetShouldOpenPdfInSystemReader(!is_checked);
-         SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1206,7 +1206,7 @@ void DownloadItemModel::DetermineAndSetS
-     return;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (download_->GetOriginalMimeType() == "application/x-x509-user-cert") {
-     SetShouldPreferOpeningInBrowser(true);
-     return;
diff --git a/chromium-next/patches/patch-chrome_browser_download_download__prefs.cc b/chromium-next/patches/patch-chrome_browser_download_download__prefs.cc
deleted file mode 100644
index 4e2a842fe9..0000000000
--- a/chromium-next/patches/patch-chrome_browser_download_download__prefs.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/download/download_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/download/download_prefs.cc
-@@ -11,6 +11,7 @@
- #include <vector>
- 
- #include "base/check.h"
-+#include "base/command_line.h"
- #include "base/feature_list.h"
- #include "base/files/file_util.h"
- #include "base/functional/bind.h"
-@@ -61,6 +62,10 @@
- #include "components/safe_browsing/content/common/file_type_policies.h"
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#endif
-+
- using content::BrowserContext;
- using content::BrowserThread;
- using content::DownloadManager;
-@@ -74,7 +79,7 @@ namespace {
- // Consider downloads 'dangerous' if they go to the home directory on Linux and
- // to the desktop on any platform.
- bool DownloadPathIsDangerous(const base::FilePath& download_path) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   base::FilePath home_dir = base::GetHomeDir();
-   if (download_path == home_dir) {
-     return true;
-@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   should_open_pdf_in_system_reader_ =
-       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
- #endif
-@@ -307,7 +312,7 @@ void DownloadPrefs::RegisterProfilePrefs
-   registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
-                                  default_download_path);
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
- #endif
- #if BUILDFLAG(IS_ANDROID)
-@@ -480,7 +485,7 @@ void DownloadPrefs::DisableAutoOpenByUse
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
-   if (should_open_pdf_in_system_reader_ == should_open)
-     return;
-@@ -506,7 +511,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste
- 
- void DownloadPrefs::ResetAutoOpenByUser() {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   SetShouldOpenPdfInSystemReader(false);
- #endif
-   auto_open_by_user_.clear();
-@@ -543,7 +548,7 @@ void DownloadPrefs::SaveAutoOpenState() 
- bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
- #if BUILDFLAG(IS_CHROMEOS)
-   return false;  // There is no UI for auto-open on ChromeOS.
--#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   return ShouldOpenPdfInSystemReader();
- #else
-   return false;
-@@ -625,7 +630,14 @@ base::FilePath DownloadPrefs::SanitizeDo
- #else
-   // If the stored download directory is an absolute path, we presume it's
-   // correct; there's not really much more validation we can do here.
-+#if BUILDFLAG(IS_OPENBSD)
-+  // If unveil(2) is used, force the file dialog directory to something we
-+  // know is available.
-+  auto* sandbox = sandbox::policy::SandboxLinux::GetInstance();
-+  if (!sandbox->unveil_initialized() && path.IsAbsolute())
-+#else
-   if (path.IsAbsolute())
-+#endif
-     return path;
- 
-   // When the default download directory is *not* an absolute path, we use the
diff --git a/chromium-next/patches/patch-chrome_browser_download_download__prefs.h b/chromium-next/patches/patch-chrome_browser_download_download__prefs.h
deleted file mode 100644
index ad35a1c108..0000000000
--- a/chromium-next/patches/patch-chrome_browser_download_download__prefs.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/download/download_prefs.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/download/download_prefs.h
-@@ -107,7 +107,7 @@ class DownloadPrefs {
-   void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   // Store the user preference to disk. If |should_open| is true, also disable
-   // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
-   void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -171,7 +171,7 @@ class DownloadPrefs {
-   std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   bool should_open_pdf_in_system_reader_;
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
deleted file mode 100644
index 5f1ff4793a..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
-@@ -151,7 +151,7 @@ AnalysisServiceSettings::AnalysisService
-   const char* verification_key = kKeyWindowsVerification;
- #elif BUILDFLAG(IS_MAC)
-   const char* verification_key = kKeyMacVerification;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const char* verification_key = kKeyLinuxVerification;
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_common.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_common.cc
deleted file mode 100644
index f758934a6b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_common.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/common.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/common.cc
-@@ -17,7 +17,7 @@
- #include "components/user_manager/user.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
- #include "components/prefs/pref_service.h"
- #endif
-@@ -192,7 +192,7 @@ std::string GetProfileEmail(Profile* pro
-   std::string email =
-       GetProfileEmail(IdentityManagerFactory::GetForProfile(profile));
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (email.empty()) {
-     email = profile->GetPrefs()->GetString(
-         enterprise_signin::prefs::kProfileUserEmail);
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_connectors__service.cc
deleted file mode 100644
index 374f7c294d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_connectors__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -476,7 +476,7 @@ policy::PolicyScope ConnectorsService::G
- bool ConnectorsService::ConnectorsEnabled() const {
-   Profile* profile = Profile::FromBrowserContext(context_);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On desktop, the guest profile is actually the primary OTR profile of
-   // the "regular" guest profile.  The regular guest profile is never used
-   // directly by users.  Also, user are not able to create child OTR profiles
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
deleted file mode 100644
index 3bba2533eb..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc
-@@ -10,7 +10,7 @@
- #include "chrome/browser/profiles/profile.h"
- #include "components/keyed_service/core/keyed_service.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/enterprise/connectors/device_trust/browser/signing_key_policy_observer.h"
- #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -40,7 +40,7 @@ DeviceTrustConnectorService* DeviceTrust
- 
- bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext()
-     const {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
-@@ -84,7 +84,7 @@ DeviceTrustConnectorServiceFactory::Buil
-   std::unique_ptr<DeviceTrustConnectorService> service =
-       std::make_unique<DeviceTrustConnectorService>(profile->GetPrefs());
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   auto* key_manager = g_browser_process->browser_policy_connector()
-                           ->chrome_browser_cloud_management_controller()
-                           ->GetDeviceTrustKeyManager();
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
deleted file mode 100644
index 6ce40a829b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
-@@ -22,7 +22,7 @@
- #include "components/policy/core/common/management/management_service.h"
- #include "content/public/browser/browser_context.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/browser_attestation_service.h"
- #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/device_attester.h"
-@@ -53,7 +53,7 @@ bool IsProfileManaged(Profile* profile) 
-   return management_service && management_service->IsManaged();
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) {
-   policy::CloudPolicyManager* user_policy_manager =
-       profile->GetCloudPolicyManager();
-@@ -105,7 +105,7 @@ DeviceTrustServiceFactory::DeviceTrustSe
-   DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
-   DependsOn(policy::ManagementServiceFactory::GetInstance());
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Depends on this service via the SignalsService having a dependency on it.
-   DependsOn(enterprise_signals::SignalsAggregatorFactory::GetInstance());
-   // Depends on this service via the ProfileAttester having a dependency on it
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
deleted file mode 100644
index 0d75581cbf..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc
-@@ -19,7 +19,7 @@
- 
- #if BUILDFLAG(IS_WIN)
- #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h"
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h"
- #elif BUILDFLAG(IS_MAC)
- #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h"
-@@ -53,7 +53,7 @@ std::unique_ptr<KeyRotationCommand> KeyR
-     policy::DeviceManagementService* device_management_service) {
- #if BUILDFLAG(IS_WIN)
-   return std::make_unique<WinKeyRotationCommand>();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return std::make_unique<LinuxKeyRotationCommand>(url_loader_factory);
- #elif BUILDFLAG(IS_MAC)
-   if (IsDTCKeyRotationUploadedBySharedAPI()) {
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
deleted file mode 100644
index f036e8f183..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc
-@@ -13,7 +13,7 @@
- #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h"
- #elif BUILDFLAG(IS_MAC)
- #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/mac_key_persistence_delegate.h"
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/linux_key_persistence_delegate.h"
- #endif
- 
-@@ -45,7 +45,7 @@ KeyPersistenceDelegateFactory::CreateKey
-   return std::make_unique<WinKeyPersistenceDelegate>();
- #elif BUILDFLAG(IS_MAC)
-   return std::make_unique<MacKeyPersistenceDelegate>();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return std::make_unique<LinuxKeyPersistenceDelegate>();
- #else
-   NOTREACHED();
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
deleted file mode 100644
index 669b9250ab..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
-@@ -23,7 +23,7 @@
- #include "chrome/browser/enterprise/connectors/connectors_service.h"
- #endif  // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "base/check.h"
- #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
- #include "chrome/browser/enterprise/core/dependency_factory_impl.h"
-@@ -63,7 +63,7 @@ std::unique_ptr<SignalsService> CreateSi
-           profile, ConnectorsServiceFactory::GetForBrowserContext(profile))));
- #endif  // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- 
-   policy::CloudPolicyManager* browser_policy_manager = nullptr;
-   if (management_service->HasManagementAuthority(
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
deleted file mode 100644
index b22cc0ebe9..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
-@@ -13,7 +13,7 @@ namespace enterprise_connectors {
- 
- BrowserCrashEventRouter::BrowserCrashEventRouter(
-     content::BrowserContext* context) {
--#if !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-   CrashReportingContext* crash_reporting_context =
-       CrashReportingContext::GetInstance();
-   Profile* profile = Profile::FromBrowserContext(context);
-@@ -23,7 +23,7 @@ BrowserCrashEventRouter::BrowserCrashEve
- }
- 
- BrowserCrashEventRouter::~BrowserCrashEventRouter() {
--#if !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-   CrashReportingContext* crash_reporting_context =
-       CrashReportingContext::GetInstance();
-   crash_reporting_context->RemoveProfile(this);
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
deleted file mode 100644
index 021798f5e8..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
-@@ -20,7 +20,7 @@
- 
- namespace enterprise_connectors {
- 
--#if !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
- 
- namespace {
- 
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
deleted file mode 100644
index cb57c70356..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
-@@ -53,7 +53,7 @@
- #include "base/strings/utf_string_conversions.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
- #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
- #include "components/device_signals/core/browser/signals_aggregator.h"
-@@ -158,7 +158,7 @@ void RealtimeReportingClient::ReportPast
-                                      /*include_profile_user_name=*/false);
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- void AddCrowdstrikeSignalsToEvent(
-     base::Value::Dict& event,
-@@ -194,7 +194,7 @@ std::string RealtimeReportingClient::Get
-   username_ =
-       identity_manager_ ? GetProfileEmail(identity_manager_) : std::string();
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (username_.empty()) {
-     username_ = Profile::FromBrowserContext(context_)->GetPrefs()->GetString(
-         enterprise_signin::prefs::kProfileUserEmail);
-@@ -246,7 +246,7 @@ std::string RealtimeReportingClient::Get
-   return client_id;
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet)
- void RealtimeReportingClient::MaybeCollectDeviceSignalsAndReportEvent(
-     ::chrome::cros::reporting::proto::Event event,
-     policy::CloudPolicyClient* client,
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
deleted file mode 100644
index fee9de026b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
-@@ -19,7 +19,7 @@
- #include "components/keyed_service/core/keyed_service.h"
- #include "components/policy/core/common/cloud/cloud_policy_client.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/device_signals/core/browser/signals_types.h"
- #endif
- 
-@@ -113,7 +113,7 @@ class RealtimeReportingClient : public R
-       const std::string& dm_token) override;
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet)
-   // DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...).
-   void MaybeCollectDeviceSignalsAndReportEventDeprecated(
-       base::Value::Dict event,
-@@ -163,7 +163,7 @@ class RealtimeReportingClient : public R
-   base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this};
- };
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Populate event dict with CrowdStrike signal values. If those signals are
- // available in `response`, this function returns a Dict with the following
- // fields added:
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc b/chromium-next/patches/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
deleted file mode 100644
index e5a75a64af..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
-@@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileA
-   // TODO(crbug.com/40267996): Add actual domains with attribute names.
-   profile_attributes->insert(std::make_pair(
-       "supported.test",
--      SAMLProfileAttributes("placeholderName", "placeholderDomain",
--                            "placeholderToken")));
-+      SAMLProfileAttributes(SAMLProfileAttributes{"placeholderName", "placeholderDomain",
-+                            "placeholderToken"})));
- 
-   // Extract domains and attributes from the command line switch.
-   const base::CommandLine& command_line =
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc b/chromium-next/patches/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
deleted file mode 100644
index 8ad69fc26b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc
-@@ -11,7 +11,7 @@
- #include "chrome/browser/profiles/profile_manager.h"
- #include "components/policy/core/common/remote_commands/remote_command_job.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.h"
- #include "chrome/browser/policy/chrome_browser_policy_connector.h"
- #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
-@@ -30,7 +30,7 @@ CBCMRemoteCommandsFactory::BuildJobForTy
-         g_browser_process->profile_manager());
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (type == enterprise_management::
-                   RemoteCommand_Type_BROWSER_ROTATE_ATTESTATION_CREDENTIAL) {
-     return std::make_unique<RotateAttestationCredentialJob>(
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc b/chromium-next/patches/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
deleted file mode 100644
index 4d6c142175..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/signals/context_info_fetcher.cc
-@@ -179,6 +179,8 @@ std::vector<std::string> ContextInfoFetc
- SettingValue ContextInfoFetcher::GetOSFirewall() {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-   return device_signals::GetOSFirewall();
-+#elif BUILDFLAG(IS_OPENBSD)
-+  return SettingValue::ENABLED;
- #elif BUILDFLAG(IS_CHROMEOS)
-   return GetChromeosFirewall();
- #else
-@@ -198,7 +200,7 @@ ScopedUfwConfigPathForTesting::~ScopedUf
- #endif  // BUILDFLAG(IS_LINUX)
- 
- std::vector<std::string> ContextInfoFetcher::GetDnsServers() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   return device_signals::GetSystemDnsServers();
- #else
-   return std::vector<std::string>();
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/chromium-next/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
deleted file mode 100644
index 95f94aaea2..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/signals/device_info_fetcher.cc
-@@ -10,7 +10,7 @@
- #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h"
- #elif BUILDFLAG(IS_WIN)
- #include "chrome/browser/enterprise/signals/device_info_fetcher_win.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
- #endif
- 
-@@ -76,7 +76,7 @@ std::unique_ptr<DeviceInfoFetcher> Devic
-   return CreateInstanceInternal();
- }
- 
--#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && \
-+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) && \
-     !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
- // static
- std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::CreateInstanceInternal() {
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h b/chromium-next/patches/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
deleted file mode 100644
index aaf22e9fd5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/signin/enterprise_signin_service.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/signin/enterprise_signin_service.h
-@@ -9,7 +9,7 @@
- 
- #include "build/build_config.h"
- 
--#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN))
-+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))
- #error EnterpriseSigninService should only be built on desktop platforms.
- #endif  // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN))
- 
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc b/chromium-next/patches/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
deleted file mode 100644
index c2062b8ff2..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc
-@@ -94,7 +94,7 @@ void ManagedProfileRequiredPage::Command
- 
-   switch (cmd) {
-     case security_interstitials::CMD_DONT_PROCEED:
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       if (ManagedProfileRequiredNavigationThrottle::IsBlockingNavigations(
-               web_contents()->GetBrowserContext())) {
-         ManagedProfileRequiredNavigationThrottle::ShowBlockedWindow(
diff --git a/chromium-next/patches/patch-chrome_browser_enterprise_util_managed__browser__utils.cc b/chromium-next/patches/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
deleted file mode 100644
index cbc5b1622e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/util/managed_browser_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/enterprise/util/managed_browser_utils.cc
-@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Pr
-       profile_manager->GetProfileAttributesStorage()
-           .GetProfileAttributesWithPath(profile->GetPath());
-   if (entry) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     SetEnterpriseProfileLabel(profile);
- #endif
-     entry->SetUserAcceptedAccountManagement(accepted);
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_BUILD.gn b/chromium-next/patches/patch-chrome_browser_extensions_BUILD.gn
deleted file mode 100644
index f18568daa4..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/BUILD.gn
-@@ -1464,6 +1464,10 @@ source_set("extensions") {
-       deps += [ "//chrome/services/printing/public/mojom" ]
-     }
- 
-+    if (is_bsd) {
-+      sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ]
-+    }
-+
-     if (enable_pdf) {
-       deps += [
-         "//chrome/browser/pdf",
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
deleted file mode 100644
index 88ff230284..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
-@@ -24,7 +24,7 @@
- #include "base/win/registry.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/environment.h"
- #include "base/nix/xdg_util.h"
- #endif
-@@ -255,7 +255,7 @@ base::FilePath GetEndpointVerificationDi
-   bool got_path = false;
- #if BUILDFLAG(IS_WIN)
-   got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<base::Environment> env(base::Environment::Create());
-   path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
-                                     base::nix::kDotConfigDir);
-@@ -266,7 +266,7 @@ base::FilePath GetEndpointVerificationDi
-   if (!got_path)
-     return path;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   path = path.AppendASCII("google");
- #else
-   path = path.AppendASCII("Google");
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
deleted file mode 100644
index 610242deb3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc
-@@ -8,7 +8,7 @@
- 
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- #include <memory>
- #include <utility>
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
deleted file mode 100644
index 8785c2872c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h
-@@ -7,7 +7,7 @@
- 
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- #include <optional>
- #include <vector>
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
deleted file mode 100644
index 52e2511c40..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
-@@ -40,7 +40,7 @@
- #include "components/reporting/util/statusor.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include <optional>
- 
- #include "base/strings/string_util.h"
-@@ -156,7 +156,7 @@ api::enterprise_reporting_private::Conte
- }
- 
- bool AllowClientCertificateReportingForUsers() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(
-       enterprise_signals::features::kAllowClientCertificateReportingForUsers);
- #else
-@@ -169,7 +169,7 @@ bool IsProfilePrefManaged(Profile* profi
-   return pref && pref->IsManaged();
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- device_signals::SignalsAggregationRequest CreateAggregationRequest(
-     device_signals::SignalName signal_name) {
-@@ -231,7 +231,7 @@ EnterpriseReportingPrivateGetDeviceIdFun
- 
- // getPersistentSecret
- 
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- 
- EnterpriseReportingPrivateGetPersistentSecretFunction::
-     EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
-@@ -671,7 +671,7 @@ void EnterpriseReportingPrivateEnqueueRe
- }
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- // getFileSystemInfo
- 
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
deleted file mode 100644
index 40b3a3abe9..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
-@@ -20,7 +20,7 @@
- #include "components/reporting/proto/synced/record.pb.h"
- #include "components/reporting/proto/synced/record_constants.pb.h"
- #include "components/reporting/util/statusor.h"
--#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/time/time.h"
- #include "components/device_signals/core/browser/signals_types.h"
- #endif  // BUILDFLAG(IS_CHROMEOS)
-@@ -56,7 +56,7 @@ class EnterpriseReportingPrivateGetDevic
-   ~EnterpriseReportingPrivateGetDeviceIdFunction() override;
- };
- 
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- 
- class EnterpriseReportingPrivateGetPersistentSecretFunction
-     : public ExtensionFunction {
-@@ -266,7 +266,7 @@ class EnterpriseReportingPrivateEnqueueR
- 
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- class EnterpriseReportingPrivateGetFileSystemInfoFunction
-     : public ExtensionFunction {
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
deleted file mode 100644
index c38c63a00e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
-@@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<
- 
- void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
-   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+#if !BUILDFLAG(IS_BSD)
-   if (g_test_device_list.Get().get() != nullptr) {
-     base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
-         FROM_HERE,
-@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDev
-        base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
-       base::BindOnce(&RemovableStorageProvider::PopulateDeviceList),
-       std::move(callback));
-+#else
-+  NOTIMPLEMENTED();
-+#endif
- }
- 
- // static
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
deleted file mode 100644
index 4c08779aec..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
-@@ -410,7 +410,7 @@ bool ChromeManagementAPIDelegate::Launch
-   apps::LaunchContainer launch_container =
-       GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
-   Profile* profile = Profile::FromBrowserContext(context);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (extensions::IsExtensionUnsupportedDeprecatedApp(profile,
-                                                       extension->id())) {
-     return false;
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
deleted file mode 100644
index a32b0c479a..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/messaging/launch_context_posix.cc
-@@ -84,7 +84,7 @@ std::optional<LaunchContext::ProcessStat
- 
-   options.current_directory = command_line.GetProgram().DirName();
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Don't use no_new_privs mode, e.g. in case the host needs to use sudo.
-   options.allow_new_privs = true;
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
deleted file mode 100644
index 9584db9b1b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
-@@ -634,7 +634,7 @@ void PasswordsPrivateDelegateImpl::OnFet
- }
- 
- void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   PasswordsPrivateEventRouter* router =
-       PasswordsPrivateEventRouterFactory::GetForProfile(profile_);
-   if (router) {
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
deleted file mode 100644
index 862596fe83..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -292,7 +292,11 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
-   } else if (strcmp(os, "linux") == 0) {
-     info->os = extensions::api::runtime::PlatformOs::kLinux;
-   } else if (strcmp(os, "openbsd") == 0) {
--    info->os = extensions::api::runtime::PlatformOs::kOpenbsd;
-+    info->os = extensions::api::runtime::PlatformOs::kLinux;
-+  } else if (strcmp(os, "freebsd") == 0) {
-+    info->os = extensions::api::runtime::PlatformOs::kLinux;
-+  } else if (strcmp(os, "netbsd") == 0) {
-+    info->os = extensions::api::runtime::PlatformOs::kLinux;
-   } else {
-     NOTREACHED() << "Platform not supported: " << os;
-   }
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
deleted file mode 100644
index 9b00f361a2..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
-   (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] =
-       settings_api::PrefType::kBoolean;
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] =
-       settings_api::PrefType::kBoolean;
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -214,7 +214,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
-   (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] =
-       settings_api::PrefType::kBoolean;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
-       settings_api::PrefType::kBoolean;
- #endif
-@@ -226,7 +226,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
-   (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
-   (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList;
-   (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   (*s_allowlist)[::prefs::kSystemTheme] = settings_api::PrefType::kNumber;
- #endif
-   (*s_allowlist)[::prefs::kHomePage] = settings_api::PrefType::kUrl;
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
deleted file mode 100644
index 56032b7ddc..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/tabs/tabs_api.cc
-@@ -932,7 +932,7 @@ ExtensionFunction::ResponseAction Window
- // created as minimized.
- // TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
- // TODO(crbug.com/40254339): Find a fix for wayland as well.
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   if (new_window->initial_show_state() ==
-       ui::mojom::WindowShowState::kMinimized) {
-     new_window->window()->Minimize();
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
deleted file mode 100644
index c021a856e0..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
-@@ -28,7 +28,7 @@
- #include "extensions/browser/process_manager.h"
- #include "extensions/common/error_utils.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "extensions/common/permissions/permissions_data.h"
- #endif
- 
-@@ -37,7 +37,7 @@ namespace {
- bool CanEnableAudioDebugRecordingsFromExtension(
-     const extensions::Extension* extension) {
-   bool enabled_by_permissions = false;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (extension) {
-     enabled_by_permissions =
-         extension->permissions_data()->active_permissions().HasAPIPermission(
-@@ -575,7 +575,7 @@ void WebrtcLoggingPrivateStartEventLoggi
- 
- ExtensionFunction::ResponseAction
- WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object,
-   // this function shouldn't be called by a component extension on behalf of
-   // some web code. It returns a DirectoryEntry for use directly in the calling
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/chromium-next/patches/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
deleted file mode 100644
index 630f611bf9..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -916,7 +916,7 @@ void WebstorePrivateBeginInstallWithMani
- #if BUILDFLAG(IS_CHROMEOS)
-       RequestExtensionApproval(contents);
-       return;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-       // Shows a parental permission dialog directly bypassing the extension
-       // install dialog view. The parental permission dialog contains a superset
-       // of data from the extension install dialog: requested extension
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc b/chromium-next/patches/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc
deleted file mode 100644
index ae3ba33d2e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
-@@ -48,7 +48,7 @@ bool IsComponentExtensionAllowlisted(con
- #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
- #endif  // BUILDFLAG(IS_CHROMEOS)
-       extension_misc::kReadingModeGDocsHelperExtensionId,
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       extension_misc::kTTSEngineExtensionId,
-       extension_misc::kComponentUpdaterTTSEngineExtensionId,
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -85,7 +85,7 @@ bool IsComponentExtensionAllowlisted(int
-     case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST:
-     case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST_MV3:
-     case IDR_READING_MODE_GDOCS_HELPER_MANIFEST:
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     case IDR_TTS_ENGINE_MANIFEST:
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-     case IDR_WEBSTORE_MANIFEST:
diff --git a/chromium-next/patches/patch-chrome_browser_extensions_external__provider__impl.cc b/chromium-next/patches/patch-chrome_browser_extensions_external__provider__impl.cc
deleted file mode 100644
index 53fdccc5d2..0000000000
--- a/chromium-next/patches/patch-chrome_browser_extensions_external__provider__impl.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/external_provider_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/extensions/external_provider_impl.cc
-@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExterna
- 
- #endif  // BUILDFLAG(IS_CHROMEOS)
-   if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     provider_list->push_back(std::make_unique<ExternalProviderImpl>(
-         service,
-         base::MakeRefCounted<ExternalPrefLoader>(
-@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExterna
-         bundled_extension_creation_flags));
- 
-     // Define a per-user source of external extensions.
--#if BUILDFLAG(IS_MAC) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+#if BUILDFLAG(IS_MAC) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
-                           BUILDFLAG(CHROMIUM_BRANDING))
-     provider_list->push_back(std::make_unique<ExternalProviderImpl>(
-         service,
diff --git a/chromium-next/patches/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc b/chromium-next/patches/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
deleted file mode 100644
index 9b0e835a48..0000000000
--- a/chromium-next/patches/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc
-@@ -37,7 +37,7 @@
- #include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
- #endif
- 
-@@ -84,7 +84,7 @@ SystemLogsFetcher* BuildAboutSystemLogsF
-   fetcher->AddSource(std::make_unique<KeyboardInfoLogSource>());
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   fetcher->AddSource(std::make_unique<OzonePlatformStateDumpSource>());
- #endif  // BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc b/chromium-next/patches/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
deleted file mode 100644
index 0318ded4a9..0000000000
--- a/chromium-next/patches/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc
-@@ -44,7 +44,7 @@
- #include "services/network/public/cpp/shared_url_loader_factory.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
- #endif
- 
-@@ -101,7 +101,7 @@ SystemLogsFetcher* BuildChromeSystemLogs
-   fetcher->AddSource(std::make_unique<UiHierarchyLogSource>(scrub_data));
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   fetcher->AddSource(std::make_unique<OzonePlatformStateDumpSource>());
- #endif  // BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/chromium-next/patches/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
deleted file mode 100644
index 1de4fdbdef..0000000000
--- a/chromium-next/patches/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -357,7 +357,7 @@ const struct {
-      FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
-      kDontBlockChildren},
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-     // On Linux also block access to devices via /dev.
-     {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren},
-     // And security sensitive data in /proc and /sys.
diff --git a/chromium-next/patches/patch-chrome_browser_first__run_first__run__dialog.h b/chromium-next/patches/patch-chrome_browser_first__run_first__run__dialog.h
deleted file mode 100644
index 654ee94533..0000000000
--- a/chromium-next/patches/patch-chrome_browser_first__run_first__run__dialog.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/first_run/first_run_dialog.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/first_run/first_run_dialog.h
-@@ -9,7 +9,7 @@
- #include "build/build_config.h"
- 
- // Hide this function on platforms where the dialog does not exist.
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- namespace first_run {
- 
diff --git a/chromium-next/patches/patch-chrome_browser_first__run_first__run__internal.h b/chromium-next/patches/patch-chrome_browser_first__run_first__run__internal.h
deleted file mode 100644
index a167f6e3af..0000000000
--- a/chromium-next/patches/patch-chrome_browser_first__run_first__run__internal.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/first_run/first_run_internal.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/first_run/first_run_internal.h
-@@ -53,7 +53,7 @@ FirstRunState DetermineFirstRunState(boo
-                                      bool force_first_run,
-                                      bool no_first_run);
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // For testing, forces the first run dialog to either be shown or not. If not
- // called, the decision to show the dialog or not will be made by Chrome based
- // on a number of factors (such as install type, whether it's a Chrome-branded
diff --git a/chromium-next/patches/patch-chrome_browser_flag__descriptions.cc b/chromium-next/patches/patch-chrome_browser_flag__descriptions.cc
deleted file mode 100644
index f06a838951..0000000000
--- a/chromium-next/patches/patch-chrome_browser_flag__descriptions.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/flag_descriptions.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/flag_descriptions.cc
-@@ -602,7 +602,7 @@ const char kAutofillEnableAllowlistForBm
-     "Autofill suggestions on the allowlisted merchant websites.";
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kAutofillEnableAmountExtractionAllowlistDesktopName[] =
-     "Enable loading and querying the checkout amount extraction allowlist on "
-     "Chrome Desktop";
-@@ -626,7 +626,7 @@ const char kAutofillEnableAmountExtracti
-         // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kAutofillEnableBuyNowPayLaterName[] =
-     "Enable buy now pay later on Autofill";
- const char kAutofillEnableBuyNowPayLaterDescription[] =
-@@ -1031,7 +1031,7 @@ const char kDevicePostureDescription[] =
-     "Enables Device Posture API (foldable devices)";
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kDocumentPictureInPictureAnimateResizeName[] =
-     "Document Picture-in-Picture Animate Resize";
- const char kDocumentPictureInPictureAnimateResizeDescription[] =
-@@ -1123,7 +1123,7 @@ const char kContextMenuEmptySpaceDescrip
-     "space, a context menu containing page-related items will be shown.";
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- const char kContextualCueingName[] = "Contextual cueing";
- const char kContextualCueingDescription[] =
-     "Enables the contextual cueing system to support showing actions.";
-@@ -1563,7 +1563,7 @@ const char kEnableIsolatedWebAppDevModeN
- const char kEnableIsolatedWebAppDevModeDescription[] =
-     "Enables the installation of unverified Isolated Web Apps";
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kEnableIwaKeyDistributionComponentName[] =
-     "Enable the Iwa Key Distribution component";
- const char kEnableIwaKeyDistributionComponentDescription[] =
-@@ -3430,7 +3430,7 @@ const char kRetainOmniboxOnFocusDescript
-     "exhibit a change in behavior.";
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kRootScrollbarFollowsTheme[] = "Make scrollbar follow theme";
- const char kRootScrollbarFollowsThemeDescription[] =
-     "If enabled makes the root scrollbar follow the browser's theme color.";
-@@ -3648,7 +3648,7 @@ const char kDefaultSiteInstanceGroupsDes
-     "SiteInstance.";
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing";
- const char kPwaNavigationCapturingDescription[] =
-     "Enables opening links from Chrome in an installed PWA. Currently under "
-@@ -3863,7 +3863,7 @@ const char kTranslateForceTriggerOnEngli
-     "Force the Translate Triggering on English pages experiment to be enabled "
-     "with the selected language model active.";
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kEnableHistorySyncOptinName[] = "History Sync Opt-in";
- const char kEnableHistorySyncOptinDescription[] =
-     "Enables the History Sync Opt-in screen on Desktop platforms. The screen "
-@@ -5451,7 +5451,7 @@ const char kTranslateOpenSettingsDescrip
-     "Add an option to the translate bubble menu to open language settings.";
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- const char kWasmTtsComponentUpdaterEnabledName[] =
-     "Enable Wasm TTS Extension Component";
- const char kWasmTtsComponentUpdaterEnabledDescription[] =
-@@ -7459,7 +7459,7 @@ const char kTetheringExperimentalFunctio
- 
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
- const char kGetAllScreensMediaDescription[] =
-     "When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -7688,7 +7688,7 @@ const char kEnableArmHwdrmDescription[] 
- 
- // Linux -----------------------------------------------------------------------
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kOzonePlatformHintChoiceDefault[] = "Default";
- const char kOzonePlatformHintChoiceAuto[] = "Auto";
- const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -7738,6 +7738,20 @@ const char kWaylandUiScalingDescription[
-     "Enable experimental support for text scaling in the Wayland backend "
-     "backed by full UI scaling. Requires #wayland-per-window-scaling to be "
-     "enabled too.";
-+
-+#if BUILDFLAG(IS_BSD)
-+const char kAudioBackendName[] =
-+    "Audio Backend";
-+const char kAudioBackendDescription[] =
-+#if BUILDFLAG(IS_OPENBSD)
-+    "Select the desired audio backend to use. The default is sndio.";
-+#elif BUILDFLAG(IS_NETBSD)
-+    "Select the desired audio backend to use. The default is audioio.";
-+#elif BUILDFLAG(IS_FREEBSD)
-+    "Select the desired audio backend to use. The default will automatically "
-+    "enumerate through the supported backends.";
-+#endif
-+#endif
- #endif  // BUILDFLAG(IS_LINUX)
- 
- // Random platform combinations -----------------------------------------------
-@@ -7750,7 +7764,7 @@ const char kZeroCopyVideoCaptureDescript
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
- const char kFollowingFeedSidepanelDescription[] =
-     "Enables the following feed in the sidepanel.";
-@@ -7793,7 +7807,7 @@ const char kGroupPromoPrototypeName[] = 
- const char kGroupPromoPrototypeDescription[] =
-     "Enables prototype for group promo.";
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kEnableNetworkServiceSandboxName[] =
-     "Enable the network service sandbox.";
- const char kEnableNetworkServiceSandboxDescription[] =
-@@ -7825,7 +7839,7 @@ const char kWebBluetoothConfirmPairingSu
-     "Bluetooth";
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(ENABLE_PRINTING)
- const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend";
- const char kCupsIppPrintingBackendDescription[] =
-@@ -7967,7 +7981,7 @@ const char kElementCaptureDescription[] 
-     "media track into a track capturing just a specific DOM element.";
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- const char kUIDebugToolsName[] = "Debugging tools for UI";
- const char kUIDebugToolsDescription[] =
-     "Enables additional keyboard shortcuts to help debugging.";
-@@ -8018,7 +8032,7 @@ const char kComposeUpfrontInputModesDesc
-     "Enables upfront input modes in the Compose dialog";
- #endif  // BUILDFLAG(ENABLE_COMPOSE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- const char kThirdPartyProfileManagementName[] =
-     "Third party profile management";
- const char kThirdPartyProfileManagementDescription[] =
-@@ -8154,7 +8168,7 @@ const char kSupervisedUserBlockInterstit
- const char kSupervisedUserBlockInterstitialV3Description[] =
-     "Enables URL filter interstitial V3 for Family Link users.";
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- const char kSupervisedProfileHideGuestName[] = "Supervised Profile Hide Guest";
- const char kSupervisedProfileHideGuestDescription[] =
-     "Hides Guest Profile entry points for supervised users";
diff --git a/chromium-next/patches/patch-chrome_browser_flag__descriptions.h b/chromium-next/patches/patch-chrome_browser_flag__descriptions.h
deleted file mode 100644
index 7451a82428..0000000000
--- a/chromium-next/patches/patch-chrome_browser_flag__descriptions.h
+++ /dev/null
@@ -1,171 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/flag_descriptions.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/flag_descriptions.h
-@@ -373,7 +373,7 @@ extern const char
-     kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[];
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[];
- extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[];
- extern const char kAutofillEnableAmountExtractionDesktopName[];
-@@ -384,7 +384,7 @@ extern const char kAutofillEnableAmountE
-         // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kAutofillEnableBuyNowPayLaterName[];
- extern const char kAutofillEnableBuyNowPayLaterDescription[];
- 
-@@ -602,7 +602,7 @@ extern const char kContextMenuEmptySpace
- extern const char kContextMenuEmptySpaceDescription[];
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- extern const char kContextualCueingName[];
- extern const char kContextualCueingDescription[];
- extern const char kGlicZeroStateSuggestionsName[];
-@@ -786,7 +786,7 @@ extern const char kDevicePostureName[];
- extern const char kDevicePostureDescription[];
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kDocumentPictureInPictureAnimateResizeName[];
- extern const char kDocumentPictureInPictureAnimateResizeDescription[];
- 
-@@ -948,7 +948,7 @@ extern const char kEnableIsolatedWebAppA
- extern const char kEnableIsolatedWebAppDevModeName[];
- extern const char kEnableIsolatedWebAppDevModeDescription[];
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kEnableIwaKeyDistributionComponentName[];
- extern const char kEnableIwaKeyDistributionComponentDescription[];
- #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -1964,7 +1964,7 @@ extern const char kRetainOmniboxOnFocusN
- extern const char kRetainOmniboxOnFocusDescription[];
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kRootScrollbarFollowsTheme[];
- extern const char kRootScrollbarFollowsThemeDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-@@ -2096,7 +2096,7 @@ extern const char kDefaultSiteInstanceGr
- extern const char kDefaultSiteInstanceGroupsDescription[];
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kPwaNavigationCapturingName[];
- extern const char kPwaNavigationCapturingDescription[];
- #endif
-@@ -2242,7 +2242,7 @@ extern const char kTouchTextEditingRedes
- extern const char kTranslateForceTriggerOnEnglishName[];
- extern const char kTranslateForceTriggerOnEnglishDescription[];
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kEnableHistorySyncOptinName[];
- extern const char kEnableHistorySyncOptinDescription[];
- 
-@@ -3197,7 +3197,7 @@ extern const char kTranslateOpenSettings
- extern const char kTranslateOpenSettingsDescription[];
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- extern const char kWasmTtsComponentUpdaterEnabledName[];
- extern const char kWasmTtsComponentUpdaterEnabledDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -4385,7 +4385,7 @@ extern const char kTetheringExperimental
- 
- #endif  // #if BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kGetAllScreensMediaName[];
- extern const char kGetAllScreensMediaDescription[];
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4520,7 +4520,7 @@ extern const char kEnableArmHwdrmDescrip
- 
- // Linux ---------------------------------------------------------------------
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kOzonePlatformHintChoiceDefault[];
- extern const char kOzonePlatformHintChoiceAuto[];
- extern const char kOzonePlatformHintChoiceX11[];
-@@ -4551,6 +4551,9 @@ extern const char kWaylandTextInputV3Des
- 
- extern const char kWaylandUiScalingName[];
- extern const char kWaylandUiScalingDescription[];
-+
-+extern const char kAudioBackendName[];
-+extern const char kAudioBackendDescription[];
- #endif  // BUILDFLAG(IS_LINUX)
- 
- // Random platform combinations -----------------------------------------------
-@@ -4570,7 +4573,7 @@ extern const char kWebBluetoothConfirmPa
- extern const char kWebBluetoothConfirmPairingSupportDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(ENABLE_PRINTING)
- extern const char kCupsIppPrintingBackendName[];
- extern const char kCupsIppPrintingBackendDescription[];
-@@ -4583,7 +4586,7 @@ extern const char kScreenlockReauthCardD
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kFollowingFeedSidepanelName[];
- extern const char kFollowingFeedSidepanelDescription[];
- 
-@@ -4600,7 +4603,7 @@ extern const char kTaskManagerDesktopRef
- extern const char kTaskManagerDesktopRefreshDescription[];
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kEnableNetworkServiceSandboxName[];
- extern const char kEnableNetworkServiceSandboxDescription[];
- 
-@@ -4695,7 +4698,7 @@ extern const char kElementCaptureName[];
- extern const char kElementCaptureDescription[];
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- extern const char kUIDebugToolsName[];
- extern const char kUIDebugToolsDescription[];
- #endif
-@@ -4734,7 +4737,7 @@ extern const char kComposeUpfrontInputMo
- extern const char kComposeUpfrontInputModesDescription[];
- #endif  // BUILDFLAG(ENABLE_COMPOSE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- extern const char kThirdPartyProfileManagementName[];
- extern const char kThirdPartyProfileManagementDescription[];
- 
-@@ -4814,7 +4817,7 @@ extern const char kEnablePolicyPromotion
- extern const char kSupervisedUserBlockInterstitialV3Name[];
- extern const char kSupervisedUserBlockInterstitialV3Description[];
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- extern const char kSupervisedProfileHideGuestName[];
- extern const char kSupervisedProfileHideGuestDescription[];
- 
diff --git a/chromium-next/patches/patch-chrome_browser_gcm_gcm__profile__service__factory.cc b/chromium-next/patches/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
deleted file mode 100644
index e3bc48b1bc..0000000000
--- a/chromium-next/patches/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/gcm/gcm_profile_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/gcm/gcm_profile_service_factory.cc
-@@ -110,7 +110,7 @@ GCMProfileServiceFactory::ScopedTestingF
- // static
- GCMProfileService* GCMProfileServiceFactory::GetForProfile(
-     content::BrowserContext* profile) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On desktop, incognito profiles are checked with IsIncognitoProfile().
-   // It's possible for non-incognito profiles to also be off-the-record.
-   bool is_profile_supported =
-@@ -153,7 +153,7 @@ std::unique_ptr<KeyedService>
- GCMProfileServiceFactory::BuildServiceInstanceForBrowserContext(
-     content::BrowserContext* context) const {
-   Profile* profile = Profile::FromBrowserContext(context);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   DCHECK(!profile->IsIncognitoProfile());
- #else
-   DCHECK(!profile->IsOffTheRecord());
diff --git a/chromium-next/patches/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc b/chromium-next/patches/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
deleted file mode 100644
index 20a58e9f47..0000000000
--- a/chromium-next/patches/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
-@@ -16,7 +16,7 @@ namespace instance_id {
- // static
- InstanceIDProfileService* InstanceIDProfileServiceFactory::GetForProfile(
-     content::BrowserContext* profile) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On desktop, the guest profile is actually the primary OTR profile of
-   // the "regular" guest profile.  The regular guest profile is never used
-   // directly by users.  Also, user are not able to create child OTR profiles
-@@ -65,7 +65,7 @@ std::unique_ptr<KeyedService>
- InstanceIDProfileServiceFactory::BuildServiceInstanceForBrowserContext(
-     content::BrowserContext* context) const {
-   Profile* profile = Profile::FromBrowserContext(context);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On desktop, incognito profiles are checked with IsIncognitoProfile().
-   // It's possible for non-incognito profiles to also be off-the-record.
-   bool is_incognito = profile->IsIncognitoProfile();
diff --git a/chromium-next/patches/patch-chrome_browser_global__features.cc b/chromium-next/patches/patch-chrome_browser_global__features.cc
deleted file mode 100644
index 0e35d6ef83..0000000000
--- a/chromium-next/patches/patch-chrome_browser_global__features.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/global_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/global_features.cc
-@@ -22,7 +22,7 @@
- #include "chrome/browser/glic/host/glic_synthetic_trial_manager.h"  // nogncheck
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // This causes a gn error on Android builds, because gn does not understand
- // buildflags, so we include it only on platforms where it is used.
- #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h"
-@@ -61,7 +61,7 @@ void GlobalFeatures::ReplaceGlobalFeatur
- 
- void GlobalFeatures::Init() {
-   system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle();
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   whats_new_registry_ = CreateWhatsNewRegistry();
- #endif
- 
-@@ -93,7 +93,7 @@ GlobalFeatures::CreateSystemPermissionsP
-   return system_permission_settings::PlatformHandle::Create();
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::unique_ptr<whats_new::WhatsNewRegistry>
- GlobalFeatures::CreateWhatsNewRegistry() {
-   return whats_new::CreateWhatsNewRegistry();
diff --git a/chromium-next/patches/patch-chrome_browser_global__features.h b/chromium-next/patches/patch-chrome_browser_global__features.h
deleted file mode 100644
index 5609e39735..0000000000
--- a/chromium-next/patches/patch-chrome_browser_global__features.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/global_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/global_features.h
-@@ -14,7 +14,7 @@
- namespace system_permission_settings {
- class PlatformHandle;
- }  // namespace system_permission_settings
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- namespace whats_new {
- class WhatsNewRegistry;
- }  // namespace whats_new
-@@ -56,7 +56,7 @@ class GlobalFeatures {
-   system_permissions_platform_handle() {
-     return system_permissions_platform_handle_.get();
-   }
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   whats_new::WhatsNewRegistry* whats_new_registry() {
-     return whats_new_registry_.get();
-   }
-@@ -85,7 +85,7 @@ class GlobalFeatures {
- 
-   virtual std::unique_ptr<system_permission_settings::PlatformHandle>
-   CreateSystemPermissionsPlatformHandle();
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry();
- #endif
- 
-@@ -95,7 +95,7 @@ class GlobalFeatures {
- 
-   std::unique_ptr<system_permission_settings::PlatformHandle>
-       system_permissions_platform_handle_;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<whats_new::WhatsNewRegistry> whats_new_registry_;
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_headless_headless__mode__util.cc b/chromium-next/patches/patch-chrome_browser_headless_headless__mode__util.cc
deleted file mode 100644
index 91abbd7d3e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_headless_headless__mode__util.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/headless/headless_mode_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/headless/headless_mode_util.cc
-@@ -10,7 +10,7 @@
- // New headless mode is available on Linux, Windows and Mac platforms.
- // More platforms will be added later, so avoid function level clutter
- // by providing stub implementations at the end of the file.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- 
- #include "base/base_switches.h"
- #include "base/files/file_path.h"
-@@ -20,7 +20,7 @@
- #include "content/public/common/content_switches.h"
- #include "ui/base/ui_base_switches.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/gl/gl_switches.h"               // nogncheck
- #include "ui/ozone/public/ozone_switches.h"  // nogncheck
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -95,7 +95,7 @@ class HeadlessModeHandleImpl : public He
-       }
-     }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Headless mode on Linux relies on ozone/headless platform.
-   command_line->AppendSwitchASCII(::switches::kOzonePlatform,
-                                   switches::kHeadless);
diff --git a/chromium-next/patches/patch-chrome_browser_intranet__redirect__detector.h b/chromium-next/patches/patch-chrome_browser_intranet__redirect__detector.h
deleted file mode 100644
index 13156965c0..0000000000
--- a/chromium-next/patches/patch-chrome_browser_intranet__redirect__detector.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/intranet_redirect_detector.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/intranet_redirect_detector.h
-@@ -25,7 +25,7 @@ class SimpleURLLoader;
- class PrefRegistrySimple;
- 
- #if !(BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
--      BUILDFLAG(IS_CHROMEOS))
-+      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- #error "IntranetRedirectDetector should only be built on Desktop platforms."
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/chromium-next/patches/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
deleted file mode 100644
index 49dfecd929..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
-@@ -40,10 +40,12 @@ void MTPDeviceMapService::RegisterMTPFil
-     // Note that this initializes the delegate asynchronously, but since
-     // the delegate will only be used from the IO thread, it is guaranteed
-     // to be created before use of it expects it to be there.
-+#if !BUILDFLAG(IS_BSD) 
-     CreateMTPDeviceAsyncDelegate(
-         device_location, read_only,
-         base::BindOnce(&MTPDeviceMapService::AddAsyncDelegate,
-                        base::Unretained(this), device_location, read_only));
-+#endif
-     mtp_device_usage_map_[key] = 0;
-   }
- 
diff --git a/chromium-next/patches/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/chromium-next/patches/patch-chrome_browser_media__galleries_media__file__system__registry.cc
deleted file mode 100644
index d1308d62d8..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media__galleries_media__file__system__registry.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -583,7 +583,12 @@ class MediaFileSystemRegistry::MediaFile
- // Constructor in 'private' section because depends on private class definition.
- MediaFileSystemRegistry::MediaFileSystemRegistry()
-     : file_system_context_(new MediaFileSystemContextImpl) {
--  StorageMonitor::GetInstance()->AddObserver(this);
-+  /*
-+   * This conditional is needed for shutdown.  Destructors
-+   * try to get the media file system registry.
-+   */
-+  if (StorageMonitor::GetInstance())
-+    StorageMonitor::GetInstance()->AddObserver(this);
- }
- 
- MediaFileSystemRegistry::~MediaFileSystemRegistry() {
diff --git a/chromium-next/patches/patch-chrome_browser_media_audio__service__util.cc b/chromium-next/patches/patch-chrome_browser_media_audio__service__util.cc
deleted file mode 100644
index 5ab03e2df5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_audio__service__util.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/audio_service_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/audio_service_util.cc
-@@ -20,7 +20,7 @@
- 
- namespace {
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const base::Value* GetPolicy(const char* policy_name) {
-   const policy::PolicyMap& policies =
-       g_browser_process->browser_policy_connector()
-@@ -39,7 +39,7 @@ bool GetPolicyOrFeature(const char* poli
- }  // namespace
- 
- bool IsAudioServiceSandboxEnabled() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return GetPolicyOrFeature(policy::key::kAudioSandboxEnabled,
-                             features::kAudioServiceSandbox);
- #else
diff --git a/chromium-next/patches/patch-chrome_browser_media_router_discovery_BUILD.gn b/chromium-next/patches/patch-chrome_browser_media_router_discovery_BUILD.gn
deleted file mode 100644
index 7be7e48c3e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_router_discovery_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/router/discovery/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/router/discovery/BUILD.gn
-@@ -79,7 +79,7 @@ static_library("discovery") {
-   ]
-   configs += [ "//build/config/compiler:wexit_time_destructors" ]
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [ "discovery_network_list_wifi_linux.cc" ]
-   }
- 
diff --git a/chromium-next/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc b/chromium-next/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
deleted file mode 100644
index fc6c462c6d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc
-@@ -10,11 +10,12 @@
- #include "chrome/browser/media/router/discovery/discovery_network_list.h"
- 
- #include <ifaddrs.h>
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <sys/time.h>
- #include <net/if.h>
- #include <net/if_arp.h>
- #include <netinet/in.h>
--#include <sys/socket.h>
--#include <sys/types.h>
- 
- #include <algorithm>
- 
-@@ -23,7 +24,7 @@
- #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h"
- #include "net/base/net_errors.h"
- 
--#if !BUILDFLAG(IS_MAC)
-+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
- #include <netpacket/packet.h>
- #else
- #include <net/if_dl.h>
-@@ -32,7 +33,7 @@
- namespace media_router {
- namespace {
- 
--#if !BUILDFLAG(IS_MAC)
-+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
- using sll = struct sockaddr_ll;
- #define SOCKET_ARP_TYPE(s) ((s)->sll_hatype)
- #define SOCKET_ADDRESS_LEN(s) ((s)->sll_halen)
-@@ -45,6 +46,12 @@ using sll = struct sockaddr_dl;
- #define SOCKET_ADDRESS(s) (LLADDR(s))
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) {
-+  return false;
-+}
-+#endif
-+
- void GetDiscoveryNetworkInfoListImpl(
-     const struct ifaddrs* if_list,
-     std::vector<DiscoveryNetworkInfo>* network_info_list) {
diff --git a/chromium-next/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc b/chromium-next/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
deleted file mode 100644
index 6510afc080..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc
-@@ -9,7 +9,11 @@
- 
- #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h"
- 
-+#include "build/build_config.h"
-+
-+#if !BUILDFLAG(IS_BSD)
- #include <linux/wireless.h>
-+#endif
- #include <string.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-@@ -24,6 +28,7 @@ namespace media_router {
- bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) {
-   DCHECK(ssid_out);
- 
-+#if !BUILDFLAG(IS_BSD)
-   base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
-   if (!ioctl_socket.is_valid()) {
-     // AF_INET is for IPv4, so it may fail for IPv6-only hosts even when there
-@@ -46,6 +51,7 @@ bool MaybeGetWifiSSID(const std::string&
-     ssid_out->assign(ssid);
-     return true;
-   }
-+#endif
-   return false;
- }
- 
diff --git a/chromium-next/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/chromium-next/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
deleted file mode 100644
index afbe6e588b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
-@@ -21,7 +21,7 @@
- #if BUILDFLAG(IS_CHROMEOS)
- #include "ash/shell.h"
- #include "ui/aura/window.h"
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/functional/callback.h"
- #include "content/public/browser/desktop_capture.h"
- #endif
-@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<raw_ptr<a
-     DestructorAtExit root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
- }  // namespace
- 
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- namespace {
- base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit
-     g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER;
-@@ -79,7 +79,7 @@ blink::mojom::StreamDevicesSetPtr Enumer
-   return stream_devices_set;
- }
- 
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- blink::mojom::StreamDevicesSetPtr EnumerateScreens(
-     blink::mojom::MediaStreamType stream_type) {
-   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-@@ -130,7 +130,7 @@ void ChromeScreenEnumerator::SetRootWind
-   root_windows_for_testing_.Get() = std::move(root_windows);
- }
- 
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
-     std::unique_ptr<webrtc::DesktopCapturer> capturer) {
-   g_desktop_capturer_for_testing.Get() = std::move(capturer);
-@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateSc
-     ScreensCallback screens_callback) const {
-   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
-       FROM_HERE, base::BindOnce(::EnumerateScreens, stream_type),
-       base::BindOnce(
diff --git a/chromium-next/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h b/chromium-next/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
deleted file mode 100644
index bae4618e15..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/webrtc/chrome_screen_enumerator.h
-@@ -18,7 +18,7 @@
- namespace aura {
- class Window;
- }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- namespace webrtc {
- class DesktopCapturer;
- }
-@@ -39,7 +39,7 @@ class ChromeScreenEnumerator : public me
- #if BUILDFLAG(IS_CHROMEOS)
-   static void SetRootWindowsForTesting(
-       std::vector<raw_ptr<aura::Window, VectorExperimental>> root_windows);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   static void SetDesktopCapturerForTesting(
-       std::unique_ptr<webrtc::DesktopCapturer> capturer);
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc b/chromium-next/patches/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
deleted file mode 100644
index caf72940c5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/webrtc/desktop_media_picker_controller.cc
-@@ -89,7 +89,7 @@ bool DesktopMediaPickerController::IsSys
- #if BUILDFLAG(IS_MAC)
-  return request_source == Params::RequestSource::kCast ||
-      base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (request_source == Params::RequestSource::kCast) {
-     return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast);
-   } else {
diff --git a/chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
deleted file mode 100644
index 1e42bd5eb5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -105,7 +105,7 @@ std::string GetLogUploadProduct() {
-   const char product[] = "Chrome";
- #elif BUILDFLAG(IS_MAC)
-   const char product[] = "Chrome_Mac";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #if !defined(ADDRESS_SANITIZER)
-   const char product[] = "Chrome_Linux";
- #else
diff --git a/chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
deleted file mode 100644
index 99086310aa..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
-@@ -25,10 +25,10 @@
- #include "components/webrtc_logging/browser/text_log_list.h"
- #include "content/public/browser/render_process_host.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/public/browser/child_process_security_policy.h"
- #include "storage/browser/file_system/isolated_context.h"
--#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- using webrtc_event_logging::WebRtcEventLogManager;
- 
-@@ -304,7 +304,7 @@ void WebRtcLoggingController::StartEvent
-       web_app_id, callback);
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void WebRtcLoggingController::GetLogsDirectory(
-     LogsDirectoryCallback callback,
-     LogsDirectoryErrorCallback error_callback) {
-@@ -350,7 +350,7 @@ void WebRtcLoggingController::GrantLogsD
-       FROM_HERE,
-       base::BindOnce(std::move(callback), file_system.id(), registered_name));
- }
--#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- void WebRtcLoggingController::OnRtpPacket(
-     base::HeapArray<uint8_t> packet_header,
diff --git a/chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
deleted file mode 100644
index 85ccec2b0e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/media/webrtc/webrtc_logging_controller.h
-@@ -133,7 +133,7 @@ class WebRtcLoggingController
-                          size_t web_app_id,
-                          const StartEventLoggingCallback& callback);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Ensures that the WebRTC Logs directory exists and then grants render
-   // process access to the 'WebRTC Logs' directory, and invokes |callback| with
-   // the ids necessary to create a DirectoryEntry object.
-@@ -197,7 +197,7 @@ class WebRtcLoggingController
- 
-   content::BrowserContext* GetBrowserContext() const;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Grants the render process access to the 'WebRTC Logs' directory, and
-   // invokes |callback| with the ids necessary to create a DirectoryEntry
-   // object. If the |logs_path| couldn't be created or found, |error_callback|
diff --git a/chromium-next/patches/patch-chrome_browser_memory__details.cc b/chromium-next/patches/patch-chrome_browser_memory__details.cc
deleted file mode 100644
index 25a62ee105..0000000000
--- a/chromium-next/patches/patch-chrome_browser_memory__details.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/memory_details.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/memory_details.cc
-@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUI
-           });
-     }
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
-     if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) {
-       process.process_type = content::PROCESS_TYPE_ZYGOTE;
-     }
diff --git a/chromium-next/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/chromium-next/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
deleted file mode 100644
index c23e4f74ae..0000000000
--- a/chromium-next/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -85,7 +85,7 @@
- #include "chrome/browser/flags/android/chrome_session_state.h"
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #if defined(__GLIBC__)
- #include <gnu/libc-version.h>
- #endif  // defined(__GLIBC__)
-@@ -110,7 +110,7 @@
- #include "chrome/installer/util/taskbar_util.h"
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -119,7 +119,7 @@
- #include "components/user_manager/user_manager.h"
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/power_metrics/system_power_monitor.h"
- #endif
- 
-@@ -873,7 +873,7 @@ void RecordStartupMetrics() {
- 
-   // Record whether Chrome is the default browser or not.
-   // Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   shell_integration::DefaultWebClientState default_state =
-       shell_integration::GetDefaultBrowser();
-   base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -1181,11 +1181,11 @@ void ChromeBrowserMainExtraPartsMetrics:
-       std::make_unique<web_app::SamplingMetricsProvider>();
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   pressure_metrics_reporter_ = std::make_unique<PressureMetricsReporter>();
- #endif  // BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(
-       power_metrics::SystemPowerMonitor::GetInstance());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium-next/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/chromium-next/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
deleted file mode 100644
index 395b7cdfe1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
-@@ -29,7 +29,7 @@ class PowerMetricsReporter;
- class ProcessMonitor;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- class PressureMetricsReporter;
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -126,7 +126,7 @@ class ChromeBrowserMainExtraPartsMetrics
-   std::unique_ptr<web_app::SamplingMetricsProvider> web_app_metrics_provider_;
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Reports pressure metrics.
-   std::unique_ptr<PressureMetricsReporter> pressure_metrics_reporter_;
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/chromium-next/patches/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
deleted file mode 100644
index 930aa8ebac..0000000000
--- a/chromium-next/patches/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -197,11 +197,11 @@
- #include "chrome/browser/metrics/google_update_metrics_provider_mac.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/metrics/motherboard_metrics_provider.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h"
- #endif
- 
-@@ -233,7 +233,7 @@ const int kMaxHistogramGatheringWaitDura
- // Needs to be kept in sync with the writer in
- // third_party/crashpad/crashpad/handler/handler_main.cc.
- const char kCrashpadHistogramAllocatorName[] = "CrashpadMetrics";
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- base::LazyInstance<ChromeMetricsServiceCrashReporter>::Leaky g_crash_reporter =
-     LAZY_INSTANCE_INITIALIZER;
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-@@ -537,7 +537,7 @@ void ChromeMetricsServiceClient::Registe
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
- 
- #if !BUILDFLAG(IS_CHROMEOS)
-@@ -619,7 +619,7 @@ std::string ChromeMetricsServiceClient::
- void ChromeMetricsServiceClient::OnEnvironmentUpdate(std::string* environment) {
-   // TODO(https://bugs.chromium.org/p/crashpad/issues/detail?id=135): call this
-   // on Mac when the Crashpad API supports it.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Register the environment with the crash reporter. Note that there is a
-   // window from startup to this point during which crash reports will not have
-   // an environment set.
-@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::Initial
-         std::make_unique<metrics::dwa::DwaService>(this, local_state);
-   }
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
-       base::SequencedTaskRunner::GetCurrentDefault());
- #endif
-@@ -781,7 +781,7 @@ void ChromeMetricsServiceClient::Registe
-   metrics_service_->RegisterMetricsProvider(
-       std::make_unique<metrics::CPUMetricsProvider>());
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   metrics_service_->RegisterMetricsProvider(
-       std::make_unique<metrics::MotherboardMetricsProvider>());
- #endif
-@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::Registe
-       std::make_unique<GoogleUpdateMetricsProviderMac>());
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   metrics_service_->RegisterMetricsProvider(
-       std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -974,7 +974,7 @@ void ChromeMetricsServiceClient::Registe
-       std::make_unique<PowerMetricsProvider>());
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   metrics_service_->RegisterMetricsProvider(
-       metrics::CreateDesktopSessionMetricsProvider());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
-@@ -1160,7 +1160,7 @@ bool ChromeMetricsServiceClient::Registe
-   }
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // This creates the DesktopProfileSessionDurationsServices if it didn't exist
-   // already.
-   metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
-@@ -1509,7 +1509,7 @@ void ChromeMetricsServiceClient::CreateS
-   recorder =
-       base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>(
-           cros_system_profile_provider_.get());
--#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- 
-   // Make sure that Structured Metrics recording delegates have been created
-   // before the service is created. This is handled in other places for ChromeOS
diff --git a/chromium-next/patches/patch-chrome_browser_metrics_perf_cpu__identity.cc b/chromium-next/patches/patch-chrome_browser_metrics_perf_cpu__identity.cc
deleted file mode 100644
index dcd9c124dc..0000000000
--- a/chromium-next/patches/patch-chrome_browser_metrics_perf_cpu__identity.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/metrics/perf/cpu_identity.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/metrics/perf/cpu_identity.cc
-@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() {
-   result.release =
- #if BUILDFLAG(IS_CHROMEOS)
-       base::SysInfo::KernelVersion();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       base::SysInfo::OperatingSystemVersion();
- #else
- #error "Unsupported configuration"
diff --git a/chromium-next/patches/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc b/chromium-next/patches/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
deleted file mode 100644
index 8476b42aa4..0000000000
--- a/chromium-next/patches/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/metrics/power/process_metrics_recorder_util.cc
-@@ -65,7 +65,7 @@ void RecordProcessHistograms(const char*
-                              const ProcessMonitor::Metrics& metrics) {
-   RecordAverageCPUUsage(histogram_suffix, metrics.cpu_usage);
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-   base::UmaHistogramCounts10000(
-       base::StrCat({"PerformanceMonitor.IdleWakeups2.", histogram_suffix}),
-       metrics.idle_wakeups);
diff --git a/chromium-next/patches/patch-chrome_browser_metrics_power_process__monitor.cc b/chromium-next/patches/patch-chrome_browser_metrics_power_process__monitor.cc
deleted file mode 100644
index b9b65c4d38..0000000000
--- a/chromium-next/patches/patch-chrome_browser_metrics_power_process__monitor.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/metrics/power/process_monitor.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/metrics/power/process_monitor.cc
-@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(ba
-       process_metrics.GetPlatformIndependentCPUUsage());
- 
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-   metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
- #endif
- #if BUILDFLAG(IS_MAC)
-@@ -83,7 +83,7 @@ void ScaleMetrics(ProcessMonitor::Metric
-   }
- 
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-   metrics->idle_wakeups *= factor;
- #endif
- 
-@@ -157,7 +157,7 @@ ProcessMonitor::Metrics& operator+=(Proc
-   }
- 
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-   lhs.idle_wakeups += rhs.idle_wakeups;
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_metrics_power_process__monitor.h b/chromium-next/patches/patch-chrome_browser_metrics_power_process__monitor.h
deleted file mode 100644
index ecdc47eab2..0000000000
--- a/chromium-next/patches/patch-chrome_browser_metrics_power_process__monitor.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/metrics/power/process_monitor.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/metrics/power/process_monitor.h
-@@ -76,7 +76,7 @@ class ProcessMonitor : public content::B
-     std::optional<double> cpu_usage;
- 
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_AIX)
-+    BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
-     // Returns the number of average idle cpu wakeups per second since the last
-     // time the metric was sampled.
-     int idle_wakeups = 0;
diff --git a/chromium-next/patches/patch-chrome_browser_net_profile__network__context__service.cc b/chromium-next/patches/patch-chrome_browser_net_profile__network__context__service.cc
deleted file mode 100644
index d9da664a11..0000000000
--- a/chromium-next/patches/patch-chrome_browser_net_profile__network__context__service.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/net/profile_network_context_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/net/profile_network_context_service.cc
-@@ -135,7 +135,7 @@
- #include "extensions/common/constants.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "chrome/browser/policy/chrome_browser_policy_connector.h"
- #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
-@@ -276,7 +276,7 @@ void UpdateCookieSettings(Profile* profi
-       });
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::unique_ptr<net::ClientCertStore> GetWrappedCertStore(
-     Profile* profile,
-     std::unique_ptr<net::ClientCertStore> platform_store) {
-@@ -1228,7 +1228,7 @@ ProfileNetworkContextService::CreateClie
-       std::make_unique<net::ClientCertStoreNSS>(
-           base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate,
-                               kCryptoModulePasswordClientAuth));
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return GetWrappedCertStore(profile_, std::move(store));
- #else
-   return store;
diff --git a/chromium-next/patches/patch-chrome_browser_net_profile__network__context__service__factory.cc b/chromium-next/patches/patch-chrome_browser_net_profile__network__context__service__factory.cc
deleted file mode 100644
index e75131a720..0000000000
--- a/chromium-next/patches/patch-chrome_browser_net_profile__network__context__service__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/net/profile_network_context_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/net/profile_network_context_service_factory.cc
-@@ -24,7 +24,7 @@
- #include "chrome/browser/net/server_certificate_database_service_factory.h"  // nogncheck
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #endif
- 
-@@ -68,7 +68,7 @@ ProfileNetworkContextServiceFactory::Pro
- #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
-   DependsOn(net::ServerCertificateDatabaseServiceFactory::GetInstance());
- #endif
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   DependsOn(client_certificates::CertificateProvisioningServiceFactory::
-                 GetInstance());
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_net_system__network__context__manager.cc b/chromium-next/patches/patch-chrome_browser_net_system__network__context__manager.cc
deleted file mode 100644
index abe13829d9..0000000000
--- a/chromium-next/patches/patch-chrome_browser_net_system__network__context__manager.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/net/system_network_context_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/net/system_network_context_manager.cc
-@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_ne
- // received a failed launch for a sandboxed network service.
- bool g_previously_failed_to_launch_sandboxed_service = false;
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Whether kerberos library loading will work in the network service due to the
- // sandbox.
- bool g_network_service_will_allow_gssapi_library_load = false;
-@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi
- const char* kGssapiDesiredPref =
- #if BUILDFLAG(IS_CHROMEOS)
-     prefs::kKerberosEnabled;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     prefs::kReceivedHttpAuthNegotiateHeader;
- #endif
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr
-   auth_dynamic_params->basic_over_http_enabled =
-       local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   auth_dynamic_params->delegate_by_kdc_policy =
-       local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr
-       local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auth_dynamic_params->allow_gssapi_library_load =
-       local_state->GetBoolean(kGssapiDesiredPref);
- #endif  // BUILDFLAG(IS_CHROMEOS)
-@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr
- 
- void OnNewHttpAuthDynamicParams(
-     network::mojom::HttpAuthDynamicParamsPtr& params) {
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // The kerberos library is incompatible with the network service sandbox, so
-   // if library loading is now enabled, the network service needs to be
-   // restarted. It will be restarted unsandboxed because is
-@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnab
-   if (g_previously_failed_to_launch_sandboxed_service) {
-     return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
-   }
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* local_state = g_browser_process->local_state();
- #endif
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // The network service sandbox and the kerberos library are incompatible.
-   // If kerberos is enabled by policy, disable the network service sandbox.
-   if (g_network_service_will_allow_gssapi_library_load ||
-@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnab
-   }
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (local_state &&
-       local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
-     return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
-@@ -522,7 +522,7 @@ void SystemNetworkContextManager::Delete
-   g_system_network_context_manager = nullptr;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- SystemNetworkContextManager::GssapiLibraryLoadObserver::
-     GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
-     : owner_(owner) {}
-@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetwo
-   pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
-                              auth_pref_callback);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
-                              auth_pref_callback);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -594,7 +594,7 @@ SystemNetworkContextManager::SystemNetwo
-                              auth_pref_callback);
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- 
-@@ -659,7 +659,7 @@ void SystemNetworkContextManager::Regist
-   registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
-                                std::string());
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
-                                 false);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -684,11 +684,11 @@ void SystemNetworkContextManager::Regist
- 
-   registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kNetworkServiceSandboxEnabled, true);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -741,7 +741,7 @@ void SystemNetworkContextManager::OnNetw
-   OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
-   network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   gssapi_library_loader_observer_.Install(network_service);
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -960,7 +960,7 @@ bool SystemNetworkContextManager::IsNetw
-       break;
-   }
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!enabled) {
-     g_network_service_will_allow_gssapi_library_load = true;
-   }
diff --git a/chromium-next/patches/patch-chrome_browser_net_system__network__context__manager.h b/chromium-next/patches/patch-chrome_browser_net_system__network__context__manager.h
deleted file mode 100644
index b9e027ab2c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_net_system__network__context__manager.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/net/system_network_context_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/net/system_network_context_manager.h
-@@ -198,7 +198,7 @@ class SystemNetworkContextManager {
-   class URLLoaderFactoryForSystem;
-   class NetworkProcessLaunchWatcher;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   class GssapiLibraryLoadObserver
-       : public network::mojom::GssapiLibraryLoadObserver {
-    public:
-@@ -279,7 +279,7 @@ class SystemNetworkContextManager {
-   std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_;
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   GssapiLibraryLoadObserver gssapi_library_loader_observer_{this};
- #endif  // BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc b/chromium-next/patches/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
deleted file mode 100644
index 5fb5b871d4..0000000000
--- a/chromium-next/patches/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc
-@@ -35,7 +35,7 @@
- #include "services/network/public/cpp/resource_request.h"
- 
- namespace {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr char kPlatform[] = "LINUX";
- #elif BUILDFLAG(IS_WIN)
- constexpr char kPlatform[] = "WINDOWS";
diff --git a/chromium-next/patches/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/chromium-next/patches/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
deleted file mode 100644
index b5340e2f4d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/new_tab_page/new_tab_page_util.cc
-@@ -28,7 +28,7 @@ bool IsOsSupportedForCart() {
- }
- 
- bool IsOsSupportedForDrive() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
diff --git a/chromium-next/patches/patch-chrome_browser_notifications_notification__display__service__impl.cc b/chromium-next/patches/patch-chrome_browser_notifications_notification__display__service__impl.cc
deleted file mode 100644
index 0f941294c0..0000000000
--- a/chromium-next/patches/patch-chrome_browser_notifications_notification__display__service__impl.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/notifications/notification_display_service_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/notifications/notification_display_service_impl.cc
-@@ -31,7 +31,7 @@
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
- #include "chrome/browser/sharing/sharing_notification_handler.h"
- #endif
-@@ -60,7 +60,7 @@ NotificationDisplayServiceImpl* Notifica
- // static
- void NotificationDisplayServiceImpl::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true);
- #endif
- }
-@@ -76,7 +76,7 @@ NotificationDisplayServiceImpl::Notifica
-                            std::make_unique<PersistentNotificationHandler>());
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     AddNotificationHandler(
-         NotificationHandler::Type::SEND_TAB_TO_SELF,
-         std::make_unique<send_tab_to_self::DesktopNotificationHandler>(
-@@ -84,7 +84,7 @@ NotificationDisplayServiceImpl::Notifica
- #endif
- 
- #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--     BUILDFLAG(IS_WIN)) &&                                                 \
-+     BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) &&                            \
-     BUILDFLAG(SAFE_BROWSING_AVAILABLE)
-     AddNotificationHandler(
-         NotificationHandler::Type::TAILORED_SECURITY,
diff --git a/chromium-next/patches/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/chromium-next/patches/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
deleted file mode 100644
index 0e0f8b7382..0000000000
--- a/chromium-next/patches/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/notifications/notification_platform_bridge_delegator.cc
-@@ -55,7 +55,7 @@ bool SystemNotificationsEnabled(Profile*
- #elif BUILDFLAG(IS_WIN)
-   return NotificationPlatformBridgeWin::SystemNotificationEnabled();
- #else
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (profile) {
-     // Prefs take precedence over flags.
-     PrefService* prefs = profile->GetPrefs();
diff --git a/chromium-next/patches/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/chromium-next/patches/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
deleted file mode 100644
index b2ac382c68..0000000000
--- a/chromium-next/patches/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -638,7 +638,7 @@ void ChromePasswordManagerClient::
- bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired(
-     device_reauth::DeviceAuthenticator* authenticator) {
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
-     return false;
-   }
-@@ -916,7 +916,7 @@ void ChromePasswordManagerClient::Notify
- }
- 
- void ChromePasswordManagerClient::NotifyKeychainError() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   PasswordsClientUIDelegate* manage_passwords_ui_controller =
-       PasswordsClientUIDelegateFromWebContents(web_contents());
-   if (manage_passwords_ui_controller) {
diff --git a/chromium-next/patches/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/chromium-next/patches/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
deleted file mode 100644
index 26148c3358..0000000000
--- a/chromium-next/patches/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
-@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServic
-   // Prepare password hash data for reuse detection.
-   reuse_manager->PreparePasswordHashData(GetSignInStateForMetrics(profile));
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<password_manager::PasswordReuseManagerSigninNotifier>
-       notifier = std::make_unique<
-           password_manager::PasswordReuseManagerSigninNotifierImpl>(
diff --git a/chromium-next/patches/patch-chrome_browser_platform__util__linux.cc b/chromium-next/patches/patch-chrome_browser_platform__util__linux.cc
deleted file mode 100644
index 135cff8303..0000000000
--- a/chromium-next/patches/patch-chrome_browser_platform__util__linux.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/platform_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/platform_util_linux.cc
-@@ -302,7 +302,9 @@ void OnLaunchOptionsCreated(const std::s
-   argv.push_back(command);
-   argv.push_back(arg);
-   options.current_directory = working_directory;
-+#if !BUILDFLAG(IS_BSD)
-   options.allow_new_privs = true;
-+#endif
-   // xdg-open can fall back on mailcap which eventually might plumb through
-   // to a command that needs a terminal.  Set the environment variable telling
-   // it that we definitely don't have a terminal available and that it should
diff --git a/chromium-next/patches/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/chromium-next/patches/patch-chrome_browser_policy_browser__signin__policy__handler.cc
deleted file mode 100644
index 038f5da1e5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_policy_browser__signin__policy__handler.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/policy/browser_signin_policy_handler.cc
-@@ -45,7 +45,7 @@ void BrowserSigninPolicyHandler::ApplyPo
-       policies.GetValue(policy_name(), base::Value::Type::INTEGER);
-   switch (static_cast<BrowserSigninMode>(value->GetInt())) {
-     case BrowserSigninMode::kForced:
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-       prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true));
- #endif
-       [[fallthrough]];
diff --git a/chromium-next/patches/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/chromium-next/patches/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
deleted file mode 100644
index abb3d74357..0000000000
--- a/chromium-next/patches/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
-@@ -60,7 +60,7 @@
- #include "chrome/browser/policy/browser_dm_token_storage_mac.h"
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/policy/browser_dm_token_storage_linux.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -69,7 +69,7 @@
- #include "chrome/install_static/install_util.h"
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/client_certificates/browser_context_delegate.h"
- #include "chrome/browser/enterprise/client_certificates/cert_utils.h"
- #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h"
-@@ -115,7 +115,7 @@ void ChromeBrowserCloudManagementControl
- 
- #if BUILDFLAG(IS_MAC)
-   storage_delegate = std::make_unique<BrowserDMTokenStorageMac>();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>();
- #elif BUILDFLAG(IS_WIN)
-   storage_delegate = std::make_unique<BrowserDMTokenStorageWin>();
-@@ -286,7 +286,7 @@ ChromeBrowserCloudManagementControllerDe
- 
- std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager>
- ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   auto* browser_dm_token_storage = BrowserDMTokenStorage::Get();
-   auto* device_management_service = GetDeviceManagementService();
-   auto shared_url_loader_factory = GetSharedURLLoaderFactory();
-@@ -308,7 +308,7 @@ ChromeBrowserCloudManagementControllerDe
- std::unique_ptr<client_certificates::CertificateProvisioningService>
- ChromeBrowserCloudManagementControllerDesktop::
-     CreateCertificateProvisioningService() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (!certificate_store_) {
-     certificate_store_ =
-         std::make_unique<client_certificates::PrefsCertificateStore>(
diff --git a/chromium-next/patches/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/chromium-next/patches/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
deleted file mode 100644
index 5445fb44cc..0000000000
--- a/chromium-next/patches/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ /dev/null
@@ -1,260 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -255,19 +255,19 @@
- #include "components/spellcheck/browser/pref_names.h"
- #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/idle/action.h"
- #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
- #include "components/device_signals/core/browser/pref_names.h"  // nogncheck due to crbug.com/1125897
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "components/enterprise/idle/idle_timeout_policy_handler.h"
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-@@ -281,13 +281,13 @@
- #endif  // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/policy/battery_saver_policy_handler.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/search_engines/enterprise/search_aggregator_policy_handler.h"
- #include "components/search_engines/enterprise/site_search_policy_handler.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -592,7 +592,7 @@ const PolicyToPreferenceMapEntry kSimple
-   { key::kDefaultDirectSocketsSetting,
-     prefs::kManagedDefaultDirectSocketsSetting,
-     base::Value::Type::INTEGER },
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   { key::kDeletingUndecryptablePasswordsEnabled,
-     password_manager::prefs::kDeletingUndecryptablePasswordsEnabled,
-     base::Value::Type::BOOLEAN },
-@@ -957,7 +957,7 @@ const PolicyToPreferenceMapEntry kSimple
-     prefs::kManagedDefaultGeolocationSetting,
-     base::Value::Type::INTEGER },
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
--     || BUILDFLAG(IS_MAC)
-+     || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   { key::kRequireOnlineRevocationChecksForLocalAnchors,
-     prefs::kCertRevocationCheckingRequiredLocalAnchors,
-     base::Value::Type::BOOLEAN },
-@@ -966,7 +966,7 @@ const PolicyToPreferenceMapEntry kSimple
-     base::Value::Type::BOOLEAN },
- #endif  // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-         // || BUILDFLAG(IS_WIN)  || BUILDFLAG(IS_MAC)
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   { key::kFullscreenAllowed,
-     prefs::kFullscreenAllowed,
-     base::Value::Type::BOOLEAN },
-@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimple
-     base::Value::Type::INTEGER},
- #endif // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   { key::kGSSAPILibraryName,
-     prefs::kGSSAPILibraryName,
-     base::Value::Type::STRING },
-@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimple
-     base::Value::Type::BOOLEAN },
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   { key::kNetworkServiceSandboxEnabled,
-     prefs::kNetworkServiceSandboxEnabled,
-     base::Value::Type::BOOLEAN },
-@@ -1921,12 +1921,12 @@ const PolicyToPreferenceMapEntry kSimple
-     prefs::kTotalMemoryLimitMb,
-     base::Value::Type::INTEGER },
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   { key::kBackgroundModeEnabled,
-     prefs::kBackgroundModeEnabled,
-     base::Value::Type::BOOLEAN },
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   { key::kUnmanagedDeviceSignalsConsentFlowEnabled,
-     device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
-     base::Value::Type::BOOLEAN },
-@@ -1937,7 +1937,7 @@ const PolicyToPreferenceMapEntry kSimple
-     prefs::kLiveTranslateEnabled,
-     base::Value::Type::BOOLEAN },
- #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   { key::kDefaultBrowserSettingEnabled,
-     prefs::kDefaultBrowserSettingEnabled,
-     base::Value::Type::BOOLEAN },
-@@ -1949,7 +1949,7 @@ const PolicyToPreferenceMapEntry kSimple
-     base::Value::Type::BOOLEAN },
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
--    || BUILDFLAG(IS_CHROMEOS)
-+    || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   { key::kAutoplayAllowed,
-     prefs::kAutoplayAllowed,
-     base::Value::Type::BOOLEAN },
-@@ -2050,7 +2050,7 @@ const PolicyToPreferenceMapEntry kSimple
-     base::Value::Type::BOOLEAN },
- #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   { key::kAlternativeBrowserPath,
-     browser_switcher::prefs::kAlternativeBrowserPath,
-     base::Value::Type::STRING },
-@@ -2155,7 +2155,7 @@ const PolicyToPreferenceMapEntry kSimple
-     base::Value::Type::BOOLEAN },
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   { key::kAuthNegotiateDelegateByKdcPolicy,
-     prefs::kAuthNegotiateDelegateByKdcPolicy,
-     base::Value::Type::BOOLEAN },
-@@ -2226,7 +2226,7 @@ const PolicyToPreferenceMapEntry kSimple
-     ash::prefs::kUrlParameterToAutofillSAMLUsername,
-     base::Value::Type::STRING },
- #endif  // BUILDFLAG(IS_CHROMEOS)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   { key::kTabDiscardingExceptions,
-     performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
-     base::Value::Type::LIST },
-@@ -2255,7 +2255,7 @@ const PolicyToPreferenceMapEntry kSimple
-     prefs::kUiAutomationProviderEnabled,
-     base::Value::Type::BOOLEAN },
- #endif  // BUILDFLAG(IS_WIN)
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   { key::kOutOfProcessSystemDnsResolutionEnabled,
-     prefs::kOutOfProcessSystemDnsResolutionEnabled,
-     base::Value::Type::BOOLEAN },
-@@ -2298,7 +2298,7 @@ const PolicyToPreferenceMapEntry kSimple
-     base::Value::Type::INTEGER },
- #endif
- #if BUILDFLAG(ENABLE_EXTENSIONS)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   { key::kExtensionInstallTypeBlocklist,
-     extensions::pref_names::kExtensionInstallTypeBlocklist,
-     base::Value::Type::LIST},
-@@ -2324,7 +2324,7 @@ const PolicyToPreferenceMapEntry kSimple
-   { key::kTabCompareSettings,
-     optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed,
-     base::Value::Type::INTEGER},
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   { key::kChromeForTestingAllowed,
-     prefs::kChromeForTestingAllowed,
-     base::Value::Type::BOOLEAN },
-@@ -2513,7 +2513,7 @@ std::unique_ptr<ConfigurationPolicyHandl
-   // Policies for all platforms - End
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
-       key::kMemorySaverModeSavings,
-       performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
-@@ -2734,7 +2734,7 @@ std::unique_ptr<ConfigurationPolicyHandl
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(
-       std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
-   handlers->AddHandler(
-@@ -2793,7 +2793,7 @@ std::unique_ptr<ConfigurationPolicyHandl
-       key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
-       chrome_schema));
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(std::make_unique<GuestModePolicyHandler>());
-   handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
-   handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
-@@ -2890,7 +2890,7 @@ std::unique_ptr<ConfigurationPolicyHandl
-   std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
-       signin_legacy_policies;
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_LINUX)
-+    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
-       key::kForceBrowserSignin, prefs::kForceBrowserSignin,
-       base::Value::Type::BOOLEAN));
-@@ -3262,7 +3262,7 @@ std::unique_ptr<ConfigurationPolicyHandl
- #endif
- 
- #if BUILDFLAG(ENABLE_SPELLCHECK)
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
-   handlers->AddHandler(
-       std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -3270,7 +3270,7 @@ std::unique_ptr<ConfigurationPolicyHandl
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
- #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
-       key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
-       base::Value::Type::BOOLEAN));
-@@ -3288,7 +3288,7 @@ std::unique_ptr<ConfigurationPolicyHandl
-           first_party_sets::FirstPartySetsOverridesPolicyHandler>(
-           key::kRelatedWebsiteSetsOverrides, chrome_schema)));
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-@@ -3311,7 +3311,7 @@ std::unique_ptr<ConfigurationPolicyHandl
-           base::Value::Type::BOOLEAN)));
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
-@@ -3329,7 +3329,7 @@ std::unique_ptr<ConfigurationPolicyHandl
-   std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails>
-       gen_ai_default_policies;
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   gen_ai_default_policies.emplace_back(
-       key::kAutofillPredictionSettings,
-       optimization_guide::prefs::
diff --git a/chromium-next/patches/patch-chrome_browser_policy_device__management__service__configuration.cc b/chromium-next/patches/patch-chrome_browser_policy_device__management__service__configuration.cc
deleted file mode 100644
index 9f2d1e9a68..0000000000
--- a/chromium-next/patches/patch-chrome_browser_policy_device__management__service__configuration.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/policy/device_management_service_configuration.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/policy/device_management_service_configuration.cc
-@@ -22,7 +22,7 @@
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ||           \
-     ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
--     !BUILDFLAG(IS_ANDROID))
-+     !BUILDFLAG(IS_ANDROID)) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/common.h"
- #include "chrome/browser/enterprise/connectors/connectors_service.h"
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/chromium-next/patches/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
deleted file mode 100644
index 64a194c27d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/policy/policy_value_and_status_aggregator.cc
-@@ -49,7 +49,7 @@
- #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
- #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/policy/core/common/cloud/profile_cloud_policy_manager.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chrome_browser_prefs_browser__prefs.cc b/chromium-next/patches/patch-chrome_browser_prefs_browser__prefs.cc
deleted file mode 100644
index 4aded482ae..0000000000
--- a/chromium-next/patches/patch-chrome_browser_prefs_browser__prefs.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/prefs/browser_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/prefs/browser_prefs.cc
-@@ -316,7 +316,7 @@
- #include "chrome/browser/devtools/devtools_window.h"
- #endif  // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
- #endif
- 
-@@ -487,11 +487,11 @@
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/device_signals/core/browser/pref_names.h"  // nogncheck due to crbug.com/1125897
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
- #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
- #endif
-@@ -519,7 +519,7 @@
- #include "chrome/browser/sessions/session_service_log.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/color/system_theme.h"
- #endif
- 
-@@ -1664,7 +1664,7 @@ void RegisterLocalState(PrefRegistrySimp
-   on_device_translation::RegisterLocalStatePrefs(registry);
- #endif  // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   WhatsNewUI::RegisterLocalStatePrefs(registry);
- #endif
- 
-@@ -1821,7 +1821,7 @@ void RegisterLocalState(PrefRegistrySimp
- #endif  // BUILDFLAG(ENABLE_PDF)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
- #endif
- 
-@@ -2177,12 +2177,12 @@ void RegisterProfilePrefs(user_prefs::Pr
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   device_signals::RegisterProfilePrefs(registry);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
-   enterprise_signin::RegisterProfilePrefs(registry);
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/chromium-next/patches/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
deleted file mode 100644
index 3f7c80c113..0000000000
--- a/chromium-next/patches/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
-@@ -203,7 +203,7 @@ const char* const kPersistentPrefNames[]
-     prefs::kShowFullscreenToolbar,
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // Toggleing custom frames affects all open windows in the profile, hence
-     // should be written to the regular profile when changed in incognito mode.
-     prefs::kUseCustomChromeFrame,
diff --git a/chromium-next/patches/patch-chrome_browser_printing_print__backend__service__manager.cc b/chromium-next/patches/patch-chrome_browser_printing_print__backend__service__manager.cc
deleted file mode 100644
index 32d7a28fe1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_printing_print__backend__service__manager.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/printing/print_backend_service_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/printing/print_backend_service_manager.cc
-@@ -36,7 +36,7 @@
- #include "printing/printing_context.h"
- #include "printing/printing_features.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "content/public/common/content_switches.h"
- #endif
- 
-@@ -883,7 +883,7 @@ PrintBackendServiceManager::GetServiceFr
-         host.BindNewPipeAndPassReceiver(),
-         content::ServiceProcessHost::Options()
-             .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-             .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
- #endif
-             .Pass());
-@@ -1060,7 +1060,7 @@ PrintBackendServiceManager::DetermineIdl
-       return kNoClientsRegisteredResetOnIdleTimeout;
- 
-     case ClientType::kQueryWithUi:
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       // No need to update if there were other query with UI clients.
-       if (HasQueryWithUiClientForRemoteId(remote_id)) {
-         return std::nullopt;
diff --git a/chromium-next/patches/patch-chrome_browser_printing_printer__query.cc b/chromium-next/patches/patch-chrome_browser_printing_printer__query.cc
deleted file mode 100644
index f5169639cd..0000000000
--- a/chromium-next/patches/patch-chrome_browser_printing_printer__query.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/printing/printer_query.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/printing/printer_query.cc
-@@ -342,7 +342,7 @@ void PrinterQuery::UpdatePrintSettings(b
-     crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
-         printer_name, print_backend->GetPrinterDriverInfo(printer_name));
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)
-+#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_CUPS)
-     PrinterBasicInfo basic_info;
-     if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) ==
-         mojom::ResultCode::kSuccess) {
diff --git a/chromium-next/patches/patch-chrome_browser_process__singleton__posix.cc b/chromium-next/patches/patch-chrome_browser_process__singleton__posix.cc
deleted file mode 100644
index 469690bf31..0000000000
--- a/chromium-next/patches/patch-chrome_browser_process__singleton__posix.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/process_singleton_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/process_singleton_posix.cc
-@@ -102,7 +102,7 @@
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/resource/scoped_startup_resource_bundle.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/process_singleton_dialog_linux.h"
- #endif
- 
-@@ -360,7 +360,7 @@ bool DisplayProfileInUseError(const base
-   if (g_disable_prompt)
-     return g_user_opted_unlock_in_use_profile;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   std::u16string relaunch_button_text =
-       l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
-   return ShowProcessSingletonDialog(error, relaunch_button_text);
diff --git a/chromium-next/patches/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/chromium-next/patches/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
deleted file mode 100644
index 0a9733e963..0000000000
--- a/chromium-next/patches/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ /dev/null
@@ -1,145 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -358,7 +358,7 @@
- #endif
- 
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/idle/idle_service_factory.h"
- #endif
- 
-@@ -400,7 +400,7 @@
- #endif
- 
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
- #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
- #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
-@@ -408,7 +408,7 @@
- #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
- #endif
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
- #endif
- 
-@@ -416,7 +416,7 @@
- #include "chrome/browser/history_embeddings/history_embeddings_service_factory.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
- #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
-@@ -730,7 +730,7 @@ void ChromeBrowserMainExtraPartsProfiles
-   DiceBoundSessionCookieServiceFactory::GetInstance();
- #endif
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
- #endif
-   browser_sync::UserEventServiceFactory::GetInstance();
-@@ -787,7 +787,7 @@ void ChromeBrowserMainExtraPartsProfiles
-   commerce::ShoppingServiceFactory::GetInstance();
-   ConsentAuditorFactory::GetInstance();
-   ContentIndexProviderFactory::GetInstance();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   contextual_cueing::ContextualCueingServiceFactory::GetInstance();
- #endif
-   CookieControlsServiceFactory::GetInstance();
-@@ -843,31 +843,31 @@ void ChromeBrowserMainExtraPartsProfiles
-   enterprise_connectors::ConnectorsServiceFactory::GetInstance();
-   enterprise_connectors::ReportingEventRouterFactory::GetInstance();
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
-   enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
- #endif
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \
-     BUILDFLAG(ENTERPRISE_LOCAL_CONTENT_ANALYSIS) &&                    \
-     BUILDFLAG(SAFE_BROWSING_AVAILABLE)
-   enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance();
- #endif
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   enterprise_idle::IdleServiceFactory::GetInstance();
- #endif
- #if !BUILDFLAG(IS_CHROMEOS)
-   enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance();
- #endif
-   enterprise_reporting::LegacyTechServiceFactory::GetInstance();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   enterprise_signals::SignalsAggregatorFactory::GetInstance();
- #endif
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   enterprise_signals::UserPermissionServiceFactory::GetInstance();
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
- #endif
- #if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles
- #if BUILDFLAG(IS_ANDROID)
-   MerchantViewerDataManagerFactory::GetInstance();
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
- #endif
- #if !BUILDFLAG(IS_ANDROID)
-@@ -1111,7 +1111,7 @@ void ChromeBrowserMainExtraPartsProfiles
- #if BUILDFLAG(IS_CHROMEOS)
-   policy::PolicyCertServiceFactory::GetInstance();
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
-   policy::UserPolicyOidcSigninServiceFactory::GetInstance();
- #endif
-@@ -1157,7 +1157,7 @@ void ChromeBrowserMainExtraPartsProfiles
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
-   ProfileStatisticsFactory::GetInstance();
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   ProfileTokenWebSigninInterceptorFactory::GetInstance();
-   OidcAuthenticationSigninInterceptorFactory::GetInstance();
- #endif
-@@ -1177,7 +1177,7 @@ void ChromeBrowserMainExtraPartsProfiles
-   ReduceAcceptLanguageFactory::GetInstance();
-   RendererUpdaterFactory::GetInstance();
-   regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance();
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   reporting::ManualTestHeartbeatEventFactory::GetInstance();
- #endif
- #if !BUILDFLAG(IS_ANDROID)
-@@ -1368,7 +1368,7 @@ void ChromeBrowserMainExtraPartsProfiles
-   WebDataServiceFactory::GetInstance();
-   webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (tab_groups::SavedTabGroupUtils::SupportsSharedTabGroups()) {
-     tab_groups::CollaborationMessagingObserverFactory::GetInstance();
-   }
diff --git a/chromium-next/patches/patch-chrome_browser_profiles_profile__impl.cc b/chromium-next/patches/patch-chrome_browser_profiles_profile__impl.cc
deleted file mode 100644
index 36a4c488de..0000000000
--- a/chromium-next/patches/patch-chrome_browser_profiles_profile__impl.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/profiles/profile_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/profiles/profile_impl.cc
-@@ -270,6 +270,10 @@
- #include "chrome/browser/safe_browsing/safe_browsing_service.h"
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#endif
-+
- using bookmarks::BookmarkModel;
- using content::BrowserThread;
- using content::DownloadManagerDelegate;
-@@ -594,7 +598,7 @@ void ProfileImpl::LoadPrefsForNormalStar
-   policy_provider = GetUserCloudPolicyManagerAsh();
- #else  // !BUILDFLAG(IS_CHROMEOS)
-   {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     ProfileManager* profile_manager = g_browser_process->profile_manager();
-     ProfileAttributesEntry* entry =
-         profile_manager->GetProfileAttributesStorage()
-@@ -890,7 +894,17 @@ void ProfileImpl::DoFinalInit(CreateMode
- }
- 
- base::FilePath ProfileImpl::last_selected_directory() {
-+#if BUILDFLAG(IS_OPENBSD)
-+  // If unveil(2) is used, force the file dialog directory to something we
-+  // know is available.
-+  auto* sandbox = sandbox::policy::SandboxLinux::GetInstance();
-+  if (sandbox->unveil_initialized())
-+    return GetPrefs()->GetFilePath(prefs::kDownloadDefaultDirectory);
-+  else
-+    return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory);
-+#else
-   return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory);
-+#endif
- }
- 
- void ProfileImpl::set_last_selected_directory(const base::FilePath& path) {
diff --git a/chromium-next/patches/patch-chrome_browser_profiles_profiles__state.cc b/chromium-next/patches/patch-chrome_browser_profiles_profiles__state.cc
deleted file mode 100644
index 000d325ccb..0000000000
--- a/chromium-next/patches/patch-chrome_browser_profiles_profiles__state.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/profiles/profiles_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/profiles/profiles_state.cc
-@@ -188,7 +188,7 @@ bool IsGuestModeRequested(const base::Co
-                           PrefService* local_state,
-                           bool show_warning) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   DCHECK(local_state);
- 
-   // Check if guest mode enforcement commandline switch or policy are provided.
-@@ -224,7 +224,7 @@ bool IsGuestModeEnabled() {
-     return false;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // If there are any supervised profiles, disable guest mode.
-   if (std::ranges::any_of(g_browser_process->profile_manager()
-                               ->GetProfileAttributesStorage()
-@@ -240,7 +240,7 @@ bool IsGuestModeEnabled() {
- }
- 
- bool IsGuestModeEnabled(const Profile& profile) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   ProfileAttributesEntry* profile_attributes =
-       g_browser_process->profile_manager()
-           ->GetProfileAttributesStorage()
diff --git a/chromium-next/patches/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc b/chromium-next/patches/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
deleted file mode 100644
index b85b62e22e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/regional_capabilities/regional_capabilities_service_client.cc
-@@ -107,7 +107,7 @@ void RegionalCapabilitiesServiceClient::
-       base::android::AttachCurrentThread(),
-       reinterpret_cast<intptr_t>(heap_callback.release()));
- }
--#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void RegionalCapabilitiesServiceClient::FetchCountryId(
-     CountryIdCallback on_country_id_fetched) {
-   std::move(on_country_id_fetched).Run(variations_latest_country_id_);
diff --git a/chromium-next/patches/patch-chrome_browser_renderer__preferences__util.cc b/chromium-next/patches/patch-chrome_browser_renderer__preferences__util.cc
deleted file mode 100644
index 1b8726ba2e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_renderer__preferences__util.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/renderer_preferences_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/renderer_preferences_util.cc
-@@ -40,7 +40,7 @@
- #include "ui/views/controls/textfield/textfield.h"
- #endif
- 
--#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
- #include "chrome/browser/themes/theme_service.h"
- #include "chrome/browser/themes/theme_service_factory.h"
- #include "ui/linux/linux_ui.h"
-@@ -180,7 +180,7 @@ void UpdateFromSystemSettings(blink::Ren
-   prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
- #endif
- 
--#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-   auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
-   if (linux_ui_theme) {
-     if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -203,7 +203,7 @@ void UpdateFromSystemSettings(blink::Ren
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   content::UpdateFontRendererPreferencesFromSystemSettings(prefs);
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css b/chromium-next/patches/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
deleted file mode 100644
index 3a71465a1f..0000000000
--- a/chromium-next/patches/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/resources/settings/autofill_page/passwords_shared.css
-@@ -100,7 +100,7 @@ cr-input.password-input::part(input),
-    * necessary to prevent Chrome from using the operating system's font
-    * instead of the Material Design font.
-    * TODO(dbeam): why not font: inherit? */
--<if expr="is_linux or is_chromeos">
-+<if expr="is_posix or is_chromeos">
-   font-family: 'DejaVu Sans Mono', monospace;
- </if>
- <if expr="is_win">
diff --git a/chromium-next/patches/patch-chrome_browser_resources_signin_signin__shared.css b/chromium-next/patches/patch-chrome_browser_resources_signin_signin__shared.css
deleted file mode 100644
index 7bca5907df..0000000000
--- a/chromium-next/patches/patch-chrome_browser_resources_signin_signin__shared.css
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/resources/signin/signin_shared.css.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/resources/signin/signin_shared.css
-@@ -54,7 +54,7 @@ a {
-   border-radius: var(--scrollbar-width);
- }
- 
--<if expr="is_macosx or is_linux or is_chromeos">
-+<if expr="is_macosx or is_posix or is_chromeos">
- .action-container {
-   flex-flow: row-reverse;
-   justify-content: flex-start;
diff --git a/chromium-next/patches/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc b/chromium-next/patches/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
deleted file mode 100644
index 45c8431f0a..0000000000
--- a/chromium-next/patches/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
-@@ -1262,7 +1262,7 @@ std::string ChromePasswordProtectionServ
-     ReusedPasswordAccountType password_type) const {
-   if (base::FeatureList::IsEnabled(
-           safe_browsing::kEnterprisePasswordReuseUiRefresh)) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     return GetPrefs()->GetString(prefs::kEnterpriseCustomLabelForProfile);
- #else
-     return std::string();
diff --git a/chromium-next/patches/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/chromium-next/patches/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
deleted file mode 100644
index d4b79de2e4..0000000000
--- a/chromium-next/patches/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
-@@ -20,7 +20,7 @@
- #include "components/safe_browsing/core/common/safebrowsing_switches.h"
- #include "net/base/url_util.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/chromium-next/patches/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
deleted file mode 100644
index fa8d76baa5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -694,7 +694,7 @@ void IncidentReportingService::OnEnviron
- 
- // Process::Current().CreationTime() is missing on some platforms.
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   base::TimeDelta uptime =
-       first_incident_time_ - base::Process::Current().CreationTime();
-   environment_data->mutable_process()->set_uptime_msec(uptime.InMilliseconds());
diff --git a/chromium-next/patches/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc b/chromium-next/patches/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc
deleted file mode 100644
index 34c040e964..0000000000
--- a/chromium-next/patches/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/safe_browsing/safe_browsing_pref_change_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/safe_browsing/safe_browsing_pref_change_handler.cc
-@@ -12,7 +12,7 @@
- #include "content/public/browser/web_contents.h"
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/browser_finder.h"
- #include "chrome/browser/ui/browser_window/public/browser_window_features.h"
- #include "chrome/browser/ui/toasts/api/toast_id.h"
-@@ -59,7 +59,7 @@ SafeBrowsingPrefChangeHandler::~SafeBrow
- void SafeBrowsingPrefChangeHandler::
-     MaybeShowEnhancedProtectionSettingChangeNotification() {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (!profile_ ||
-       !base::FeatureList::IsEnabled(safe_browsing::kEsbAsASyncedSetting)) {
-     return;
diff --git a/chromium-next/patches/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/chromium-next/patches/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
deleted file mode 100644
index 731ff4349e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/screen_ai/screen_ai_install_state.cc
-@@ -30,7 +30,7 @@ bool IsDeviceCompatible() {
-   // TODO(crbug.com/381256355): Update when ScreenAI library is compatible with
-   // older CPUs.
-   static const bool device_compatible = base::CPU().has_sse42();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On Linux, the library is only built for X86 CPUs.
-   static constexpr bool device_compatible = false;
- #else
diff --git a/chromium-next/patches/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/chromium-next/patches/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
deleted file mode 100644
index 3c3c64bf1d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/screen_ai/screen_ai_service_router.cc
-@@ -403,7 +403,7 @@ void ScreenAIServiceRouter::LaunchIfNotR
-   base::FilePath binary_path = state_instance->get_component_binary_path();
- #if BUILDFLAG(IS_WIN)
-   std::vector<base::FilePath> preload_libraries = {binary_path};
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   std::vector<std::string> extra_switches = {
-       base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
-                          binary_path.MaybeAsASCII().c_str())};
-@@ -417,7 +417,7 @@ void ScreenAIServiceRouter::LaunchIfNotR
-           .WithPreloadedLibraries(
-               preload_libraries,
-               content::ServiceProcessHostPreloadLibraries::GetPassKey())
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-           .WithExtraCommandLineSwitches(extra_switches)
- #endif  // BUILDFLAG(IS_WIN)
-           .Pass());
diff --git a/chromium-next/patches/patch-chrome_browser_sessions_session__restore.cc b/chromium-next/patches/patch-chrome_browser_sessions_session__restore.cc
deleted file mode 100644
index 7c611fd27c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_sessions_session__restore.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/sessions/session_restore.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/sessions/session_restore.cc
-@@ -108,7 +108,7 @@
- #include "ui/wm/core/scoped_animation_disabler.h"
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -1117,7 +1117,7 @@ class SessionRestoreImpl : public Browse
-     bool is_first_tab = true;
-     for (const auto& startup_tab : startup_tabs) {
-       const GURL& url = startup_tab.url;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       if (url == whats_new::GetWebUIStartupURL()) {
-         whats_new::StartWhatsNewFetch(browser);
-         continue;
diff --git a/chromium-next/patches/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/chromium-next/patches/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
deleted file mode 100644
index 48e0007f4d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/sharing/sharing_handler_registry_impl.cc
-@@ -21,7 +21,7 @@
- #endif  // BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
- #endif
- 
-@@ -72,7 +72,7 @@ SharingHandlerRegistryImpl::SharingHandl
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (sharing_device_registration->IsRemoteCopySupported()) {
-     AddSharingHandler(
-         std::make_unique<RemoteCopyMessageHandler>(profile),
diff --git a/chromium-next/patches/patch-chrome_browser_shortcuts_icon__badging.cc b/chromium-next/patches/patch-chrome_browser_shortcuts_icon__badging.cc
deleted file mode 100644
index 1dfc56fdb8..0000000000
--- a/chromium-next/patches/patch-chrome_browser_shortcuts_icon__badging.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/shortcuts/icon_badging.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/shortcuts/icon_badging.cc
-@@ -59,7 +59,7 @@ enum class BadgeSize {
- constexpr ShortcutSize kSizesNeededForShortcutCreation[] = {
-     ShortcutSize::k16, ShortcutSize::k32, ShortcutSize::k128,
-     ShortcutSize::k256, ShortcutSize::k512};
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr ShortcutSize kSizesNeededForShortcutCreation[] = {ShortcutSize::k32,
-                                                             ShortcutSize::k128};
- #elif BUILDFLAG(IS_WIN)
diff --git a/chromium-next/patches/patch-chrome_browser_signin_accounts__policy__manager.cc b/chromium-next/patches/patch-chrome_browser_signin_accounts__policy__manager.cc
deleted file mode 100644
index 8c653b7191..0000000000
--- a/chromium-next/patches/patch-chrome_browser_signin_accounts__policy__manager.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/signin/accounts_policy_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/signin/accounts_policy_manager.cc
-@@ -41,7 +41,7 @@
- #include "chrome/browser/ui/webui/profile_helper.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/policy/core/common/features.h"
- #include "components/signin/public/identity_manager/accounts_mutator.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -209,7 +209,7 @@ void AccountsPolicyManager::Initialize()
-           &AccountsPolicyManager::OnGoogleServicesUsernamePatternChanged,
-           weak_pointer_factory_.GetWeakPtr()));
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* identity_manager = IdentityManagerFactory::GetForProfile(profile_);
-   identity_manager_observation_.Observe(identity_manager);
-   profile_pref_change_registrar_.Init(profile_->GetPrefs());
-@@ -224,7 +224,7 @@ void AccountsPolicyManager::Initialize()
- }
- 
- void AccountsPolicyManager::Shutdown() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   profile_pref_change_registrar_.RemoveAll();
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-   local_state_pref_registrar_.RemoveAll();
-@@ -332,7 +332,7 @@ void AccountsPolicyManager::OnUserConfir
- }
- #endif  // defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void AccountsPolicyManager::OnRefreshTokensLoaded() {
-   RemoveUnallowedAccounts();
-   identity_manager_observation_.Reset();
diff --git a/chromium-next/patches/patch-chrome_browser_signin_accounts__policy__manager.h b/chromium-next/patches/patch-chrome_browser_signin_accounts__policy__manager.h
deleted file mode 100644
index 9675a74ed8..0000000000
--- a/chromium-next/patches/patch-chrome_browser_signin_accounts__policy__manager.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/signin/accounts_policy_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/signin/accounts_policy_manager.h
-@@ -13,7 +13,7 @@
- #include "components/signin/public/base/signin_metrics.h"
- #include "components/signin/public/identity_manager/identity_manager.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/scoped_observation.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -64,7 +64,7 @@ class AccountsPolicyManager : public Key
-   }
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void RemoveUnallowedAccounts();
- 
-   // IdentityManager::Observer implementation.
-@@ -85,7 +85,7 @@ class AccountsPolicyManager : public Key
-   bool hide_ui_for_testing_ = false;
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::ScopedObservation<signin::IdentityManager,
-                           signin::IdentityManager::Observer>
-       identity_manager_observation_{this};
diff --git a/chromium-next/patches/patch-chrome_browser_signin_signin__util.cc b/chromium-next/patches/patch-chrome_browser_signin_signin__util.cc
deleted file mode 100644
index 52ede641b7..0000000000
--- a/chromium-next/patches/patch-chrome_browser_signin_signin__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/signin/signin_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/signin/signin_util.cc
-@@ -80,7 +80,7 @@ CookiesMover::CookiesMover(base::WeakPtr
- CookiesMover::~CookiesMover() = default;
- 
- void CookiesMover::StartMovingCookies() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   bool allow_cookies_to_be_moved = base::FeatureList::IsEnabled(
-       profile_management::features::kThirdPartyProfileManagement);
- #else
diff --git a/chromium-next/patches/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc b/chromium-next/patches/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
deleted file mode 100644
index 0e95b5133a..0000000000
--- a/chromium-next/patches/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/supervised_user/classify_url_navigation_throttle.cc
-@@ -68,7 +68,7 @@ std::ostream& operator<<(std::ostream& s
-   }
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- bool ShouldShowReAuthInterstitial(
-     content::NavigationHandle& navigation_handle) {
-   Profile* profile = Profile::FromBrowserContext(
-@@ -230,7 +230,7 @@ void ClassifyUrlNavigationThrottle::OnIn
-     }
-     case InterstitialResultCallbackActions::kCancelWithInterstitial: {
-       CHECK(navigation_handle());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-       if (ShouldShowReAuthInterstitial(*navigation_handle())) {
-         // Show the re-authentication interstitial if the user signed out of
-         // the content area, as parent's approval requires authentication.
diff --git a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc b/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
deleted file mode 100644
index 6fc9cbbb54..0000000000
--- a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_browser_utils.cc
-@@ -40,7 +40,7 @@
- #include "chrome/browser/ash/profiles/profile_helper.h"
- #include "components/user_manager/user.h"
- #include "components/user_manager/user_type.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
- #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h"
- #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h"
-@@ -165,7 +165,7 @@ void AssertChildStatusOfTheUser(Profile*
- #endif
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- std::string CreateReauthenticationInterstitialForYouTube(
-     content::NavigationHandle& navigation_handle) {
-   content::WebContents* web_contents = navigation_handle.GetWebContents();
diff --git a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h b/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
deleted file mode 100644
index c31592fd12..0000000000
--- a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_browser_utils.h
-@@ -52,7 +52,7 @@ std::string GetAccountGivenName(Profile&
- // of the user.
- void AssertChildStatusOfTheUser(Profile* profile, bool is_child);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Returns the html content of the reauthentication interstitial for blocked
- // sites. This interstitial is associated with the given NavigationHandle.
- std::string CreateReauthenticationInterstitialForBlockedSites(
diff --git a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
deleted file mode 100644
index 899b0c5513..0000000000
--- a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
-@@ -197,7 +197,7 @@ void SupervisedUserExtensionsDelegateImp
-       return;
-     }
-   }
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   CHECK(contents.value());
-   content::WebContents* web_contents = contents.value().get();
-   if (supervised_user::
diff --git a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
deleted file mode 100644
index 208cebc880..0000000000
--- a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
-@@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager::
-     ActivateManagementPolicyAndUpdateRegistration() {
-   SetActiveForSupervisedUsers();
-   UpdateManagementPolicyRegistration();
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   MaybeMarkExtensionsLocallyParentApproved();
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- }
-@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::Sh
-   return false;
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void SupervisedUserExtensionsManager::
-     MaybeMarkExtensionsLocallyParentApproved() {
-   supervised_user::LocallyParentApprovedExtensionsMigrationState
diff --git a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h b/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
deleted file mode 100644
index 46599a2f95..0000000000
--- a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_extensions_manager.h
-@@ -153,7 +153,7 @@ class SupervisedUserExtensionsManager : 
-   // launched.
-   bool ShouldBlockExtension(const std::string& extension_id) const;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Triggers an one-time migration of the present extensions as parent-approved
-   // when the feature
-   // `kEnableSupervisedUserSkipParentApprovalToInstallExtensions` becomes
diff --git a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
deleted file mode 100644
index 64b98c73b6..0000000000
--- a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
-@@ -33,12 +33,12 @@
- #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
- #include "components/signin/public/identity_manager/identity_manager.h"
- #include "ui/android/view_android.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
- #include "chrome/browser/supervised_user/supervised_user_verification_page.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- namespace {
- bool IsYouTubeInfrastructureSubframe(content::NavigationHandle* handle) {
-   if (handle->GetNavigatingFrameType() != content::FrameType::kSubframe) {
-@@ -160,7 +160,7 @@ SupervisedUserGoogleAuthNavigationThrott
-     return content::NavigationThrottle::DEFER;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // When an unauthenticated supervised user tries to access YouTube, we force
-   // re-authentication with an interstitial so that YouTube can be subject to
-   // content restrictions. This interstitial is only available on Desktop
diff --git a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc b/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
deleted file mode 100644
index 85c417c07b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc
-@@ -14,7 +14,7 @@
- #include "components/supervised_user/core/browser/supervised_user_service.h"
- #include "content/public/browser/browser_context.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_extensions_metrics_delegate_impl.h"
- #endif
- 
-@@ -62,7 +62,7 @@ SupervisedUserMetricsServiceFactory::Bui
-   std::unique_ptr<supervised_user::SupervisedUserMetricsService ::
-                       SupervisedUserMetricsServiceExtensionDelegate>
-       extensions_metrics_delegate = nullptr;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   extensions_metrics_delegate =
-       std::make_unique<SupervisedUserExtensionsMetricsDelegateImpl>(
-           extensions::ExtensionRegistry::Get(profile), profile);
diff --git a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
deleted file mode 100644
index e26d03c0e6..0000000000
--- a/chromium-next/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc
-@@ -47,7 +47,7 @@
- #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h"
- #elif BUILDFLAG(IS_CHROMEOS)
- #include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h"
--#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h"
- #endif
- 
-@@ -67,7 +67,7 @@ std::unique_ptr<supervised_user::WebCont
- #elif BUILDFLAG(IS_ANDROID)
-   return std::make_unique<SupervisedUserWebContentHandlerImpl>(
-       web_contents, frame_id, navigation_id);
--#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return std::make_unique<SupervisedUserWebContentHandlerImpl>(
-       web_contents, frame_id, navigation_id);
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_sync_chrome__sync__controller__builder.cc b/chromium-next/patches/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
deleted file mode 100644
index aeb5681b23..0000000000
--- a/chromium-next/patches/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/sync/chrome_sync_controller_builder.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/sync/chrome_sync_controller_builder.cc
-@@ -280,7 +280,7 @@ ChromeSyncControllerBuilder::Build(synce
- #if BUILDFLAG(ENABLE_SPELLCHECK)
-     // Chrome prefers OS provided spell checkers where they exist. So only sync
-     // the custom dictionary on platforms that typically don't provide one.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     // Dictionary sync is enabled by default.
-     if (spellcheck_service_.value()) {
-       controllers.push_back(
diff --git a/chromium-next/patches/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/chromium-next/patches/patch-chrome_browser_sync_device__info__sync__client__impl.cc
deleted file mode 100644
index 3ec00fb6d0..0000000000
--- a/chromium-next/patches/patch-chrome_browser_sync_device__info__sync__client__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/sync/device_info_sync_client_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/sync/device_info_sync_client_impl.cc
-@@ -34,7 +34,7 @@ DeviceInfoSyncClientImpl::~DeviceInfoSyn
- std::string DeviceInfoSyncClientImpl::GetSigninScopedDeviceId() const {
- // Since the local sync backend is currently only supported on Windows, Mac and
- // Linux don't even check the pref on other os-es.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   syncer::SyncPrefs prefs(profile_->GetPrefs());
-   if (prefs.IsLocalSyncEnabled()) {
-     return "local_device";
diff --git a/chromium-next/patches/patch-chrome_browser_sync_sync__service__factory.cc b/chromium-next/patches/patch-chrome_browser_sync_sync__service__factory.cc
deleted file mode 100644
index edd90154c1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_sync_sync__service__factory.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/sync/sync_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/sync/sync_service_factory.cc
-@@ -108,7 +108,7 @@
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
- #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
- #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
-@@ -135,7 +135,7 @@ namespace {
- tab_groups::TabGroupSyncService* GetTabGroupSyncService(Profile* profile) {
-   CHECK(profile);
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   tab_groups::TabGroupSyncService* service =
-       tab_groups::SavedTabGroupUtils::GetServiceForProfile(profile);
-   CHECK(service);
-@@ -377,7 +377,7 @@ std::unique_ptr<KeyedService> BuildSyncS
-   bool local_sync_backend_enabled = false;
-   // Only check the local sync backend pref on the supported platforms of
-   // Windows, Mac and Linux.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   syncer::SyncPrefs prefs(profile->GetPrefs());
-   local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
-   base::UmaHistogramBoolean("Sync.Local.Enabled2", local_sync_backend_enabled);
-@@ -512,7 +512,7 @@ SyncServiceFactory::SyncServiceFactory()
-   DependsOn(ProfilePasswordStoreFactory::GetInstance());
-   DependsOn(PowerBookmarkServiceFactory::GetInstance());
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   DependsOn(tab_groups::SavedTabGroupServiceFactory::GetInstance());
- #elif BUILDFLAG(IS_ANDROID)
-   DependsOn(tab_groups::TabGroupSyncServiceFactory::GetInstance());
diff --git a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group.cc b/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group.cc
deleted file mode 100644
index 4e0bba9c90..0000000000
--- a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/task_manager/sampling/task_group.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/task_manager/sampling/task_group.cc
-@@ -36,7 +36,7 @@ const int kBackgroundRefreshTypesMask =
- #if BUILDFLAG(IS_WIN)
-     REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
- #endif  // BUILDFLAG(IS_WIN)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     REFRESH_TYPE_FD_COUNT |
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
- #if BUILDFLAG(ENABLE_NACL)
-@@ -117,7 +117,7 @@ TaskGroup::TaskGroup(
- #if BUILDFLAG(ENABLE_NACL)
-       nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
- #endif  // BUILDFLAG(ENABLE_NACL)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       open_fd_count_(-1),
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-       idle_wakeups_per_second_(-1),
-@@ -132,7 +132,7 @@ TaskGroup::TaskGroup(
-                             weak_ptr_factory_.GetWeakPtr()),
-         base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone,
-                             weak_ptr_factory_.GetWeakPtr()),
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-         base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone,
-                             weak_ptr_factory_.GetWeakPtr()),
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -302,7 +302,7 @@ void TaskGroup::OnRefreshNaClDebugStubPo
- }
- #endif  // BUILDFLAG(ENABLE_NACL)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) {
-   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- 
diff --git a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group.h b/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group.h
deleted file mode 100644
index 3d4ddc9a29..0000000000
--- a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/task_manager/sampling/task_group.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/task_manager/sampling/task_group.h
-@@ -41,7 +41,7 @@ constexpr int kUnsupportedVMRefreshFlags
-     REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
-     REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES |
-     REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY |
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     REFRESH_TYPE_FD_COUNT |
- #endif
-     REFRESH_TYPE_HARD_FAULTS;
-@@ -144,7 +144,7 @@ class TaskGroup {
-   }
- #endif  // BUILDFLAG(ENABLE_NACL)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   int open_fd_count() const { return open_fd_count_; }
-   void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; }
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -164,7 +164,7 @@ class TaskGroup {
-   void RefreshNaClDebugStubPort(int child_process_unique_id);
-   void OnRefreshNaClDebugStubPortDone(int port);
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   void OnOpenFdCountRefreshDone(int open_fd_count);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
- 
-@@ -235,7 +235,7 @@ class TaskGroup {
- #if BUILDFLAG(ENABLE_NACL)
-   int nacl_debug_stub_port_;
- #endif  // BUILDFLAG(ENABLE_NACL)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   // The number of file descriptors currently open by the process.
-   int open_fd_count_;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
diff --git a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
deleted file mode 100644
index bd019cd7b9..0000000000
--- a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/task_manager/sampling/task_group_sampler.cc
-@@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler(
-     const OnCpuRefreshCallback& on_cpu_refresh,
-     const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
-     const OnIdleWakeupsCallback& on_idle_wakeups,
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     const OnOpenFdCountCallback& on_open_fd_count,
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-     const OnProcessPriorityCallback& on_process_priority)
-@@ -55,7 +55,7 @@ TaskGroupSampler::TaskGroupSampler(
-       on_cpu_refresh_callback_(on_cpu_refresh),
-       on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
-       on_idle_wakeups_callback_(on_idle_wakeups),
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       on_open_fd_count_callback_(on_open_fd_count),
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-       on_process_priority_callback_(on_process_priority) {
-@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t r
-         base::BindOnce(on_swapped_mem_refresh_callback_));
-   }
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
-                                                     refresh_flags)) {
-     blocking_pool_runner_->PostTaskAndReplyWithResult(
-@@ -95,7 +95,7 @@ void TaskGroupSampler::Refresh(int64_t r
-   }
- #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
-                                                     refresh_flags)) {
-     blocking_pool_runner_->PostTaskAndReplyWithResult(
-@@ -152,7 +152,7 @@ int TaskGroupSampler::RefreshIdleWakeups
-   return process_metrics_->GetIdleWakeupsPerSecond();
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- int TaskGroupSampler::RefreshOpenFdCount() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(worker_pool_sequenced_checker_);
- 
diff --git a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
deleted file mode 100644
index 4bb0c9505a..0000000000
--- a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/task_manager/sampling/task_group_sampler.h
-@@ -31,7 +31,7 @@ class TaskGroupSampler : public base::Re
-   using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>;
-   using OnSwappedMemRefreshCallback = base::RepeatingCallback<void(int64_t)>;
-   using OnIdleWakeupsCallback = base::RepeatingCallback<void(int)>;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   using OnOpenFdCountCallback = base::RepeatingCallback<void(int)>;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-   using OnProcessPriorityCallback =
-@@ -43,7 +43,7 @@ class TaskGroupSampler : public base::Re
-       const OnCpuRefreshCallback& on_cpu_refresh,
-       const OnSwappedMemRefreshCallback& on_memory_refresh,
-       const OnIdleWakeupsCallback& on_idle_wakeups,
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       const OnOpenFdCountCallback& on_open_fd_count,
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-       const OnProcessPriorityCallback& on_process_priority);
-@@ -63,7 +63,7 @@ class TaskGroupSampler : public base::Re
-   double RefreshCpuUsage();
-   int64_t RefreshSwappedMem();
-   int RefreshIdleWakeupsPerSecond();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   int RefreshOpenFdCount();
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-   base::Process::Priority RefreshProcessPriority();
-@@ -87,7 +87,7 @@ class TaskGroupSampler : public base::Re
-   const OnCpuRefreshCallback on_cpu_refresh_callback_;
-   const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_;
-   const OnIdleWakeupsCallback on_idle_wakeups_callback_;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   const OnOpenFdCountCallback on_open_fd_count_callback_;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-   const OnProcessPriorityCallback on_process_priority_callback_;
diff --git a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
deleted file mode 100644
index b809d6b321..0000000000
--- a/chromium-next/patches/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -235,7 +235,7 @@ void TaskManagerImpl::GetUSERHandles(Tas
- }
- 
- int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   return GetTaskGroupByTaskId(task_id)->open_fd_count();
- #else
-   return -1;
diff --git a/chromium-next/patches/patch-chrome_browser_task__manager_task__manager__observer.h b/chromium-next/patches/patch-chrome_browser_task__manager_task__manager__observer.h
deleted file mode 100644
index 2a9571ca4e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_task__manager_task__manager__observer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/task_manager/task_manager_observer.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/task_manager/task_manager_observer.h
-@@ -46,7 +46,7 @@ enum RefreshType {
-   // or backgrounded.
-   REFRESH_TYPE_PRIORITY = 1 << 13,
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   // For observers interested in getting the number of open file descriptors of
-   // processes.
-   REFRESH_TYPE_FD_COUNT = 1 << 14,
diff --git a/chromium-next/patches/patch-chrome_browser_themes_theme__helper.cc b/chromium-next/patches/patch-chrome_browser_themes_theme__helper.cc
deleted file mode 100644
index 32cb82fee0..0000000000
--- a/chromium-next/patches/patch-chrome_browser_themes_theme__helper.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/themes/theme_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/themes/theme_helper.cc
-@@ -16,7 +16,7 @@
- #include "ui/gfx/image/image.h"
- #include "ui/native_theme/native_theme.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_themes_theme__service.cc b/chromium-next/patches/patch-chrome_browser_themes_theme__service.cc
deleted file mode 100644
index aaaa286f73..0000000000
--- a/chromium-next/patches/patch-chrome_browser_themes_theme__service.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/themes/theme_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/themes/theme_service.cc
-@@ -72,7 +72,7 @@
- #include "extensions/browser/extension_registry_observer.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #include "ui/ozone/public/ozone_platform.h"  // nogncheck
- #endif
-@@ -332,7 +332,7 @@ CustomThemeSupplier* ThemeService::GetTh
- }
- 
- bool ThemeService::ShouldUseCustomFrame() const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!ui::OzonePlatform::GetInstance()
-            ->GetPlatformRuntimeProperties()
-            .supports_server_side_window_decorations) {
diff --git a/chromium-next/patches/patch-chrome_browser_themes_theme__service__aura__linux.cc b/chromium-next/patches/patch-chrome_browser_themes_theme__service__aura__linux.cc
deleted file mode 100644
index c23f808d5c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_themes_theme__service__aura__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/themes/theme_service_aura_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/themes/theme_service_aura_linux.cc
-@@ -23,7 +23,7 @@ namespace {
- ui::SystemTheme ValidateSystemTheme(ui::SystemTheme system_theme) {
-   switch (system_theme) {
-     case ui::SystemTheme::kDefault:
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case ui::SystemTheme::kGtk:
-     case ui::SystemTheme::kQt:
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_themes_theme__service__factory.cc b/chromium-next/patches/patch-chrome_browser_themes_theme__service__factory.cc
deleted file mode 100644
index 97d5e426f1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_themes_theme__service__factory.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/themes/theme_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/themes/theme_service_factory.cc
-@@ -24,7 +24,7 @@
- #include "chrome/browser/themes/theme_helper_win.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/themes/theme_service_aura_linux.h"
- #include "ui/linux/linux_ui_factory.h"
- #endif
-@@ -103,7 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactor
- std::unique_ptr<KeyedService>
- ThemeServiceFactory::BuildServiceInstanceForBrowserContext(
-     content::BrowserContext* profile) const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   using ThemeService = ThemeServiceAuraLinux;
- #endif
- 
-@@ -115,7 +115,7 @@ ThemeServiceFactory::BuildServiceInstanc
- 
- void ThemeServiceFactory::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   registry->RegisterIntegerPref(prefs::kSystemTheme,
-                                 static_cast<int>(ui::GetDefaultSystemTheme()));
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_actions_chrome__action__id.h b/chromium-next/patches/patch-chrome_browser_ui_actions_chrome__action__id.h
deleted file mode 100644
index aec9074f84..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_actions_chrome__action__id.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/actions/chrome_action_id.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/actions/chrome_action_id.h
-@@ -497,7 +497,7 @@
- #if BUILDFLAG(IS_CHROMEOS)
- #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
-   E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU)
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
-   E(kUseSystemTitleBar, IDC_USE_SYSTEM_TITLE_BAR) \
-   E(kRestoreWindow, IDC_RESTORE_WINDOW)
diff --git a/chromium-next/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/chromium-next/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
deleted file mode 100644
index 0ab4622e37..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
-@@ -57,7 +57,7 @@ gfx::Rect GetPopupSizeForBnpl() {
- DesktopPaymentsWindowManager::DesktopPaymentsWindowManager(
-     ContentAutofillClient* client)
-     : client_(CHECK_DEREF(client)) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   scoped_observation_.Observe(BrowserList::GetInstance());
- #endif  // BUILDFLAG(IS_LINUX)
- }
-@@ -142,7 +142,7 @@ void DesktopPaymentsWindowManager::WebCo
-   }
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void DesktopPaymentsWindowManager::OnBrowserSetLastActive(Browser* browser) {
-   // If there is an ongoing payments window manager pop-up flow, and the
-   // original tab's WebContents become active, activate the pop-up's
diff --git a/chromium-next/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/chromium-next/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
deleted file mode 100644
index dbe1e4c25c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h
-@@ -14,7 +14,7 @@
- #include "components/autofill/core/browser/payments/payments_window_manager.h"
- #include "content/public/browser/web_contents_observer.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/scoped_observation.h"
- #include "chrome/browser/ui/browser_list.h"
- #include "chrome/browser/ui/browser_list_observer.h"
-@@ -39,7 +39,7 @@ class PaymentsWindowUserConsentDialogCon
- // WebContents of the original tab that the pop-up is created in. If there is a
- // pop-up currently present, `this` will observe the WebContents of that pop-up.
- class DesktopPaymentsWindowManager : public PaymentsWindowManager,
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-                                      public BrowserListObserver,
- #endif  // BUILDFLAG(IS_LINUX)
-                                      public content::WebContentsObserver {
-@@ -59,7 +59,7 @@ class DesktopPaymentsWindowManager : pub
-       content::NavigationHandle* navigation_handle) override;
-   void WebContentsDestroyed() override;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // BrowserListObserver:
-   void OnBrowserSetLastActive(Browser* browser) override;
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -161,7 +161,7 @@ class DesktopPaymentsWindowManager : pub
-   // Used in tests to notify the test infrastructure that the pop-up has closed.
-   base::RepeatingClosure popup_closed_closure_for_testing_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::ScopedObservation<BrowserList, BrowserListObserver> scoped_observation_{
-       this};
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-chrome_browser_ui_browser.h b/chromium-next/patches/patch-chrome_browser_ui_browser.h
deleted file mode 100644
index b3e81d5e8f..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_browser.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/browser.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/browser.h
-@@ -301,7 +301,7 @@ class Browser : public TabStripModelObse
-     std::optional<int64_t> display_id;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // When the browser window is shown, the desktop environment is notified
-     // using this ID.  In response, the desktop will stop playing the "waiting
-     // for startup" animation (if any).
diff --git a/chromium-next/patches/patch-chrome_browser_ui_browser__command__controller.cc b/chromium-next/patches/patch-chrome_browser_ui_browser__command__controller.cc
deleted file mode 100644
index 871100bf68..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_browser__command__controller.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/browser_command_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/browser_command_controller.cc
-@@ -126,7 +126,7 @@
- #include "components/user_manager/user_manager.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/base/ime/text_edit_commands.h"
- #include "ui/base/ime/text_input_flags.h"
- #include "ui/linux/linux_ui.h"
-@@ -136,7 +136,7 @@
- #include "ui/ozone/public/ozone_platform.h"
- #endif
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h"
- #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
- 
-@@ -332,7 +332,7 @@ bool BrowserCommandController::IsReserve
- #endif
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // If this key was registered by the user as a content editing hotkey, then
-   // it is not reserved.
-   auto* linux_ui = ui::LinuxUi::instance();
-@@ -595,7 +595,7 @@ bool BrowserCommandController::ExecuteCo
-       break;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case IDC_MINIMIZE_WINDOW:
-       browser_->window()->Minimize();
-       break;
-@@ -812,7 +812,7 @@ bool BrowserCommandController::ExecuteCo
-       break;
-     case IDC_CREATE_SHORTCUT:
-       base::RecordAction(base::UserMetricsAction("CreateShortcut"));
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       chrome::CreateDesktopShortcutForActiveWebContents(browser_);
- #else
-       web_app::CreateWebAppFromCurrentWebContents(
-@@ -979,7 +979,7 @@ bool BrowserCommandController::ExecuteCo
- #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
-     case IDC_CHROME_WHATS_NEW:
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
--    (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX))
-+    (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-       ShowChromeWhatsNew(browser_);
-       break;
- #else
-@@ -1324,7 +1324,7 @@ void BrowserCommandController::InitComma
-   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
-   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
-   command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
-   command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
-@@ -1682,7 +1682,7 @@ void BrowserCommandController::UpdateCom
-   bool can_create_web_app = web_app::CanCreateWebApp(browser_);
-   command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app);
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   command_updater_.UpdateCommandEnabled(
-       IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_));
- #else
diff --git a/chromium-next/patches/patch-chrome_browser_ui_browser__commands.cc b/chromium-next/patches/patch-chrome_browser_ui_browser__commands.cc
deleted file mode 100644
index 2c319b99f8..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_browser__commands.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/browser_commands.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/browser_commands.cc
-@@ -1980,7 +1980,7 @@ void OpenUpdateChromeDialog(Browser* bro
-   } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
-     UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate();
-   } else {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     if (base::FeatureList::IsEnabled(features::kFewerUpdateConfirmations)) {
-       chrome::AttemptRelaunch();
-       return;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_browser__ui__prefs.cc b/chromium-next/patches/patch-chrome_browser_ui_browser__ui__prefs.cc
deleted file mode 100644
index b8b4683d22..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_browser__ui__prefs.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/browser_ui_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/browser_ui_prefs.cc
-@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySi
-   registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0);
-   registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime,
-                              base::Time());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser,
-                                std::string());
-   registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser,
-@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs
-   registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
-   registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
-   registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForProfile,
-                                std::string());
-   registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForProfile,
diff --git a/chromium-next/patches/patch-chrome_browser_ui_browser__view__prefs.cc b/chromium-next/patches/patch-chrome_browser_ui_browser__view__prefs.cc
deleted file mode 100644
index 6ffb049524..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_browser__view__prefs.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/browser_view_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/browser_view_prefs.cc
-@@ -14,7 +14,7 @@
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool GetCustomFramePrefDefault() {
- #if BUILDFLAG(IS_OZONE)
-   return ui::OzonePlatform::GetInstance()
-@@ -30,7 +30,7 @@ bool GetCustomFramePrefDefault() {
- 
- void RegisterBrowserViewProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
-                                 GetCustomFramePrefDefault());
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_chrome__pages.cc b/chromium-next/patches/patch-chrome_browser_ui_chrome__pages.cc
deleted file mode 100644
index 2c550172f2..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_chrome__pages.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/chrome_pages.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/chrome_pages.cc
-@@ -84,7 +84,7 @@
- #include "components/signin/public/identity_manager/identity_manager.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/web_applications/web_app_utils.h"
- #endif
- 
-@@ -381,7 +381,7 @@ void ShowChromeTips(Browser* browser) {
-   ShowSingletonTab(browser, GURL(kChromeTipsURL));
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void ShowChromeWhatsNew(Browser* browser) {
-   ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL));
- }
-@@ -699,7 +699,7 @@ void ShowShortcutCustomizationApp(Profil
- }
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void ShowWebAppSettingsImpl(Browser* browser,
-                             Profile* profile,
-                             const std::string& app_id,
diff --git a/chromium-next/patches/patch-chrome_browser_ui_chrome__pages.h b/chromium-next/patches/patch-chrome_browser_ui_chrome__pages.h
deleted file mode 100644
index d00d229a3c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_chrome__pages.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/chrome_pages.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/chrome_pages.h
-@@ -39,7 +39,7 @@ namespace signin {
- enum class ConsentLevel;
- }  // namespace signin
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- namespace web_app {
- enum class AppSettingsPageEntryPoint;
- }  // namespace web_app
-@@ -174,7 +174,7 @@ void ShowShortcutCustomizationApp(Profil
-                                   const std::string& category);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Show chrome://app-settings/<app-id> page.
- void ShowWebAppSettings(Browser* browser,
-                         const std::string& app_id,
diff --git a/chromium-next/patches/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc b/chromium-next/patches/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
deleted file mode 100644
index ca7961d3ad..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/color/native_chrome_color_mixer.cc
-@@ -7,7 +7,7 @@
- #include "build/build_config.h"
- 
- #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && \
--    !BUILDFLAG(IS_WIN)
-+    !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD)
- void AddNativeChromeColorMixer(ui::ColorProvider* provider,
-                                const ui::ColorProviderKey& key) {}
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_managed__ui.cc b/chromium-next/patches/patch-chrome_browser_ui_managed__ui.cc
deleted file mode 100644
index 383de10fe5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_managed__ui.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/managed_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/managed_ui.cc
-@@ -433,7 +433,7 @@ std::optional<std::string> GetDeviceMana
-       g_browser_process->platform_part()->browser_policy_connector_ash();
-   return connector->GetEnterpriseDomainManager();
- #else
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(
-           features::kEnterpriseManagementDisclaimerUsesCustomLabel)) {
-     std::string custom_management_label =
-@@ -463,7 +463,7 @@ std::optional<std::string> GetAccountMan
-     return std::nullopt;
-   }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(
-           features::kEnterpriseManagementDisclaimerUsesCustomLabel)) {
-     std::string custom_management_label =
diff --git a/chromium-next/patches/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/chromium-next/patches/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
deleted file mode 100644
index f08eea0e4e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
-@@ -1985,7 +1985,7 @@ const gfx::VectorIcon& GetSharingHubVect
-   return omnibox::kShareMacChromeRefreshIcon;
- #elif BUILDFLAG(IS_WIN)
-   return omnibox::kShareWinChromeRefreshIcon;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return omnibox::kShareLinuxChromeRefreshIcon;
- #else
-   return omnibox::kShareChromeRefreshIcon;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc b/chromium-next/patches/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
deleted file mode 100644
index 81b877cf3c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc
-@@ -44,7 +44,7 @@ std::u16string RelaunchChromeBubbleContr
- #if BUILDFLAG(IS_MAC)
-           ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_BRANDED
-           : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_NON_BRANDED
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-           ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_LINUX_BRANDED
-           : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_LINUX_NON_BRANDED
- #endif
-@@ -57,7 +57,7 @@ std::u16string RelaunchChromeBubbleContr
- #if BUILDFLAG(IS_MAC)
-           ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_BRANDED
-           : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_NON_BRANDED
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-           ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_LINUX_BRANDED
-           : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_LINUX_NON_BRANDED
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/chromium-next/patches/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
deleted file mode 100644
index 9443f4c3b5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
-@@ -102,7 +102,7 @@ namespace {
- 
- using Logger = autofill::SavePasswordProgressLogger;
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Should be kept in sync with constant declared in
- // bubble_controllers/relaunch_chrome_bubble_controller.cc.
- constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3;
-@@ -549,7 +549,7 @@ void ManagePasswordsUIController::OnBiom
- }
- 
- void ManagePasswordsUIController::OnKeychainError() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   CHECK(!dialog_controller_);
-   PrefService* prefs =
-       Profile::FromBrowserContext(web_contents()->GetBrowserContext())
diff --git a/chromium-next/patches/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc b/chromium-next/patches/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
deleted file mode 100644
index 9f89d02631..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/prefs/prefs_tab_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/prefs/prefs_tab_helper.cc
-@@ -66,7 +66,7 @@
- #include <windows.h>
- #endif
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // If a font name in prefs default values starts with a comma, consider it's a
- // comma-separated font list and resolve it to the first available font.
- #define PREFS_FONT_LIST 1
diff --git a/chromium-next/patches/patch-chrome_browser_ui_sad__tab.cc b/chromium-next/patches/patch-chrome_browser_ui_sad__tab.cc
deleted file mode 100644
index 08fa1c78a7..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_sad__tab.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/sad_tab.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/sad_tab.cc
-@@ -179,7 +179,7 @@ std::vector<int> SadTab::GetSubMessages(
-       if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) {
-         message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO);
-       }
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // Note: on macOS, Linux and ChromeOS, the first bullet is either one of
-       // IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS
-       // followed by one of the above suggestions.
diff --git a/chromium-next/patches/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h b/chromium-next/patches/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
deleted file mode 100644
index 75e7023a75..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
-@@ -36,7 +36,7 @@ class SharingHubBubbleController {
-   // Returns true if the omnibox icon should be shown.
-   virtual bool ShouldOfferOmniboxIcon() = 0;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // This method returns the set of first-party actions, which are actions
-   // internal to Chrome. Third-party actions (those outside Chrome) are
-   // currently not supported.
diff --git a/chromium-next/patches/patch-chrome_browser_ui_signin_signin__view__controller.cc b/chromium-next/patches/patch-chrome_browser_ui_signin_signin__view__controller.cc
deleted file mode 100644
index 7880133100..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_signin_signin__view__controller.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/signin/signin_view_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/signin/signin_view_controller.cc
-@@ -443,7 +443,7 @@ void SigninViewController::ShowModalSync
- void SigninViewController::ShowModalManagedUserNoticeDialog(
-     std::unique_ptr<signin::EnterpriseProfileCreationDialogParams>
-         create_param) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   CloseModalSignin();
-   dialog_ = std::make_unique<SigninModalDialogImpl>(
-       SigninViewControllerDelegate::CreateManagedUserNoticeDelegate(
diff --git a/chromium-next/patches/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h b/chromium-next/patches/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
deleted file mode 100644
index 01937f1fff..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/signin/signin_view_controller_delegate.h
-@@ -79,7 +79,7 @@ class SigninViewControllerDelegate {
-       SignoutConfirmationCallback callback);
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Returns a platform-specific SigninViewContolllerDelegate instance that
-   // displays the managed user notice modal dialog. The returned object
-   // should delete itself when the window it's managing is closed.
diff --git a/chromium-next/patches/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/chromium-next/patches/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
deleted file mode 100644
index 9181a55f57..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -95,7 +95,7 @@ const char* const kBadFlags[] = {
-     extensions::switches::kExtensionsOnChromeURLs,
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // Speech dispatcher is buggy, it can crash and it can make Chrome freeze.
-     // http://crbug.com/327295
-     switches::kEnableSpeechDispatcher,
diff --git a/chromium-next/patches/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/chromium-next/patches/patch-chrome_browser_ui_startup_startup__browser__creator.cc
deleted file mode 100644
index 13f7b507a4..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -134,7 +134,7 @@
- #include "chrome/credential_provider/common/gcp_strings.h"
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/headless/headless_mode_util.h"
- #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
- #include "components/headless/policy/headless_mode_policy.h"
-@@ -978,7 +978,7 @@ bool StartupBrowserCreator::ProcessCmdLi
-   TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
-   ComputeAndRecordLaunchMode(command_line);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (headless::IsHeadlessMode() &&
-       headless::HeadlessModePolicy::IsHeadlessModeDisabled(
-           g_browser_process->local_state())) {
-@@ -1081,7 +1081,7 @@ bool StartupBrowserCreator::ProcessCmdLi
-     silent_launch = true;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // Writes open and installed web apps to the specified file without
-   // launching a new browser window or tab.
-   if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
-@@ -1298,7 +1298,7 @@ bool StartupBrowserCreator::ProcessCmdLi
-     CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
-         << "Failed launch with app: couldn't pick a profile";
-     std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // If Chrome Apps are deprecated and |app_id| is a Chrome App, display the
-     // deprecation UI instead of launching the app.
-     if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id)) {
diff --git a/chromium-next/patches/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/chromium-next/patches/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
deleted file mode 100644
index b50ce11288..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -76,7 +76,7 @@
- #include "components/app_restore/full_restore_utils.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -208,7 +208,7 @@ Browser* StartupBrowserCreatorImpl::Open
-     // at the state of the MessageLoop.
-     Browser::CreateParams params = Browser::CreateParams(profile_, false);
-     params.creation_source = Browser::CreationSource::kStartupCreator;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     params.startup_id =
-         command_line_->GetSwitchValueASCII("desktop-startup-id");
- #endif
-@@ -238,7 +238,7 @@ Browser* StartupBrowserCreatorImpl::Open
-       continue;
-     }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // Start the What's New fetch but don't add the tab at this point. The tab
-     // will open as the foreground tab only if the remote content can be
-     // retrieved successfully. This prevents needing to automatically close the
diff --git a/chromium-next/patches/patch-chrome_browser_ui_startup_startup__tab__provider.cc b/chromium-next/patches/patch-chrome_browser_ui_startup_startup__tab__provider.cc
deleted file mode 100644
index 6cfcff2bd1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_startup_startup__tab__provider.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/startup/startup_tab_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/startup/startup_tab_provider.cc
-@@ -62,7 +62,7 @@
- #include "extensions/browser/extension_registry.h"
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/headless/headless_mode_util.h"
- #endif
- 
-@@ -101,7 +101,7 @@ bool ValidateUrl(const GURL& url) {
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
-   bool url_scheme_is_chrome = false;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // In Headless mode, allow any URL pattern that matches chrome:// scheme if
-   // the user explicitly allowed it.
-   if (headless::IsHeadlessMode() && url.SchemeIs(content::kChromeUIScheme)) {
diff --git a/chromium-next/patches/patch-chrome_browser_ui_tab__helpers.cc b/chromium-next/patches/patch-chrome_browser_ui_tab__helpers.cc
deleted file mode 100644
index d35f71b298..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_tab__helpers.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/tab_helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/tab_helpers.cc
-@@ -218,7 +218,7 @@
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
- #include "chrome/browser/ui/browser_finder.h"
- #include "chrome/browser/ui/hats/hats_helper.h"
-@@ -697,12 +697,12 @@ void TabHelpers::AttachTabHelpers(WebCon
-   webapps::PreRedirectionURLObserver::CreateForWebContents(web_contents);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents);
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(
-           features::kHappinessTrackingSurveysForDesktopDemo) ||
-       base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) ||
diff --git a/chromium-next/patches/patch-chrome_browser_ui_tabs_features.cc b/chromium-next/patches/patch-chrome_browser_ui_tabs_features.cc
deleted file mode 100644
index 16b09f4d73..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_tabs_features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/tabs/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/tabs/features.cc
-@@ -47,7 +47,7 @@ bool CanShowTabSearchPositionSetting() {
-   }
- // Mac and other platforms will always have the tab search position in the
- // correct location, cros/linux/win git the user the option to change.
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(kTabSearchPositionSetting);
- #else
-   return false;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc b/chromium-next/patches/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc
deleted file mode 100644
index 3822ee11bb..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/tabs/tab_dialog_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/tabs/tab_dialog_manager.cc
-@@ -83,7 +83,7 @@ bool SupportsGlobalScreenCoordinates() {
- }
- 
- bool PlatformClipsChildrenToViewport() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc b/chromium-next/patches/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
deleted file mode 100644
index 5b99495826..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/tabs/tab_strip_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/tabs/tab_strip_prefs.cc
-@@ -21,7 +21,7 @@ namespace tabs {
- 
- bool GetDefaultTabSearchRightAligned() {
-   // These platforms are all left aligned, the others should be right.
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return false;
- #else
-   return true;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.h b/chromium-next/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.h
deleted file mode 100644
index 9f84600df1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/task_manager/task_manager_columns.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/task_manager/task_manager_columns.h
-@@ -277,7 +277,7 @@ inline constexpr std::array kColumns = {
-                     .default_visibility = false},
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     TableColumnData{.id = IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN,
-                     .align = ui::TableColumn::RIGHT,
-                     .width = -1,
diff --git a/chromium-next/patches/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/chromium-next/patches/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
deleted file mode 100644
index 66e517fcde..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -419,7 +419,7 @@ TaskManagerTableModel::~TaskManagerTable
-   // Note: system_total_time_ is used for both since there is no functional
-   // difference between browser & system (they are essentially the same tab).
-   // Instead, the data is routed to the platform appropriate bucket.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   task_manager::RecordTabSwitchEvent(CategoryRecord::kBrowser,
-                                      system_total_time_);
- #elif BUILDFLAG(IS_CHROMEOS)
-@@ -560,7 +560,7 @@ std::u16string TaskManagerTableModel::Ge
-                  ? stringifier_->backgrounded_string()
-                  : stringifier_->foregrounded_string();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
-       const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
-       return fd_count >= 0 ? base::FormatNumber(fd_count)
-@@ -723,7 +723,7 @@ int TaskManagerTableModel::CompareValues
-       return BooleanCompare(is_proc1_bg, is_proc2_bg);
-     }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
-       const int proc1_fd_count =
-           observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -1030,7 +1030,7 @@ void TaskManagerTableModel::UpdateRefres
-       type = REFRESH_TYPE_KEEPALIVE_COUNT;
-       break;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN:
-       type = REFRESH_TYPE_FD_COUNT;
-       break;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_test_popup__browsertest.cc b/chromium-next/patches/patch-chrome_browser_ui_test_popup__browsertest.cc
deleted file mode 100644
index db1229a417..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_test_popup__browsertest.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/test/popup_browsertest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/test/popup_browsertest.cc
-@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLe
-   const display::Display display = GetDisplayNearestBrowser(popup);
-   gfx::Rect expected(popup->window()->GetBounds().size());
-   expected.AdjustToFit(display.work_area());
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(crbug.com/40815883) Desktop Linux window bounds are inaccurate.
-   expected.Outset(50);
-   EXPECT_TRUE(expected.Contains(popup->window()->GetBounds()))
-@@ -107,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenCl
-     // The popup should be constrained to the opener's available display space.
-     EXPECT_EQ(display, GetDisplayNearestBrowser(popup));
-     gfx::Rect work_area(display.work_area());
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/40815883) Desktop Linux bounds flakily extend outside the
-     // work area on trybots, when opening with excessive width and height, e.g.:
-     // width=${screen.availWidth+300},height=${screen.availHeight+300} yields:
diff --git a/chromium-next/patches/patch-chrome_browser_ui_test_test__browser__ui.cc b/chromium-next/patches/patch-chrome_browser_ui_test_test__browser__ui.cc
deleted file mode 100644
index 48ed4c0291..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_test_test__browser__ui.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/test/test_browser_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/test/test_browser_ui.cc
-@@ -19,7 +19,7 @@
- #include "ui/views/widget/widget.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "content/public/common/content_switches.h"
- #include "ui/base/test/skia_gold_matching_algorithm.h"
- #include "ui/compositor/compositor.h"
-@@ -33,7 +33,7 @@
- #endif
- 
- // TODO(crbug.com/40625383) support Mac for pixel tests.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define SUPPORTS_PIXEL_TEST
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_ui_ui__features.cc b/chromium-next/patches/patch-chrome_browser_ui_ui__features.cc
deleted file mode 100644
index c6cbf3c553..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_ui__features.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/ui_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/ui_features.cc
-@@ -45,7 +45,7 @@ bool IsExtensionMenuInRootAppMenu() {
-   return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu);
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Enables the feature to remove the last confirmation dialog when relaunching
- // to update Chrome.
- BASE_FEATURE(kFewerUpdateConfirmations,
-@@ -326,7 +326,7 @@ BASE_FEATURE(kViewsJSAppModalDialog,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kUsePortalAccentColor,
-              "UsePortalAccentColor",
-              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-chrome_browser_ui_ui__features.h b/chromium-next/patches/patch-chrome_browser_ui_ui__features.h
deleted file mode 100644
index c851947587..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_ui__features.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/ui_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/ui_features.h
-@@ -31,7 +31,7 @@ BASE_DECLARE_FEATURE(kCloseOmniboxPopupO
- BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu);
- bool IsExtensionMenuInRootAppMenu();
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kFewerUpdateConfirmations);
- #endif
- 
-@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialo
- BASE_DECLARE_FEATURE(kViewsJSAppModalDialog);
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kUsePortalAccentColor);
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_accelerator__table.cc b/chromium-next/patches/patch-chrome_browser_ui_views_accelerator__table.cc
deleted file mode 100644
index 09193b9a4e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_accelerator__table.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/accelerator_table.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/accelerator_table.cc
-@@ -70,11 +70,11 @@ const AcceleratorMapping kAcceleratorMap
-     {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
-     {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
-     {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
-     {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
- #endif  // BUILDFLAG(IS_LINUX)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
-     {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
-      IDC_MOVE_TAB_PREVIOUS},
-@@ -102,7 +102,7 @@ const AcceleratorMapping kAcceleratorMap
-     {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
-     {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
-     {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
-     {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
-     {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
-@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap
-      IDC_SHOW_AVATAR_MENU},
- 
- // Platform-specific key maps.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
-     {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
-     {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/chromium-next/patches/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
deleted file mode 100644
index 6b0d286669..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
-@@ -19,7 +19,7 @@
- #include "ui/menus/simple_menu_model.h"
- #include "ui/views/widget/widget.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/shell_integration_linux.h"
- #endif
- 
-@@ -49,7 +49,7 @@ void ChromeNativeAppWindowViewsAura::OnB
-     const AppWindow::CreateParams& create_params,
-     views::Widget::InitParams* init_params,
-     views::Widget* widget) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::string app_name =
-       web_app::GenerateApplicationNameFromAppId(app_window()->extension_id());
-   // Set up a custom WM_CLASS for app windows. This allows task switchers in
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/chromium-next/patches/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
deleted file mode 100644
index 5535adb97b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -39,7 +39,7 @@
- #include "ui/wm/core/wm_state.h"
- #endif  // defined(USE_AURA)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -135,7 +135,7 @@ void ChromeBrowserMainExtraPartsViews::P
-         return controller;
-       }));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On the Linux desktop, we want to prevent the user from logging in as root,
-   // so that we don't destroy the profile. Now that we have some minimal ui
-   // initialized, check to see if we're running as root and bail if we are.
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_chrome__views__delegate.h b/chromium-next/patches/patch-chrome_browser_ui_views_chrome__views__delegate.h
deleted file mode 100644
index bfcf5f444d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_chrome__views__delegate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -52,7 +52,7 @@ class ChromeViewsDelegate : public views
-                              base::OnceClosure callback) override;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool WindowManagerProvidesTitleBar(bool maximized) override;
-   gfx::ImageSkia* GetDefaultWindowIcon() const override;
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc b/chromium-next/patches/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
deleted file mode 100644
index 23cf019509..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/chrome_views_delegate_linux.cc
-@@ -26,7 +26,7 @@ bool IsDesktopEnvironmentUnity() {
-   return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- int GetWindowIconResourceId() {
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-   switch (chrome::GetChannel()) {
-@@ -80,7 +80,7 @@ views::NativeWidget* ChromeViewsDelegate
-                               delegate);
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
-   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-   return rb.GetImageSkiaNamed(GetWindowIconResourceId());
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
deleted file mode 100644
index 061cf4e2da..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/compose/compose_dialog_view.cc
-@@ -160,7 +160,7 @@ void ComposeDialogView::OnBeforeBubbleWi
-     views::Widget::InitParams* params,
-     views::Widget* widget) const {
-   WebUIBubbleDialogView::OnBeforeBubbleWidgetInit(params, widget);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // In linux, windows may be clipped to their anchors' bounds,
-   // resulting in visual errors, unless they use accelerated rendering. See
-   // crbug.com/1445770 for details.
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame.cc
deleted file mode 100644
index b1d21ceb50..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -52,7 +52,7 @@
- #include "ui/aura/window.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/display/screen.h"
- #include "ui/linux/linux_ui.h"
- #endif
-@@ -87,7 +87,7 @@ class ThemeChangedObserver : public view
- };
- 
- bool IsUsingLinuxSystemTheme(Profile* profile) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
- #else
-   return false;
-@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() {
- 
-   Init(std::move(params));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   SelectNativeTheme();
- #else
-   SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi());
-@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspa
-   chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
-   chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
-                                            IsVisibleOnAllWorkspaces());
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // If the window was sent to a different workspace, prioritize it if
-   // it was sent to the current workspace and deprioritize it
-   // otherwise.  This is done by MoveBrowsersInWorkspaceToFront()
-@@ -568,7 +568,7 @@ void BrowserFrame::OnMenuClosed() {
- }
- 
- void BrowserFrame::SelectNativeTheme() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Use the regular NativeTheme instance if running incognito mode, regardless
-   // of system theme (gtk, qt etc).
-   ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
-@@ -609,7 +609,7 @@ void BrowserFrame::OnTouchUiChanged() {
- bool BrowserFrame::RegenerateFrameOnThemeChange(
-     BrowserThemeChangeType theme_change_type) {
-   bool need_regenerate = false;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // System and user theme changes can both change frame buttons, so the frame
-   // always needs to be regenerated on Linux.
-   need_regenerate = true;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame.h b/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame.h
deleted file mode 100644
index e42a05ace2..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/browser_frame.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/browser_frame.h
-@@ -66,7 +66,7 @@ class BrowserFrame : public views::Widge
- 
-   ~BrowserFrame() override;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Returns whether the frame is in a tiled state.
-   bool tiled() const { return tiled_; }
-   void set_tiled(bool tiled) { tiled_ = tiled; }
-@@ -227,7 +227,7 @@ class BrowserFrame : public views::Widge
-   // contents for smoother dragging.
-   TabDragKind tab_drag_kind_ = TabDragKind::kNone;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool tiled_ = false;
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
deleted file mode 100644
index e02101e00c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc
-@@ -54,7 +54,7 @@ gfx::Insets BrowserFrameViewLayoutLinux:
-         OpaqueBrowserFrameViewLayout::RestoredFrameBorderInsets());
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const bool tiled = delegate_->IsTiled();
- #else
-   const bool tiled = false;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
deleted file mode 100644
index d4842e4f86..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc
-@@ -18,7 +18,7 @@ BrowserFrameViewLayoutLinuxNative::~Brow
- 
- ui::WindowFrameProvider* BrowserFrameViewLayoutLinuxNative::GetFrameProvider()
-     const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const bool tiled = delegate_->IsTiled();
-   const bool maximized = delegate_->IsMaximized();
- #else
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
deleted file mode 100644
index fc5c9d8ba3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/browser_frame_view_linux.cc
-@@ -70,7 +70,7 @@ gfx::ShadowValues BrowserFrameViewLinux:
- 
- void BrowserFrameViewLinux::PaintRestoredFrameBorder(
-     gfx::Canvas* canvas) const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const bool tiled = frame()->tiled();
- #else
-   const bool tiled = false;
-@@ -125,7 +125,7 @@ int BrowserFrameViewLinux::NonClientHitT
- }
- 
- float BrowserFrameViewLinux::GetRestoredCornerRadiusDip() const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const bool tiled = frame()->tiled();
- #else
-   const bool tiled = false;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
deleted file mode 100644
index 14386739b9..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
-@@ -15,7 +15,7 @@
- #include "chrome/browser/ui/views/frame/browser_frame_view_win.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h"
- #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h"
- #include "chrome/browser/ui/views/frame/browser_frame_view_linux_native.h"
-@@ -32,7 +32,7 @@ namespace {
- std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView(
-     BrowserFrame* frame,
-     BrowserView* browser_view) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* profile = browser_view->browser()->profile();
-   auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
-   auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
deleted file mode 100644
index 9c9879f710..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2581,7 +2581,7 @@ void BrowserView::ToolbarSizeChanged(boo
- }
- 
- void BrowserView::TabDraggingStatusChanged(bool is_dragging) {
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   GetContentsWebView()->SetFastResize(is_dragging);
-   if (multi_contents_view_) {
-     multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging);
-@@ -5825,7 +5825,7 @@ void BrowserView::MaybeShowProfileSwitch
- }
- 
- void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!ShouldShowAvatarToolbarIPH()) {
-     return;
-   }
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
deleted file mode 100644
index 98689d6827..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -54,7 +54,7 @@
- #include "ui/views/window/vector_icons/vector_icons.h"
- #include "ui/views/window/window_shape.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "ui/views/controls/menu/menu_runner.h"
- #endif
- 
-@@ -572,7 +572,7 @@ bool OpaqueBrowserFrameView::EverHasVisi
- 
- OpaqueBrowserFrameView::FrameButtonStyle
- OpaqueBrowserFrameView::GetFrameButtonStyle() const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return FrameButtonStyle::kMdButton;
- #else
-   return FrameButtonStyle::kImageButton;
-@@ -591,7 +591,7 @@ bool OpaqueBrowserFrameView::ShouldDrawR
-   return false;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool OpaqueBrowserFrameView::IsTiled() const {
-   return frame()->tiled();
- }
-@@ -794,7 +794,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIco
- }
- 
- void OpaqueBrowserFrameView::WindowIconPressed() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Chrome OS doesn't show the window icon, and Windows handles this on its own
-   // due to the hit test being HTSYSMENU.
-   menu_runner_ = std::make_unique<views::MenuRunner>(
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
deleted file mode 100644
index e672feb4fa..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
-@@ -110,7 +110,7 @@ class OpaqueBrowserFrameView : public Br
-   FrameButtonStyle GetFrameButtonStyle() const override;
-   void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override;
-   bool ShouldDrawRestoredFrameShadow() const override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool IsTiled() const override;
- #endif
-   int WebAppButtonHeight() const override;
-@@ -227,7 +227,7 @@ class OpaqueBrowserFrameView : public Br
-   // Background painter for the window frame.
-   std::unique_ptr<views::FrameBackground> frame_background_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<views::MenuRunner> menu_runner_;
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h b/chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
deleted file mode 100644
index b56acb8026..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
-@@ -9,7 +9,7 @@
- 
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/base/ui_base_types.h"
- #endif
- 
-@@ -92,7 +92,7 @@ class OpaqueBrowserFrameViewLayoutDelega
-   // Returns true if a client-side shadow should be drawn for restored windows.
-   virtual bool ShouldDrawRestoredFrameShadow() const = 0;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Returns whether the window is in a tiled state.
-   virtual bool IsTiled() const = 0;
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
deleted file mode 100644
index 26cd9d5ed1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
-@@ -62,7 +62,7 @@
- #include "ui/aura/window.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/themes/theme_service.h"
- #include "chrome/browser/themes/theme_service_factory.h"
- #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
-@@ -76,7 +76,7 @@
- 
- // Windows, Mac and CrOS do not clip child widgets to their parents, so we
- // don't have to worry about resizing quite as much.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define PLATFORM_CLIPS_CHILD_WINDOWS
- #endif
- 
-@@ -89,7 +89,7 @@ constexpr int kContentSettingIconSize = 
- // The height of the controls bar at the top of the window.
- constexpr int kTopControlsHeight = 34;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Frame border when window shadow is not drawn.
- constexpr int kFrameBorderThickness = 4;
- #endif
-@@ -184,7 +184,7 @@ class WindowEventObserver : public ui::E
- 
-     gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // Calculate input bounds for Linux. This is needed because the input bounds
-     // is not necessary the same as the local bounds on Linux.
-     if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -630,7 +630,7 @@ PictureInPictureBrowserFrameView::Pictur
-         AddChildView(std::move(auto_pip_setting_overlay));
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* profile = browser_view->browser()->profile();
-   auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
-   auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
-@@ -855,7 +855,7 @@ void PictureInPictureBrowserFrameView::O
-     view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
-   }
- 
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   // On Linux the top bar background will be drawn in OnPaint().
-   top_bar_container_view_->SetBackground(views::CreateSolidBackground(
-       color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -944,7 +944,7 @@ void PictureInPictureBrowserFrameView::R
-   BrowserNonClientFrameView::RemovedFromWidget();
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- gfx::Insets
- PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const {
-   auto border = FrameBorderInsets();
-@@ -1235,7 +1235,7 @@ void PictureInPictureBrowserFrameView::A
- // views::View implementations:
- 
- void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Draw the PiP window frame borders and shadows, including the top bar
-   // background.
-   if (window_frame_provider_) {
-@@ -1390,7 +1390,7 @@ void PictureInPictureBrowserFrameView::U
- }
- 
- gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (window_frame_provider_) {
-     const auto insets = window_frame_provider_->GetFrameThicknessDip();
-     const bool tiled = frame()->tiled();
-@@ -1408,7 +1408,7 @@ gfx::Insets PictureInPictureBrowserFrame
- }
- 
- gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return FrameBorderInsets();
- #elif !BUILDFLAG(IS_CHROMEOS)
-   return gfx::Insets(kResizeBorder);
-@@ -1429,7 +1429,7 @@ gfx::Size PictureInPictureBrowserFrameVi
-                    top_height + border_thickness.bottom());
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool PictureInPictureBrowserFrameView::ShouldDrawFrameShadow() const {
-   return static_cast<DesktopBrowserFrameAuraLinux*>(
-              frame()->native_browser_frame())
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/chromium-next/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
deleted file mode 100644
index 80726cba8b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
-@@ -30,7 +30,7 @@
- #include "ui/views/layout/flex_layout_view.h"
- #include "ui/views/widget/widget_observer.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/window_frame_provider.h"
- #endif
- 
-@@ -87,7 +87,7 @@ class PictureInPictureBrowserFrameView
-   void Layout(PassKey) override;
-   void AddedToWidget() override;
-   void RemovedFromWidget() override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   gfx::Insets RestoredMirroredFrameBorderInsets() const override;
-   gfx::Insets GetInputInsets() const override;
-   SkRRect GetRestoredClipRegion() const override;
-@@ -179,7 +179,7 @@ class PictureInPictureBrowserFrameView
-   // Returns true if there's an overlay view that's currently shown.
-   bool IsOverlayViewVisible() const;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Returns whether a client-side shadow should be drawn for the window.
-   bool ShouldDrawFrameShadow() const;
- 
-@@ -388,7 +388,7 @@ class PictureInPictureBrowserFrameView
-   // `top_bar_color_animation_`.
-   std::optional<SkColor> current_foreground_color_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Used to draw window frame borders and shadow on Linux when GTK theme is
-   // enabled.
-   raw_ptr<ui::WindowFrameProvider> window_frame_provider_ = nullptr;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
deleted file mode 100644
index 3635610777..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
-@@ -74,7 +74,7 @@ void SystemMenuModelBuilder::BuildMenu(u
- 
- void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
-     ui::SimpleMenuModel* model) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU);
-   model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU);
-   model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU);
-@@ -92,7 +92,7 @@ void SystemMenuModelBuilder::BuildSystem
-     model->AddSeparator(ui::NORMAL_SEPARATOR);
-     model->AddItemWithStringId(IDC_TASK_MANAGER_CONTEXT_MENU, IDS_TASK_MANAGER);
-   }
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   model->AddSeparator(ui::NORMAL_SEPARATOR);
-   bool supports_server_side_decorations = true;
- #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS)
-@@ -166,7 +166,7 @@ void SystemMenuModelBuilder::BuildSystem
-     model->AddSeparator(ui::NORMAL_SEPARATOR);
-     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
-   }
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   model->AddSeparator(ui::NORMAL_SEPARATOR);
-   model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
deleted file mode 100644
index b6fb1161c6..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
-@@ -20,7 +20,7 @@
- #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/common/pref_names.h"
- #include "components/prefs/pref_service.h"
- #endif
-@@ -39,7 +39,7 @@ SystemMenuModelDelegate::SystemMenuModel
- SystemMenuModelDelegate::~SystemMenuModelDelegate() = default;
- 
- bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
-     PrefService* prefs = browser_->profile()->GetPrefs();
-     return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
-@@ -59,7 +59,7 @@ bool SystemMenuModelDelegate::IsCommandI
- }
- 
- bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool is_maximized = browser_->window()->IsMaximized();
-   switch (command_id) {
-     case IDC_MAXIMIZE_WINDOW:
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
deleted file mode 100644
index 45109a1955..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
-@@ -222,7 +222,7 @@ TabStripRegionView::TabStripRegionView(s
-       new_tab_button_->GetViewAccessibility().SetName(
-           l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       // The New Tab Button can be middle-clicked on Linux.
-       new_tab_button_->SetTriggerableEventFlags(
-           new_tab_button_->GetTriggerableEventFlags() |
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_hung__renderer__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_hung__renderer__view.cc
deleted file mode 100644
index 1f85e83aa7..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/hung_renderer_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -452,7 +452,7 @@ void HungRendererDialogView::ForceCrashH
-   content::RenderProcessHost* rph =
-       hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
-   if (rph) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
-     // Instead we send an explicit IPC to crash on the renderer's IO thread.
-     rph->ForceCrash();
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/chromium-next/patches/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
deleted file mode 100644
index 9cc6f0bbe1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc
-@@ -2089,7 +2089,7 @@ void OmniboxViewViews::MaybeAddSendTabTo
- }
- 
- void OmniboxViewViews::OnPopupOpened() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // It's not great for promos to overlap the omnibox if the user opens the
-   // drop-down after showing the promo. This especially causes issues on Mac and
-   // Linux due to z-order/rendering issues, see crbug.com/1225046 and
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/chromium-next/patches/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
deleted file mode 100644
index bd72aa7c11..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc
-@@ -42,7 +42,7 @@
- #include "ui/base/metadata/metadata_impl_macros.h"
- #include "ui/views/controls/button/button.h"
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h"
- #endif
- 
-@@ -175,7 +175,7 @@ PasswordBubbleViewBase* PasswordBubbleVi
-   } else if (model_state ==
-              password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) {
-     view = new SharedPasswordsNotificationView(web_contents, anchor_view);
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   } else if (model_state == password_manager::ui::KEYCHAIN_ERROR_STATE) {
-     view = new RelaunchChromeView(
-         web_contents, anchor_view,
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc b/chromium-next/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc
deleted file mode 100644
index 3159263889..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/profiles/avatar_toolbar_button.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
-@@ -346,7 +346,7 @@ void AvatarToolbarButton::MaybeShowProfi
-   }
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void AvatarToolbarButton::MaybeShowSupervisedUserSignInIPH() {
-   if (!base::FeatureList::IsEnabled(
-           feature_engagement::kIPHSupervisedUserProfileSigninFeature)) {
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h b/chromium-next/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h
deleted file mode 100644
index 314f638c6d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/profiles/avatar_toolbar_button.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/profiles/avatar_toolbar_button.h
-@@ -84,7 +84,7 @@ class AvatarToolbarButton : public Toolb
-   // Attempts showing the In-Produce-Help for profile Switching.
-   void MaybeShowProfileSwitchIPH();
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Attempts showing the In-Produce-Help when a supervised user signs-in in a
-   // profile.
-   void MaybeShowSupervisedUserSignInIPH();
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc b/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc
deleted file mode 100644
index 94aeca7f47..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
-@@ -50,7 +50,7 @@ void ProfileMenuCoordinator::Show(bool i
-   browser.window()->NotifyFeaturePromoFeatureUsed(
-       feature_engagement::kIPHProfileSwitchFeature,
-       FeaturePromoFeatureUsedAction::kClosePromoIfPresent);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   browser.window()->NotifyFeaturePromoFeatureUsed(
-       feature_engagement::kIPHSupervisedUserProfileSigninFeature,
-       FeaturePromoFeatureUsedAction::kClosePromoIfPresent);
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
deleted file mode 100644
index 5ff4dd82ea..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -92,7 +92,7 @@
- #include "ui/strings/grit/ui_strings.h"
- #include "ui/views/accessibility/view_accessibility.h"
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
- #endif
- 
-@@ -550,7 +550,7 @@ void ProfileMenuView::SetMenuTitleForAcc
-     case signin_util::SignedInState::kSignedOut:
-     case signin_util::SignedInState::kWebOnlySignedIn: {
-       std::string profile_user_display_name, profile_user_email;
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       profile_user_display_name = profile->GetPrefs()->GetString(
-           enterprise_signin::prefs::kProfileUserDisplayName);
-       profile_user_email = profile->GetPrefs()->GetString(
-@@ -647,7 +647,7 @@ void ProfileMenuView::BuildIdentity() {
-         badge_image_model, menu_title_, menu_subtitle_, management_label);
-   } else {
-     std::string profile_user_display_name, profile_user_email;
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     profile_user_display_name = profile->GetPrefs()->GetString(
-         enterprise_signin::prefs::kProfileUserDisplayName);
-     profile_user_email = profile->GetPrefs()->GetString(
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
deleted file mode 100644
index 90cf5c542b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -650,7 +650,7 @@ void ProfileMenuViewBase::SetProfileIden
-       ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder,
-       /*has_dotted_ring=*/false);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // crbug.com/1161166: Orca does not read the accessible window title of the
-   // bubble, so we duplicate it in the top-level menu item. To be revisited
-   // after considering other options, including fixes on the AT side.
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
deleted file mode 100644
index aba9c14ece..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/profiles/profile_picker_view.cc
-@@ -85,7 +85,7 @@
- #include "chrome/browser/global_keyboard_shortcuts_mac.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/shell_integration_linux.h"
- #endif
- 
-@@ -115,7 +115,7 @@ class ProfilePickerWidget : public views
-     views::Widget::InitParams params(
-         views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET);
-     params.delegate = profile_picker_view_;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     params.wm_class_name = shell_integration_linux::GetProgramClassName();
-     params.wm_class_class = shell_integration_linux::GetProgramClassClass();
-     params.wayland_app_id = params.wm_class_class;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/chromium-next/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
deleted file mode 100644
index a731516f56..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
-@@ -65,7 +65,7 @@
- namespace {
- 
- const int kModalDialogWidth = 448;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const int kManagedUserNoticeConfirmationDialogWidth = 512;
- const int kManagedUserNoticeConfirmationDialogHeight = 576;
- const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 780;
-@@ -197,7 +197,7 @@ SigninViewControllerDelegateViews::Creat
- }
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // static
- std::unique_ptr<views::WebView>
- SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView(
-@@ -382,7 +382,7 @@ SigninViewControllerDelegateViews::Signi
- 
-   SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone));
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On the local profile creation dialog, cancelling the dialog (for instance
-   // through the VKEY_ESCAPE accelerator) should delete the profile.
-   if (delete_profile_on_cancel) {
-@@ -472,7 +472,7 @@ void SigninViewControllerDelegateViews::
-   content_view_->RequestFocus();
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void SigninViewControllerDelegateViews::DeleteProfileOnCancel() {
-   ProfileAttributesEntry* entry =
-       g_browser_process->profile_manager()
-@@ -553,7 +553,7 @@ SigninViewControllerDelegate::CreateSign
- }
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // static
- SigninViewControllerDelegate*
- SigninViewControllerDelegate::CreateManagedUserNoticeDelegate(
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/chromium-next/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
deleted file mode 100644
index e3d680a08c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
-@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews
-       SignoutConfirmationCallback callback);
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   static std::unique_ptr<views::WebView>
-   CreateManagedUserNoticeConfirmationWebView(
-       Browser* browser,
-@@ -144,7 +144,7 @@ class SigninViewControllerDelegateViews
-       std::optional<int> dialog_width,
-       InitializeSigninWebDialogUI initialize_signin_web_dialog_ui);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Deletes the ephemeral profile when cancelling the local profile creation
-   // dialog.
-   void DeleteProfileOnCancel();
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc b/chromium-next/patches/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
deleted file mode 100644
index 18c7d434d7..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc
-@@ -190,7 +190,7 @@ bool IsWindowDragUsingSystemDragDropAllo
- 
- void UpdateSystemDnDDragImage(TabDragContext* attached_context,
-                               const gfx::ImageSkia& image) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   VLOG(1) << __func__ << " image size=" << image.size().ToString();
-   aura::Window* root_window =
-       attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
-@@ -381,7 +381,7 @@ TabDragController::Liveness TabDragContr
-   //     synchronous on desktop Linux, so use that.
-   // - ChromeOS Ash
-   //     Releasing capture on Ash cancels gestures so avoid it.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   ref->can_release_capture_ = false;
- #endif
-   ref->start_point_in_screen_ =
-@@ -889,7 +889,7 @@ TabDragController::Liveness TabDragContr
-       CHECK_EQ(SetCapture(target_context), Liveness::ALIVE);
-     }
- 
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-     // EndMoveLoop is going to snap the window back to its original location.
-     // Hide it so users don't see this. Hiding a window in Linux aura causes
-     // it to lose capture so skip it.
-@@ -1914,7 +1914,7 @@ void TabDragController::CompleteDrag() {
-     }
- 
-     // If source window was maximized - maximize the new window as well.
--#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)
-+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
-     // Keeping maximized state breaks snap to Grid on Windows when dragging
-     // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
-     // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2331,7 +2331,7 @@ TabDragController::Liveness TabDragContr
-     }
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Exclude windows which are pending deletion via Browser::TabStripEmpty().
-   // These windows can be returned in the Linux Aura port because the browser
-   // window which was used for dragging is not hidden once all of its tabs are
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab.cc b/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab.cc
deleted file mode 100644
index 02c6b98cbb..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/tabs/tab.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/tabs/tab.cc
-@@ -642,7 +642,7 @@ void Tab::MaybeUpdateHoverStatus(const u
-     return;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Move the hit test area for hovering up so that it is not overlapped by tab
-   // hover cards when they are shown.
-   // TODO(crbug.com/41467565): Once Linux/CrOS widget transparency is solved,
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
deleted file mode 100644
index 5dba45817b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
-@@ -380,7 +380,7 @@ TabHoverCardBubbleView::TabHoverCardBubb
-   // not become active. Setting this to false creates the need to explicitly
-   // hide the hovercard on press, touch, and keyboard events.
-   SetCanActivate(false);
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   set_accept_events(false);
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
deleted file mode 100644
index 10b370aa97..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc
-@@ -97,7 +97,7 @@ TabStripComboButton::TabStripComboButton
-       base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged,
-                           base::Unretained(this))));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // The New Tab Button can be middle-clicked on Linux.
-   new_tab_button->SetTriggerableEventFlags(
-       new_tab_button->GetTriggerableEventFlags() | ui::EF_MIDDLE_MOUSE_BUTTON);
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
deleted file mode 100644
index 9cb9112ded..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/tabs/tab_style_views.cc
-@@ -545,7 +545,7 @@ float TabStyleViewsImpl::GetCurrentActiv
-   if (!IsHoverAnimationActive()) {
-     return base_opacity;
-   }
--  return std::lerp(base_opacity, GetHoverOpacity(), GetHoverAnimationValue());
-+  return std::lerp(base_opacity, GetHoverOpacity(), static_cast<float>(GetHoverAnimationValue()));
- }
- 
- TabActive TabStyleViewsImpl::GetApparentActiveState() const {
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc b/chromium-next/patches/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc
deleted file mode 100644
index e17aac756b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/task_manager_search_bar_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/task_manager_search_bar_view.cc
-@@ -27,7 +27,7 @@ TaskManagerSearchBarView::TaskManagerSea
-     const gfx::Insets& margins,
-     Delegate& delegate)
-     : delegate_(delegate)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       ,
-       textfield_placeholder_color_id_(kColorTaskManagerSearchBarPlaceholderText)
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/chromium-next/patches/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
deleted file mode 100644
index 889effdea5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
-@@ -930,7 +930,7 @@ void MaybeRegisterChromeFeaturePromos(
-                 "Triggered when a shared tab becomes the active tab.")));
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // kIPHSupervisedUserProfileSigninFeature
-   registry.RegisterFeature(std::move(
-       FeaturePromoSpecification::CreateForCustomAction(
-@@ -1209,7 +1209,7 @@ void MaybeRegisterChromeFeaturePromos(
-                        "Triggered to inform users of the availability of the "
-                        "new translate screen feature on the Lens Overlay.")));
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // kIPHDesktopPWAsLinkCapturingLaunch:
-   registry.RegisterFeature(std::move(
-       FeaturePromoSpecification::CreateForCustomAction(
diff --git a/chromium-next/patches/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/chromium-next/patches/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
deleted file mode 100644
index 690109f8e0..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
-@@ -510,7 +510,7 @@ std::string GetFileExtension(FileExtensi
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
-   SiteConfig config;
-   bool is_app_found = false;
-@@ -2057,7 +2057,7 @@ void WebAppIntegrationTestDriver::Delete
-   if (app_name.empty()) {
-     app_name = GetSiteConfiguration(site).app_name;
-   }
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ASSERT_TRUE(override_registration_->test_override().IsShortcutCreated(
-       profile(), app_id, app_name));
-   ASSERT_TRUE(
-@@ -3377,7 +3377,7 @@ void WebAppIntegrationTestDriver::CheckR
-           app_state->id, app_state->name);
-   ASSERT_TRUE(icon_color.has_value());
-   ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
--#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ASSERT_TRUE(override_registration_->test_override().IsRunOnOsLoginEnabled(
-       profile(), app_state->id, app_state->name));
- #endif
-@@ -3392,7 +3392,7 @@ void WebAppIntegrationTestDriver::CheckR
-       GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
-   ASSERT_TRUE(app_state);
-   base::ScopedAllowBlockingForTesting allow_blocking;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ASSERT_FALSE(override_registration_->test_override().IsRunOnOsLoginEnabled(
-       profile(), app_state->id, app_state->name));
- #endif
-@@ -3402,7 +3402,7 @@ void WebAppIntegrationTestDriver::CheckR
- void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
-     Site site,
-     FileExtension file_extension) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!BeforeStateCheckAction(__FUNCTION__)) {
-     return;
-   }
-@@ -3418,7 +3418,7 @@ void WebAppIntegrationTestDriver::CheckS
- void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
-     Site site,
-     FileExtension file_extension) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!BeforeStateCheckAction(__FUNCTION__)) {
-     return;
-   }
-@@ -4243,7 +4243,7 @@ base::FilePath WebAppIntegrationTestDriv
-     base::FilePath shortcut_dir,
-     const std::string& app_name,
-     const webapps::AppId& app_id) {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return override_registration_->test_override().GetShortcutPath(
-       profile(), shortcut_dir, app_id, app_name);
- #else
-@@ -4443,7 +4443,7 @@ bool WebAppIntegrationTestDriver::IsShor
-     const webapps::AppId& id) {
-   base::ScopedAllowBlockingForTesting allow_blocking;
-   bool is_shortcut_and_icon_correct = false;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool is_shortcut_correct =
-       override_registration_->test_override().IsShortcutCreated(profile, id,
-                                                                 name);
-@@ -4487,7 +4487,7 @@ bool WebAppIntegrationTestDriver::DoIcon
-     do_icon_colors_match =
-         (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
-   }
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   SkColor expected_icon_pixel_color =
-       GetSiteConfigurationFromAppName(name).icon_color;
-   std::optional<SkColor> actual_color_install_icon_size =
diff --git a/chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__dialogs.h b/chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
deleted file mode 100644
index 190270fbc7..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/web_applications/web_app_dialogs.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/web_applications/web_app_dialogs.h
-@@ -21,7 +21,7 @@
- #include "ui/gfx/native_widget_types.h"
- 
- static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
--              BUILDFLAG(IS_CHROMEOS));
-+              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD));
- 
- class GURL;
- class Profile;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
deleted file mode 100644
index aaf07496c5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
-@@ -519,7 +519,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPr
-     Browser* browser,
-     Profile* profile,
-     const std::string& app_id) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   WebAppProvider* provider = WebAppProvider::GetForWebApps(profile);
-   CHECK(provider);
- 
-@@ -748,7 +748,7 @@ void WebAppUiManagerImpl::ClearWebAppSit
-   }
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- const base::Feature& GetPromoFeatureEngagementFromBrowser(
-     const Browser* browser) {
diff --git a/chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h b/chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
deleted file mode 100644
index ada261d42b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h
-@@ -225,7 +225,7 @@ class WebAppUiManagerImpl : public Brows
-       UninstallCompleteCallback uninstall_complete_callback,
-       webapps::UninstallResultCode uninstall_code);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void ShowIPHPromoForAppsLaunchedViaLinkCapturing(const Browser* browser,
-                                                    const webapps::AppId& app_id,
-                                                    bool is_activated);
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_about_about__ui.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_about_about__ui.cc
deleted file mode 100644
index d95bbc3b67..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_about_about__ui.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/about/about_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/about/about_ui.cc
-@@ -496,7 +496,7 @@ std::string ChromeURLs(content::BrowserC
-   return html;
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- std::string AboutLinuxProxyConfig() {
-   std::string data;
-   AppendHeader(&data,
-@@ -538,7 +538,7 @@ TermsUIConfig::TermsUIConfig()
-     : AboutUIConfigBase(chrome::kChromeUITermsHost) {}
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- LinuxProxyConfigUI::LinuxProxyConfigUI()
-     : AboutUIConfigBase(chrome::kChromeUILinuxProxyConfigHost) {}
- #endif
-@@ -590,7 +590,7 @@ void AboutUIHTMLSource::StartDataRequest
-       response =
-           ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
-     }
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
-     response = AboutLinuxProxyConfig();
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_about_about__ui.h b/chromium-next/patches/patch-chrome_browser_ui_webui_about_about__ui.h
deleted file mode 100644
index 3e97907be8..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_about_about__ui.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/about/about_ui.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/about/about_ui.h
-@@ -55,7 +55,7 @@ class TermsUIConfig : public AboutUIConf
- };
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // chrome://linux-proxy-config
- class LinuxProxyConfigUI : public AboutUIConfigBase {
-  public:
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
deleted file mode 100644
index ce89dda444..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -61,7 +61,7 @@
- #include "ui/base/window_open_disposition_utils.h"
- #include "url/gurl.h"
- 
--static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX));
-+static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD));
- 
- using content::WebUI;
- using extensions::Extension;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h b/chromium-next/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
deleted file mode 100644
index c7fa282fc1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/app_home/app_home_page_handler.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/app_home/app_home_page_handler.h
-@@ -24,7 +24,7 @@
- #include "mojo/public/cpp/bindings/receiver.h"
- #include "mojo/public/cpp/bindings/remote.h"
- 
--static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX));
-+static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD));
- 
- class ExtensionEnableFlow;
- 
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h b/chromium-next/patches/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
deleted file mode 100644
index 219d8b7d58..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/app_settings/web_app_settings_ui.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/app_settings/web_app_settings_ui.h
-@@ -14,13 +14,13 @@
- #include "ui/webui/mojo_web_ui_controller.h"
- #include "ui/webui/resources/cr_components/app_management/app_management.mojom-forward.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/common/webui_url_constants.h"
- #include "content/public/browser/webui_config.h"
- #include "content/public/common/url_constants.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- class WebAppSettingsUI;
- 
- class WebAppSettingsUIConfig
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
deleted file mode 100644
index 90e8500ea3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc
-@@ -221,7 +221,7 @@ CertificateManagerPageHandler::GetCertSo
-                 CERTIFICATE_TRUST_TYPE_DISTRUSTED,
-             profile_, &remote_client_);
-         break;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       case certificate_manager_v2::mojom::CertificateSource::
-           kProvisionedClientCert:
-         source_ptr = CreateProvisionedClientCertSource(profile_);
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
deleted file mode 100644
index e9a56e6d12..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc
-@@ -54,7 +54,7 @@
- #include "net/ssl/client_cert_store_mac.h"
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public
- };
- #endif
- 
--#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- std::unique_ptr<ClientCertStoreLoader> CreatePlatformClientCertLoader(
-     Profile* profile) {
- #if BUILDFLAG(IS_WIN)
-@@ -192,7 +192,7 @@ std::unique_ptr<ClientCertStoreLoader> C
- }
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // ClientCertStore implementation that always returns an empty list. The
- // CertificateProvisioningService implementation expects to wrap a platform
- // cert store, but here we only want to get results from the provisioning
-@@ -368,7 +368,7 @@ class ClientCertSource : public Certific
-   std::optional<net::CertificateList> certs_;
- };
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // ChromeOS currently can use either Kcer or NSS for listing client certs, and
- // Linux uses NSS only. This interface provides an abstraction to hide that
- // from WritableClientCertSource. Currently this class only handles reading
-@@ -1099,7 +1099,7 @@ CreatePlatformClientCertSource(
-     mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>*
-         remote_client,
-     Profile* profile) {
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return std::make_unique<WritableClientCertSource>(remote_client, profile);
- #else
-   return std::make_unique<ClientCertSource>(
-@@ -1107,7 +1107,7 @@ CreatePlatformClientCertSource(
- #endif
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::unique_ptr<CertificateManagerPageHandler::CertSource>
- CreateProvisionedClientCertSource(Profile* profile) {
-   return std::make_unique<ClientCertSource>(
-@@ -1156,7 +1156,7 @@ bool ClientCertManagementAccessControls:
- 
-   return client_cert_policy_ == ClientCertificateManagementPermission::kAll;
- }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- ClientCertManagementAccessControls::ClientCertManagementAccessControls(
-     Profile* profile) {}
- 
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
deleted file mode 100644
index 025abff163..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h
-@@ -19,7 +19,7 @@ CreatePlatformClientCertSource(
-         remote_client,
-     Profile* profile);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::unique_ptr<CertificateManagerPageHandler::CertSource>
- CreateProvisionedClientCertSource(Profile* profile);
- #endif
-@@ -29,7 +29,7 @@ std::unique_ptr<CertificateManagerPageHa
- CreateExtensionsClientCertSource(Profile* profile);
- #endif
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- class ClientCertManagementAccessControls {
-  public:
-   enum KeyStorage {
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
deleted file mode 100644
index c53b93c2ca..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -137,7 +137,7 @@
- #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
- #include "chrome/browser/ui/webui/browser_switch/browser_switch_ui.h"
- #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin_ui.h"
-@@ -145,19 +145,19 @@
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
-         // BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/discards/discards_ui.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
-@@ -185,7 +185,7 @@
- #include "chrome/browser/ui/webui/signin/signin_error_ui.h"
- #endif  //  !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -323,7 +323,7 @@ void RegisterChromeWebUIConfigs() {
-   map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>());
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>());
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
-         // BUILDFLAG(IS_OPENBSD)
-@@ -348,7 +348,7 @@ void RegisterChromeWebUIConfigs() {
-   map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>());
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>());
-   map.AddWebUIConfig(std::make_unique<HistorySyncOptinUIConfig>());
-   map.AddWebUIConfig(std::make_unique<OnDeviceTranslationInternalsUIConfig>());
-@@ -357,13 +357,13 @@ void RegisterChromeWebUIConfigs() {
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   map.AddWebUIConfig(std::make_unique<SandboxInternalsUIConfig>());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
-         // BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   map.AddWebUIConfig(
-       std::make_unique<enterprise_connectors::ConnectorsInternalsUIConfig>());
-   map.AddWebUIConfig(std::make_unique<DiscardsUIConfig>());
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
deleted file mode 100644
index d5f7de97b3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -118,16 +118,16 @@
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/commerce/product_specifications_ui.h"
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
- #endif
- 
-@@ -408,7 +408,7 @@ base::RefCountedMemory* ChromeWebUIContr
-     return NewTabPageUI::GetFaviconResourceBytes(scale_factor);
-   }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) {
-     return WhatsNewUI::GetFaviconResourceBytes(scale_factor);
-   }
-@@ -442,7 +442,7 @@ base::RefCountedMemory* ChromeWebUIContr
-   }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (page_url.host_piece() == commerce::kChromeUICompareHost) {
-     return commerce::ProductSpecificationsUI::GetFaviconResourceBytes(
-         scale_factor);
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
deleted file mode 100644
index 15d68cef5a..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
-@@ -7,7 +7,7 @@
- #include "build/build_config.h"
- #include "components/enterprise/buildflags/buildflags.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "base/base64url.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -38,7 +38,7 @@ namespace enterprise_connectors::utils {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- 
- connectors_internals::mojom::KeyTrustLevel ParseTrustLevel(
-     BPKUR::KeyTrustLevel trust_level) {
-@@ -173,7 +173,7 @@ connectors_internals::mojom::Certificate
- }  // namespace
- 
- connectors_internals::mojom::KeyInfoPtr GetKeyInfo() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   auto* key_manager = g_browser_process->browser_policy_connector()
-                           ->chrome_browser_cloud_management_controller()
-                           ->GetDeviceTrustKeyManager();
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
deleted file mode 100644
index 9332263d78..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -77,7 +77,7 @@
- #include "components/security_interstitials/content/captive_portal_blocking_page.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
- #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h"
- #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h"
-@@ -424,7 +424,7 @@ std::unique_ptr<EnterpriseWarnPage> Crea
- }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- std::unique_ptr<SupervisedUserVerificationPageForYouTube>
- CreateSupervisedUserVerificationPageForYouTube(
-     content::WebContents* web_contents,
-@@ -651,7 +651,7 @@ void InterstitialHTMLSource::StartDataRe
-     interstitial_delegate = CreateInsecureFormPage(web_contents);
-   } else if (path_without_query == "/https_only") {
-     interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   } else if (path_without_query == "/supervised-user-verify") {
-     interstitial_delegate = CreateSupervisedUserVerificationPageForYouTube(
-         web_contents, /*is_main_frame=*/true);
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui.cc
deleted file mode 100644
index f5db288834..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/management/management_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/management/management_ui.cc
-@@ -175,11 +175,11 @@ void ManagementUI::GetLocalizedStrings(
-        IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA},
-       {kManagementReportFileEvents, IDS_MANAGEMENT_REPORT_FILE_EVENTS},
- #endif  // BUILDFLAG(IS_CHROMEOS)
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT},
-       {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA},
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       {kManagementDeviceSignalsDisclosure,
-        IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE},
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
deleted file mode 100644
index d16700991e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/management/management_ui_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/management/management_ui_constants.cc
-@@ -89,12 +89,12 @@ const char kProfileReportingExtension[] 
- const char kProfileReportingPolicy[] = "profileReportingPolicy";
- const char kProfileReportingLearnMore[] = "profileReportingLearnMore";
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent";
- const char kManagementScreenCaptureData[] = "managementScreenCaptureData";
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kManagementDeviceSignalsDisclosure[] =
-     "managementDeviceSignalsDisclosure";
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.h b/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.h
deleted file mode 100644
index 849739c6a3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/management/management_ui_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/management/management_ui_constants.h
-@@ -7,14 +7,14 @@
- 
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Constants defining the IDs for the localized strings sent to the page as
- // load time data.
- extern const char kManagementScreenCaptureEvent[];
- extern const char kManagementScreenCaptureData[];
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kManagementDeviceSignalsDisclosure[];
- #endif  // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
deleted file mode 100644
index 0b242e98ca..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -58,7 +58,7 @@
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/webui/web_ui_util.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
- #include "components/device_signals/core/browser/user_permission_service.h"  // nogncheck
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -359,7 +359,7 @@ void ManagementUIHandler::AddReportingIn
-       report_sources->Append(std::move(data));
-     }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     auto device_signal_data = GetDeviceSignalGrantedMessage();
-     if (!device_signal_data.empty()) {
-       report_sources->Append(std::move(device_signal_data));
-@@ -381,7 +381,7 @@ void ManagementUIHandler::AddReportingIn
-       report_sources->Append(std::move(data));
-     }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     auto device_signal_data = GetDeviceSignalGrantedMessage();
-     if (!device_signal_data.empty()) {
-       report_sources->Append(std::move(device_signal_data));
-@@ -567,7 +567,7 @@ policy::PolicyService* ManagementUIHandl
-       ->policy_service();
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- device_signals::UserPermissionService*
- ManagementUIHandler::GetUserPermissionService() {
-   return enterprise_signals::UserPermissionServiceFactory::GetForProfile(
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.h
deleted file mode 100644
index 5e590c4542..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/management/management_ui_handler.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/management/management_ui_handler.h
-@@ -30,7 +30,7 @@ namespace policy {
- class PolicyService;
- }  // namespace policy
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- namespace device_signals {
- class UserPermissionService;
- }  // namespace device_signals
-@@ -71,7 +71,7 @@ class ManagementUIHandler : public conte
-   base::Value::List GetManagedWebsitesInfo(Profile* profile) const;
-   base::Value::List GetApplicationsInfo(Profile* profile) const;
-   virtual policy::PolicyService* GetPolicyService();
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   virtual device_signals::UserPermissionService* GetUserPermissionService();
-   base::Value::Dict GetDeviceSignalGrantedMessage();
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
deleted file mode 100644
index fc15d7f21d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/password_manager/promo_cards_handler.cc
-@@ -28,7 +28,7 @@
- #include "chrome/browser/ui/webui/password_manager/promo_cards/web_password_manager_promo.h"
- #endif
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.h"
- #endif
- 
-@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<PasswordProm
-           .get()));
- #endif
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   promo_cards.push_back(
-       std::make_unique<RelaunchChromePromo>(profile->GetPrefs()));
- #endif
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
deleted file mode 100644
index bff64e64e0..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc
-@@ -37,7 +37,7 @@ std::u16string RelaunchChromePromo::GetT
-   return l10n_util::GetStringUTF16(
- #if BUILDFLAG(IS_MAC)
-       IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE_LINUX
- #endif
-   );
-@@ -47,7 +47,7 @@ std::u16string RelaunchChromePromo::GetD
-   return l10n_util::GetStringUTF16(
- #if BUILDFLAG(IS_MAC)
-       IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION_LINUX
- #endif
-   );
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
deleted file mode 100644
index 4dd3e06eb1..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc
-@@ -111,7 +111,7 @@ const char* kMacShareIconResourceName =
- #elif BUILDFLAG(IS_WIN)
- const char* kWinShareIconResourceName =
-     "//resources/cr_components/searchbox/icons/win_share.svg";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char* kLinuxShareIconResourceName =
-     "//resources/cr_components/searchbox/icons/share.svg";
- #else
-@@ -171,7 +171,7 @@ static void DefineChromeRefreshRealboxIc
- #elif BUILDFLAG(IS_WIN)
-   kWinShareIconResourceName =
-       "//resources/cr_components/searchbox/icons/win_share_cr23.svg";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   kLinuxShareIconResourceName =
-       "//resources/cr_components/searchbox/icons/share_cr23.svg";
- #else
-@@ -607,7 +607,7 @@ std::string SearchboxHandler::ActionVect
-       icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
-     return kWinShareIconResourceName;
-   }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (icon.name == omnibox::kShareIcon.name ||
-       icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) {
-     return kLinuxShareIconResourceName;
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
deleted file mode 100644
index 36cee9a59d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/settings/appearance_handler.cc
-@@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages
-       "useDefaultTheme",
-       base::BindRepeating(&AppearanceHandler::HandleUseTheme,
-                           base::Unretained(this), ui::SystemTheme::kDefault));
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   web_ui()->RegisterMessageCallback(
-       "useGtkTheme",
-       base::BindRepeating(&AppearanceHandler::HandleUseTheme,
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
deleted file mode 100644
index 287c518c4a..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -140,7 +140,7 @@
- #include "chrome/browser/ui/webui/settings/system_handler.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/display/screen.h"
- #endif
- 
-@@ -159,7 +159,7 @@
- #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui_factory.h"
- #include "ui/ozone/public/ozone_platform.h"
- #endif
-@@ -288,7 +288,7 @@ void AddA11yStrings(content::WebUIDataSo
-       {"toastAlertLevelDescription",
-        IDS_SETTINGS_ACCESSIBILITY_TOAST_FREQUENCY_DESCRIPTION},
- #endif
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       {"overscrollHistoryNavigationTitle",
-        IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
-       {"overscrollHistoryNavigationSubtitle",
-@@ -577,7 +577,7 @@ void AddAppearanceStrings(content::WebUI
-       {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT},
-       {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT},
-       {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT},
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       {"gtkTheme", IDS_SETTINGS_GTK_THEME},
-       {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
-       {"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUI
-       {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-       {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME},
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
- #endif
- #if BUILDFLAG(IS_MAC)
-@@ -607,7 +607,7 @@ void AddAppearanceStrings(content::WebUI
-   html_source->AddBoolean("tabSearchIsRightAlignedAtStartup",
-                           tabs::GetTabSearchTrailingTabstrip(profile));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance()
-                                       ->GetPlatformRuntimeProperties()
-                                       .supports_server_side_window_decorations;
-@@ -1495,7 +1495,7 @@ void AddSignOutDialogStrings(content::We
-           g_browser_process->GetApplicationLocale())
-           .spec();
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   html_source->AddString(
-       "syncDisconnectManagedProfileExplanation",
-       l10n_util::GetStringFUTF8(
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
deleted file mode 100644
index 26df8a101d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/signin/profile_picker_handler.cc
-@@ -165,7 +165,7 @@ base::Value::Dict CreateProfileEntry(con
-       IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name);
-   if (AccountInfo::IsManaged(entry->GetHostedDomain())) {
-     profile_entry.Set("avatarBadge", "cr:domain");
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   } else if (base::FeatureList::IsEnabled(
-                  supervised_user::kShowKiteForSupervisedUsers) &&
-              entry->IsSupervised()) {
diff --git a/chromium-next/patches/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc b/chromium-next/patches/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
deleted file mode 100644
index 599f84f0de..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc
-@@ -50,7 +50,7 @@
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/webui/resource_path.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/browser_navigator.h"
- #include "chrome/browser/ui/browser_navigator_params.h"
- #include "net/base/url_util.h"
-@@ -90,7 +90,7 @@ user_education::NewBadgeRegistry* GetNew
- }
- 
- whats_new::WhatsNewRegistry* GetWhatsNewRegistry() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return g_browser_process->GetFeatures()->whats_new_registry();
- #else
-   return nullptr;
-@@ -828,7 +828,7 @@ void UserEducationInternalsPageHandlerIm
- }
- 
- void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   GURL url = net::AppendQueryParameter(GURL(chrome::kChromeUIWhatsNewURL),
-                                        "staging", "true");
-   NavigateParams params(profile_, url, ui::PAGE_TRANSITION_TYPED);
diff --git a/chromium-next/patches/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/chromium-next/patches/patch-chrome_browser_ui_window__sizer_window__sizer.cc
deleted file mode 100644
index 40f82f6a4f..0000000000
--- a/chromium-next/patches/patch-chrome_browser_ui_window__sizer_window__sizer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/window_sizer/window_sizer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/ui/window_sizer/window_sizer.cc
-@@ -220,7 +220,7 @@ void WindowSizer::GetBrowserWindowBounds
-       browser, window_bounds, show_state);
- }
- 
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Linux has its own implementation, see WindowSizerLinux.
- // static
- void WindowSizer::GetBrowserWindowBoundsAndShowState(
diff --git a/chromium-next/patches/patch-chrome_browser_upgrade__detector_version__history__client.cc b/chromium-next/patches/patch-chrome_browser_upgrade__detector_version__history__client.cc
deleted file mode 100644
index 754139c524..0000000000
--- a/chromium-next/patches/patch-chrome_browser_upgrade__detector_version__history__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/upgrade_detector/version_history_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/upgrade_detector/version_history_client.cc
-@@ -175,7 +175,7 @@ GURL GetVersionReleasesUrl(base::Version
- #define CURRENT_PLATFORM "win"
- #endif
- 
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- #define CURRENT_PLATFORM "linux"
- 
diff --git a/chromium-next/patches/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/chromium-next/patches/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
deleted file mode 100644
index e6a4afdb74..0000000000
--- a/chromium-next/patches/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc
-@@ -45,7 +45,7 @@
- #include "components/visited_url_ranking/public/visited_url_ranking_service.h"
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h"
- #elif BUILDFLAG(IS_ANDROID)
- #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h"
-@@ -119,7 +119,7 @@ VisitedURLRankingServiceFactory::BuildSe
- 
-   std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers;
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   data_fetchers.emplace(
-       Fetcher::kTabModel,
-       std::make_unique<visited_url_ranking::DesktopTabModelURLVisitDataFetcher>(
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc b/chromium-next/patches/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
deleted file mode 100644
index f3cb13d594..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/commands/launch_web_app_command.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/commands/launch_web_app_command.cc
-@@ -101,7 +101,7 @@ void LaunchWebAppCommand::StartWithLock(
-     // OsIntegrationTestOverride can use the xdg install command to detect
-     // install.
-     SynchronizeOsOptions options;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     options.add_shortcut_to_desktop = true;
- #endif
-     lock_->os_integration_manager().Synchronize(
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc b/chromium-next/patches/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
deleted file mode 100644
index 07a889cdd3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/commands/set_user_display_mode_command.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/commands/set_user_display_mode_command.cc
-@@ -57,7 +57,7 @@ void SetUserDisplayModeCommand::StartWit
-     // OsIntegrationTestOverride can use the xdg install command to detect
-     // install.
-     SynchronizeOsOptions options;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     options.add_shortcut_to_desktop = true;
- #endif
-     app_lock_->os_integration_manager().Synchronize(
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_extension__status__utils.h b/chromium-next/patches/patch-chrome_browser_web__applications_extension__status__utils.h
deleted file mode 100644
index 75b1a02ce3..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_extension__status__utils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/extension_status_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/extension_status_utils.h
-@@ -50,7 +50,7 @@ bool IsExtensionDefaultInstalled(content
- bool IsExternalExtensionUninstalled(content::BrowserContext* context,
-                                     const std::string& extension_id);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // If this method returns true, then |extension_id| will not be launchable.
- //
- // The eventual goal is that this method should return true for all hosted apps,
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/chromium-next/patches/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
deleted file mode 100644
index b938323b00..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/extensions/extension_status_utils.cc
-@@ -26,7 +26,7 @@ namespace {
- 
- const char* g_preinstalled_app_for_testing = nullptr;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // TODO(b/268221237): Remove this allow-list.
- const char kDefaultAllowedExtensionIds[] =
-     "alhngdkjgnedakdlnamimgfihgkmenbh,"
-@@ -105,7 +105,7 @@ bool IsExternalExtensionUninstalled(cont
-   return prefs && prefs->IsExternalExtensionUninstalled(extension_id);
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context,
-                                          const std::string& extension_id) {
-   if (testing::g_enable_chrome_apps_for_testing) {
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
deleted file mode 100644
index 3c13c269de..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/os_integration/os_integration_manager.cc
-@@ -662,7 +662,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrat
-     }
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const std::vector<WebAppShortcutsMenuItemInfo>& shortcuts_menu_item_infos =
-       app->shortcuts_menu_item_infos();
-   DCHECK_LE(shortcuts_menu_item_infos.size(), kMaxApplicationDockMenuItems);
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
deleted file mode 100644
index a88b55c238..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/os_integration/os_integration_test_override.h
-@@ -99,7 +99,7 @@ class OsIntegrationTestOverride
-   virtual base::FilePath chrome_apps_folder() = 0;
-   virtual void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
-                                           bool enable_on_login) = 0;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   virtual base::Environment* environment() = 0;
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc b/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
deleted file mode 100644
index b919e02875..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc
-@@ -54,7 +54,7 @@ proto::os_state::RunOnOsLogin::Mode Conv
- // different from other platforms, see web_app_run_on_os_login_manager.h for
- // more info.
- bool DoesRunOnOsLoginRequireExecution() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(features::kDesktopPWAsRunOnOsLogin);
- #else
-   return false;
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
deleted file mode 100644
index 0ededaf2c2..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc
-@@ -199,7 +199,7 @@ void ShortcutSubManager::Execute(
-     return;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   // Protocol handler update detection. Shortcuts need to be updated in this
-   // case on Linux & Mac because the shortcut itself includes the protocol
-   // handling metadata.
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h b/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
deleted file mode 100644
index 3a8f032ba5..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h
-@@ -43,7 +43,7 @@ void UnregisterFileHandlersWithOs(const 
-                                   const base::FilePath& profile_path,
-                                   ResultCallback callback);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Exposed for testing purposes. Register the set of
- // MIME-type-to-file-extensions mappings corresponding to |file_handlers|. File
- // I/O and callouts to the Linux shell are performed asynchronously.
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
deleted file mode 100644
index ce56a82a26..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc
-@@ -71,7 +71,7 @@ namespace {
- 
- #if BUILDFLAG(IS_MAC)
- const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512};
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
- // that "Minimally you should install a 48x48 icon in the hicolor theme."
- const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512};
-@@ -253,7 +253,7 @@ std::unique_ptr<ShortcutInfo> BuildShort
- 
- // TODO(crbug.com/40257107): Implement tests on Linux for using shortcuts_menu
- // actions.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const std::vector<WebAppShortcutsMenuItemInfo>& shortcuts_menu_item_infos =
-       CreateShortcutsMenuItemInfos(state.shortcut_menus());
-   DCHECK_LE(shortcuts_menu_item_infos.size(), kMaxApplicationDockMenuItems);
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
deleted file mode 100644
index 45d24d3df8..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/os_integration/web_app_shortcut.h
-@@ -22,7 +22,7 @@
- #include "ui/gfx/image/image_family.h"
- #include "url/gurl.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h"
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -77,7 +77,7 @@ struct ShortcutInfo {
-   // the installed PWA experience and thus the icons are not designed to be
-   // displayed on an OS dock.
-   bool is_diy_app = false;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::set<DesktopActionInfo> actions;
- #endif  // BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/chromium-next/patches/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
deleted file mode 100644
index 811c60f7ca..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/policy/web_app_policy_manager.cc
-@@ -105,7 +105,7 @@ namespace web_app {
- 
- BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration,
-              "DesktopPWAsForceUnregisterOSIntegration",
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/chromium-next/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
deleted file mode 100644
index 8ea77c8424..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc
-@@ -45,7 +45,7 @@
- #include "third_party/skia/include/core/SkBitmap.h"
- #include "third_party/skia/include/core/SkColor.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/nix/xdg_util.h"
- #endif
- 
-@@ -130,7 +130,7 @@ std::vector<std::wstring> GetFileExtensi
- }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Performs a blocking read of app icons from the disk.
- std::optional<SkBitmap> IconManagerReadIconForSize(
-     WebAppIconManager& icon_manager,
-@@ -315,7 +315,7 @@ bool OsIntegrationTestOverrideImpl::Simu
-       GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
-   CHECK(base::PathExists(app_folder_shortcut_path));
-   return base::DeletePathRecursively(app_folder_shortcut_path);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::FilePath desktop_shortcut_path =
-       GetShortcutPath(profile, desktop(), app_id, app_name);
-   LOG(INFO) << desktop_shortcut_path;
-@@ -362,7 +362,7 @@ bool OsIntegrationTestOverrideImpl::Dele
- }
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() {
-   if (desktop_.IsValid()) {
-     return desktop_.Delete();
-@@ -376,7 +376,7 @@ bool OsIntegrationTestOverrideImpl::IsRu
-     Profile* profile,
-     const webapps::AppId& app_id,
-     const std::string& app_name) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::string shortcut_filename =
-       "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
-   return base::PathExists(startup().Append(shortcut_filename));
-@@ -431,7 +431,7 @@ bool OsIntegrationTestOverrideImpl::IsFi
-   is_file_handled =
-       shell_integration::CanApplicationHandleURL(app_path, test_file_url);
-   base::DeleteFile(test_file_path);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::FilePath user_applications_dir = applications();
-   bool database_update_called = false;
-   for (const LinuxFileRegistration& command : linux_file_registration_) {
-@@ -481,7 +481,7 @@ std::optional<SkBitmap> OsIntegrationTes
-     return std::nullopt;
-   }
-   return GetIconFromShortcutFile(shortcut_path);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile);
-   if (!provider) {
-     return std::nullopt;
-@@ -547,7 +547,7 @@ base::FilePath OsIntegrationTestOverride
-       app_installed_profiles.end()) {
-     return shortcut_path;
-   }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::string shortcut_filename =
-       "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
-   base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename);
-@@ -572,7 +572,7 @@ bool OsIntegrationTestOverrideImpl::IsSh
-   base::FilePath app_shortcut_path =
-       GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
-   return base::PathExists(app_shortcut_path);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::FilePath desktop_shortcut_path =
-       GetShortcutPath(profile, desktop(), app_id, app_name);
-   return base::PathExists(desktop_shortcut_path);
-@@ -764,7 +764,7 @@ void OsIntegrationTestOverrideImpl::Enab
- }
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- base::FilePath OsIntegrationTestOverrideImpl::desktop() {
-   return desktop_.GetPath();
- }
-@@ -815,7 +815,7 @@ OsIntegrationTestOverrideImpl::OsIntegra
-   success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(
-       outer_temp_dir_.GetPath());
-   CHECK(success);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   success = desktop_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath());
-   CHECK(success);
-   success = startup_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath());
-@@ -828,7 +828,7 @@ OsIntegrationTestOverrideImpl::OsIntegra
-   CHECK(success);
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto callback = base::BindRepeating([](base::FilePath filename_in,
-                                          std::string xdg_command,
-                                          std::string file_contents) {
-@@ -900,7 +900,7 @@ OsIntegrationTestOverrideImpl::~OsIntegr
-   EXPECT_TRUE(!startup_.IsValid() || startup_.Delete());
- #elif BUILDFLAG(IS_MAC)
-   EXPECT_TRUE(!chrome_apps_folder_.IsValid() || DeleteChromeAppsDir());
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   EXPECT_TRUE(!desktop_.IsValid() || desktop_.Delete());
-   EXPECT_TRUE(!startup_.IsValid() || startup_.Delete());
-   EXPECT_TRUE(!xdg_data_home_dir_.IsValid() || xdg_data_home_dir_.Delete());
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/chromium-next/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
deleted file mode 100644
index 818a6b43dc..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/test/os_integration_test_override_impl.h
-@@ -40,7 +40,7 @@ class ShellLinkItem;
- 
- namespace web_app {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- struct LinuxFileRegistration {
-   base::FilePath file_name;
-   std::string xdg_command;
-@@ -122,7 +122,7 @@ class OsIntegrationTestOverrideImpl : pu
-   bool DeleteApplicationMenuDirOnWin();
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool DeleteDesktopDirOnLinux();
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -250,7 +250,7 @@ class OsIntegrationTestOverrideImpl : pu
-   base::FilePath chrome_apps_folder() override;
-   void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
-                                   bool enable_on_login) override;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::FilePath desktop();
-   base::FilePath startup();
-   base::FilePath applications();
-@@ -323,7 +323,7 @@ class OsIntegrationTestOverrideImpl : pu
-   base::ScopedTempDir chrome_apps_folder_;
-   std::map<base::FilePath, bool> startup_enabled_;
- 
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::ScopedTempDir desktop_;
-   base::ScopedTempDir startup_;
-   base::ScopedTempDir xdg_data_home_dir_;
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_web__app__helpers.cc b/chromium-next/patches/patch-chrome_browser_web__applications_web__app__helpers.cc
deleted file mode 100644
index e49c84030b..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_web__app__helpers.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/web_app_helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/web_app_helpers.cc
-@@ -145,7 +145,7 @@ bool IsValidWebAppUrl(const GURL& app_ur
-     return false;
- 
-   bool allow_extension_apps = true;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Stop allowing apps to be extension urls when the shortcuts are separated -
-   // they can be extension urls instead.
-   allow_extension_apps = false;
diff --git a/chromium-next/patches/patch-chrome_browser_web__applications_web__app__install__info.h b/chromium-next/patches/patch-chrome_browser_web__applications_web__app__install__info.h
deleted file mode 100644
index b09ed2e54e..0000000000
--- a/chromium-next/patches/patch-chrome_browser_web__applications_web__app__install__info.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/web_applications/web_app_install_info.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/web_applications/web_app_install_info.h
-@@ -38,7 +38,7 @@
- #include "url/gurl.h"
- 
- static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
--              BUILDFLAG(IS_CHROMEOS));
-+              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD));
- 
- namespace web_app {
- 
diff --git a/chromium-next/patches/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/chromium-next/patches/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
deleted file mode 100644
index 78e8956178..0000000000
--- a/chromium-next/patches/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -577,7 +577,7 @@ void ChromeAuthenticatorRequestDelegate:
-     g_observer->ConfiguringCable(request_type);
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // No caBLEv1 on Linux. It tends to crash bluez.
-   if (base::Contains(pairings_from_extension,
-                      device::CableDiscoveryData::Version::V1,
diff --git a/chromium-next/patches/patch-chrome_browser_webauthn_enclave__manager.cc b/chromium-next/patches/patch-chrome_browser_webauthn_enclave__manager.cc
deleted file mode 100644
index e7942f5abe..0000000000
--- a/chromium-next/patches/patch-chrome_browser_webauthn_enclave__manager.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/webauthn/enclave_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/webauthn/enclave_manager.cc
-@@ -689,7 +689,7 @@ base::flat_set<GaiaId> GetGaiaIDs(
- 
- std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return label;
- #else
-   return std::string("placeholder");
-@@ -699,7 +699,7 @@ std::string UserVerifyingLabelToString(c
- std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString(
-     std::string saved_label) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return saved_label;
- #else
-   return std::nullopt;
diff --git a/chromium-next/patches/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc b/chromium-next/patches/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
deleted file mode 100644
index 21f9b77df7..0000000000
--- a/chromium-next/patches/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/webauthn/gpm_user_verification_policy.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/webauthn/gpm_user_verification_policy.cc
-@@ -17,7 +17,7 @@ bool GpmWillDoUserVerification(device::U
-       return platform_has_biometrics;
- #elif BUILDFLAG(IS_MAC)
-       return platform_has_biometrics;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       return false;
- #else
-       // This default is for unit tests.
diff --git a/chromium-next/patches/patch-chrome_browser_webauthn_password__credential__controller.cc b/chromium-next/patches/patch-chrome_browser_webauthn_password__credential__controller.cc
deleted file mode 100644
index c974e8900d..0000000000
--- a/chromium-next/patches/patch-chrome_browser_webauthn_password__credential__controller.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/webauthn/password_credential_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/webauthn/password_credential_controller.cc
-@@ -46,7 +46,7 @@ password_manager::PasswordManagerClient*
- }
- 
- std::u16string GetAuthenticationMessage(std::string_view rp_id) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return u"";
- #else
-   return l10n_util::GetStringFUTF16(IDS_PASSWORD_MANAGER_FILLING_REAUTH,
diff --git a/chromium-next/patches/patch-chrome_browser_webauthn_unexportable__key__utils.cc b/chromium-next/patches/patch-chrome_browser_webauthn_unexportable__key__utils.cc
deleted file mode 100644
index cac7aa4f5c..0000000000
--- a/chromium-next/patches/patch-chrome_browser_webauthn_unexportable__key__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/webauthn/unexportable_key_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/browser/webauthn/unexportable_key_utils.cc
-@@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() {
-   // If there is a scoped UnexportableKeyProvider configured, we always use
-   // that so that tests can still override the key provider.
-   const bool use_software_provider =
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       !crypto::internal::HasScopedUnexportableKeyProvider();
- #else
-       false;
diff --git a/chromium-next/patches/patch-chrome_common_channel__info.h b/chromium-next/patches/patch-chrome_common_channel__info.h
deleted file mode 100644
index d94f5cb614..0000000000
--- a/chromium-next/patches/patch-chrome_common_channel__info.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/channel_info.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/channel_info.h
-@@ -11,7 +11,7 @@
- #include "build/branding_buildflags.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- namespace base {
- class Environment;
- }
-@@ -99,7 +99,7 @@ void ClearChannelIdForTesting();
- std::string GetChannelSuffixForDataDir();
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::string GetChannelSuffixForExtraFlagsEnvVarName();
- 
- // Returns the channel-specific filename of the desktop shortcut used to launch
diff --git a/chromium-next/patches/patch-chrome_common_channel__info__posix.cc b/chromium-next/patches/patch-chrome_common_channel__info__posix.cc
deleted file mode 100644
index 6517392ebb..0000000000
--- a/chromium-next/patches/patch-chrome_common_channel__info__posix.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/channel_info_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/channel_info_posix.cc
-@@ -94,7 +94,7 @@ std::string GetChannelSuffixForDataDir()
-   }
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::string GetChannelSuffixForExtraFlagsEnvVarName() {
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-   const auto channel_state = GetChannelImpl();
-@@ -120,7 +120,7 @@ std::string GetChannelSuffixForExtraFlag
- }
- #endif  // BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::string GetDesktopName(base::Environment* env) {
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-   // Google Chrome packaged as a snap is a special case: the application name
diff --git a/chromium-next/patches/patch-chrome_common_chrome__features.cc b/chromium-next/patches/patch-chrome_common_chrome__features.cc
deleted file mode 100644
index e9cb98e679..0000000000
--- a/chromium-next/patches/patch-chrome_common_chrome__features.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/chrome_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/chrome_features.cc
-@@ -80,7 +80,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppSh
- #endif  // BUILDFLAG(IS_MAC)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Enables or disables the Autofill survey triggered by opening a prompt to
- // save address info.
- BASE_FEATURE(kAutofillAddressSurvey,
-@@ -98,7 +98,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Enables the Restart background mode optimization. When all Chrome UI is
- // closed and it goes in the background, allows to restart the browser to
- // discard memory.
-@@ -233,7 +233,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtension
- BASE_FEATURE(kDesktopPWAsRunOnOsLogin,
-              "DesktopPWAsRunOnOsLogin",
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -259,7 +259,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSetting
-              "DesktopPWAsTabStripSettings",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
- // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
- // Apps will not launch and will be marked in the UI as deprecated.
-@@ -898,7 +898,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
-              "KAnonymityServiceStorage",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kLinuxLowMemoryMonitor,
-              "LinuxLowMemoryMonitor",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -911,7 +911,7 @@ constexpr base::FeatureParam<int> kLinux
-     &kLinuxLowMemoryMonitor, "critical_level", 255};
- #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kListWebAppsSwitch,
-              "ListWebAppsSwitch",
-              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-chrome_common_chrome__features.h b/chromium-next/patches/patch-chrome_common_chrome__features.h
deleted file mode 100644
index 3fe5784712..0000000000
--- a/chromium-next/patches/patch-chrome_common_chrome__features.h
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/chrome_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/chrome_features.h
-@@ -50,13 +50,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningFor
- #endif  // BUILDFLAG(IS_MAC)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillAddressSurvey);
- COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillCardSurvey);
- COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillPasswordSurvey);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(CHROME_FEATURES)
- BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -146,7 +146,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPrevent
- COMPONENT_EXPORT(CHROME_FEATURES)
- BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
- COMPONENT_EXPORT(CHROME_FEATURES)
- BASE_DECLARE_FEATURE(kShortcutsNotApps);
-@@ -521,7 +521,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceO
- COMPONENT_EXPORT(CHROME_FEATURES)
- BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
- 
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
- COMPONENT_EXPORT(CHROME_FEATURES)
- extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -529,7 +529,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
- extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
- #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kListWebAppsSwitch);
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_common_chrome__paths.cc b/chromium-next/patches/patch-chrome_common_chrome__paths.cc
deleted file mode 100644
index a1e98f0e15..0000000000
--- a/chromium-next/patches/patch-chrome_common_chrome__paths.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/chrome_paths.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/chrome_paths.cc
-@@ -32,7 +32,7 @@
- #include "base/apple/foundation_util.h"
- #endif
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
- #include "components/policy/core/common/policy_paths.h"
- #endif
- 
-@@ -48,14 +48,14 @@ namespace {
- 
- std::optional<bool> g_override_using_default_data_directory_for_testing;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // The path to the external extension <id>.json files.
- // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
- const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
--    FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
-+    FILE_PATH_LITERAL("@PREFIX@/share/chromium/extensions");
- #else
--    FILE_PATH_LITERAL("/usr/share/chromium/extensions");
-+    FILE_PATH_LITERAL("@PREFIX@/share/chromium/extensions");
- #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
- 
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -212,7 +212,7 @@ bool PathProvider(int key, base::FilePat
-       }
-       break;
-     case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       if (!GetUserDownloadsDirectorySafe(&cur)) {
-         return false;
-       }
-@@ -504,13 +504,13 @@ bool PathProvider(int key, base::FilePat
-       break;
-     }
- #endif
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
-     case chrome::DIR_POLICY_FILES: {
-       cur = base::FilePath(policy::kPolicyPath);
-       break;
-     }
- #endif
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING))
-     case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
-       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
-@@ -520,7 +520,7 @@ bool PathProvider(int key, base::FilePat
-       break;
-     }
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
-       cur = base::FilePath(kFilepathSinglePrefExtensions);
-       break;
-@@ -558,7 +558,7 @@ bool PathProvider(int key, base::FilePat
-       break;
- 
- #if BUILDFLAG(ENABLE_EXTENSIONS) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD))
-     case chrome::DIR_NATIVE_MESSAGING:
- #if BUILDFLAG(IS_MAC)
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -572,6 +572,9 @@ bool PathProvider(int key, base::FilePat
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-       cur = base::FilePath(
-           FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
-+#elif BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
-+      cur = base::FilePath(FILE_PATH_LITERAL(
-+          "@PREFIX@/etc/chromium/native-messaging-hosts"));
- #else
-       cur = base::FilePath(
-           FILE_PATH_LITERAL("/etc/chromium/native-messaging-hosts"));
diff --git a/chromium-next/patches/patch-chrome_common_chrome__paths.h b/chromium-next/patches/patch-chrome_common_chrome__paths.h
deleted file mode 100644
index c33cde0b00..0000000000
--- a/chromium-next/patches/patch-chrome_common_chrome__paths.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/chrome_paths.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/chrome_paths.h
-@@ -56,7 +56,7 @@ enum {
-                      // to set policies for chrome. This directory
-                      // contains subdirectories.
- #endif
--#if BUILDFLAG(IS_CHROMEOS) || \
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || BUILDFLAG(IS_MAC)
-   DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
-                                  // on Chrome Mac and Chromium Linux.
-@@ -65,7 +65,7 @@ enum {
-                                  // create it.
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
-                                        // definition manifest files that
-                                        // describe extensions which are to be
-@@ -112,7 +112,7 @@ enum {
- 
- #endif
- #if BUILDFLAG(ENABLE_EXTENSIONS) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD))
-   DIR_NATIVE_MESSAGING,       // System directory where native messaging host
-                               // manifest files are stored.
-   DIR_USER_NATIVE_MESSAGING,  // Directory with Native Messaging Hosts
diff --git a/chromium-next/patches/patch-chrome_common_chrome__paths__internal.h b/chromium-next/patches/patch-chrome_common_chrome__paths__internal.h
deleted file mode 100644
index 6440f25733..0000000000
--- a/chromium-next/patches/patch-chrome_common_chrome__paths__internal.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/chrome_paths_internal.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/chrome_paths_internal.h
-@@ -53,7 +53,7 @@ void GetUserCacheDirectory(const base::F
- // Get the path to the user's documents directory.
- bool GetUserDocumentsDirectory(base::FilePath* result);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Gets the path to a safe default download directory for a user.
- bool GetUserDownloadsDirectorySafe(base::FilePath* result);
- #endif
diff --git a/chromium-next/patches/patch-chrome_common_chrome__switches.cc b/chromium-next/patches/patch-chrome_common_chrome__switches.cc
deleted file mode 100644
index 0850787ed1..0000000000
--- a/chromium-next/patches/patch-chrome_common_chrome__switches.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/chrome_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/chrome_switches.cc
-@@ -883,7 +883,7 @@ const char kAllowNaClSocketAPI[] = "allo
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
- 
- // Causes the browser to launch directly in guest mode.
-@@ -911,7 +911,7 @@ const char kGlicDev[] = "glic-dev";
- const char kGlicHostLogging[] = "glic-host-logging";
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Writes open and installed web apps for each profile to the specified file
- // without launching a new browser window or tab. Pass a absolute file path to
- // specify where to output the information. Can be used together with optional
diff --git a/chromium-next/patches/patch-chrome_common_chrome__switches.h b/chromium-next/patches/patch-chrome_common_chrome__switches.h
deleted file mode 100644
index 2dd4137dac..0000000000
--- a/chromium-next/patches/patch-chrome_common_chrome__switches.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/chrome_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/chrome_switches.h
-@@ -273,7 +273,7 @@ extern const char kAllowNaClSocketAPI[];
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- extern const char kEnableNewAppMenuIcon[];
- extern const char kGuest[];
- extern const char kForceNtpMobilePromo[];
-@@ -290,7 +290,7 @@ extern const char kGlicDev[];
- extern const char kGlicHostLogging[];
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- extern const char kListApps[];
- extern const char kProfileBaseName[];
- extern const char kProfileManagementAttributes[];
diff --git a/chromium-next/patches/patch-chrome_common_crash__keys.cc b/chromium-next/patches/patch-chrome_common_crash__keys.cc
deleted file mode 100644
index 2ac552f695..0000000000
--- a/chromium-next/patches/patch-chrome_common_crash__keys.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/crash_keys.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/crash_keys.cc
-@@ -51,7 +51,9 @@ class CrashKeyWithName {
-   ~CrashKeyWithName() = delete;
- 
-   std::string_view Name() const { return name_; }
-+#if BUILDFLAG(USE_CRASHPAD_ANNOTATION)
-   std::string_view Value() const { return crash_key_.value(); }
-+#endif
-   void Clear() { crash_key_.Clear(); }
-   void Set(std::string_view value) { crash_key_.Set(value); }
- 
-@@ -196,6 +198,7 @@ void AllocateCrashKeyInBrowserAndChildre
-   GetCommandLineStringAnnotations().emplace_back(std::string(key)).Set(value);
- }
- 
-+#if BUILDFLAG(USE_CRASHPAD_ANNOTATION)
- void AppendStringAnnotationsCommandLineSwitch(base::CommandLine* command_line) {
-   std::string string_annotations;
-   for (const auto& crash_key : GetCommandLineStringAnnotations()) {
-@@ -210,6 +213,7 @@ void AppendStringAnnotationsCommandLineS
-   }
-   command_line->AppendSwitchASCII(kStringAnnotationsSwitch, string_annotations);
- }
-+#endif
- 
- void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
-   SetStringAnnotations(command_line);
diff --git a/chromium-next/patches/patch-chrome_common_extensions_extension__constants.cc b/chromium-next/patches/patch-chrome_common_extensions_extension__constants.cc
deleted file mode 100644
index 2fc19d1378..0000000000
--- a/chromium-next/patches/patch-chrome_common_extensions_extension__constants.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/extensions/extension_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/extensions/extension_constants.cc
-@@ -38,7 +38,7 @@ const char* const kBuiltInFirstPartyExte
-     kGoogleSpeechSynthesisExtensionId,
- #endif  // BUILDFLAG(IS_CHROMEOS)
-     kReadingModeGDocsHelperExtensionId,
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     kTTSEngineExtensionId,
-     kComponentUpdaterTTSEngineExtensionId,
- #endif        // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
diff --git a/chromium-next/patches/patch-chrome_common_extensions_extension__constants.h b/chromium-next/patches/patch-chrome_common_extensions_extension__constants.h
deleted file mode 100644
index 7d065955ca..0000000000
--- a/chromium-next/patches/patch-chrome_common_extensions_extension__constants.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/extensions/extension_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/extensions/extension_constants.h
-@@ -310,7 +310,7 @@ inline constexpr char kReadingModeGDocsH
- inline constexpr base::FilePath::CharType
-     kReadingModeGDocsHelperManifestFilename[] =
-         FILE_PATH_LITERAL("reading_mode_gdocs_helper_manifest.json");
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- // The extension id of the google tts engine extension to use on-device natural
- // Google voices.
- inline constexpr char kTTSEngineExtensionId[] =
diff --git a/chromium-next/patches/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc b/chromium-next/patches/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
deleted file mode 100644
index 86b0f651f7..0000000000
--- a/chromium-next/patches/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/extensions/permissions/chrome_permission_message_rules.cc
-@@ -280,7 +280,7 @@ class USBDevicesFormatter : public Chrom
- int GetEnterpriseReportingPrivatePermissionMessageId() {
- #if BUILDFLAG(IS_WIN)
-   return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN;
--#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC)
-+#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC) or BUILDFLAG(IS_BSD)
-   return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS;
- #else
-   return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE;
diff --git a/chromium-next/patches/patch-chrome_common_media_cdm__host__file__path.cc b/chromium-next/patches/patch-chrome_common_media_cdm__host__file__path.cc
deleted file mode 100644
index 841d0aad9c..0000000000
--- a/chromium-next/patches/patch-chrome_common_media_cdm__host__file__path.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/media/cdm_host_file_path.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/media/cdm_host_file_path.cc
-@@ -90,7 +90,7 @@ void AddCdmHostFilePaths(
-   cdm_host_file_paths->emplace_back(chrome_framework_path,
-                                     chrome_framework_sig_path);
- 
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
-   base::FilePath chrome_exe_dir;
-   if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir)) {
diff --git a/chromium-next/patches/patch-chrome_common_media_cdm__registration.cc b/chromium-next/patches/patch-chrome_common_media_cdm__registration.cc
deleted file mode 100644
index 444961d408..0000000000
--- a/chromium-next/patches/patch-chrome_common_media_cdm__registration.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/media/cdm_registration.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/media/cdm_registration.cc
-@@ -32,7 +32,7 @@
- #if BUILDFLAG(ENABLE_WIDEVINE)
- #include "components/cdm/common/cdm_manifest.h"
- #include "third_party/widevine/cdm/widevine_cdm_common.h"  // nogncheck
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/native_library.h"
- #include "chrome/common/chrome_paths.h"
- #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
-@@ -51,7 +51,7 @@ using Robustness = content::CdmInfo::Rob
- #if BUILDFLAG(ENABLE_WIDEVINE)
- #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) ||            \
-      BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and
- // |capability|.
- std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo(
-@@ -93,7 +93,7 @@ std::unique_ptr<content::CdmInfo> Create
-         // BUILDFLAG(IS_CHROMEOS))
- 
- #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- // On Linux/ChromeOS we have to preload the CDM since it uses the zygote
- // sandbox. On Windows and Mac, CDM registration is handled by Component
- // Update (as the CDM can be loaded only when needed).
-@@ -117,7 +117,7 @@ std::unique_ptr<content::CdmInfo> GetBun
-         // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
- 
- #if (BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \
--     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)))
-+     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)))
- // This code checks to see if Component Updater picked a version of the Widevine
- // CDM to be used last time it ran. (Component Updater may choose the bundled
- // CDM if there is not a new version available for download.) If there is one
-@@ -159,7 +159,7 @@ void AddSoftwareSecureWidevine(std::vect
-       /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName,
-       kWidevineCdmType, base::FilePath());
- 
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // The Widevine CDM on Linux/ChromeOS needs to be registered (and loaded)
-   // before the zygote is locked down. The CDM can be found from the version
-   // bundled with Chrome (if BUNDLE_WIDEVINE_CDM = true) and/or the version
-@@ -385,7 +385,7 @@ void RegisterCdmInfo(std::vector<content
- }
- 
- #if BUILDFLAG(ENABLE_WIDEVINE) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- std::vector<content::CdmInfo> GetSoftwareSecureWidevine() {
-   std::vector<content::CdmInfo> cdms;
-   AddSoftwareSecureWidevine(&cdms);
diff --git a/chromium-next/patches/patch-chrome_common_media_cdm__registration.h b/chromium-next/patches/patch-chrome_common_media_cdm__registration.h
deleted file mode 100644
index b68312ab9f..0000000000
--- a/chromium-next/patches/patch-chrome_common_media_cdm__registration.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/media/cdm_registration.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/media/cdm_registration.h
-@@ -15,7 +15,7 @@
- void RegisterCdmInfo(std::vector<content::CdmInfo>* cdms);
- 
- #if BUILDFLAG(ENABLE_WIDEVINE) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- // Returns the software secure Widevine CDM, if one exists.
- std::vector<content::CdmInfo> GetSoftwareSecureWidevine();
- #endif
diff --git a/chromium-next/patches/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/chromium-next/patches/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
deleted file mode 100644
index 8dd8257cd7..0000000000
--- a/chromium-next/patches/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/media/component_widevine_cdm_hint_file_linux.h
-@@ -14,7 +14,7 @@
- #error "This file only applies when Widevine used."
- #endif
- 
--#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- #error "This file only applies to desktop Linux and ChromeOS."
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_common_pref__names.h b/chromium-next/patches/patch-chrome_common_pref__names.h
deleted file mode 100644
index 8745ab3327..0000000000
--- a/chromium-next/patches/patch-chrome_common_pref__names.h
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/pref_names.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/pref_names.h
-@@ -1325,7 +1325,7 @@ inline constexpr char kGeminiSettings[] 
- inline constexpr char kAllowedDomainsForApps[] =
-     "settings.allowed_domains_for_apps";
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Linux specific preference on whether we should match the system theme.
- inline constexpr char kSystemTheme[] = "extensions.theme.system_theme";
- #endif
-@@ -1502,7 +1502,7 @@ inline constexpr char kShowUpdatePromoti
-     "browser.show_update_promotion_info_bar";
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Boolean that is false if we should show window manager decorations.  If
- // true, we draw a custom chrome frame (thicker title bar and blue border).
- inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -2129,7 +2129,7 @@ inline constexpr char kDownloadDefaultDi
- inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade";
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- inline constexpr char kOpenPdfDownloadInSystemReader[] =
-     "download.open_pdf_in_system_reader";
- #endif
-@@ -2622,14 +2622,14 @@ inline constexpr char kMediaStorageIdSal
- inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data";
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // A boolean pref to determine whether or not the network service is running
- // sandboxed.
- inline constexpr char kNetworkServiceSandboxEnabled[] =
-     "net.network_service_sandbox";
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Records whether the user has seen an HTTP auth "negotiate" header.
- inline constexpr char kReceivedHttpAuthNegotiateHeader[] =
-     "net.received_http_auth_negotiate_headers";
-@@ -2721,7 +2721,7 @@ inline constexpr char kIsolatedWebAppIns
- inline constexpr char kIsolatedWebAppPendingInitializationCount[] =
-     "profile.isolated_web_app.install.pending_initialization_count";
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
- // along with kAuthNegotiateDelegateAllowlist.
- inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3240,7 +3240,7 @@ inline constexpr char kKioskChromeAppsFo
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- // Defines administrator-set availability of Chrome for Testing.
- inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed";
- #endif
-@@ -3763,7 +3763,7 @@ inline constexpr char kScreenCaptureWith
- inline constexpr char kSandboxExternalProtocolBlocked[] =
-     "profile.sandbox_external_protocol_blocked";
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Boolean that indicates if system notifications are allowed to be used in
- // place of Chrome notifications.
- inline constexpr char kAllowSystemNotifications[] =
-@@ -3959,7 +3959,7 @@ inline constexpr char kLensDesktopNTPSea
-     "policy.lens_desktop_ntp_search_enabled";
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // A dict mapping the edition name with the major version it was shown.
- inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used";
- // A list containing the features of each module in order of when they
-@@ -4056,7 +4056,7 @@ inline constexpr char kPrintingOAuth2Aut
-     "printing.oauth2_authorization_servers";
- #endif
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // If this exists and is true, Chrome may run system DNS resolution out of the
- // network process. If false, Chrome will run system DNS resolution in the
- // network process. If non-existent, Chrome will decide where to run system DNS
diff --git a/chromium-next/patches/patch-chrome_common_url__constants.h b/chromium-next/patches/patch-chrome_common_url__constants.h
deleted file mode 100644
index 6eadaf9f5c..0000000000
--- a/chromium-next/patches/patch-chrome_common_url__constants.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/url_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/url_constants.h
-@@ -983,7 +983,7 @@ inline constexpr char kOutdatedPluginLea
- inline constexpr char kPhoneHubPermissionLearnMoreURL[] =
-     "https://support.google.com/chromebook?p=multidevice";;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // "Learn more" URL for the chrome apps deprecation dialog.
- inline constexpr char kChromeAppsDeprecationLearnMoreURL[] =
-     "https://support.google.com/chrome?p=chrome_app_deprecation";;
diff --git a/chromium-next/patches/patch-chrome_common_webui__url__constants.cc b/chromium-next/patches/patch-chrome_common_webui__url__constants.cc
deleted file mode 100644
index 061099bdba..0000000000
--- a/chromium-next/patches/patch-chrome_common_webui__url__constants.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/webui_url_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/webui_url_constants.cc
-@@ -192,18 +192,18 @@ base::span<const base::cstring_view> Chr
-       kChromeUIAssistantOptInHost,
- #endif
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       kChromeUIConnectorsInternalsHost,
-       kChromeUIDiscardsHost,
- #endif
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       kChromeUIWebAppSettingsHost,
- #endif
- #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
-       kChromeUILinuxProxyConfigHost,
- #endif
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-       kChromeUISandboxHost,
- #endif
- #if BUILDFLAG(IS_WIN)
diff --git a/chromium-next/patches/patch-chrome_common_webui__url__constants.h b/chromium-next/patches/patch-chrome_common_webui__url__constants.h
deleted file mode 100644
index c18ad45ebb..0000000000
--- a/chromium-next/patches/patch-chrome_common_webui__url__constants.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/common/webui_url_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/common/webui_url_constants.h
-@@ -513,18 +513,18 @@ inline constexpr char kChromeUIOsUrlAppU
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- inline constexpr char kChromeUIConnectorsInternalsHost[] =
-     "connectors-internals";
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- inline constexpr char kChromeUIDiscardsHost[] = "discards";
- inline constexpr char kChromeUIDiscardsURL[] = "chrome://discards/";
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings";
- inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
- inline constexpr char kChromeUIWhatsNewHost[] = "whats-new";
-@@ -536,11 +536,11 @@ inline constexpr char kChromeUILinuxProx
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- inline constexpr char kChromeUISandboxHost[] = "sandbox";
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch";
- inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
- inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser";
-@@ -565,7 +565,7 @@ inline constexpr char kChromeUIHistorySy
-     "chrome://history-sync-optin/";
- #endif
- 
--#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
-      defined(TOOLKIT_VIEWS)) ||                         \
-     defined(USE_AURA)
- inline constexpr char kChromeUITabModalConfirmDialogHost[] =
diff --git a/chromium-next/patches/patch-chrome_enterprise__companion_enterprise__companion__client.cc b/chromium-next/patches/patch-chrome_enterprise__companion_enterprise__companion__client.cc
deleted file mode 100644
index 4de9c2f377..0000000000
--- a/chromium-next/patches/patch-chrome_enterprise__companion_enterprise__companion__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/enterprise_companion/enterprise_companion_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/enterprise_companion/enterprise_companion_client.cc
-@@ -35,7 +35,7 @@ namespace {
- 
- #if BUILDFLAG(IS_MAC)
- constexpr char kServerName[] = MAC_BUNDLE_IDENTIFIER_STRING ".service";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr char kServerName[] =
-     "/run/" COMPANY_SHORTNAME_STRING "/" PRODUCT_FULLNAME_STRING "/service.sk";
- #elif BUILDFLAG(IS_WIN)
diff --git a/chromium-next/patches/patch-chrome_enterprise__companion_event__logger.cc b/chromium-next/patches/patch-chrome_enterprise__companion_event__logger.cc
deleted file mode 100644
index 40e2dfa693..0000000000
--- a/chromium-next/patches/patch-chrome_enterprise__companion_event__logger.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/enterprise_companion/event_logger.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/enterprise_companion/event_logger.cc
-@@ -126,7 +126,7 @@ proto::EnterpriseCompanionMetadata GetMe
-   metadata.set_application_arch(proto::ARM64);
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   metadata.set_os_platform(proto::LINUX);
- #elif BUILDFLAG(IS_MAC)
-   metadata.set_os_platform(proto::MAC);
diff --git a/chromium-next/patches/patch-chrome_enterprise__companion_lock.cc b/chromium-next/patches/patch-chrome_enterprise__companion_lock.cc
deleted file mode 100644
index a449b682ea..0000000000
--- a/chromium-next/patches/patch-chrome_enterprise__companion_lock.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/enterprise_companion/lock.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/enterprise_companion/lock.cc
-@@ -17,7 +17,7 @@
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr char kLockName[] = "/" PRODUCT_FULLNAME_STRING ".lock";
- #elif BUILDFLAG(IS_MAC)
- constexpr char kLockName[] = MAC_BUNDLE_IDENTIFIER_STRING ".lock";
-@@ -42,7 +42,7 @@ CSecurityDesc GetAdminDaclSecurityDescri
- namespace enterprise_companion {
- 
- std::unique_ptr<ScopedLock> CreateScopedLock(base::TimeDelta timeout) {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return named_system_lock::ScopedLock::Create(kLockName, timeout);
- #elif BUILDFLAG(IS_WIN)
-   CSecurityAttributes sa =
diff --git a/chromium-next/patches/patch-chrome_services_printing_print__backend__service__impl.cc b/chromium-next/patches/patch-chrome_services_printing_print__backend__service__impl.cc
deleted file mode 100644
index 0e44b48f13..0000000000
--- a/chromium-next/patches/patch-chrome_services_printing_print__backend__service__impl.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/services/printing/print_backend_service_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/services/printing/print_backend_service_impl.cc
-@@ -49,7 +49,7 @@
- #include "printing/backend/cups_connection_pool.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/no_destructor.h"
- #include "ui/linux/linux_ui.h"
- #include "ui/linux/linux_ui_delegate_stub.h"
-@@ -76,7 +76,7 @@ namespace printing {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void InstantiateLinuxUiDelegate() {
-   // TODO(crbug.com/40561724)  Until a real UI can be used in a utility process,
-   // need to use the stub version.
-@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() {
- #endif
- 
- scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Use task runner associated with equivalent of UI thread.  Needed for calls
-   // made through `PrintDialogLinuxInterface` to properly execute.
-   CHECK(base::SequencedTaskRunner::HasCurrentDefault());
-@@ -468,7 +468,7 @@ void PrintBackendServiceImpl::Init(
-   // `InitCommon()`.
-   InitializeProcessForPrinting();
-   print_backend_ = PrintBackend::CreateInstance(locale);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Test framework already initializes the UI, so this should not go in
-   // `InitCommon()`.  Additionally, low-level Linux UI is not needed when tests
-   // are using `TestPrintingContext`.
-@@ -689,7 +689,7 @@ void PrintBackendServiceImpl::UpdatePrin
-   crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
-       *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name));
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS)
-   // Try to fill in advanced settings based upon basic info options.
-   PrinterBasicInfo basic_info;
-   if (print_backend_->GetPrinterBasicInfo(*printer_name, &basic_info) ==
diff --git a/chromium-next/patches/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/chromium-next/patches/patch-chrome_services_speech_audio__source__fetcher__impl.cc
deleted file mode 100644
index 84946a13e6..0000000000
--- a/chromium-next/patches/patch-chrome_services_speech_audio__source__fetcher__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/services/speech/audio_source_fetcher_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/services/speech/audio_source_fetcher_impl.cc
-@@ -132,7 +132,7 @@ void AudioSourceFetcherImpl::Start(
- 
-   // TODO(crbug.com/40753481): Check implementation / sandbox policy on Mac and
-   // Windows.
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   is_started_ = true;
-   // Initialize the AudioCapturerSource with |this| as the CaptureCallback,
-   // get the parameters for the device ID, then start audio capture.
diff --git a/chromium-next/patches/patch-chrome_test_base_scoped__channel__override__posix.cc b/chromium-next/patches/patch-chrome_test_base_scoped__channel__override__posix.cc
deleted file mode 100644
index f730e0293f..0000000000
--- a/chromium-next/patches/patch-chrome_test_base_scoped__channel__override__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/test/base/scoped_channel_override_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/test/base/scoped_channel_override_posix.cc
-@@ -45,7 +45,7 @@ std::string GetVersionExtra(ScopedChanne
-       return "beta";
-     case ScopedChannelOverride::Channel::kDev:
-       return "unstable";
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case ScopedChannelOverride::Channel::kCanary:
-       return "canary";
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-chrome_test_chromedriver_chrome__launcher.cc b/chromium-next/patches/patch-chrome_test_chromedriver_chrome__launcher.cc
deleted file mode 100644
index 1de31c2e2c..0000000000
--- a/chromium-next/patches/patch-chrome_test_chromedriver_chrome__launcher.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/test/chromedriver/chrome_launcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/test/chromedriver/chrome_launcher.cc
-@@ -73,6 +73,7 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <unistd.h>
- #elif BUILDFLAG(IS_WIN)
- #include <windows.h>
diff --git a/chromium-next/patches/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/chromium-next/patches/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
deleted file mode 100644
index 0d2b9e2177..0000000000
--- a/chromium-next/patches/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/test/chromedriver/chrome/chrome_finder.cc
-@@ -58,7 +58,7 @@ void GetApplicationDirs(std::vector<base
-         installation_locations[i].Append(L"Chromium\\Application"));
-   }
- }
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void GetApplicationDirs(std::vector<base::FilePath>* locations) {
-   // TODO: Respect users' PATH variables.
-   // Until then, we use an approximation of the most common defaults.
-@@ -125,7 +125,7 @@ std::vector<base::FilePath> GetChromePro
-             chrome::kGoogleChromeForTestingBrowserProcessExecutablePath),
-         base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath),
-         base::FilePath(chrome::kChromiumBrowserProcessExecutablePath),
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     base::FilePath(chrome::kBrowserProcessExecutablePath),
-         base::FilePath("chrome"),  // Chrome for Testing or Google Chrome
-         base::FilePath("google-chrome"), base::FilePath("chromium"),
-@@ -141,7 +141,7 @@ std::vector<base::FilePath> GetHeadlessS
-   return {
- #if BUILDFLAG(IS_WIN)
-     base::FilePath(FILE_PATH_LITERAL("chrome-headless-shell.exe")),
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     base::FilePath("chrome-headless-shell"),
- #else
-     // it will compile but won't work on other OSes
diff --git a/chromium-next/patches/patch-chrome_test_chromedriver_key__converter__unittest.cc b/chromium-next/patches/patch-chrome_test_chromedriver_key__converter__unittest.cc
deleted file mode 100644
index 18fc57a53b..0000000000
--- a/chromium-next/patches/patch-chrome_test_chromedriver_key__converter__unittest.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/test/chromedriver/key_converter_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/test/chromedriver/key_converter_unittest.cc
-@@ -252,7 +252,7 @@ TEST(KeyConverter, ToggleModifiers) {
-   CheckEventsReleaseModifiers(keys, key_events);
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Fails on bots: crbug.com/174962
- #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols
- #else
-@@ -310,7 +310,7 @@ TEST(KeyConverter, AllEnglishKeyboardTex
- TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) {
-   ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US);
-   const auto kTextForKeys = std::to_array<char>({
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       0,   0,   0,   0,   '\t', 0,   '\r', '\r', 0,   0,   0,   0,   0,
- #else
-       0,   0,   0,   0,   0,   0,   '\r', '\r', 0,   0,   0,   0,   0,
diff --git a/chromium-next/patches/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/chromium-next/patches/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
deleted file mode 100644
index 41efd29aed..0000000000
--- a/chromium-next/patches/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc
-@@ -64,7 +64,7 @@ std::string ConvertKeyCodeToTextNoError(
- 
- }  // namespace
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Fails on bots: crbug.com/174962
- #define MAYBE_KeyCodeToText DISABLED_KeyCodeToText
- #else
-@@ -98,7 +98,7 @@ TEST(KeycodeTextConversionTest, MAYBE_Ke
-       ConvertKeyCodeToTextNoError(ui::VKEY_SHIFT, kShiftKeyModifierMask));
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Fails on bots: crbug.com/174962
- #define MAYBE_CharToKeyCode DISABLED_CharToKeyCode
- #else
diff --git a/chromium-next/patches/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc b/chromium-next/patches/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
deleted file mode 100644
index a9343f4aca..0000000000
--- a/chromium-next/patches/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/test/supervised_user/google_auth_state_waiter_mixin.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/test/supervised_user/google_auth_state_waiter_mixin.cc
-@@ -24,7 +24,7 @@ GoogleAuthStateWaiterMixin::GoogleAuthSt
- GoogleAuthStateWaiterMixin::~GoogleAuthStateWaiterMixin() = default;
- 
- void GoogleAuthStateWaiterMixin::SetUpOnMainThread() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   ChildAccountService* child_account_service =
-       ChildAccountServiceFactory::GetForProfile(
-           test_base_->browser()->profile());
diff --git a/chromium-next/patches/patch-chrome_updater_app_app__uninstall.cc b/chromium-next/patches/patch-chrome_updater_app_app__uninstall.cc
deleted file mode 100644
index 341db31b98..0000000000
--- a/chromium-next/patches/patch-chrome_updater_app_app__uninstall.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/updater/app/app_uninstall.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/updater/app/app_uninstall.cc
-@@ -157,7 +157,7 @@ void UninstallInThreadPool(UpdaterScope 
-             }
-             if (int result = UninstallOtherVersions(scope);
-                 result != kErrorOk) {
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-               // TODO(crbug.com/366249606): Ignores the errors when uninstalls
-               // the other versions, because currently older Linux updater on
-               // CIPD exits with error `kErrorFailedToDeleteFolder`.
diff --git a/chromium-next/patches/patch-chrome_updater_configurator.cc b/chromium-next/patches/patch-chrome_updater_configurator.cc
deleted file mode 100644
index 714c382bc3..0000000000
--- a/chromium-next/patches/patch-chrome_updater_configurator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/updater/configurator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/updater/configurator.cc
-@@ -73,7 +73,7 @@ Configurator::Configurator(scoped_refptr
-         return std::nullopt;
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-       }()) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On Linux creating the NetworkFetcherFactory requires performing blocking IO
-   // to load an external library. This should be done when the configurator is
-   // created.
diff --git a/chromium-next/patches/patch-chrome_updater_lock.cc b/chromium-next/patches/patch-chrome_updater_lock.cc
deleted file mode 100644
index caf4712d48..0000000000
--- a/chromium-next/patches/patch-chrome_updater_lock.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/updater/lock.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/updater/lock.cc
-@@ -26,7 +26,7 @@ namespace updater {
- std::unique_ptr<ScopedLock> CreateScopedLock(const std::string& name,
-                                              UpdaterScope scope,
-                                              base::TimeDelta timeout) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return named_system_lock::ScopedLock::Create(
-       base::StrCat({"/" PRODUCT_FULLNAME_STRING, name,
-                     UpdaterScopeToString(scope), ".lock"}),
diff --git a/chromium-next/patches/patch-chrome_updater_util_posix__util.cc b/chromium-next/patches/patch-chrome_updater_util_posix__util.cc
deleted file mode 100644
index 4727bbb719..0000000000
--- a/chromium-next/patches/patch-chrome_updater_util_posix__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/updater/util/posix_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/updater/util/posix_util.cc
-@@ -20,7 +20,7 @@
- #include "chrome/updater/updater_branding.h"
- #include "chrome/updater/util/util.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/updater/util/linux_util.h"
- #endif
- 
diff --git a/chromium-next/patches/patch-chrome_utility_services.cc b/chromium-next/patches/patch-chrome_utility_services.cc
deleted file mode 100644
index 9ba1e3317d..0000000000
--- a/chromium-next/patches/patch-chrome_utility_services.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/utility/services.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chrome/utility/services.cc
-@@ -48,7 +48,7 @@
- #include "chrome/services/system_signals/mac/mac_system_signals_service.h"
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/services/system_signals/linux/linux_system_signals_service.h"
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -205,7 +205,7 @@ auto RunMacNotificationService(
- }
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- auto RunSystemSignalsService(
-     mojo::PendingReceiver<device_signals::mojom::SystemSignalsService>
-         receiver) {
-@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::Se
-   services.Add(RunWindowsIconReader);
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   services.Add(RunSystemSignalsService);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-chromecast_browser_cast__browser__main__parts.cc b/chromium-next/patches/patch-chromecast_browser_cast__browser__main__parts.cc
deleted file mode 100644
index dd273ac86b..0000000000
--- a/chromium-next/patches/patch-chromecast_browser_cast__browser__main__parts.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chromecast/browser/cast_browser_main_parts.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chromecast/browser/cast_browser_main_parts.cc
-@@ -100,7 +100,7 @@
- #include "ui/ozone/public/ozone_platform.h"
- #endif  // BUILDFLAG(IS_OZONE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <fontconfig/fontconfig.h>
- #include <signal.h>
- #include <sys/prctl.h>
-@@ -273,7 +273,7 @@ class CastViewsDelegate : public views::
- 
- #endif  // defined(USE_AURA)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- base::FilePath GetApplicationFontsDir() {
-   std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -319,7 +319,7 @@ const DefaultCommandLineSwitch kDefaultS
-     {switches::kDisableThreadedAnimation, ""},
- #endif  // BUILDFLAG(IS_ANDROID)
- #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #if defined(ARCH_CPU_X86_FAMILY)
-     // This is needed for now to enable the x11 Ozone platform to work with
-     // current Linux/NVidia OpenGL drivers.
-@@ -496,7 +496,7 @@ void CastBrowserMainParts::ToolkitInitia
-     views_delegate_ = std::make_unique<CastViewsDelegate>();
- #endif  // defined(USE_AURA)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   base::FilePath dir_font = GetApplicationFontsDir();
-   const FcChar8* dir_font_char8 =
-       reinterpret_cast<const FcChar8*>(dir_font.value().data());
diff --git a/chromium-next/patches/patch-chromecast_browser_cast__content__browser__client.cc b/chromium-next/patches/patch-chromecast_browser_cast__content__browser__client.cc
deleted file mode 100644
index ac2a9d51c8..0000000000
--- a/chromium-next/patches/patch-chromecast_browser_cast__content__browser__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chromecast/browser/cast_content_browser_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chromecast/browser/cast_content_browser_client.cc
-@@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExt
-                                           switches::kAudioOutputChannels));
-     }
-   } else if (process_type == switches::kGpuProcess) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // Necessary for accelerated 2d canvas.  By default on Linux, Chromium
-     // assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU
-     // canvas apps.
diff --git a/chromium-next/patches/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc b/chromium-next/patches/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
deleted file mode 100644
index bbb88bd1ee..0000000000
--- a/chromium-next/patches/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc
-@@ -352,7 +352,7 @@ CastWebView::Scoped RuntimeApplicationSe
-   params->force_720p_resolution =
-       GetFlagEntry(feature::kCastCoreForce720p, config_.extra_features(),
-                    /*default_value=*/false);
--#if BUILDFLAG(ENABLE_CAST_RECEIVER) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_CAST_RECEIVER) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-   // Starboard-based (linux) cast receivers may not render their UI at 720p, so
-   // we need to scale to the proper resolution. For example, a 4k TV may render
-   // the window at 1920x1080, so a scaling factor of 1.5 is necessary for a 720p
diff --git a/chromium-next/patches/patch-chromecast_media_base_default__monotonic__clock.cc b/chromium-next/patches/patch-chromecast_media_base_default__monotonic__clock.cc
deleted file mode 100644
index ab10bce88b..0000000000
--- a/chromium-next/patches/patch-chromecast_media_base_default__monotonic__clock.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chromecast/media/base/default_monotonic_clock.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ chromecast/media/base/default_monotonic_clock.cc
-@@ -11,7 +11,7 @@
- #include "base/time/time.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chromecast/media/base/buildflags.h"
- #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
-@@ -28,7 +28,7 @@ std::unique_ptr<MonotonicClock> Monotoni
-   return std::make_unique<DefaultMonotonicClock>();
- }
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- int64_t MonotonicClockNow() {
-   timespec now = {0, 0};
- #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW)
diff --git a/chromium-next/patches/patch-components_BUILD.gn b/chromium-next/patches/patch-components_BUILD.gn
deleted file mode 100644
index e3a7ba9e4a..0000000000
--- a/chromium-next/patches/patch-components_BUILD.gn
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/BUILD.gn
-@@ -208,7 +208,6 @@ test("components_unittests") {
-     "//components/content_settings/core/browser:unit_tests",
-     "//components/content_settings/core/common:unit_tests",
-     "//components/country_codes:unit_tests",
--    "//components/crash/core/common:unit_tests",
-     "//components/cross_device/logging:unit_tests",
-     "//components/crx_file:unit_tests",
-     "//components/data_sharing:unit_tests",
-@@ -610,7 +609,7 @@ test("components_unittests") {
-       deps += [ "//components/cast:unit_tests" ]
-     }
- 
--    if (!is_fuchsia) {  #!iOS and!Fuchsia
-+    if (!is_fuchsia && !is_bsd) {  #!iOS and!Fuchsia
-       deps += [
-         "//components/crash/content/browser:unit_tests",
-         "//components/crash/core/app:unit_tests",
-@@ -771,7 +770,7 @@ test("components_unittests") {
-     deps += [ "//components/constrained_window:unit_tests" ]
-   }
- 
--  if (is_win || is_linux || is_chromeos || is_mac) {
-+  if (is_win || (is_linux && !is_bsd) || is_chromeos || is_mac) {
-     deps += [ "//components/stability_report:unit_tests" ]
-   }
- 
diff --git a/chromium-next/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/chromium-next/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
deleted file mode 100644
index 6df166ec51..0000000000
--- a/chromium-next/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
-@@ -950,7 +950,7 @@ void PaymentsDataManager::SetPrefService
-           &PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange,
-           base::Unretained(this)));
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   pref_registrar_.Add(
-       prefs::kAutofillBnplEnabled,
-       base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange,
-@@ -1026,7 +1026,7 @@ void PaymentsDataManager::SetAutofillHas
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const {
-   return prefs::HasSeenBnpl(pref_service_);
- }
-@@ -2022,7 +2022,7 @@ bool PaymentsDataManager::AreEwalletAcco
- 
- bool PaymentsDataManager::AreBnplIssuersSupported() const {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return app_locale_ == "en-US" && GetCountryCodeForExperimentGroup() == "US" &&
-          base::FeatureList::IsEnabled(
-              features::kAutofillEnableBuyNowPayLaterSyncing);
-@@ -2055,7 +2055,7 @@ void PaymentsDataManager::ClearAllCredit
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void PaymentsDataManager::OnBnplEnabledPrefChange() {
-   // On pref change to `false`, clearing BNPL issuers is implicitly handled by
-   // `GetBnplIssuers()`, since it returns an empty vector when
diff --git a/chromium-next/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/chromium-next/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
deleted file mode 100644
index f775126429..0000000000
--- a/chromium-next/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h
-@@ -354,7 +354,7 @@ class PaymentsDataManager : public Autof
-   void SetAutofillHasSeenIban();
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Returns the value of the kAutofillHasSeenBnpl pref.
-   bool IsAutofillHasSeenBnplPrefEnabled() const;
- 
-@@ -683,7 +683,7 @@ class PaymentsDataManager : public Autof
-   void ClearAllCreditCardBenefits();
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Monitors the `kAutofillBnplEnabled` preference for changes and controls the
-   // clearing/loading of payment instruments accordingly. Will also log the
-   // `Autofill.SettingsPage.BnplToggled` metric.
diff --git a/chromium-next/patches/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc b/chromium-next/patches/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc
deleted file mode 100644
index 3c5776e13f..0000000000
--- a/chromium-next/patches/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/browser/integrators/autofill_optimization_guide.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/autofill/core/browser/integrators/autofill_optimization_guide.cc
-@@ -231,7 +231,7 @@ void AutofillOptimizationGuide::OnDidPar
-   }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   auto bnpl_issuer_allowlist_can_be_loaded =
-       [&payments_data_manager](std::string_view issuer_id) {
-         return base::Contains(payments_data_manager.GetBnplIssuers(), issuer_id,
diff --git a/chromium-next/patches/patch-components_autofill_core_browser_payments_bnpl__manager.cc b/chromium-next/patches/patch-components_autofill_core_browser_payments_bnpl__manager.cc
deleted file mode 100644
index 8b345e6a94..0000000000
--- a/chromium-next/patches/patch-components_autofill_core_browser_payments_bnpl__manager.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/browser/payments/bnpl_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/autofill/core/browser/payments/bnpl_manager.cc
-@@ -114,7 +114,7 @@ void BnplManager::OnAmountExtractionRetu
- 
- bool BnplManager::ShouldShowBnplSettings() const {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   const PaymentsDataManager& payments_data_manager =
-       payments_autofill_client().GetPaymentsDataManager();
- 
-@@ -431,7 +431,7 @@ void BnplManager::MaybeUpdateSuggestions
-       .Run(update_suggestions_result.suggestions, trigger_source);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   payments_autofill_client().GetPaymentsDataManager().SetAutofillHasSeenBnpl();
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium-next/patches/patch-components_autofill_core_common_autofill__payments__features.cc b/chromium-next/patches/patch-components_autofill_core_common_autofill__payments__features.cc
deleted file mode 100644
index 513aff4a72..0000000000
--- a/chromium-next/patches/patch-components_autofill_core_common_autofill__payments__features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/common/autofill_payments_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -267,7 +267,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccount
- #endif  // BUILDFLAG(IS_ANDROID)
- 
- bool ShouldShowImprovedUserConsentForCreditCardSave() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // The new user consent UI is fully launched on MacOS, Windows and Linux.
-   return true;
- #else
diff --git a/chromium-next/patches/patch-components_autofill_core_common_autofill__prefs.cc b/chromium-next/patches/patch-components_autofill_core_common_autofill__prefs.cc
deleted file mode 100644
index b1143fdf11..0000000000
--- a/chromium-next/patches/patch-components_autofill_core_common_autofill__prefs.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/common/autofill_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/autofill/core/common/autofill_prefs.cc
-@@ -98,7 +98,7 @@ void RegisterProfilePrefs(user_prefs::Pr
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(
-       kAutofillBnplEnabled, true,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-@@ -277,7 +277,7 @@ bool IsFacilitatedPaymentsEwalletEnabled
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void SetAutofillBnplEnabled(PrefService* prefs, bool value) {
-   prefs->SetBoolean(kAutofillBnplEnabled, value);
- }
-@@ -286,7 +286,7 @@ void SetAutofillBnplEnabled(PrefService*
- 
- bool IsAutofillBnplEnabled(const PrefService* prefs) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return prefs->GetBoolean(kAutofillBnplEnabled);
- #else
-   return false;
-@@ -295,7 +295,7 @@ bool IsAutofillBnplEnabled(const PrefSer
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // If called, always sets the pref to true, and once true, it will follow the
- // user around forever.
- void SetAutofillHasSeenBnpl(PrefService* prefs) {
diff --git a/chromium-next/patches/patch-components_autofill_core_common_autofill__prefs.h b/chromium-next/patches/patch-components_autofill_core_common_autofill__prefs.h
deleted file mode 100644
index 5617c21c9e..0000000000
--- a/chromium-next/patches/patch-components_autofill_core_common_autofill__prefs.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/common/autofill_prefs.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/autofill/core/common/autofill_prefs.h
-@@ -32,7 +32,7 @@ inline constexpr std::string_view kAutof
- inline constexpr char kAutofillAiOptInStatus[] =
-     "autofill.autofill_ai.opt_in_status";
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Boolean that is true if BNPL on Autofill is enabled.
- inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled";
- // Boolean that is true if the user has ever seen a BNPL suggestion.
-@@ -208,7 +208,7 @@ void SetFacilitatedPaymentsEwallet(PrefS
- bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void SetAutofillBnplEnabled(PrefService* prefs, bool value);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
-@@ -216,7 +216,7 @@ void SetAutofillBnplEnabled(PrefService*
- bool IsAutofillBnplEnabled(const PrefService* prefs);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void SetAutofillHasSeenBnpl(PrefService* prefs);
- 
- bool HasSeenBnpl(const PrefService* prefs);
diff --git a/chromium-next/patches/patch-components_commerce_core_commerce__feature__list.cc b/chromium-next/patches/patch-components_commerce_core_commerce__feature__list.cc
deleted file mode 100644
index 38d39b11c1..0000000000
--- a/chromium-next/patches/patch-components_commerce_core_commerce__feature__list.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/commerce/core/commerce_feature_list.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/commerce/core/commerce_feature_list.cc
-@@ -156,7 +156,8 @@ BASE_FEATURE(kPriceInsights,
-              "PriceInsights",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) || \
-+    BUILDFLAG(IS_BSD)
- BASE_FEATURE(kPriceInsightsRegionLaunched,
-              "PriceInsightsRegionLaunched",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -227,7 +228,7 @@ BASE_FEATURE(kEnableDiscountInfoApi,
- const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page";
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- const base::FeatureParam<bool> kDiscountOnShoppyPage{
-     &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true};
- #else
-@@ -236,7 +237,7 @@ const base::FeatureParam<bool> kDiscount
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched,
-              "EnableDiscountInfoApiRegionLaunched",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -251,7 +252,7 @@ const char kMerchantWideBehaviorParam[] 
- const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior";
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting,
-              "DiscountDialogAutoPopupBehaviorSetting",
-              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-components_constrained__window_constrained__window__views.cc b/chromium-next/patches/patch-components_constrained__window_constrained__window__views.cc
deleted file mode 100644
index 5c8ad69ff5..0000000000
--- a/chromium-next/patches/patch-components_constrained__window_constrained__window__views.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/constrained_window/constrained_window_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/constrained_window/constrained_window_views.cc
-@@ -377,7 +377,7 @@ bool SupportsGlobalScreenCoordinates() {
- }
- 
- bool PlatformClipsChildrenToViewport() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
diff --git a/chromium-next/patches/patch-components_content__settings_core_browser_website__settings__registry.cc b/chromium-next/patches/patch-components_content__settings_core_browser_website__settings__registry.cc
deleted file mode 100644
index 2bc3cba7c6..0000000000
--- a/chromium-next/patches/patch-components_content__settings_core_browser_website__settings__registry.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/content_settings/core/browser/website_settings_registry.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/content_settings/core/browser/website_settings_registry.cc
-@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettin
- #if BUILDFLAG(IS_WIN)
-   if (!(platform & PLATFORM_WINDOWS))
-     return nullptr;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!(platform & PLATFORM_LINUX))
-     return nullptr;
- #elif BUILDFLAG(IS_MAC)
diff --git a/chromium-next/patches/patch-components_cookie__config_cookie__store__util.cc b/chromium-next/patches/patch-components_cookie__config_cookie__store__util.cc
deleted file mode 100644
index 863992e06e..0000000000
--- a/chromium-next/patches/patch-components_cookie__config_cookie__store__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/cookie_config/cookie_store_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/cookie_config/cookie_store_util.cc
-@@ -12,7 +12,7 @@
- namespace cookie_config {
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- namespace {
- 
- // Use the operating system's mechanisms to encrypt cookies before writing
diff --git a/chromium-next/patches/patch-components_crash_core_app_BUILD.gn b/chromium-next/patches/patch-components_crash_core_app_BUILD.gn
deleted file mode 100644
index 1bc1730e92..0000000000
--- a/chromium-next/patches/patch-components_crash_core_app_BUILD.gn
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/crash/core/app/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/crash/core/app/BUILD.gn
-@@ -70,6 +70,10 @@ static_library("app") {
-     ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [ "crashpad.cc" ]
-+  }
-+
-   defines = [ "CRASH_IMPLEMENTATION" ]
- 
-   public_deps = [ ":lib" ]
-@@ -83,7 +87,7 @@ static_library("app") {
-     "//third_party/crashpad/crashpad/util",
-   ]
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [ "crashpad_linux.cc" ]
-     data_deps = [ ":chrome_crashpad_handler" ]
-   }
-@@ -105,7 +109,7 @@ static_library("app") {
-     libs = [ "log" ]
-   }
- 
--  if (is_android || is_linux || is_chromeos) {
-+  if ((is_android || is_linux || is_chromeos) && !is_bsd) {
-     deps += [
-       "//base:base_static",
-       "//components/crash/core/common",
-@@ -238,11 +242,6 @@ if (is_mac || is_android || is_linux || 
-   executable("chrome_crashpad_handler") {
-     sources = [ "chrome_crashpad_handler.cc" ]
- 
--    deps = [
--      ":crashpad_handler_main",
--      "//third_party/crashpad/crashpad/handler",
--    ]
--
-     if (is_mac && (is_component_build || is_asan || is_ubsan_any)) {
-       ldflags = [
-         # The handler is in
diff --git a/chromium-next/patches/patch-components_crash_core_app_chrome__crashpad__handler.cc b/chromium-next/patches/patch-components_crash_core_app_chrome__crashpad__handler.cc
deleted file mode 100644
index 3260d9111a..0000000000
--- a/chromium-next/patches/patch-components_crash_core_app_chrome__crashpad__handler.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/crash/core/app/chrome_crashpad_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/crash/core/app/chrome_crashpad_handler.cc
-@@ -6,5 +6,9 @@
- extern "C" int CrashpadHandlerMain(int argc, char* argv[]);
- 
- int main(int argc, char* argv[]) {
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+  return -1;
-+#else
-   return CrashpadHandlerMain(argc, argv);
-+#endif
- }
diff --git a/chromium-next/patches/patch-components_crash_core_app_crashpad__handler__main.cc b/chromium-next/patches/patch-components_crash_core_app_crashpad__handler__main.cc
deleted file mode 100644
index 04b10129dc..0000000000
--- a/chromium-next/patches/patch-components_crash_core_app_crashpad__handler__main.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/crash/core/app/crashpad_handler_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/crash/core/app/crashpad_handler_main.cc
-@@ -10,7 +10,7 @@
- #include "third_party/crashpad/crashpad/handler/handler_main.h"
- #include "third_party/crashpad/crashpad/handler/user_stream_data_source.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "components/stability_report/user_stream_data_source_posix.h"
- #endif
- 
-@@ -31,7 +31,7 @@ __attribute__((visibility("default"), us
-     char* argv[]) {
-   crashpad::UserStreamDataSources user_stream_data_sources;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   user_stream_data_sources.push_back(
-       std::make_unique<stability_report::UserStreamDataSourcePosix>());
- #endif
diff --git a/chromium-next/patches/patch-components_crash_core_browser_crash__upload__list__crashpad.cc b/chromium-next/patches/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
deleted file mode 100644
index 004c90a9e3..0000000000
--- a/chromium-next/patches/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/crash/core/browser/crash_upload_list_crashpad.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/crash/core/browser/crash_upload_list_crashpad.cc
-@@ -37,7 +37,9 @@ CrashUploadListCrashpad::~CrashUploadLis
- std::vector<std::unique_ptr<UploadList::UploadInfo>>
- CrashUploadListCrashpad::LoadUploadList() {
-   std::vector<crash_reporter::Report> reports;
-+#if !BUILDFLAG(IS_BSD)
-   crash_reporter::GetReports(&reports);
-+#endif
- 
-   std::vector<std::unique_ptr<UploadInfo>> uploads;
-   for (const crash_reporter::Report& report : reports) {
-@@ -51,9 +53,13 @@ CrashUploadListCrashpad::LoadUploadList(
- 
- void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin,
-                                               const base::Time& end) {
-+#if !BUILDFLAG(IS_BSD)
-   crash_reporter::ClearReportsBetween(begin, end);
-+#endif
- }
- 
- void CrashUploadListCrashpad::RequestSingleUpload(const std::string& local_id) {
-+#if !BUILDFLAG(IS_BSD)
-   crash_reporter::RequestSingleCrashUpload(local_id);
-+#endif
- }
diff --git a/chromium-next/patches/patch-components_crash_core_common_BUILD.gn b/chromium-next/patches/patch-components_crash_core_common_BUILD.gn
deleted file mode 100644
index 1951148588..0000000000
--- a/chromium-next/patches/patch-components_crash_core_common_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/crash/core/common/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/crash/core/common/BUILD.gn
-@@ -9,7 +9,7 @@ import("//components/gwp_asan/buildflags
- 
- declare_args() {
-   # If set to true, this will stub out and disable the entire crash key system.
--  use_crash_key_stubs = is_fuchsia
-+  use_crash_key_stubs = is_fuchsia || is_bsd
- }
- 
- group("common") {
diff --git a/chromium-next/patches/patch-components_device__signals_core_browser_browser__utils.h b/chromium-next/patches/patch-components_device__signals_core_browser_browser__utils.h
deleted file mode 100644
index c63921e3fd..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_browser_browser__utils.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/browser/browser_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/browser/browser_utils.h
-@@ -15,7 +15,7 @@ namespace device_signals {
- // Returns the hostname of the current machine.
- std::string GetHostName();
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Returns the hostname of the current machine.
- std::vector<std::string> GetSystemDnsServers();
- 
-@@ -23,7 +23,7 @@ std::vector<std::string> GetSystemDnsSer
- SettingValue GetOSFirewall();
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Returns the path to the ufw configuration file.
- const char** GetUfwConfigPath();
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-components_device__signals_core_browser_mock__signals__aggregator.h b/chromium-next/patches/patch-components_device__signals_core_browser_mock__signals__aggregator.h
deleted file mode 100644
index c1792694ec..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_browser_mock__signals__aggregator.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/browser/mock_signals_aggregator.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/browser/mock_signals_aggregator.h
-@@ -17,7 +17,7 @@ class MockSignalsAggregator : public Sig
-   MockSignalsAggregator();
-   ~MockSignalsAggregator() override;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   MOCK_METHOD(void,
-               GetSignalsForUser,
-               (const UserContext&,
diff --git a/chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator.h b/chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator.h
deleted file mode 100644
index b27dc7fbd9..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/browser/signals_aggregator.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/browser/signals_aggregator.h
-@@ -22,7 +22,7 @@ class SignalsAggregator : public KeyedSe
- 
-   ~SignalsAggregator() override = default;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Will asynchronously collect signals whose names are specified in the
-   // `request` object, and will also use a `user_context` to validate that the
-   // user has permissions to the device's signals. Invokes `callback` with the
diff --git a/chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.cc b/chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
deleted file mode 100644
index adcb2ba915..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/browser/signals_aggregator_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/browser/signals_aggregator_impl.cc
-@@ -64,7 +64,7 @@ SignalsAggregatorImpl::SignalsAggregator
- 
- SignalsAggregatorImpl::~SignalsAggregatorImpl() = default;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void SignalsAggregatorImpl::GetSignalsForUser(
-     const UserContext& user_context,
-     const SignalsAggregationRequest& request,
diff --git a/chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.h b/chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.h
deleted file mode 100644
index 391007a70b..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/browser/signals_aggregator_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/browser/signals_aggregator_impl.h
-@@ -30,7 +30,7 @@ class SignalsAggregatorImpl : public Sig
-   ~SignalsAggregatorImpl() override;
- 
-   // SignalsAggregator:
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void GetSignalsForUser(const UserContext& user_context,
-                          const SignalsAggregationRequest& request,
-                          GetSignalsCallback callback) override;
diff --git a/chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service.h b/chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service.h
deleted file mode 100644
index 94121c91cf..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/browser/user_permission_service.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/browser/user_permission_service.h
-@@ -57,7 +57,7 @@ class UserPermissionService : public Key
-   // missing.
-   virtual bool ShouldCollectConsent() const = 0;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Will verify whether context-aware signals can be collected
-   // on behalf of the user represented by `user_context`. Returns `kGranted` if
-   // collection is allowed.
diff --git a/chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service__impl.cc b/chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service__impl.cc
deleted file mode 100644
index 853d9ca5e0..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/browser/user_permission_service_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/browser/user_permission_service_impl.cc
-@@ -87,7 +87,7 @@ bool UserPermissionServiceImpl::ShouldCo
-          consent_required_by_dependent_policy;
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- UserPermission UserPermissionServiceImpl::CanUserCollectSignals(
-     const UserContext& user_context) const {
-   // Return "unknown user" if no user ID was given.
diff --git a/chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service__impl.h b/chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service__impl.h
deleted file mode 100644
index 117780197c..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_browser_user__permission__service__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/browser/user_permission_service_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/browser/user_permission_service_impl.h
-@@ -38,7 +38,7 @@ class UserPermissionServiceImpl : public
- 
-   // UserPermissionService:
-   bool ShouldCollectConsent() const override;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   UserPermission CanUserCollectSignals(
-       const UserContext& user_context) const override;
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX
diff --git a/chromium-next/patches/patch-components_device__signals_core_common_linux_platform__utils__linux.cc b/chromium-next/patches/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
deleted file mode 100644
index 40de314375..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/common/linux/platform_utils_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/common/linux/platform_utils_linux.cc
-@@ -4,11 +4,22 @@
- 
- #include "components/device_signals/core/common/platform_utils.h"
- 
-+#include "build/build_config.h"
-+
- #if defined(USE_GIO)
- #include <gio/gio.h>
- #endif  // defined(USE_GIO)
- #include <sys/stat.h>
-+#if !BUILDFLAG(IS_BSD)
- #include <sys/sysmacros.h>
-+#endif
-+
-+#if BUILDFLAG(IS_BSD)
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <ifaddrs.h>
-+#include <net/if_dl.h>
-+#endif
- 
- #include <algorithm>
- #include <optional>
-@@ -100,6 +111,7 @@ SettingValue GetScreenlockSecured() {
- // Implements the logic from the native host installation script. First find the
- // root device identifier, then locate its parent and get its type.
- SettingValue GetDiskEncrypted() {
-+#if !BUILDFLAG(IS_BSD)
-   struct stat info;
-   // First figure out the device identifier. Fail fast if this fails.
-   if (stat("/", &info) != 0) {
-@@ -122,11 +134,35 @@ SettingValue GetDiskEncrypted() {
-     }
-     return SettingValue::UNKNOWN;
-   }
-+#endif
-   return SettingValue::DISABLED;
- }
- 
- std::vector<std::string> GetMacAddresses() {
-   std::vector<std::string> result;
-+#if BUILDFLAG(IS_BSD)
-+  struct ifaddrs* ifa = nullptr;
-+
-+  if (getifaddrs(&ifa) != 0)
-+    return result;
-+
-+  struct ifaddrs* interface = ifa;
-+  for (; interface != nullptr; interface = interface->ifa_next) {
-+    if (interface->ifa_addr == nullptr ||
-+        interface->ifa_addr->sa_family != AF_LINK) {
-+      continue;
-+    }
-+    struct sockaddr_dl* sdl =
-+        reinterpret_cast<struct sockaddr_dl*>(interface->ifa_addr);
-+    if (!sdl || sdl->sdl_alen != 6)
-+      continue;
-+    char* link_address = static_cast<char*>(LLADDR(sdl));
-+    result.push_back(base::StringPrintf(
-+        "%02x:%02x:%02x:%02x:%02x:%02x", link_address[0] & 0xff,
-+        link_address[1] & 0xff, link_address[2] & 0xff, link_address[3] & 0xff,
-+        link_address[4] & 0xff, link_address[5] & 0xff));
-+  }
-+#else
-   base::DirReaderPosix reader("/sys/class/net");
-   if (!reader.IsValid()) {
-     return result;
-@@ -151,6 +187,7 @@ std::vector<std::string> GetMacAddresses
-                               &address);
-     result.push_back(address);
-   }
-+#endif
-   return result;
- }
- 
diff --git a/chromium-next/patches/patch-components_device__signals_core_common_signals__features.cc b/chromium-next/patches/patch-components_device__signals_core_common_signals__features.cc
deleted file mode 100644
index 650619d268..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_common_signals__features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/common/signals_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/common/signals_features.cc
-@@ -31,7 +31,7 @@ bool IsBrowserSignalsReportingEnabled() 
- }
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Enables the triggering of device signals consent dialog when conditions met
- // This feature also requires UnmanagedDeviceSignalsConsentFlowEnabled policy to
- // be enabled
diff --git a/chromium-next/patches/patch-components_device__signals_core_common_signals__features.h b/chromium-next/patches/patch-components_device__signals_core_common_signals__features.h
deleted file mode 100644
index 8cd8911280..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_common_signals__features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/common/signals_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/common/signals_features.h
-@@ -24,7 +24,7 @@ bool IsProfileSignalsReportingEnabled();
- bool IsBrowserSignalsReportingEnabled();
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kDeviceSignalsConsentDialog);
- 
- // Returns true if device signals consent dialog has been enabled for
diff --git a/chromium-next/patches/patch-components_device__signals_core_system__signals_platform__delegate.cc b/chromium-next/patches/patch-components_device__signals_core_system__signals_platform__delegate.cc
deleted file mode 100644
index 91e515537c..0000000000
--- a/chromium-next/patches/patch-components_device__signals_core_system__signals_platform__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/core/system_signals/platform_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/core/system_signals/platform_delegate.cc
-@@ -11,7 +11,7 @@ namespace device_signals {
- 
- bool CustomFilePathComparator::operator()(const base::FilePath& a,
-                                           const base::FilePath& b) const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On Linux, the file system is case sensitive.
-   return a < b;
- #else
diff --git a/chromium-next/patches/patch-components_device__signals_test_signals__contract.cc b/chromium-next/patches/patch-components_device__signals_test_signals__contract.cc
deleted file mode 100644
index 32f4852c4d..0000000000
--- a/chromium-next/patches/patch-components_device__signals_test_signals__contract.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/device_signals/test/signals_contract.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/device_signals/test/signals_contract.cc
-@@ -221,7 +221,7 @@ GetSignalsContract(bool is_av_signal_ena
-       base::BindRepeating(VerifyUnset, names::kCrowdStrike);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   contract[names::kAllowScreenLock] =
-       base::BindRepeating(VerifyUnset, names::kAllowScreenLock);
-   contract[names::kImei] = base::BindRepeating(VerifyUnset, names::kImei);
diff --git a/chromium-next/patches/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/chromium-next/patches/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
deleted file mode 100644
index 6a7ce47508..0000000000
--- a/chromium-next/patches/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/discardable_memory/service/discardable_shared_memory_manager.cc
-@@ -172,7 +172,7 @@ uint64_t GetDefaultMemoryLimit() {
-   // Limits the number of FDs used to 32, assuming a 4MB allocation size.
-   uint64_t max_default_memory_limit = 128 * kMegabyte;
- #else
--  uint64_t max_default_memory_limit = 512 * kMegabyte;
-+  uint64_t max_default_memory_limit = 128 * kMegabyte;
- #endif
- 
-   // Use 1/8th of discardable memory on low-end devices.
diff --git a/chromium-next/patches/patch-components_embedder__support_user__agent__utils.cc b/chromium-next/patches/patch-components_embedder__support_user__agent__utils.cc
deleted file mode 100644
index 5e390bbc2b..0000000000
--- a/chromium-next/patches/patch-components_embedder__support_user__agent__utils.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/embedder_support/user_agent_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/embedder_support/user_agent_utils.cc
-@@ -318,7 +318,7 @@ std::string GetUserAgentPlatform() {
-   return "";
- #elif BUILDFLAG(IS_MAC)
-   return "Macintosh; ";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return "X11; ";  // strange, but that's what Firefox uses
- #elif BUILDFLAG(IS_ANDROID)
-   return "Linux; ";
-@@ -344,7 +344,7 @@ std::string GetUnifiedPlatform() {
-   return "Windows NT 10.0; Win64; x64";
- #elif BUILDFLAG(IS_FUCHSIA)
-   return "Fuchsia";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "X11; Linux x86_64";
- #elif BUILDFLAG(IS_IOS)
-   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
-@@ -601,6 +601,9 @@ std::string GetPlatformForUAMetadata() {
- #else
-   return "Chromium OS";
- #endif
-+#elif BUILDFLAG(IS_BSD)
-+  // The internet is weird...
-+  return "Linux";
- #else
-   return std::string(version_info::GetOSType());
- #endif
-@@ -813,6 +816,16 @@ std::string BuildOSCpuInfoFromOSVersionA
-                       "Android %s", os_version.c_str()
- #elif BUILDFLAG(IS_FUCHSIA)
-                       "Fuchsia"
-+#elif BUILDFLAG(IS_BSD)
-+#if defined(__x86_64__)
-+                      "Linux x86_64; %s %s",
-+#elif defined(__aarch64__)
-+                      "Linux aarch64; %s %s",
-+#else 
-+                      "Linux i686; %s %s",
-+#endif
-+                      unixinfo.sysname,  // e.g. Linux
-+                      cpu_type.c_str()   // e.g. i686
- #elif BUILDFLAG(IS_IOS)
-                       "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
-                       os_version.c_str()
diff --git a/chromium-next/patches/patch-components_embedder__support_user__agent__utils__unittest.cc b/chromium-next/patches/patch-components_embedder__support_user__agent__utils__unittest.cc
deleted file mode 100644
index f2e85ea982..0000000000
--- a/chromium-next/patches/patch-components_embedder__support_user__agent__utils__unittest.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/embedder_support/user_agent_utils_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -148,7 +148,7 @@ void CheckUserAgentStringOrdering(bool m
-   ASSERT_EQ("CrOS", pieces[0]);
-   ASSERT_EQ("x86_64", pieces[1]);
-   ASSERT_EQ("14541.0.0", pieces[2]);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Post-UA Reduction there is a single <unifiedPlatform> value for Linux:
-   // X11; Linux x86_64
-   ASSERT_EQ(2u, pieces.size());
-@@ -336,7 +336,7 @@ class UserAgentUtilsTest : public testin
-         "X11; CrOS x86_64 14541.0.0";
- #elif BUILDFLAG(IS_FUCHSIA)
-         "Fuchsia";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-         "X11; Linux x86_64";
- #elif BUILDFLAG(IS_MAC)
-         "Macintosh; Intel Mac OS X 10_15_7";
-@@ -696,7 +696,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMeta
- #endif
- #elif BUILDFLAG(IS_ANDROID)
-   EXPECT_EQ(metadata.platform, "Android");
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   EXPECT_EQ(metadata.platform, "Linux");
- #elif BUILDFLAG(IS_FREEBSD)
-   EXPECT_EQ(metadata.platform, "FreeBSD");
diff --git a/chromium-next/patches/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc b/chromium-next/patches/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc
deleted file mode 100644
index 600ad144da..0000000000
--- a/chromium-next/patches/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/enterprise/connectors/core/realtime_reporting_client_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/enterprise/connectors/core/realtime_reporting_client_base.cc
-@@ -190,7 +190,7 @@ void RealtimeReportingClientBase::Report
-     event.mutable_time()->set_nanos((timestamp_millis % 1000) * 1000000);
-   }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet)
-   MaybeCollectDeviceSignalsAndReportEvent(std::move(event), client, settings);
- #else
-   // Regardless of collecting device signals or not, upload the security event
-@@ -239,7 +239,7 @@ void RealtimeReportingClientBase::Report
-   if (include_profile_user_name) {
-     event.Set(kKeyProfileUserName, GetProfileUserName());
-   }
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet)
-   MaybeCollectDeviceSignalsAndReportEventDeprecated(std::move(event), client,
-                                                     name, settings, time);
- #else
diff --git a/chromium-next/patches/patch-components_enterprise_watermarking_watermark.cc b/chromium-next/patches/patch-components_enterprise_watermarking_watermark.cc
deleted file mode 100644
index 403c04d36b..0000000000
--- a/chromium-next/patches/patch-components_enterprise_watermarking_watermark.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/enterprise/watermarking/watermark.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/enterprise/watermarking/watermark.cc
-@@ -31,7 +31,7 @@ gfx::Font WatermarkFont() {
-       "Segoe UI",
- #elif BUILDFLAG(IS_MAC)
-       "SF Pro Text",
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       "Ubuntu",
- #elif BUILDFLAG(IS_CHROMEOS)
-       "Google Sans",
-@@ -47,7 +47,7 @@ const gfx::FontList& WatermarkFontList()
- }
- 
- gfx::Font::Weight WatermarkFontWeight() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return gfx::Font::Weight::SEMIBOLD;
- #else
-   return gfx::Font::Weight::MEDIUM;
diff --git a/chromium-next/patches/patch-components_error__page_common_localized__error.cc b/chromium-next/patches/patch-components_error__page_common_localized__error.cc
deleted file mode 100644
index 30fe9c92f2..0000000000
--- a/chromium-next/patches/patch-components_error__page_common_localized__error.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/error_page/common/localized_error.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/error_page/common/localized_error.cc
-@@ -901,7 +901,7 @@ void AddSuggestionsDetails(int error_cod
-   if (suggestions & SUGGEST_PROXY_CONFIG) {
-     // Custom body string.
-     std::u16string inner =
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-         l10n_util::GetStringFUTF16(
-             IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM,
-             l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE),
diff --git a/chromium-next/patches/patch-components_eye__dropper_eye__dropper__view.cc b/chromium-next/patches/patch-components_eye__dropper_eye__dropper__view.cc
deleted file mode 100644
index f3d0661ccd..0000000000
--- a/chromium-next/patches/patch-components_eye__dropper_eye__dropper__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/eye_dropper/eye_dropper_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/eye_dropper/eye_dropper_view.cc
-@@ -208,7 +208,7 @@ EyeDropperView::EyeDropperView(gfx::Nati
-   // EyeDropper/WidgetDelegate.
-   set_owned_by_client();
-   SetPreferredSize(GetSize());
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Use TYPE_MENU for Linux to ensure that the eye dropper view is displayed
-   // above the color picker.
-   views::Widget::InitParams params(
diff --git a/chromium-next/patches/patch-components_feature__engagement_public_event__constants.cc b/chromium-next/patches/patch-components_feature__engagement_public_event__constants.cc
deleted file mode 100644
index 473d19926d..0000000000
--- a/chromium-next/patches/patch-components_feature__engagement_public_event__constants.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feature_engagement/public/event_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feature_engagement/public/event_constants.cc
-@@ -11,7 +11,7 @@ namespace feature_engagement {
- namespace events {
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- const char kNewTabOpened[] = "new_tab_opened";
- const char kSixthTabOpened[] = "sixth_tab_opened";
- const char kReadingListItemAdded[] = "reading_list_item_added";
diff --git a/chromium-next/patches/patch-components_feature__engagement_public_event__constants.h b/chromium-next/patches/patch-components_feature__engagement_public_event__constants.h
deleted file mode 100644
index 582d54040d..0000000000
--- a/chromium-next/patches/patch-components_feature__engagement_public_event__constants.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feature_engagement/public/event_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feature_engagement/public/event_constants.h
-@@ -14,7 +14,7 @@ namespace events {
- 
- // Desktop
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // The user has explicitly opened a new tab via an entry point from inside of
- // Chrome.
- extern const char kNewTabOpened[];
diff --git a/chromium-next/patches/patch-components_feature__engagement_public_feature__configurations.cc b/chromium-next/patches/patch-components_feature__engagement_public_feature__configurations.cc
deleted file mode 100644
index 32c4a9aa1f..0000000000
--- a/chromium-next/patches/patch-components_feature__engagement_public_feature__configurations.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feature_engagement/public/feature_configurations.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feature_engagement/public/feature_configurations.cc
-@@ -100,7 +100,7 @@ std::optional<FeatureConfig> CreateNewUs
- 
- std::optional<FeatureConfig> GetClientSideFeatureConfig(
-     const base::Feature* feature) {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- 
-   // The IPH bubble for link capturing has a trigger set to ANY so that it
-   // always shows up. The per app specific guardrails are independently stored
-@@ -119,7 +119,7 @@ std::optional<FeatureConfig> GetClientSi
- 
- #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) {
-     FeatureConfig config;
-     config.valid = true;
-@@ -1740,7 +1740,8 @@ std::optional<FeatureConfig> GetClientSi
- #endif  // BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
- 
-   if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) {
-     // The credit card benefit IPH appears up to three times over 10 years and
diff --git a/chromium-next/patches/patch-components_feature__engagement_public_feature__constants.cc b/chromium-next/patches/patch-components_feature__engagement_public_feature__constants.cc
deleted file mode 100644
index b57ea61556..0000000000
--- a/chromium-next/patches/patch-components_feature__engagement_public_feature__constants.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feature_engagement/public/feature_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feature_engagement/public/feature_constants.cc
-@@ -19,7 +19,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode
- BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- BASE_FEATURE(kEsbDownloadRowPromoFeature,
-              "EsbDownloadRowPromo",
-@@ -710,7 +710,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCrite
- 
- #endif  // BUILDFLAG(IS_IOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
- BASE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
-              "IPH_AutofillBnplAffirmOrZipSuggestion",
-@@ -857,7 +857,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeatur
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // This can be enabled by default, as the DesktopPWAsLinkCapturing
- // flag is needed for the IPH linked to this feature to work, and
- // use-cases to show the IPH are guarded by that flag.
diff --git a/chromium-next/patches/patch-components_feature__engagement_public_feature__constants.h b/chromium-next/patches/patch-components_feature__engagement_public_feature__constants.h
deleted file mode 100644
index e59d36b0ff..0000000000
--- a/chromium-next/patches/patch-components_feature__engagement_public_feature__constants.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feature_engagement/public/feature_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feature_engagement/public/feature_constants.h
-@@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDe
- FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature);
- #endif
-@@ -316,7 +316,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefau
- 
- #endif  // BUILDFLAG(IS_IOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
- FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature);
- FEATURE_CONSTANTS_DECLARE_FEATURE(
-@@ -374,7 +374,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHSc
- FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch);
- FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunchAppInTab);
- FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHSupervisedUserProfileSigninFeature);
diff --git a/chromium-next/patches/patch-components_feature__engagement_public_feature__list.cc b/chromium-next/patches/patch-components_feature__engagement_public_feature__list.cc
deleted file mode 100644
index 8139e8c4b4..0000000000
--- a/chromium-next/patches/patch-components_feature__engagement_public_feature__list.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feature_engagement/public/feature_list.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feature_engagement/public/feature_list.cc
-@@ -175,7 +175,7 @@ const base::Feature* const kAllFeatures[
-     &kIPHiOSSettingsInOverflowMenuBubbleFeature,
- #endif  // BUILDFLAG(IS_IOS)
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-     &kEsbDownloadRowPromoFeature,
- #endif
-@@ -247,7 +247,7 @@ const base::Feature* const kAllFeatures[
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-     &kIPHAutofillAiOptInFeature,
-     &kIPHAutofillBnplAffirmOrZipSuggestionFeature,
-@@ -302,7 +302,7 @@ const base::Feature* const kAllFeatures[
-     &kIPHScalableIphGamingFeature,
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     &kIPHDesktopPWAsLinkCapturingLaunch,
-     &kIPHDesktopPWAsLinkCapturingLaunchAppInTab,
-     &kIPHSupervisedUserProfileSigninFeature,
diff --git a/chromium-next/patches/patch-components_feature__engagement_public_feature__list.h b/chromium-next/patches/patch-components_feature__engagement_public_feature__list.h
deleted file mode 100644
index 57a297ad99..0000000000
--- a/chromium-next/patches/patch-components_feature__engagement_public_feature__list.h
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feature_engagement/public/feature_list.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feature_engagement/public/feature_list.h
-@@ -312,7 +312,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSettingsIn
- #endif  // BUILDFLAG(IS_IOS)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo");
- #endif
-@@ -427,7 +427,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsShar
-         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
- DEFINE_VARIATION_PARAM(kIPHAutofillAiOptInFeature, "IPH_AutofillAiOptIn");
- DEFINE_VARIATION_PARAM(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
-                        "IPH_AutofillBnplAffirmOrZipSuggestion");
-@@ -523,7 +524,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHe
- DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming");
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch,
-                        "IPH_DesktopPWAsLinkCapturingLaunch");
- DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab,
-@@ -697,7 +698,7 @@ inline constexpr flags_ui::FeatureEntry:
-             kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature),
-         VARIATION_ENTRY(kIPHiOSDownloadAutoDeletionFeature),
- #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-         VARIATION_ENTRY(kIPHBatterySaverModeFeature),
-         VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
-         VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature),
-@@ -759,7 +760,8 @@ inline constexpr flags_ui::FeatureEntry:
-         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
-         VARIATION_ENTRY(kIPHAutofillAiOptInFeature),
-         VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature),
-         VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature),
-@@ -812,7 +814,7 @@ inline constexpr flags_ui::FeatureEntry:
-         VARIATION_ENTRY(kIPHScalableIphGamingFeature),
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-         VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunch),
-         VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunchAppInTab),
-         VARIATION_ENTRY(kIPHSupervisedUserProfileSigninFeature),
diff --git a/chromium-next/patches/patch-components_feed_core_proto_v2_wire_version.proto b/chromium-next/patches/patch-components_feed_core_proto_v2_wire_version.proto
deleted file mode 100644
index e6f55f6978..0000000000
--- a/chromium-next/patches/patch-components_feed_core_proto_v2_wire_version.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feed/core/proto/v2/wire/version.proto.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feed/core/proto/v2/wire/version.proto
-@@ -25,8 +25,8 @@ message Version {
-     BETA = 3;
-     RELEASE = 4;
-   }
--  optional int32 major = 1;
--  optional int32 minor = 2;
-+  optional int32 gmajor = 1;
-+  optional int32 gminor = 2;
-   optional int32 build = 3;
-   optional int32 revision = 4;
-   optional Architecture architecture = 5;
diff --git a/chromium-next/patches/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/chromium-next/patches/patch-components_feed_core_v2_feed__network__impl__unittest.cc
deleted file mode 100644
index 5502403408..0000000000
--- a/chromium-next/patches/patch-components_feed_core_v2_feed__network__impl__unittest.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feed/core/v2/feed_network_impl_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feed/core/v2/feed_network_impl_unittest.cc
-@@ -747,8 +747,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_D
- 
-   EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type());
-   EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type());
--  EXPECT_EQ(1, client_info.app_version().major());
--  EXPECT_EQ(2, client_info.app_version().minor());
-+  EXPECT_EQ(1, client_info.app_version().gmajor());
-+  EXPECT_EQ(2, client_info.app_version().gminor());
-   EXPECT_EQ(3, client_info.app_version().build());
-   EXPECT_EQ(4, client_info.app_version().revision());
-   EXPECT_FALSE(client_info.chrome_client_info().start_surface());
diff --git a/chromium-next/patches/patch-components_feed_core_v2_proto__util.cc b/chromium-next/patches/patch-components_feed_core_v2_proto__util.cc
deleted file mode 100644
index db739e8790..0000000000
--- a/chromium-next/patches/patch-components_feed_core_v2_proto__util.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feed/core/v2/proto_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feed/core/v2/proto_util.cc
-@@ -93,8 +93,8 @@ feedwire::Version GetPlatformVersionMess
- 
-   int32_t major, minor, revision;
-   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision);
--  result.set_major(major);
--  result.set_minor(minor);
-+  result.set_gmajor(major);
-+  result.set_gminor(minor);
-   result.set_revision(revision);
- #if BUILDFLAG(IS_ANDROID)
-   result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int());
-@@ -109,8 +109,8 @@ feedwire::Version GetAppVersionMessage(c
-   // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH.
-   const std::vector<uint32_t>& numbers = chrome_info.version.components();
-   if (numbers.size() > 3) {
--    result.set_major(static_cast<int32_t>(numbers[0]));
--    result.set_minor(static_cast<int32_t>(numbers[1]));
-+    result.set_gmajor(static_cast<int32_t>(numbers[0]));
-+    result.set_gminor(static_cast<int32_t>(numbers[1]));
-     result.set_build(static_cast<int32_t>(numbers[2]));
-     result.set_revision(static_cast<int32_t>(numbers[3]));
-   }
diff --git a/chromium-next/patches/patch-components_feed_core_v2_proto__util__unittest.cc b/chromium-next/patches/patch-components_feed_core_v2_proto__util__unittest.cc
deleted file mode 100644
index 1cb415248b..0000000000
--- a/chromium-next/patches/patch-components_feed_core_v2_proto__util__unittest.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feed/core/v2/proto_util_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feed/core/v2/proto_util_unittest.cc
-@@ -43,8 +43,8 @@ TEST(ProtoUtilTest, CreateClientInfo) {
-   feedwire::ClientInfo result = CreateClientInfo(request_metadata);
-   EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, result.app_type());
-   EXPECT_EQ(feedwire::Version::RELEASE, result.app_version().build_type());
--  EXPECT_EQ(1, result.app_version().major());
--  EXPECT_EQ(2, result.app_version().minor());
-+  EXPECT_EQ(1, result.app_version().gmajor());
-+  EXPECT_EQ(2, result.app_version().gminor());
-   EXPECT_EQ(3, result.app_version().build());
-   EXPECT_EQ(4, result.app_version().revision());
- 
diff --git a/chromium-next/patches/patch-components_feed_core_v2_test_proto__printer.cc b/chromium-next/patches/patch-components_feed_core_v2_test_proto__printer.cc
deleted file mode 100644
index 462d2688bb..0000000000
--- a/chromium-next/patches/patch-components_feed_core_v2_test_proto__printer.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/feed/core/v2/test/proto_printer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/feed/core/v2/test/proto_printer.cc
-@@ -158,8 +158,8 @@ class TextProtoPrinter {
-   }
-   TextProtoPrinter& operator<<(const feedwire::Version& v) {
-     BeginMessage();
--    PRINT_FIELD(major);
--    PRINT_FIELD(minor);
-+    PRINT_FIELD(gmajor);
-+    PRINT_FIELD(gminor);
-     PRINT_FIELD(build);
-     PRINT_FIELD(revision);
-     PRINT_FIELD(architecture);
diff --git a/chromium-next/patches/patch-components_gcm__driver_gcm__desktop__utils.cc b/chromium-next/patches/patch-components_gcm__driver_gcm__desktop__utils.cc
deleted file mode 100644
index e4dd5a265c..0000000000
--- a/chromium-next/patches/patch-components_gcm__driver_gcm__desktop__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/gcm_driver/gcm_desktop_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/gcm_driver/gcm_desktop_utils.cc
-@@ -32,7 +32,7 @@ GCMClient::ChromePlatform GetPlatform() 
-   return GCMClient::PLATFORM_ANDROID;
- #elif BUILDFLAG(IS_CHROMEOS)
-   return GCMClient::PLATFORM_CROS;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return GCMClient::PLATFORM_LINUX;
- #else
-   // For all other platforms, return as LINUX.
diff --git a/chromium-next/patches/patch-components_gwp__asan_BUILD.gn b/chromium-next/patches/patch-components_gwp__asan_BUILD.gn
deleted file mode 100644
index 8ce7f7af55..0000000000
--- a/chromium-next/patches/patch-components_gwp__asan_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/gwp_asan/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/gwp_asan/BUILD.gn
-@@ -15,7 +15,7 @@ test("gwp_asan_unittests") {
-     "//testing/gtest",
-     "//third_party/boringssl",
-   ]
--  if (is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) {
-+  if ((is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) && !is_bsd) {
-     deps += [
-       "//components/gwp_asan/client:unit_tests",
-       "//components/gwp_asan/crash_handler:unit_tests",
diff --git a/chromium-next/patches/patch-components_gwp__asan_buildflags_buildflags.gni b/chromium-next/patches/patch-components_gwp__asan_buildflags_buildflags.gni
deleted file mode 100644
index bbf13e1072..0000000000
--- a/chromium-next/patches/patch-components_gwp__asan_buildflags_buildflags.gni
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/gwp_asan/buildflags/buildflags.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/gwp_asan/buildflags/buildflags.gni
-@@ -10,10 +10,7 @@ import("//build/config/compiler/compiler
- # Android component builds are disabled due to https://crbug.com/976399
- # Android requires frame pointers for unwinding, unwind tables aren't shipped in
- # official builds.
--supported_platform =
--    is_linux || is_chromeos || is_mac || is_ios ||
--    (is_win && (current_cpu == "x64" || current_cpu == "arm64")) ||
--    (is_android && !is_component_build && enable_frame_pointers)
-+supported_platform = false
- 
- declare_args() {
-   # Is GWP-ASan malloc/PartitionAlloc hooking enabled for chrome/ on a given
diff --git a/chromium-next/patches/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc b/chromium-next/patches/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
deleted file mode 100644
index 8256a6f55f..0000000000
--- a/chromium-next/patches/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/gwp_asan/client/guarded_page_allocator_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/gwp_asan/client/guarded_page_allocator_posix.cc
-@@ -35,8 +35,9 @@ void GuardedPageAllocator::MarkPageInacc
-   // mmap() a PROT_NONE page over the address to release it to the system, if
-   // we used mprotect() here the system would count pages in the quarantine
-   // against the RSS.
-+  // MAP_ANONYMOUS requires the fd to be -1 on !linux
-   void* err = mmap(ptr, state_.page_size, PROT_NONE,
--                   MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
-+                   MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-   PCHECK(err == ptr) << "mmap";
- }
- 
diff --git a/chromium-next/patches/patch-components_gwp__asan_client_gwp__asan.cc b/chromium-next/patches/patch-components_gwp__asan_client_gwp__asan.cc
deleted file mode 100644
index 5c6fa4f2d4..0000000000
--- a/chromium-next/patches/patch-components_gwp__asan_client_gwp__asan.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/gwp_asan/client/gwp_asan.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/gwp_asan/client/gwp_asan.cc
-@@ -76,7 +76,7 @@ namespace {
- // ProcessSamplingBoost is the multiplier to increase the
- // ProcessSamplingProbability in scenarios where we want to perform additional
- // testing (e.g., on canary/dev builds).
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- constexpr int kDefaultMaxAllocations = 50;
- constexpr int kDefaultMaxMetadata = 210;
- constexpr int kDefaultTotalPages = kCpuIs64Bit ? 2048 : kDefaultMaxMetadata * 2;
diff --git a/chromium-next/patches/patch-components_gwp__asan_client_gwp__asan__features.cc b/chromium-next/patches/patch-components_gwp__asan_client_gwp__asan__features.cc
deleted file mode 100644
index 1abae24a55..0000000000
--- a/chromium-next/patches/patch-components_gwp__asan_client_gwp__asan__features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/gwp_asan/client/gwp_asan_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/gwp_asan/client/gwp_asan_features.cc
-@@ -9,7 +9,7 @@
- namespace gwp_asan::internal {
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) ||                                          \
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ||                     \
-     (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS))
- constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT;
- #else
diff --git a/chromium-next/patches/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/chromium-next/patches/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
deleted file mode 100644
index deada05513..0000000000
--- a/chromium-next/patches/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/gwp_asan/crash_handler/crash_analyzer.cc
-@@ -35,7 +35,7 @@
- #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h"
- #include "third_party/crashpad/crashpad/util/process/process_memory.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include <signal.h>
- #elif BUILDFLAG(IS_APPLE)
- #include <mach/exception_types.h>
-@@ -113,7 +113,7 @@ bool CrashAnalyzer::GetExceptionInfo(
- 
- crashpad::VMAddress CrashAnalyzer::GetAccessAddress(
-     const crashpad::ExceptionSnapshot& exception) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   if (exception.Exception() == SIGSEGV || exception.Exception() == SIGBUS)
-     return exception.ExceptionAddress();
- #elif BUILDFLAG(IS_APPLE)
diff --git a/chromium-next/patches/patch-components_live__caption_caption__util.cc b/chromium-next/patches/patch-components_live__caption_caption__util.cc
deleted file mode 100644
index 8db40b527a..0000000000
--- a/chromium-next/patches/patch-components_live__caption_caption__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/live_caption/caption_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/live_caption/caption_util.cc
-@@ -136,7 +136,7 @@ bool IsLiveCaptionFeatureSupported() {
- std::string GetCaptionSettingsUrl() {
- #if BUILDFLAG(IS_CHROMEOS)
-   return "chrome://os-settings/audioAndCaptions";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "chrome://settings/captions";
- #elif BUILDFLAG(IS_WIN)
-   return base::win::GetVersion() >= base::win::Version::WIN10
diff --git a/chromium-next/patches/patch-components_live__caption_caption__util.h b/chromium-next/patches/patch-components_live__caption_caption__util.h
deleted file mode 100644
index ce49a38d34..0000000000
--- a/chromium-next/patches/patch-components_live__caption_caption__util.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/live_caption/caption_util.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/live_caption/caption_util.h
-@@ -15,7 +15,7 @@ class PrefService;
- namespace captions {
- 
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- extern const char kCaptionSettingsUrl[];
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
-         // BUILDFLAG(IS_MAC)
diff --git a/chromium-next/patches/patch-components_media__router_common_media__source.cc b/chromium-next/patches/patch-components_media__router_common_media__source.cc
deleted file mode 100644
index 039a5352a4..0000000000
--- a/chromium-next/patches/patch-components_media__router_common_media__source.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/media_router/common/media_source.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/media_router/common/media_source.cc
-@@ -62,7 +62,7 @@ bool IsSystemAudioCaptureSupported() {
-   if (!media::IsSystemLoopbackCaptureSupported()) {
-     return false;
-   }
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast);
- #else
-   return true;
diff --git a/chromium-next/patches/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc b/chromium-next/patches/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
deleted file mode 100644
index 5b7669f472..0000000000
--- a/chromium-next/patches/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/media_router/common/providers/cast/channel/cast_message_util.cc
-@@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() {
-   return 4;
- #elif BUILDFLAG(IS_CHROMEOS)
-   return 5;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return 6;
- #else
-   return 0;
diff --git a/chromium-next/patches/patch-components_media__router_common_providers_cast_channel_enum__table.h b/chromium-next/patches/patch-components_media__router_common_providers_cast_channel_enum__table.h
deleted file mode 100644
index 7d3973dfeb..0000000000
--- a/chromium-next/patches/patch-components_media__router_common_providers_cast_channel_enum__table.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/media_router/common/providers/cast/channel/enum_table.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/media_router/common/providers/cast/channel/enum_table.h
-@@ -368,7 +368,12 @@ class EnumTable {
- 
-  private:
- #ifdef ARCH_CPU_64_BITS
-+#ifdef __cpp_lib_hardware_interference_size
-   alignas(std::hardware_destructive_interference_size)
-+#else
-+  static constexpr std::size_t hardware_destructive_interference_size = 64;
-+  alignas(hardware_destructive_interference_size)
-+#endif
- #endif
-       std::initializer_list<Entry> data_;
-   bool is_sorted_;
diff --git a/chromium-next/patches/patch-components_metrics_drive__metrics__provider.cc b/chromium-next/patches/patch-components_metrics_drive__metrics__provider.cc
deleted file mode 100644
index 1ec8adbd98..0000000000
--- a/chromium-next/patches/patch-components_metrics_drive__metrics__provider.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/metrics/drive_metrics_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/metrics/drive_metrics_provider.cc
-@@ -21,7 +21,7 @@
- namespace metrics {
- 
- namespace {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void RecordTriStateMetric(const char* name, std::optional<bool> sample) {
-   base::UmaHistogramEnumeration(
-       name, !sample.has_value()
-@@ -106,7 +106,7 @@ void DriveMetricsProvider::FillDriveMetr
-     drive->set_has_seek_penalty(*response.has_seek_penalty);
-   }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   RecordTriStateMetric("UMA.DriveIsRemovableResult", response.is_removable);
- #endif
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
diff --git a/chromium-next/patches/patch-components_metrics_dwa_dwa__service.cc b/chromium-next/patches/patch-components_metrics_dwa_dwa__service.cc
deleted file mode 100644
index bb11ffcb3f..0000000000
--- a/chromium-next/patches/patch-components_metrics_dwa_dwa__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/metrics/dwa/dwa_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/metrics/dwa/dwa_service.cc
-@@ -162,7 +162,7 @@ void DwaService::RecordCoarseSystemInfor
-   coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_WINDOWS);
- #elif BUILDFLAG(IS_MAC)
-   coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_MACOS);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_LINUX);
- #elif BUILDFLAG(IS_ANDROID)
-   // TODO(b/366276323): Populate set_platform using more granular
diff --git a/chromium-next/patches/patch-components_metrics_metrics__log.cc b/chromium-next/patches/patch-components_metrics_metrics__log.cc
deleted file mode 100644
index 37de91da87..0000000000
--- a/chromium-next/patches/patch-components_metrics_metrics__log.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/metrics/metrics_log.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/metrics/metrics_log.cc
-@@ -62,7 +62,7 @@
- #include "base/win/current_module.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/environment.h"
- #include "base/nix/xdg_util.h"
- #endif
-@@ -158,7 +158,7 @@ void RecordCurrentTime(
-   }
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType(
-     base::nix::SessionType session_type) {
-   switch (session_type) {
-@@ -441,7 +441,7 @@ void MetricsLog::RecordCoreSystemProfile
- // OperatingSystemVersion refers to the ChromeOS release version.
- #if BUILDFLAG(IS_CHROMEOS)
-   os->set_kernel_version(base::SysInfo::KernelVersion());
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Linux operating system version is copied over into kernel version to be
-   // consistent.
-   os->set_kernel_version(base::SysInfo::OperatingSystemVersion());
-@@ -458,7 +458,7 @@ void MetricsLog::RecordCoreSystemProfile
-   os->set_build_number(base::SysInfo::GetIOSBuildNumber());
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<base::Environment> env = base::Environment::Create();
-   os->set_xdg_session_type(ToProtoSessionType(base::nix::GetSessionType(*env)));
-   os->set_xdg_current_desktop(
diff --git a/chromium-next/patches/patch-components_metrics_motherboard.cc b/chromium-next/patches/patch-components_metrics_motherboard.cc
deleted file mode 100644
index 3f54f2411e..0000000000
--- a/chromium-next/patches/patch-components_metrics_motherboard.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/metrics/motherboard.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/metrics/motherboard.cc
-@@ -1,6 +1,7 @@
- // Copyright 2022 The Chromium Authors
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-+// CHECK
- 
- #include "components/metrics/motherboard.h"
- 
diff --git a/chromium-next/patches/patch-components_named__mojo__ipc__server_connection__info.h b/chromium-next/patches/patch-components_named__mojo__ipc__server_connection__info.h
deleted file mode 100644
index 55db30bd0b..0000000000
--- a/chromium-next/patches/patch-components_named__mojo__ipc__server_connection__info.h
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/named_mojo_ipc_server/connection_info.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/named_mojo_ipc_server/connection_info.h
-@@ -12,8 +12,17 @@
- #include "base/win/scoped_handle.h"
- #elif BUILDFLAG(IS_MAC)
- #include <bsm/libbsm.h>
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-+#if BUILDFLAG(IS_OPENBSD)
-+#include <sys/ucred.h>
-+#endif
- #include <sys/socket.h>
-+#if defined(__NetBSD__)
-+#include <sys/un.h>
-+#define ucred unpcbid
-+#define SO_PEERCRED LOCAL_PEEREID
-+#define pid unp_pid
-+#endif
- #endif
- 
- namespace named_mojo_ipc_server {
-@@ -29,7 +38,7 @@ struct ConnectionInfo {
-   base::ProcessId pid{};
- #if BUILDFLAG(IS_MAC)
-   audit_token_t audit_token{};
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
-   ucred credentials{};
- #endif
- };
diff --git a/chromium-next/patches/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc b/chromium-next/patches/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
deleted file mode 100644
index 2b63eb5076..0000000000
--- a/chromium-next/patches/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc
-@@ -23,7 +23,7 @@ namespace named_mojo_ipc_server {
- // static
- mojo::PlatformChannelEndpoint ConnectToServer(
-     const mojo::NamedPlatformChannel::ServerName& server_name) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return mojo::NamedPlatformChannel::ConnectToServer(server_name);
- #elif BUILDFLAG(IS_MAC)
-   mojo::PlatformChannelEndpoint endpoint =
diff --git a/chromium-next/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc b/chromium-next/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
deleted file mode 100644
index 07b998548a..0000000000
--- a/chromium-next/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc
-@@ -89,7 +89,9 @@ void NamedMojoServerEndpointConnectorLin
-     PLOG(ERROR) << "getsockopt failed.";
-     return;
-   }
-+#if !BUILDFLAG(IS_OPENBSD)
-   info->pid = info->credentials.pid;
-+#endif
- 
-   mojo::PlatformChannelEndpoint endpoint(
-       mojo::PlatformHandle(std::move(connection_fd)));
diff --git a/chromium-next/patches/patch-components_named__system__lock_BUILD.gn b/chromium-next/patches/patch-components_named__system__lock_BUILD.gn
deleted file mode 100644
index 7d1c6f8b4b..0000000000
--- a/chromium-next/patches/patch-components_named__system__lock_BUILD.gn
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/named_system_lock/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/named_system_lock/BUILD.gn
-@@ -5,7 +5,7 @@
- static_library("named_system_lock") {
-   sources = [ "lock.h" ]
-   deps = [ "//base" ]
--  if (is_linux) {
-+  if (!is_bsd && is_linux) {
-     sources += [ "lock_linux.cc" ]
-   } else if (is_mac) {
-     sources += [ "lock_mac.mm" ]
-@@ -20,7 +20,7 @@ source_set("unit_tests") {
-   sources = []
- 
-   # Disable NamedSystemLockTest on unsupported platforms.
--  if (is_linux || is_win || is_mac) {
-+  if (!is_bsd && (is_linux || is_win || is_mac)) {
-     sources += [ "lock_unittest.cc" ]
-   }
- 
diff --git a/chromium-next/patches/patch-components_named__system__lock_lock.h b/chromium-next/patches/patch-components_named__system__lock_lock.h
deleted file mode 100644
index b1856842b9..0000000000
--- a/chromium-next/patches/patch-components_named__system__lock_lock.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/named_system_lock/lock.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/named_system_lock/lock.h
-@@ -38,7 +38,7 @@ class ScopedLock {
-   // may acquire that lock. The lock name has different meanings per platform:
-   // Linux: A shared memory object name starting with `/`. E.g. `/MyApp.lock`.
-   // Mac: A bootstrap service name (see `man bootstrap_check_in`).
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   static std::unique_ptr<ScopedLock> Create(const std::string& name,
-                                             base::TimeDelta timeout);
- #elif BUILDFLAG(IS_WIN)
diff --git a/chromium-next/patches/patch-components_named__system__lock_lock__unittest.cc b/chromium-next/patches/patch-components_named__system__lock_lock__unittest.cc
deleted file mode 100644
index 4f6c9c2206..0000000000
--- a/chromium-next/patches/patch-components_named__system__lock_lock__unittest.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/named_system_lock/lock_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/named_system_lock/lock_unittest.cc
-@@ -18,7 +18,7 @@
- #include "build/build_config.h"
- #include "testing/gtest/include/gtest/gtest.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include <fcntl.h>
- #include <sys/mman.h>
- 
-@@ -45,7 +45,7 @@ class NamedSystemLockTest : public ::tes
-   const std::string lock_name_ = base::UnguessableToken::Create().ToString();
- 
-   std::unique_ptr<ScopedLock> CreateLock() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     return ScopedLock::Create(lock_name_, base::Seconds(0));
- #else
-     CSecurityAttributes sa;
-@@ -95,7 +95,7 @@ TEST_F(NamedSystemLockTest, TryLockInThr
-   EXPECT_TRUE(CreateLock());
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- TEST_F(NamedSystemLockTest, SharedMemoryWrongPermissions) {
-   // Create a shared memory region with overpermissive perms.
-   int shm_fd = shm_open(lock_name_.c_str(), O_RDWR | O_CREAT | O_EXCL,
diff --git a/chromium-next/patches/patch-components_optimization__guide_core_optimization__guide__features.cc b/chromium-next/patches/patch-components_optimization__guide_core_optimization__guide__features.cc
deleted file mode 100644
index f66f768923..0000000000
--- a/chromium-next/patches/patch-components_optimization__guide_core_optimization__guide__features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/optimization_guide/core/optimization_guide_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/optimization_guide/core/optimization_guide_features.cc
-@@ -136,7 +136,7 @@ BASE_FEATURE(kOptimizationGuideModelExec
- // Whether to use the on device model service in optimization guide.
- BASE_FEATURE(kOptimizationGuideOnDeviceModel,
-              "OptimizationGuideOnDeviceModel",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-components_optimization__guide_core_optimization__guide__util.cc b/chromium-next/patches/patch-components_optimization__guide_core_optimization__guide__util.cc
deleted file mode 100644
index 7de889eff6..0000000000
--- a/chromium-next/patches/patch-components_optimization__guide_core_optimization__guide__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/optimization_guide/core/optimization_guide_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/optimization_guide/core/optimization_guide_util.cc
-@@ -37,7 +37,7 @@ optimization_guide::proto::Platform GetP
-   return optimization_guide::proto::PLATFORM_CHROMEOS;
- #elif BUILDFLAG(IS_ANDROID)
-   return optimization_guide::proto::PLATFORM_ANDROID;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return optimization_guide::proto::PLATFORM_LINUX;
- #else
-   return optimization_guide::proto::PLATFORM_UNDEFINED;
diff --git a/chromium-next/patches/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc b/chromium-next/patches/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
deleted file mode 100644
index 39acd7e739..0000000000
--- a/chromium-next/patches/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/os_crypt/async/browser/secret_portal_key_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/os_crypt/async/browser/secret_portal_key_provider.cc
-@@ -5,7 +5,9 @@
- #include "components/os_crypt/async/browser/secret_portal_key_provider.h"
- 
- #include <fcntl.h>
-+#if BUILDFLAG(IS_LINUX)
- #include <linux/limits.h>
-+#endif
- 
- #include <array>
- #include <utility>
diff --git a/chromium-next/patches/patch-components_os__crypt_sync_libsecret__util__linux.cc b/chromium-next/patches/patch-components_os__crypt_sync_libsecret__util__linux.cc
deleted file mode 100644
index f8beca958c..0000000000
--- a/chromium-next/patches/patch-components_os__crypt_sync_libsecret__util__linux.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/os_crypt/sync/libsecret_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/os_crypt/sync/libsecret_util_linux.cc
-@@ -185,16 +185,22 @@ bool LibsecretLoader::EnsureLibsecretLoa
- 
- // static
- bool LibsecretLoader::LoadLibsecret() {
-+#if BUILDFLAG(IS_BSD)
-+  const char* kSecretLib = "libsecret-1.so";
-+#else
-+  const char* kSecretLib = "libsecret-1.so.0";
-+#endif
-+
-   if (libsecret_loaded_)
-     return true;
- 
--  static void* handle = dlopen("libsecret-1.so.0", RTLD_NOW | RTLD_GLOBAL);
-+  static void* handle = dlopen(kSecretLib, RTLD_NOW | RTLD_GLOBAL);
-   if (!handle) {
-     // We wanted to use libsecret, but we couldn't load it. Warn, because
-     // either the user asked for this, or we autodetected it incorrectly. (Or
-     // the system has broken libraries, which is also good to warn about.)
-     // TODO(crbug.com/40467093): Channel this message to the user-facing log
--    VLOG(1) << "Could not load libsecret-1.so.0: " << dlerror();
-+    VLOG(1) << "Could not load " << kSecretLib << ": " << dlerror();
-     return false;
-   }
- 
diff --git a/chromium-next/patches/patch-components_os__crypt_sync_os__crypt.h b/chromium-next/patches/patch-components_os__crypt_sync_os__crypt.h
deleted file mode 100644
index e7b2ebf141..0000000000
--- a/chromium-next/patches/patch-components_os__crypt_sync_os__crypt.h
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/os_crypt/sync/os_crypt.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/os_crypt/sync/os_crypt.h
-@@ -16,7 +16,7 @@
- #include "build/chromecast_buildflags.h"
- #include "crypto/subtle_passkey.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- class KeyStorageLinux;
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -32,7 +32,7 @@ struct Config;
- // Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions
- // of what each function does.
- namespace OSCrypt {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(OS_CRYPT)
- void SetConfig(std::unique_ptr<os_crypt::Config> config);
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -77,7 +77,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockK
- COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy);
- COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting();
- #endif  // BUILDFLAG(IS_WIN)
--#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(OS_CRYPT)
- void UseMockKeyStorageForTesting(
-     base::OnceCallback<std::unique_ptr<KeyStorageLinux>()>
-@@ -111,7 +111,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCrypt
-   // Returns singleton instance of OSCryptImpl.
-   static OSCryptImpl* GetInstance();
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Set the configuration of OSCryptImpl.
-   // This method, or SetRawEncryptionKey(), must be called before using
-   // EncryptString() and DecryptString().
-@@ -207,7 +207,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCrypt
-   void ResetStateForTesting();
- #endif
- 
--#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
-   // For unit testing purposes, inject methods to be used.
-   // |storage_provider_factory| provides the desired |KeyStorage|
-   // implementation. If the provider returns |nullptr|, a hardcoded password
-@@ -231,13 +231,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCrypt
-   bool DeriveKey();
- #endif  // BUILDFLAG(IS_APPLE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   // This lock is used to make the GetEncryptionKey and
-   // GetRawEncryptionKey methods thread-safe.
-   static base::Lock& GetLock();
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   static constexpr size_t kDerivedKeyBytes = 16;
- 
-   crypto::SubtlePassKey MakeCryptoPassKey();
diff --git a/chromium-next/patches/patch-components_paint__preview_browser_paint__preview__client.cc b/chromium-next/patches/patch-components_paint__preview_browser_paint__preview__client.cc
deleted file mode 100644
index 57306ac0cd..0000000000
--- a/chromium-next/patches/patch-components_paint__preview_browser_paint__preview__client.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/paint_preview/browser/paint_preview_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/paint_preview/browser/paint_preview_client.cc
-@@ -326,8 +326,8 @@ void PaintPreviewClient::CapturePaintPre
-   metadata->set_version(kPaintPreviewVersion);
-   auto* chromeVersion = metadata->mutable_chrome_version();
-   const auto& current_chrome_version = version_info::GetVersion();
--  chromeVersion->set_major(current_chrome_version.components()[0]);
--  chromeVersion->set_minor(current_chrome_version.components()[1]);
-+  chromeVersion->set_gmajor(current_chrome_version.components()[0]);
-+  chromeVersion->set_gminor(current_chrome_version.components()[1]);
-   chromeVersion->set_build(current_chrome_version.components()[2]);
-   chromeVersion->set_patch(current_chrome_version.components()[3]);
-   document_data.callback = std::move(callback);
diff --git a/chromium-next/patches/patch-components_paint__preview_browser_paint__preview__client__unittest.cc b/chromium-next/patches/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
deleted file mode 100644
index e4762746ee..0000000000
--- a/chromium-next/patches/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/paint_preview/browser/paint_preview_client_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/paint_preview/browser/paint_preview_client_unittest.cc
-@@ -174,8 +174,8 @@ TEST_P(PaintPreviewClientRenderViewHostT
-   metadata->set_version(kPaintPreviewVersion);
-   auto* chromeVersion = metadata->mutable_chrome_version();
-   const auto& current_chrome_version = version_info::GetVersion();
--  chromeVersion->set_major(current_chrome_version.components()[0]);
--  chromeVersion->set_minor(current_chrome_version.components()[1]);
-+  chromeVersion->set_gmajor(current_chrome_version.components()[0]);
-+  chromeVersion->set_gminor(current_chrome_version.components()[1]);
-   chromeVersion->set_build(current_chrome_version.components()[2]);
-   chromeVersion->set_patch(current_chrome_version.components()[3]);
-   PaintPreviewFrameProto* main_frame = expected_proto.mutable_root_frame();
diff --git a/chromium-next/patches/patch-components_paint__preview_common_proto_paint__preview.proto b/chromium-next/patches/patch-components_paint__preview_common_proto_paint__preview.proto
deleted file mode 100644
index 9b010ef558..0000000000
--- a/chromium-next/patches/patch-components_paint__preview_common_proto_paint__preview.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/paint_preview/common/proto/paint_preview.proto.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/paint_preview/common/proto/paint_preview.proto
-@@ -82,8 +82,8 @@ message PaintPreviewFrameProto {
- // Stores Chrome version.
- // NEXT_TAG = 5
- message ChromeVersionProto {
--  optional uint64 major = 1;
--  optional uint64 minor = 2;
-+  optional uint64 gmajor = 1;
-+  optional uint64 gminor = 2;
-   optional uint64 build = 3;
-   optional uint64 patch = 4;
- }
diff --git a/chromium-next/patches/patch-components_paint__preview_player_player__compositor__delegate.cc b/chromium-next/patches/patch-components_paint__preview_player_player__compositor__delegate.cc
deleted file mode 100644
index 0c5aa7e2a2..0000000000
--- a/chromium-next/patches/patch-components_paint__preview_player_player__compositor__delegate.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/paint_preview/player/player_compositor_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/paint_preview/player/player_compositor_delegate.cc
-@@ -433,8 +433,8 @@ void PlayerCompositorDelegate::ValidateP
-   auto chrome_version = capture_result_->proto.metadata().chrome_version();
-   const auto& current_chrome_version = version_info::GetVersion();
-   if (capture_result_->proto.metadata().has_chrome_version() &&
--      chrome_version.major() == current_chrome_version.components()[0] &&
--      chrome_version.minor() == current_chrome_version.components()[1] &&
-+      chrome_version.gmajor() == current_chrome_version.components()[0] &&
-+      chrome_version.gminor() == current_chrome_version.components()[1] &&
-       chrome_version.build() == current_chrome_version.components()[2] &&
-       chrome_version.patch() == current_chrome_version.components()[3]) {
-     paint_preview_service_->GetFileMixin()->GetAXTreeUpdate(
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_features_password__features.cc b/chromium-next/patches/patch-components_password__manager_core_browser_features_password__features.cc
deleted file mode 100644
index fdc0b0172d..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_features_password__features.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/features/password_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/features/password_features.cc
-@@ -40,7 +40,7 @@ BASE_FEATURE(kClearUndecryptablePassword
- BASE_FEATURE(kClearUndecryptablePasswordsOnSync,
-              "ClearUndecryptablePasswordsInSync",
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -112,7 +112,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPassw
-              "ReuseDetectionBasedOnPasswordHashes",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kRestartToGainAccessToKeychain,
-              "RestartToGainAccessToKeychain",
- #if BUILDFLAG(IS_MAC)
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_features_password__features.h b/chromium-next/patches/patch-components_password__manager_core_browser_features_password__features.h
deleted file mode 100644
index a2a41ff4fc..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_features_password__features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/features/password_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/features/password_features.h
-@@ -108,7 +108,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFall
- // Detects password reuse based on hashed password values.
- BASE_DECLARE_FEATURE(kReuseDetectionBasedOnPasswordHashes);
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Enables "Needs access to keychain, restart chrome" bubble and banner.
- BASE_DECLARE_FEATURE(kRestartToGainAccessToKeychain);
- #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__form__manager.cc b/chromium-next/patches/patch-components_password__manager_core_browser_password__form__manager.cc
deleted file mode 100644
index cf8cc6d124..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__form__manager.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_form_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_form_manager.cc
-@@ -64,7 +64,7 @@
- #include "components/webauthn/android/webauthn_cred_man_delegate.h"
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "components/os_crypt/sync/os_crypt.h"
- #endif
- 
-@@ -240,7 +240,7 @@ bool ShouldUploadCrowdsourcingVotes(cons
-   return false;
- }
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool ShouldShowKeychainErrorBubble(
-     std::optional<PasswordStoreBackendError> backend_error) {
-   if (!backend_error.has_value()) {
-@@ -913,7 +913,7 @@ void PasswordFormManager::OnFetchComplet
-         error.value().type);
-   }
- 
--#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (ShouldShowKeychainErrorBubble(
-           form_fetcher_->GetProfileStoreBackendError())) {
-     client_->NotifyKeychainError();
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__manager.cc b/chromium-next/patches/patch-components_password__manager_core_browser_password__manager.cc
deleted file mode 100644
index e57e0daaf3..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__manager.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_manager.cc
-@@ -511,7 +511,7 @@ void PasswordManager::RegisterProfilePre
-       prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false);
- #endif  // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
-   registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true);
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter,
-                                 0);
- #endif
-@@ -524,7 +524,7 @@ void PasswordManager::RegisterProfilePre
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kDeletingUndecryptablePasswordsEnabled,
-                                 true);
- #endif
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__manager__client.h b/chromium-next/patches/patch-components_password__manager_core_browser_password__manager__client.h
deleted file mode 100644
index 4a0e1499b9..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__manager__client.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_manager_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_manager_client.h
-@@ -31,7 +31,7 @@
- #include "net/cert/cert_status_flags.h"
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/i18n/rtl.h"
- #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
- #include "ui/gfx/geometry/rect_f.h"
-@@ -533,7 +533,7 @@ class PasswordManagerClient {
-   virtual void TriggerSignIn(signin_metrics::AccessPoint access_point) const;
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Shows the bubble with the details of the `form`.
-   virtual void OpenPasswordDetailsBubble(
-       const password_manager::PasswordForm& form) = 0;
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__manager__switches.cc b/chromium-next/patches/patch-components_password__manager_core_browser_password__manager__switches.cc
deleted file mode 100644
index 32bc33f014..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__manager__switches.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_manager_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_manager_switches.cc
-@@ -6,7 +6,7 @@
- 
- namespace password_manager {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Specifies which encryption storage backend to use. Possible values are
- // kwallet, kwallet5, kwallet6, gnome-libsecret, basic.
- // Any other value will lead to Chrome detecting the best backend automatically.
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__manager__switches.h b/chromium-next/patches/patch-components_password__manager_core_browser_password__manager__switches.h
deleted file mode 100644
index 0543b12fd9..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__manager__switches.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_manager_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_manager_switches.h
-@@ -9,7 +9,7 @@
- 
- namespace password_manager {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kPasswordStore[];
- extern const char kEnableEncryptionSelection[];
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/chromium-next/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
deleted file mode 100644
index af94f5468a..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_manual_fallback_flow.cc
-@@ -46,7 +46,7 @@ std::u16string GetUsernameFromLabel(cons
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Returns the password form corresponding to the `payload` data. In most
- // cases there is only one such form stored, but having more than one or no
- // forms is also possible. If there is more than one form, showing any of them
-@@ -295,7 +295,7 @@ void PasswordManualFallbackFlow::DidAcce
-     }
-     case autofill::SuggestionType::kViewPasswordDetails: {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       std::optional<password_manager::PasswordForm> credentials =
-           GetCorrespondingPasswordForm(
-               suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(),
-@@ -425,7 +425,7 @@ void PasswordManualFallbackFlow::EnsureC
-     const Suggestion::PasswordSuggestionDetails& payload,
-     base::OnceClosure on_allowed) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (payload.is_cross_domain) {
-     cross_domain_confirmation_popup_controller_ =
-         password_client_->ShowCrossDomainConfirmationPopup(
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/chromium-next/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
deleted file mode 100644
index 1448c5d85a..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_manual_fallback_flow.h
-@@ -19,7 +19,7 @@
- #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-         // BUILDFLAG(IS_CHROMEOS)
-@@ -180,7 +180,7 @@ class PasswordManualFallbackFlow : publi
-   std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_;
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<PasswordCrossDomainConfirmationPopupController>
-       cross_domain_confirmation_popup_controller_;
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__store__factory__util.cc b/chromium-next/patches/patch-components_password__manager_core_browser_password__store__factory__util.cc
deleted file mode 100644
index 3729e79750..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__store__factory__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_store_factory_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_store_factory_util.cc
-@@ -29,7 +29,7 @@ namespace {
- LoginDatabase::DeletingUndecryptablePasswordsEnabled GetPolicyFromPrefs(
-     PrefService* prefs) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
-   return LoginDatabase::DeletingUndecryptablePasswordsEnabled(
-       prefs->GetBoolean(prefs::kDeletingUndecryptablePasswordsEnabled));
- #else
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database.cc b/chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database.cc
deleted file mode 100644
index c4ef177d9f..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_store/login_database.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_store/login_database.cc
-@@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords(
-     bool is_user_data_dir_policy_set,
-     bool is_enabled_by_policy,
-     IsAccountStore is_account_store) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<base::Environment> environment(base::Environment::Create());
-   // On Linux user data directory ca be specified using an env variable. If it
-   // exists, passwords shouldn't be deleted.
-@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords(
-     return false;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (command_line->HasSwitch(password_manager::kPasswordStore)) {
-     RecordShouldDeleteUndecryptablePasswordsMetric(
-         ShouldDeleteUndecryptablePasswordsResult::
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc b/chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
deleted file mode 100644
index 7391b84608..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_store/login_database_async_helper.cc
-@@ -154,7 +154,7 @@ LoginsResultOrError LoginDatabaseAsyncHe
-     std::vector<PasswordForm> matched_forms;
-     if (!login_db_ ||
-         !login_db_->GetLogins(form, include_psl, &matched_forms)) {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       return PasswordStoreBackendError(
-           OSCrypt::IsEncryptionAvailable()
-               ? PasswordStoreBackendErrorType::kUncategorized
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
deleted file mode 100644
index cb30163d25..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/password_store/login_database_unittest.cc
-@@ -2257,7 +2257,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCur
-                                           testing::Bool()));
- 
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- class LoginDatabaseUndecryptableLoginsTest : public testing::Test {
-  protected:
-   LoginDatabaseUndecryptableLoginsTest() = default;
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/chromium-next/patches/patch-components_password__manager_core_browser_stub__password__manager__client.cc
deleted file mode 100644
index ed3cd183aa..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_stub__password__manager__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/stub_password_manager_client.cc
-@@ -206,7 +206,7 @@ version_info::Channel StubPasswordManage
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void StubPasswordManagerClient::OpenPasswordDetailsBubble(
-     const password_manager::PasswordForm& form) {}
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
diff --git a/chromium-next/patches/patch-components_password__manager_core_browser_stub__password__manager__client.h b/chromium-next/patches/patch-components_password__manager_core_browser_stub__password__manager__client.h
deleted file mode 100644
index d83e6a5d42..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_browser_stub__password__manager__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/browser/stub_password_manager_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/browser/stub_password_manager_client.h
-@@ -77,7 +77,7 @@ class StubPasswordManagerClient : public
-   MockPasswordFeatureManager* GetPasswordFeatureManager();
-   version_info::Channel GetChannel() const override;
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   void OpenPasswordDetailsBubble(
-       const password_manager::PasswordForm& form) override;
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
diff --git a/chromium-next/patches/patch-components_password__manager_core_common_password__manager__pref__names.h b/chromium-next/patches/patch-components_password__manager_core_common_password__manager__pref__names.h
deleted file mode 100644
index ff7b7ddecb..0000000000
--- a/chromium-next/patches/patch-components_password__manager_core_common_password__manager__pref__names.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/password_manager/core/common/password_manager_pref_names.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/password_manager/core/common/password_manager_pref_names.h
-@@ -59,7 +59,7 @@ inline constexpr char kCredentialProvide
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
- // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy.
- // If set to false it blocks deleting undecryptable passwords, otherwise the
- // deletion can happen.
-@@ -356,7 +356,7 @@ inline constexpr char kAutofillableCrede
- inline constexpr char kPasswordSharingEnabled[] =
-     "password_manager.password_sharing_enabled";
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Integer pref indicating how many times relaunch Chrome bubble was dismissed.
- inline constexpr char kRelaunchChromeBubbleDismissedCounter[] =
-     "password_manager.relaunch_chrome_bubble_dismissed_counter";
diff --git a/chromium-next/patches/patch-components_performance__manager_decorators_process__metrics__decorator.cc b/chromium-next/patches/patch-components_performance__manager_decorators_process__metrics__decorator.cc
deleted file mode 100644
index 8bbd691ce8..0000000000
--- a/chromium-next/patches/patch-components_performance__manager_decorators_process__metrics__decorator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/performance_manager/decorators/process_metrics_decorator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/performance_manager/decorators/process_metrics_decorator.cc
-@@ -264,7 +264,7 @@ void ProcessMetricsDecorator::DidGetMemo
-     // RSS and PMF to each node proportionally to its V8 heap size.
-     uint64_t process_rss = process_dump_iter.os_dump().resident_set_kb;
-     process_node->set_resident_set_kb(process_rss);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-     process_node->set_private_swap_kb(
-         process_dump_iter.os_dump().private_footprint_swap_kb);
- #endif
diff --git a/chromium-next/patches/patch-components_performance__manager_public_features.h b/chromium-next/patches/patch-components_performance__manager_public_features.h
deleted file mode 100644
index ed8ad9064e..0000000000
--- a/chromium-next/patches/patch-components_performance__manager_public_features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/performance_manager/public/features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/performance_manager/public/features.h
-@@ -19,7 +19,7 @@ namespace performance_manager::features 
- 
- #if !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() false
- #else
- #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() true
diff --git a/chromium-next/patches/patch-components_permissions_prediction__service_prediction__common.cc b/chromium-next/patches/patch-components_permissions_prediction__service_prediction__common.cc
deleted file mode 100644
index 74cf5dc8b1..0000000000
--- a/chromium-next/patches/patch-components_permissions_prediction__service_prediction__common.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/permissions/prediction_service/prediction_common.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/permissions/prediction_service/prediction_common.cc
-@@ -34,7 +34,7 @@ int BucketizeValue(int count) {
- 
- ClientFeatures_Platform GetCurrentPlatformProto() {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   return permissions::ClientFeatures_Platform_PLATFORM_DESKTOP;
- #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-   return permissions::ClientFeatures_Platform_PLATFORM_MOBILE;
-@@ -45,7 +45,7 @@ ClientFeatures_Platform GetCurrentPlatfo
- 
- ClientFeatures_PlatformEnum GetCurrentPlatformEnumProto() {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   return permissions::ClientFeatures_PlatformEnum_PLATFORM_DESKTOP_V2;
- #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-   return permissions::ClientFeatures_PlatformEnum_PLATFORM_MOBILE_V2;
diff --git a/chromium-next/patches/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/chromium-next/patches/patch-components_policy_core_browser_policy__pref__mapping__test.cc
deleted file mode 100644
index 6cb8b6c497..0000000000
--- a/chromium-next/patches/patch-components_policy_core_browser_policy__pref__mapping__test.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -432,7 +432,7 @@ class PolicyTestCase {
-     const std::string os("chromeos");
- #elif BUILDFLAG(IS_IOS)
-     const std::string os("ios");
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     const std::string os("linux");
- #elif BUILDFLAG(IS_MAC)
-     const std::string os("mac");
diff --git a/chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__client.cc
deleted file mode 100644
index f44419617d..0000000000
--- a/chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -742,7 +742,7 @@ void CloudPolicyClient::FetchPolicy(Poli
-         fetch_request->set_invalidation_payload(invalidation_payload_);
-       }
-     }
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // Only set browser device identifier for CBCM Chrome cloud policy on
-     // desktop.
-     if (type_to_fetch.first ==
diff --git a/chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc b/chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
deleted file mode 100644
index 17a8b9b4cb..0000000000
--- a/chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc
-@@ -25,7 +25,7 @@ namespace policy {
- 
- namespace {
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kRetryWithKeyReset,
-              "RetryWithKeyReset",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -220,7 +220,7 @@ void CloudPolicyRefreshScheduler::OnStor
-   // continue using the stale information. Thus, no specific response to a store
-   // error is required. NB: Changes to is_managed fire OnStoreLoaded().
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Client is registered means we have successfully get policy key once. However,
-   // a following policy fetch request is failed because we can't verified
-   // signature. Delete the policy key so that we can get it again with next
diff --git a/chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__util.cc
deleted file mode 100644
index 3b480b9608..0000000000
--- a/chromium-next/patches/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/policy/core/common/cloud/cloud_policy_util.cc
-@@ -21,7 +21,7 @@
- #include "base/win/wincred_shim.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- #include <pwd.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -36,10 +36,15 @@
- #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include <limits.h>  // For HOST_NAME_MAX
- #endif
- 
-+#if BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
-+#include <sys/param.h>
-+#define HOST_NAME_MAX MAXHOSTNAMELEN
-+#endif
-+
- #include <algorithm>
- #include <utility>
- 
-@@ -84,7 +89,7 @@ namespace policy {
- namespace em = enterprise_management;
- 
- std::string GetMachineName() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   char hostname[HOST_NAME_MAX];
-   if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
-     return hostname;
-@@ -140,7 +145,7 @@ std::string GetMachineName() {
- 
- std::string GetOSVersion() {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   return base::SysInfo::OperatingSystemVersion();
- #elif BUILDFLAG(IS_WIN)
-   base::win::OSInfo::VersionNumber version_number =
-@@ -162,7 +167,7 @@ std::string GetOSArchitecture() {
- }
- 
- std::string GetOSUsername() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   struct passwd* creds = getpwuid(getuid());
-   if (!creds || !creds->pw_name)
-     return std::string();
diff --git a/chromium-next/patches/patch-components_policy_core_common_policy__loader__common.cc b/chromium-next/patches/patch-components_policy_core_common_policy__loader__common.cc
deleted file mode 100644
index 933cfeab2b..0000000000
--- a/chromium-next/patches/patch-components_policy_core_common_policy__loader__common.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/policy/core/common/policy_loader_common.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/policy/core/common/policy_loader_common.cc
-@@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = {
-     key::kDefaultSearchProviderEnabled,
-     key::kSafeBrowsingEnabled,
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     key::kAutoOpenFileTypes,
-     key::kEnterpriseSearchAggregatorSettings,
-     key::kHomepageIsNewTabPage,
-@@ -57,7 +57,7 @@ const char* kSensitivePolicies[] = {
-     key::kSafeBrowsingAllowlistDomains,
-     key::kSiteSearchSettings,
- #endif
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     key::kCommandLineFlagSecurityWarningsEnabled,
- #endif
- #if !BUILDFLAG(IS_IOS)
diff --git a/chromium-next/patches/patch-components_policy_core_common_policy__paths.cc b/chromium-next/patches/patch-components_policy_core_common_policy__paths.cc
deleted file mode 100644
index 9d38d8a7f5..0000000000
--- a/chromium-next/patches/patch-components_policy_core_common_policy__paths.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/policy/core/common/policy_paths.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/policy/core/common/policy_paths.cc
-@@ -17,6 +17,10 @@ namespace policy {
- const char kPolicyPath[] = "/etc/opt/chrome/policies";
- #elif BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING)
- const char kPolicyPath[] = "/etc/opt/chrome_for_testing/policies";
-+#elif BUILDFLAG(IS_FREEBSD)
-+const char kPolicyPath[] = "/usr/local/etc/chromium/policies";
-+#elif BUILDFLAG(IS_NETBSD)
-+const char kPolicyPath[] = "@PKG_SYSCONFBASE@/chromium/policies";
- #else
- const char kPolicyPath[] = "/etc/chromium/policies";
- #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
diff --git a/chromium-next/patches/patch-components_policy_core_common_policy__utils.cc b/chromium-next/patches/patch-components_policy_core_common_policy__utils.cc
deleted file mode 100644
index 305b7dce8f..0000000000
--- a/chromium-next/patches/patch-components_policy_core_common_policy__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/policy/core/common/policy_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/policy/core/common/policy_utils.cc
-@@ -22,7 +22,7 @@ bool IsPolicyTestingEnabled(PrefService*
-     return true;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
-   if (channel == version_info::Channel::DEV) {
-     return true;
-   }
diff --git a/chromium-next/patches/patch-components_policy_tools_generate__policy__source.py b/chromium-next/patches/patch-components_policy_tools_generate__policy__source.py
deleted file mode 100644
index 5b8140f580..0000000000
--- a/chromium-next/patches/patch-components_policy_tools_generate__policy__source.py
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/policy/tools/generate_policy_source.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/policy/tools/generate_policy_source.py
-@@ -38,9 +38,9 @@ PLATFORM_STRINGS = {
-     'ios': ['ios'],
-     'fuchsia': ['fuchsia'],
-     'chrome.win': ['win'],
--    'chrome.linux': ['linux'],
-+    'chrome.linux': ['linux', 'openbsd', 'freebsd', 'netbsd'],
-     'chrome.mac': ['mac'],
--    'chrome.*': ['win', 'mac', 'linux'],
-+    'chrome.*': ['win', 'mac', 'linux', 'openbsd', 'freebsd', 'netbsd'],
-     'chrome.win7': ['win'],
- }
- 
diff --git a/chromium-next/patches/patch-components_power__metrics_BUILD.gn b/chromium-next/patches/patch-components_power__metrics_BUILD.gn
deleted file mode 100644
index 3f8fece877..0000000000
--- a/chromium-next/patches/patch-components_power__metrics_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/power_metrics/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/power_metrics/BUILD.gn
-@@ -41,7 +41,7 @@ static_library("power_metrics") {
-     ldflags = [ "/DELAYLOAD:setupapi.dll" ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux && !is_bsd) || is_chromeos) {
-     sources += [
-       "energy_metrics_provider_linux.cc",
-       "energy_metrics_provider_linux.h",
diff --git a/chromium-next/patches/patch-components_power__metrics_energy__metrics__provider.cc b/chromium-next/patches/patch-components_power__metrics_energy__metrics__provider.cc
deleted file mode 100644
index 119e200418..0000000000
--- a/chromium-next/patches/patch-components_power__metrics_energy__metrics__provider.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/power_metrics/energy_metrics_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/power_metrics/energy_metrics_provider.cc
-@@ -9,6 +9,8 @@
- #include "components/power_metrics/energy_metrics_provider_win.h"
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- #include "components/power_metrics/energy_metrics_provider_linux.h"
-+#elif BUILDFLAG(IS_BSD)
-+#include "base/notreached.h"
- #endif  // BUILDFLAG(IS_WIN)
- 
- namespace power_metrics {
-@@ -22,6 +24,9 @@ std::unique_ptr<EnergyMetricsProvider> E
-   return EnergyMetricsProviderWin::Create();
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-   return EnergyMetricsProviderLinux::Create();
-+#elif BUILDFLAG(IS_BSD)
-+  NOTIMPLEMENTED();
-+  return nullptr;
- #else
-   return nullptr;
- #endif  // BUILDFLAG(IS_WIN)
diff --git a/chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__service.cc b/chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__service.cc
deleted file mode 100644
index 4c1e855f1d..0000000000
--- a/chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/regional_capabilities/regional_capabilities_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/regional_capabilities/regional_capabilities_service.cc
-@@ -216,7 +216,7 @@ std::optional<CountryId> RegionalCapabil
-     return persisted_country_id;
-   }
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) {
-     profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall);
-     base::UmaHistogramEnumeration(kUnknownCountryIdStored,
diff --git a/chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__switches.cc b/chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__switches.cc
deleted file mode 100644
index 8a7e5ed527..0000000000
--- a/chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__switches.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/regional_capabilities/regional_capabilities_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/regional_capabilities/regional_capabilities_switches.cc
-@@ -6,7 +6,7 @@
- 
- namespace switches {
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kClearPrefForUnknownCountry,
-              "ClearCountryPrefForStoredUnknownCountry",
-              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__switches.h b/chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__switches.h
deleted file mode 100644
index f21af23c21..0000000000
--- a/chromium-next/patches/patch-components_regional__capabilities_regional__capabilities__switches.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/regional_capabilities/regional_capabilities_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/regional_capabilities/regional_capabilities_switches.h
-@@ -25,7 +25,7 @@ inline constexpr char kSearchEngineChoic
- inline constexpr char kDefaultListCountryOverride[] = "DEFAULT_EEA";
- inline constexpr char kEeaListCountryOverride[] = "EEA_ALL";
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // When an invalid `country_codes::CountryId` is stored in prefs and this
- // feature is enabled the pref will be cleared allowing a valid country to be
- // set again.
diff --git a/chromium-next/patches/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc b/chromium-next/patches/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
deleted file mode 100644
index f59fa6a8fe..0000000000
--- a/chromium-next/patches/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/safe_browsing/content/common/file_type_policies_unittest.cc
-@@ -146,7 +146,7 @@ TEST_F(FileTypePoliciesTest, UnpackResou
-   EXPECT_EQ(142, file_type.uma_value());
-   EXPECT_FALSE(file_type.is_archive());
-   EXPECT_EQ(DownloadFileType::FULL_PING, file_type.ping_setting());
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   EXPECT_EQ(DownloadFileType::ALLOW_ON_USER_GESTURE,
-             file_type.platform_settings(0).danger_level());
-   EXPECT_EQ(DownloadFileType::DISALLOW_AUTO_OPEN,
diff --git a/chromium-next/patches/patch-components_safe__browsing_content_resources_gen__file__type__proto.py b/chromium-next/patches/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
deleted file mode 100644
index c53042634a..0000000000
--- a/chromium-next/patches/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/safe_browsing/content/resources/gen_file_type_proto.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/safe_browsing/content/resources/gen_file_type_proto.py
-@@ -37,6 +37,9 @@ def PlatformTypes():
-         "chromeos":
-         download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_CHROME_OS,
-         "linux": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX,
-+        "openbsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX,
-+        "freebsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX,
-+        "netbsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX,
-         "mac": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_MAC,
-         "win": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_WINDOWS,
-         # LINT.ThenChange(BUILD.gn:PlatformTypes)
-@@ -179,7 +182,7 @@ class DownloadFileTypeProtoGenerator(Bin
-             '-t',
-             '--type',
-             help='The platform type. One of android, chromeos, ' +
--            'linux, mac, win')
-+            'linux, mac, win, openbsd, freebsd, netbsd')
- 
-     def AddExtraCommandLineArgsForVirtualEnvRun(self, opts, command):
-         if opts.type is not None:
diff --git a/chromium-next/patches/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/chromium-next/patches/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
deleted file mode 100644
index 29c1145b9c..0000000000
--- a/chromium-next/patches/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
-@@ -119,7 +119,7 @@ std::ostream& operator<<(std::ostream& o
- PlatformType GetCurrentPlatformType() {
- #if BUILDFLAG(IS_WIN)
-   return WINDOWS_PLATFORM;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return LINUX_PLATFORM;
- #elif BUILDFLAG(IS_IOS)
-   return IOS_PLATFORM;
diff --git a/chromium-next/patches/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/chromium-next/patches/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
deleted file mode 100644
index f55bc21d0e..0000000000
--- a/chromium-next/patches/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
-@@ -111,7 +111,7 @@ RTLookupRequest::OSType GetRTLookupReque
-   return RTLookupRequest::OS_TYPE_CHROME_OS;
- #elif BUILDFLAG(IS_IOS)
-   return RTLookupRequest::OS_TYPE_IOS;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return RTLookupRequest::OS_TYPE_LINUX;
- #elif BUILDFLAG(IS_MAC)
-   return RTLookupRequest::OS_TYPE_MAC;
diff --git a/chromium-next/patches/patch-components_search__engines_template__url__service.cc b/chromium-next/patches/patch-components_search__engines_template__url__service.cc
deleted file mode 100644
index a5b25ec0b0..0000000000
--- a/chromium-next/patches/patch-components_search__engines_template__url__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/search_engines/template_url_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/search_engines/template_url_service.cc
-@@ -3435,7 +3435,7 @@ bool TemplateURLService::MatchesDefaultS
- std::unique_ptr<EnterpriseSearchManager>
- TemplateURLService::GetEnterpriseSearchManager(PrefService* prefs) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return std::make_unique<EnterpriseSearchManager>(
-       prefs, base::BindRepeating(&TemplateURLService::EnterpriseSearchChanged,
-                                  base::Unretained(this)));
diff --git a/chromium-next/patches/patch-components_security__interstitials_content_utils.cc b/chromium-next/patches/patch-components_security__interstitials_content_utils.cc
deleted file mode 100644
index e5155ef216..0000000000
--- a/chromium-next/patches/patch-components_security__interstitials_content_utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/security_interstitials/content/utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/security_interstitials/content/utils.cc
-@@ -37,7 +37,7 @@ void LaunchDateAndTimeSettings() {
- #if BUILDFLAG(IS_ANDROID)
-   JNIEnv* env = base::android::AttachCurrentThread();
-   Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   struct ClockCommand {
-     const char* const pathname;
-     const char* const argument;
diff --git a/chromium-next/patches/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/chromium-next/patches/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
deleted file mode 100644
index 16cd25fdbf..0000000000
--- a/chromium-next/patches/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc
-@@ -147,7 +147,7 @@ void CrossDeviceUserSegment::ExecuteMode
- // Check for current device type and subtract it from the device count
- // calculation.
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   desktop_count -= 1;
- #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
-   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
diff --git a/chromium-next/patches/patch-components_services_on__device__translation_sandbox__hook.cc b/chromium-next/patches/patch-components_services_on__device__translation_sandbox__hook.cc
deleted file mode 100644
index be1a5d9781..0000000000
--- a/chromium-next/patches/patch-components_services_on__device__translation_sandbox__hook.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/services/on_device_translation/sandbox_hook.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/services/on_device_translation/sandbox_hook.cc
-@@ -7,12 +7,15 @@
- #include "components/services/on_device_translation/translate_kit_client.h"
- #include "sandbox/linux/syscall_broker/broker_command.h"
- 
-+#if !BUILDFLAG(IS_BSD)
- using sandbox::syscall_broker::BrokerFilePermission;
- using sandbox::syscall_broker::MakeBrokerCommandSet;
-+#endif
- 
- namespace on_device_translation {
- namespace {
- 
-+#if !BUILDFLAG(IS_BSD)
- // Gets the file permissions required by the TranslateKit
- std::vector<BrokerFilePermission> GetOnDeviceTranslationFilePermissions() {
-   std::vector<BrokerFilePermission> permissions{
-@@ -21,6 +24,7 @@ std::vector<BrokerFilePermission> GetOnD
-   };
-   return permissions;
- }
-+#endif
- 
- }  // namespace
- 
-@@ -29,6 +33,7 @@ bool OnDeviceTranslationSandboxHook(
-   // Call `TranslateKitClient::Get()` to load libtranslatekit.so
-   TranslateKitClient::Get();
- 
-+#if !BUILDFLAG(IS_BSD)
-   auto* instance = sandbox::policy::SandboxLinux::GetInstance();
-   instance->StartBrokerProcess(MakeBrokerCommandSet({
-                                    sandbox::syscall_broker::COMMAND_OPEN,
-@@ -36,7 +41,7 @@ bool OnDeviceTranslationSandboxHook(
-                                GetOnDeviceTranslationFilePermissions(),
-                                options);
-   instance->EngageNamespaceSandboxIfPossible();
--
-+#endif
-   return true;
- }
- 
diff --git a/chromium-next/patches/patch-components_services_on__device__translation_sandbox__hook.h b/chromium-next/patches/patch-components_services_on__device__translation_sandbox__hook.h
deleted file mode 100644
index 32fe0b1b50..0000000000
--- a/chromium-next/patches/patch-components_services_on__device__translation_sandbox__hook.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/services/on_device_translation/sandbox_hook.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/services/on_device_translation/sandbox_hook.h
-@@ -5,7 +5,13 @@
- #ifndef COMPONENTS_SERVICES_ON_DEVICE_TRANSLATION_SANDBOX_HOOK_H_
- #define COMPONENTS_SERVICES_ON_DEVICE_TRANSLATION_SANDBOX_HOOK_H_
- 
-+#include "build/build_config.h"
-+
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace on_device_translation {
- 
diff --git a/chromium-next/patches/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/chromium-next/patches/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
deleted file mode 100644
index acb4ae9fca..0000000000
--- a/chromium-next/patches/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc
-@@ -22,7 +22,7 @@
- 
- #if BUILDFLAG(IS_WIN)
- #include "content/public/child/dwrite_font_proxy_init_win.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/cpp/font_loader.h"
- #endif
- 
-@@ -79,7 +79,7 @@ PaintPreviewCompositorCollectionImpl::Pa
-     // Initialize font access for Skia.
- #if BUILDFLAG(IS_WIN)
-   content::InitializeDWriteFontProxy();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   mojo::PendingRemote<font_service::mojom::FontService> font_service;
-   content::UtilityThread::Get()->BindHostReceiver(
-       font_service.InitWithNewPipeAndPassReceiver());
-@@ -102,7 +102,7 @@ PaintPreviewCompositorCollectionImpl::Pa
-                              base::BindOnce([] { skia::DefaultFontMgr(); }));
- 
-   // Sanity check that fonts are working.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // No WebSandbox is provided on Linux so the local fonts aren't accessible.
-   // This is fine since since the subsetted fonts are provided in the SkPicture.
-   // However, we still need to check that the SkFontMgr starts as it is used by
diff --git a/chromium-next/patches/patch-components_signin_public_base_signin__switches.cc b/chromium-next/patches/patch-components_signin_public_base_signin__switches.cc
deleted file mode 100644
index cdc78a6640..0000000000
--- a/chromium-next/patches/patch-components_signin_public_base_signin__switches.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/signin/public/base/signin_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/signin/public/base/signin_switches.cc
-@@ -55,7 +55,7 @@ BASE_FEATURE(kUseHostedDomainForManageme
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Enables the History Sync Opt-in on Desktop.
- BASE_FEATURE(kEnableHistorySyncOptin,
-              "EnableHistorySyncOptin",
diff --git a/chromium-next/patches/patch-components_signin_public_base_signin__switches.h b/chromium-next/patches/patch-components_signin_public_base_signin__switches.h
deleted file mode 100644
index 41d380d092..0000000000
--- a/chromium-next/patches/patch-components_signin_public_base_signin__switches.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/signin/public/base/signin_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/signin/public/base/signin_switches.h
-@@ -52,7 +52,7 @@ COMPONENT_EXPORT(SIGNIN_SWITCHES)
- BASE_DECLARE_FEATURE(kUseHostedDomainForManagementCheckOnSignin);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(SIGNIN_SWITCHES)
- BASE_DECLARE_FEATURE(kEnableHistorySyncOptin);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-components_soda_soda__util.cc b/chromium-next/patches/patch-components_soda_soda__util.cc
deleted file mode 100644
index 3da89ad4ab..0000000000
--- a/chromium-next/patches/patch-components_soda_soda__util.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/soda/soda_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/soda/soda_util.cc
-@@ -23,7 +23,7 @@
- #include "base/win/windows_version.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_X86_FAMILY)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_FAMILY)
- #include "base/cpu.h"
- #endif
- 
-@@ -39,7 +39,7 @@ bool IsSupportedChromeOS() {
- }
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool IsSupportedLinux() {
- #if defined(ARCH_CPU_X86_FAMILY)
-   // Check if the CPU has the required instruction set to run the Speech
-@@ -70,7 +70,7 @@ bool IsSupportedWin() {
- bool IsOnDeviceSpeechRecognitionSupported() {
- #if BUILDFLAG(IS_CHROMEOS)
-   return IsSupportedChromeOS();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return IsSupportedLinux();
- #elif BUILDFLAG(IS_WIN)
-   return IsSupportedWin();
diff --git a/chromium-next/patches/patch-components_startup__metric__utils_common_startup__metric__utils.cc b/chromium-next/patches/patch-components_startup__metric__utils_common_startup__metric__utils.cc
deleted file mode 100644
index 9de80e7b87..0000000000
--- a/chromium-next/patches/patch-components_startup__metric__utils_common_startup__metric__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/startup_metric_utils/common/startup_metric_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/startup_metric_utils/common/startup_metric_utils.cc
-@@ -94,7 +94,7 @@ base::TimeTicks CommonStartupMetricRecor
-   // Enabling this logic on OS X causes a significant performance regression.
-   // TODO(crbug.com/40464036): Remove IS_APPLE ifdef once utility processes
-   // set their desired main thread priority.
--#if !BUILDFLAG(IS_APPLE)
-+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
-   static bool statics_initialized = false;
-   if (!statics_initialized) {
-     statics_initialized = true;
diff --git a/chromium-next/patches/patch-components_storage__monitor_BUILD.gn b/chromium-next/patches/patch-components_storage__monitor_BUILD.gn
deleted file mode 100644
index 6c80e511cf..0000000000
--- a/chromium-next/patches/patch-components_storage__monitor_BUILD.gn
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/storage_monitor/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/storage_monitor/BUILD.gn
-@@ -73,7 +73,7 @@ component("storage_monitor") {
-       deps += [ "//services/device/public/mojom" ]
-     }
-   } else if (is_linux) {
--    if (use_udev) {
-+    if (use_udev && !is_bsd) {
-       sources += [
-         "mtab_watcher_linux.cc",
-         "mtab_watcher_linux.h",
-@@ -182,7 +182,7 @@ source_set("unit_tests") {
-         "storage_monitor_chromeos_unittest.cc",
-       ]
-     }
--  } else if (is_linux) {
-+  } else if (is_linux && !is_bsd) {
-     if (use_udev) {
-       sources += [ "storage_monitor_linux_unittest.cc" ]
-     }
diff --git a/chromium-next/patches/patch-components_storage__monitor_removable__device__constants.cc b/chromium-next/patches/patch-components_storage__monitor_removable__device__constants.cc
deleted file mode 100644
index bdb2ed9c14..0000000000
--- a/chromium-next/patches/patch-components_storage__monitor_removable__device__constants.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/storage_monitor/removable_device_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/storage_monitor/removable_device_constants.cc
-@@ -10,7 +10,7 @@ namespace storage_monitor {
- const char kFSUniqueIdPrefix[] = "UUID:";
- const char kVendorModelSerialPrefix[] = "VendorModelSerial:";
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kVendorModelVolumeStoragePrefix[] = "VendorModelVolumeStorage:";
- #endif
- 
diff --git a/chromium-next/patches/patch-components_storage__monitor_removable__device__constants.h b/chromium-next/patches/patch-components_storage__monitor_removable__device__constants.h
deleted file mode 100644
index 275d6c934c..0000000000
--- a/chromium-next/patches/patch-components_storage__monitor_removable__device__constants.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/storage_monitor/removable_device_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/storage_monitor/removable_device_constants.h
-@@ -15,7 +15,7 @@ namespace storage_monitor {
- extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kFSUniqueIdPrefix[];
- extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kVendorModelSerialPrefix[];
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern COMPONENT_EXPORT(STORAGE_MONITOR) const
-     char kVendorModelVolumeStoragePrefix[];
- #endif
diff --git a/chromium-next/patches/patch-components_supervised__user_core_browser_list__family__members__service.h b/chromium-next/patches/patch-components_supervised__user_core_browser_list__family__members__service.h
deleted file mode 100644
index c538586b61..0000000000
--- a/chromium-next/patches/patch-components_supervised__user_core_browser_list__family__members__service.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/supervised_user/core/browser/list_family_members_service.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/supervised_user/core/browser/list_family_members_service.h
-@@ -33,7 +33,7 @@ namespace supervised_user {
- // If true, this fetcher is active for all users with CanFetchFamilyMemberInfo
- // capability. Otherwise, it is only used by supervised users.
- constexpr bool FetchListFamilyMembersWithCapability() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
diff --git a/chromium-next/patches/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc b/chromium-next/patches/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
deleted file mode 100644
index bdb0ccc881..0000000000
--- a/chromium-next/patches/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/supervised_user/core/browser/supervised_user_metrics_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/supervised_user/core/browser/supervised_user_metrics_service.cc
-@@ -47,7 +47,7 @@ SupervisedUserMetricsService::Supervised
-       extensions_metrics_delegate_(std::move(extensions_metrics_delegate)) {
-   DCHECK(pref_service_);
-   DCHECK(url_filter_);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   CHECK(extensions_metrics_delegate_)
-       << "Extensions metrics delegate must exist on Win/Linux/Mac";
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/chromium-next/patches/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
deleted file mode 100644
index 346394fc91..0000000000
--- a/chromium-next/patches/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/supervised_user/core/browser/supervised_user_preferences.cc
-@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySi
-   registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false);
-   registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string());
- #if BUILDFLAG(ENABLE_EXTENSIONS) && \
--    (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX))
-+    (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-   registry->RegisterIntegerPref(
-       prefs::kLocallyParentApprovedExtensionsMigrationState,
-       static_cast<int>(
diff --git a/chromium-next/patches/patch-components_supervised__user_core_common_features.cc b/chromium-next/patches/patch-components_supervised__user_core_common_features.cc
deleted file mode 100644
index e66695432c..0000000000
--- a/chromium-next/patches/patch-components_supervised__user_core_common_features.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/supervised_user/core/common/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/supervised_user/core/common/features.cc
-@@ -36,7 +36,7 @@ BASE_FEATURE(kAllowSubframeLocalWebAppro
- #endif
- 
- #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
- 
- const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs{
-@@ -45,7 +45,7 @@ const base::FeatureParam<int> kLocalWebA
- #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kEnableLocalWebApprovalErrorDialog,
-              "EnableLocalWebApprovalErrorDialog",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -97,7 +97,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExten
-              "UpdatedSupervisedUserExtensionApprovalStrings",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop,
-              "EnableExtensionsPermissionsForSupervisedUsersOnDesktop",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -112,7 +112,7 @@ bool IsSupervisedUserSkipParentApprovalT
- #if BUILDFLAG(IS_CHROMEOS)
-   return base::FeatureList::IsEnabled(
-       kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
--#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   bool skipParentApprovalEnabled = base::FeatureList::IsEnabled(
-       kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
-   bool permissionExtensionsForSupervisedUsersEnabled =
-@@ -129,7 +129,7 @@ bool IsSupervisedUserSkipParentApprovalT
- }
- #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kCustomProfileStringsForSupervisedUsers,
-              "CustomProfileStringsForSupervisedUsers",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -141,13 +141,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers
- 
- BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers,
-              "ForceSafeSearchForUnauthenticatedSupervisedUsers",
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog,
-              "EnableSupervisedUserVersionSignOutDialog",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -169,7 +169,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructur
- // platform #defines.
- BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers,
-              "UncredentialedFilteringFallbackForSupervisedUsers",
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-components_supervised__user_core_common_features.h b/chromium-next/patches/patch-components_supervised__user_core_common_features.h
deleted file mode 100644
index 54e80b381b..0000000000
--- a/chromium-next/patches/patch-components_supervised__user_core_common_features.h
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/supervised_user/core/common/features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/supervised_user/core/common/features.h
-@@ -19,12 +19,12 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals)
- BASE_DECLARE_FEATURE(kAllowSubframeLocalWebApprovals);
- 
- #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- extern const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs;
- #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Whether we show an error screen in case of failure of a local web approval.
- BASE_DECLARE_FEATURE(kEnableLocalWebApprovalErrorDialog);
- #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(
- // Applies new informative strings during the parental extension approval flow.
- BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings);
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
- #endif
- 
-@@ -62,7 +62,7 @@ BASE_DECLARE_FEATURE(kExposedParentalCon
- bool IsSupervisedUserSkipParentApprovalToInstallExtensionsEnabled();
- #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Enable different web sign in interception behaviour for supervised users:
- //
- // 1. Supervised user signs in to existing signed out Profile: show modal
-@@ -80,7 +80,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervi
- // unauthenticated (e.g. signed out of the content area) account.
- BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Uses supervised user strings on the signout dialog.
- BASE_DECLARE_FEATURE(kEnableSupervisedUserVersionSignOutDialog);
- 
diff --git a/chromium-next/patches/patch-components_supervised__user_core_common_pref__names.h b/chromium-next/patches/patch-components_supervised__user_core_common_pref__names.h
deleted file mode 100644
index f173c6c3a0..0000000000
--- a/chromium-next/patches/patch-components_supervised__user_core_common_pref__names.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/supervised_user/core/common/pref_names.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/supervised_user/core/common/pref_names.h
-@@ -129,7 +129,7 @@ inline constexpr char kDefaultSupervised
-     "profile.managed.default_filtering_behavior";
- 
- #if BUILDFLAG(ENABLE_EXTENSIONS)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // An integer pref that stores the current state of the local extension
- // parent approval migration when the feature
- // `kEnableSupervisedUserSkipParentApprovalToInstallExtensions` becomes enabled.
diff --git a/chromium-next/patches/patch-components_sync__device__info_local__device__info__util.cc b/chromium-next/patches/patch-components_sync__device__info_local__device__info__util.cc
deleted file mode 100644
index ddd1ad668c..0000000000
--- a/chromium-next/patches/patch-components_sync__device__info_local__device__info__util.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/sync_device_info/local_device_info_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/sync_device_info/local_device_info_util.cc
-@@ -84,7 +84,7 @@ void OnMachineStatisticsLoaded(LocalDevi
- sync_pb::SyncEnums::DeviceType GetLocalDeviceType() {
- #if BUILDFLAG(IS_CHROMEOS)
-   return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
- #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
-   switch (ui::GetDeviceFormFactor()) {
-@@ -107,7 +107,7 @@ sync_pb::SyncEnums::DeviceType GetLocalD
- DeviceInfo::OsType GetLocalDeviceOSType() {
- #if BUILDFLAG(IS_CHROMEOS)
-   return DeviceInfo::OsType::kChromeOsAsh;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return DeviceInfo::OsType::kLinux;
- #elif BUILDFLAG(IS_ANDROID)
-   return DeviceInfo::OsType::kAndroid;
-@@ -126,7 +126,7 @@ DeviceInfo::OsType GetLocalDeviceOSType(
- 
- DeviceInfo::FormFactor GetLocalDeviceFormFactor() {
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return DeviceInfo::FormFactor::kDesktop;
- #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
-   return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET
diff --git a/chromium-next/patches/patch-components_sync__device__info_local__device__info__util__linux.cc b/chromium-next/patches/patch-components_sync__device__info_local__device__info__util__linux.cc
deleted file mode 100644
index 1ca3e1c3d7..0000000000
--- a/chromium-next/patches/patch-components_sync__device__info_local__device__info__util__linux.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/sync_device_info/local_device_info_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/sync_device_info/local_device_info_util_linux.cc
-@@ -9,6 +9,11 @@
- 
- #include "base/linux_util.h"
- 
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#include <sys/param.h>
-+#define HOST_NAME_MAX MAXHOSTNAMELEN
-+#endif
-+
- namespace syncer {
- 
- std::string GetPersonalizableDeviceNameInternal() {
diff --git a/chromium-next/patches/patch-components_sync__preferences_common__syncable__prefs__database.cc b/chromium-next/patches/patch-components_sync__preferences_common__syncable__prefs__database.cc
deleted file mode 100644
index e082365513..0000000000
--- a/chromium-next/patches/patch-components_sync__preferences_common__syncable__prefs__database.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/sync_preferences/common_syncable_prefs_database.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/sync_preferences/common_syncable_prefs_database.cc
-@@ -334,7 +334,7 @@ constexpr auto kCommonSyncablePrefsAllow
-           PrefSensitivity::kNone, MergeBehavior::kNone}},
- #endif  // BUILDFLAG(IS_ANDROID)
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-         {autofill::prefs::kAutofillBnplEnabled,
-          {syncable_prefs_ids::kAutofillBnplEnabled, syncer::PREFERENCES,
-           PrefSensitivity::kNone, MergeBehavior::kNone}},
diff --git a/chromium-next/patches/patch-components_sync_base_sync__util.cc b/chromium-next/patches/patch-components_sync_base_sync__util.cc
deleted file mode 100644
index cda727de4b..0000000000
--- a/chromium-next/patches/patch-components_sync_base_sync__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/sync/base/sync_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/sync/base/sync_util.cc
-@@ -44,6 +44,8 @@ std::string GetSystemString() {
-   system = "FREEBSD ";
- #elif BUILDFLAG(IS_OPENBSD)
-   system = "OPENBSD ";
-+#elif BUILDFLAG(IS_NETBSD)
-+  system = "NETBSD ";
- #elif BUILDFLAG(IS_MAC)
-   system = "MAC ";
- #endif
diff --git a/chromium-next/patches/patch-components_system__cpu_cpu__probe.cc b/chromium-next/patches/patch-components_system__cpu_cpu__probe.cc
deleted file mode 100644
index 1aeacb2569..0000000000
--- a/chromium-next/patches/patch-components_system__cpu_cpu__probe.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/system_cpu/cpu_probe.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/system_cpu/cpu_probe.cc
-@@ -30,6 +30,9 @@ std::unique_ptr<CpuProbe> CpuProbe::Crea
-   return CpuProbeWin::Create();
- #elif BUILDFLAG(IS_MAC)
-   return CpuProbeMac::Create();
-+#elif BUILDFLAG(IS_BSD)
-+  NOTIMPLEMENTED();
-+  return nullptr;
- #else
-   return nullptr;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium-next/patches/patch-components_translate_core_common_translate__util.cc b/chromium-next/patches/patch-components_translate_core_common_translate__util.cc
deleted file mode 100644
index f985dd0e09..0000000000
--- a/chromium-next/patches/patch-components_translate_core_common_translate__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/translate/core/common/translate_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/translate/core/common/translate_util.cc
-@@ -21,7 +21,7 @@ const char kSecurityOrigin[] = "https://
- BASE_FEATURE(kTFLiteLanguageDetectionEnabled,
-              "TFLiteLanguageDetectionEnabled",
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium-next/patches/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/chromium-next/patches/patch-components_trusted__vault_trusted__vault__connection__impl.cc
deleted file mode 100644
index 582e9d01f4..0000000000
--- a/chromium-next/patches/patch-components_trusted__vault_trusted__vault__connection__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/trusted_vault/trusted_vault_connection_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/trusted_vault/trusted_vault_connection_impl.cc
-@@ -103,7 +103,7 @@ GetLocalPhysicalDeviceType() {
-   // currently used or even built on all platforms.
- #if BUILDFLAG(IS_CHROMEOS)
-   return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_LINUX;
- #elif BUILDFLAG(IS_ANDROID)
-   return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_ANDROID;
diff --git a/chromium-next/patches/patch-components_update__client_update__query__params.cc b/chromium-next/patches/patch-components_update__client_update__query__params.cc
deleted file mode 100644
index 5f7e4e4449..0000000000
--- a/chromium-next/patches/patch-components_update__client_update__query__params.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/update_client/update_query_params.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/update_client/update_query_params.cc
-@@ -39,6 +39,10 @@ const char kOs[] =
-     "fuchsia";
- #elif BUILDFLAG(IS_OPENBSD)
-     "openbsd";
-+#elif defined(OS_FREEBSD)
-+    "freebsd";
-+#elif defined(OS_NETBSD)
-+    "netbsd";
- #else
- #error "unknown os"
- #endif
diff --git a/chromium-next/patches/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/chromium-next/patches/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
deleted file mode 100644
index 942ed1be08..0000000000
--- a/chromium-next/patches/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -298,7 +298,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
-   // The ideal fix would be to change the omnibox font used for Thai. In
-   // that case, the Linux-only list should be revisited and potentially
-   // removed.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-        "[ทนบพรหเแ๐ดลปฟม]",
- #else
-        "[บพเแ๐]",
diff --git a/chromium-next/patches/patch-components_user__education_views_help__bubble__view.cc b/chromium-next/patches/patch-components_user__education_views_help__bubble__view.cc
deleted file mode 100644
index fe80bcd202..0000000000
--- a/chromium-next/patches/patch-components_user__education_views_help__bubble__view.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/user_education/views/help_bubble_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/user_education/views/help_bubble_view.cc
-@@ -268,7 +268,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(He
- // TODO(https://crbug.com/382611284): Temporarily handle the case when the
- // primary window is minimized by closing the help bubble. Remove this code when
- // the issue is solved at the Views framework level.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver {
-  public:
-   explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble)
-@@ -743,7 +743,7 @@ HelpBubbleView::HelpBubbleView(
-     event_relay_->Init(this);
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   primary_widget_observer_ = std::make_unique<PrimaryWidgetObserver>(*this);
- #endif
- 
-@@ -855,7 +855,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect(
- void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
-                                               views::Widget* widget) const {
-   BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD)
-   // Help bubbles anchored to menus may be clipped to their anchors' bounds,
-   // resulting in visual errors, unless they use accelerated rendering. See
-   // crbug.com/1445770 for details. This also applies to bubbles anchored to
diff --git a/chromium-next/patches/patch-components_user__education_views_help__bubble__view.h b/chromium-next/patches/patch-components_user__education_views_help__bubble__view.h
deleted file mode 100644
index 390dc0789d..0000000000
--- a/chromium-next/patches/patch-components_user__education_views_help__bubble__view.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/user_education/views/help_bubble_view.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/user_education/views/help_bubble_view.h
-@@ -160,7 +160,7 @@ class HelpBubbleView : public views::Bub
- // work around this problem by closing the bubble if the widget is minimized.
- // When the underlying issue is fixed at the framework level, this can be
- // removed.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   class PrimaryWidgetObserver;
-   std::unique_ptr<PrimaryWidgetObserver> primary_widget_observer_;
- #endif
diff --git a/chromium-next/patches/patch-components_variations_service_variations__service.cc b/chromium-next/patches/patch-components_variations_service_variations__service.cc
deleted file mode 100644
index 6a96c21ee7..0000000000
--- a/chromium-next/patches/patch-components_variations_service_variations__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/variations/service/variations_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/variations/service/variations_service.cc
-@@ -100,7 +100,7 @@ std::string GetPlatformString() {
-   return "android";
- #elif BUILDFLAG(IS_FUCHSIA)
-   return "fuchsia";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_SOLARIS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_BSD)
-   // Default BSD and SOLARIS to Linux to not break those builds, although these
-   // platforms are not officially supported by Chrome.
-   return "linux";
diff --git a/chromium-next/patches/patch-components_visited__url__ranking_public_url__visit__util.cc b/chromium-next/patches/patch-components_visited__url__ranking_public_url__visit__util.cc
deleted file mode 100644
index f047b5a0c6..0000000000
--- a/chromium-next/patches/patch-components_visited__url__ranking_public_url__visit__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/visited_url_ranking/public/url_visit_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/visited_url_ranking/public/url_visit_util.cc
-@@ -67,7 +67,7 @@ PlatformType GetPlatformInput() {
-   return PlatformType::kWindows;
- #elif BUILDFLAG(IS_MAC)
-   return PlatformType::kMac;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return PlatformType::kLinux;
- #elif BUILDFLAG(IS_IOS)
-   return PlatformType::kIos;
diff --git a/chromium-next/patches/patch-components_viz_host_gpu__host__impl.cc b/chromium-next/patches/patch-components_viz_host_gpu__host__impl.cc
deleted file mode 100644
index 7f13d2b61e..0000000000
--- a/chromium-next/patches/patch-components_viz_host_gpu__host__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/host/gpu_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/host/gpu_host_impl.cc
-@@ -135,7 +135,7 @@ GpuHostImpl::GpuHostImpl(Delegate* deleg
-       mojom::GpuServiceCreationParams::New();
- #if BUILDFLAG(IS_OZONE)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Linux has an issue when running in single-process mode wherein
-   // GetPlatformRuntimeProperties() browser-side calls can have a data race with
-   // in-process GPU service initialization. The call to
diff --git a/chromium-next/patches/patch-components_viz_host_host__display__client.cc b/chromium-next/patches/patch-components_viz_host_host__display__client.cc
deleted file mode 100644
index f2f112f33d..0000000000
--- a/chromium-next/patches/patch-components_viz_host_host__display__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/host/host_display_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/host/host_display_client.cc
-@@ -65,7 +65,7 @@ void HostDisplayClient::AddChildWindowTo
- }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
- void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) {
-   NOTIMPLEMENTED();
- }
diff --git a/chromium-next/patches/patch-components_viz_host_host__display__client.h b/chromium-next/patches/patch-components_viz_host_host__display__client.h
deleted file mode 100644
index cb968b9264..0000000000
--- a/chromium-next/patches/patch-components_viz_host_host__display__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/host/host_display_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/host/host_display_client.h
-@@ -52,7 +52,7 @@ class VIZ_HOST_EXPORT HostDisplayClient 
-   void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override;
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
- #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
- 
diff --git a/chromium-next/patches/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/chromium-next/patches/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
deleted file mode 100644
index b8494378ce..0000000000
--- a/chromium-next/patches/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1510,7 +1510,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::G
-                                             ->GetVulkanPhysicalDevice(),
-                                         VK_IMAGE_TILING_OPTIMAL, vk_format,
-                                         si_format, yuv_color_space, ycbcr_info);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // Textures that were allocated _on linux_ with ycbcr info came from
-     // VaapiVideoDecoder, which exports using DRM format modifiers.
-     return GrBackendFormats::MakeVk(gr_ycbcr_info,
diff --git a/chromium-next/patches/patch-components_viz_service_display__embedder_software__output__surface.cc b/chromium-next/patches/patch-components_viz_service_display__embedder_software__output__surface.cc
deleted file mode 100644
index 7b75558d7f..0000000000
--- a/chromium-next/patches/patch-components_viz_service_display__embedder_software__output__surface.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/service/display_embedder/software_output_surface.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/service/display_embedder/software_output_surface.cc
-@@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersC
-   base::TimeTicks now = base::TimeTicks::Now();
-   base::TimeDelta interval_to_next_refresh =
-       now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (needs_swap_size_notifications_)
-     client_->DidSwapWithSize(pixel_size);
- #endif
-@@ -142,7 +142,7 @@ gfx::OverlayTransform SoftwareOutputSurf
-   return gfx::OVERLAY_TRANSFORM_NONE;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void SoftwareOutputSurface::SetNeedsSwapSizeNotifications(
-     bool needs_swap_size_notifications) {
-   needs_swap_size_notifications_ = needs_swap_size_notifications;
diff --git a/chromium-next/patches/patch-components_viz_service_display__embedder_software__output__surface.h b/chromium-next/patches/patch-components_viz_service_display__embedder_software__output__surface.h
deleted file mode 100644
index 6011347c69..0000000000
--- a/chromium-next/patches/patch-components_viz_service_display__embedder_software__output__surface.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/service/display_embedder/software_output_surface.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/service/display_embedder/software_output_surface.h
-@@ -41,7 +41,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputS
-       UpdateVSyncParametersCallback callback) override;
-   void SetDisplayTransformHint(gfx::OverlayTransform transform) override {}
-   gfx::OverlayTransform GetDisplayTransform() override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void SetNeedsSwapSizeNotifications(
-       bool needs_swap_size_notifications) override;
- #endif
-@@ -59,7 +59,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputS
-   base::TimeTicks refresh_timebase_;
-   base::TimeDelta refresh_interval_ = BeginFrameArgs::DefaultInterval();
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool needs_swap_size_notifications_ = false;
- #endif
- 
diff --git a/chromium-next/patches/patch-components_viz_service_display_skia__renderer.cc b/chromium-next/patches/patch-components_viz_service_display_skia__renderer.cc
deleted file mode 100644
index 4ae3523e37..0000000000
--- a/chromium-next/patches/patch-components_viz_service_display_skia__renderer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/service/display/skia_renderer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/service/display/skia_renderer.cc
-@@ -1391,7 +1391,7 @@ void SkiaRenderer::ClearFramebuffer() {
-   if (current_frame()->current_render_pass->has_transparent_background) {
-     ClearCanvas(SkColors::kTransparent);
-   } else {
--#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX)
-+#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-     // On DEBUG builds, opaque render passes are cleared to blue
-     // to easily see regions that were not drawn on the screen.
-     // ClearCavas() call causes slight pixel difference, so linux-ref and
diff --git a/chromium-next/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/chromium-next/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
deleted file mode 100644
index bd02e01d82..0000000000
--- a/chromium-next/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -126,7 +126,7 @@ RootCompositorFrameSinkImpl::Create(
-   output_surface->SetNeedsSwapSizeNotifications(
-       params->send_swap_size_notifications);
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   // For X11, we need notify client about swap completion after resizing, so the
-   // client can use it for synchronize with X11 WM.
-   output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -884,7 +884,7 @@ void RootCompositorFrameSinkImpl::Displa
-   if (display_client_ && enable_swap_completion_callback_) {
-     display_client_->DidCompleteSwapWithSize(pixel_size);
-   }
--#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   if (display_client_ && pixel_size != last_swap_pixel_size_) {
-     last_swap_pixel_size_ = pixel_size;
-     display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_);
diff --git a/chromium-next/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/chromium-next/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
deleted file mode 100644
index c3287d2501..0000000000
--- a/chromium-next/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -229,7 +229,7 @@ class VIZ_SERVICE_EXPORT RootCompositorF
-   base::TimeDelta preferred_frame_interval_ =
-       FrameRateDecider::UnspecifiedFrameInterval();
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   gfx::Size last_swap_pixel_size_;
- #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
- 
diff --git a/chromium-next/patches/patch-components_viz_test_fake__display__client.cc b/chromium-next/patches/patch-components_viz_test_fake__display__client.cc
deleted file mode 100644
index 6fd998c297..0000000000
--- a/chromium-next/patches/patch-components_viz_test_fake__display__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/test/fake_display_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/test/fake_display_client.cc
-@@ -27,7 +27,7 @@ void FakeDisplayClient::AddChildWindowTo
-     gpu::SurfaceHandle child_window) {}
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
- void FakeDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) {}
- #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
- 
diff --git a/chromium-next/patches/patch-components_viz_test_fake__display__client.h b/chromium-next/patches/patch-components_viz_test_fake__display__client.h
deleted file mode 100644
index b950bdd14e..0000000000
--- a/chromium-next/patches/patch-components_viz_test_fake__display__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/test/fake_display_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/test/fake_display_client.h
-@@ -36,7 +36,7 @@ class FakeDisplayClient : public mojom::
-   void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override;
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
- #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
- 
diff --git a/chromium-next/patches/patch-components_viz_test_mock__display__client.h b/chromium-next/patches/patch-components_viz_test_mock__display__client.h
deleted file mode 100644
index 4c96d0e35f..0000000000
--- a/chromium-next/patches/patch-components_viz_test_mock__display__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/viz/test/mock_display_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/viz/test/mock_display_client.h
-@@ -45,7 +45,7 @@ class MockDisplayClient : public mojom::
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
-   MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate));
- #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&));
- #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
- 
diff --git a/chromium-next/patches/patch-components_webui_flags_flags__state.cc b/chromium-next/patches/patch-components_webui_flags_flags__state.cc
deleted file mode 100644
index 3c8dfc51ef..0000000000
--- a/chromium-next/patches/patch-components_webui_flags_flags__state.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/webui/flags/flags_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ components/webui/flags/flags_state.cc
-@@ -782,7 +782,7 @@ unsigned short FlagsState::GetCurrentPla
-   return kOsWin;
- #elif BUILDFLAG(IS_CHROMEOS)
-   return kOsCrOS;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return kOsLinux;
- #elif BUILDFLAG(IS_ANDROID)
-   return kOsAndroid;
diff --git a/chromium-next/patches/patch-content_app_BUILD.gn b/chromium-next/patches/patch-content_app_BUILD.gn
deleted file mode 100644
index f0beaf2d99..0000000000
--- a/chromium-next/patches/patch-content_app_BUILD.gn
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/app/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/app/BUILD.gn
-@@ -90,9 +90,9 @@ source_set("content_main_runner_app") {
-            "//third_party/tflite:buildflags",
-            "//tools/v8_context_snapshot:buildflags",
-          ]
--  if (build_tflite_with_xnnpack) {
--    deps += [ "//third_party/cpuinfo" ]
--  }
-+#  if (build_tflite_with_xnnpack) {
-+#    deps += [ "//third_party/cpuinfo" ]
-+#  }
- }
- 
- source_set("app") {
diff --git a/chromium-next/patches/patch-content_app_content__main.cc b/chromium-next/patches/patch-content_app_content__main.cc
deleted file mode 100644
index c7627102d5..0000000000
--- a/chromium-next/patches/patch-content_app_content__main.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/app/content_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/app/content_main.cc
-@@ -227,7 +227,7 @@ NO_STACK_PROTECTOR int RunContentProcess
-     base::EnableTerminationOnOutOfMemory();
-     logging::RegisterAbslAbortHook();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // The various desktop environments set this environment variable that
-     // allows the dbus client library to connect directly to the bus. When this
-     // variable is not set (test environments like xvfb-run), the dbus client
-@@ -317,7 +317,7 @@ NO_STACK_PROTECTOR int RunContentProcess
- #endif
- #endif
- 
--#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD)
-+#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD) && defined(notyet)
-     base::subtle::EnableFDOwnershipEnforcement(true);
- #endif
- 
diff --git a/chromium-next/patches/patch-content_app_content__main__runner__impl.cc b/chromium-next/patches/patch-content_app_content__main__runner__impl.cc
deleted file mode 100644
index 009df48b85..0000000000
--- a/chromium-next/patches/patch-content_app_content__main__runner__impl.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/app/content_main_runner_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/app/content_main_runner_impl.cc
-@@ -146,18 +146,20 @@
- #include "content/browser/posix_file_descriptor_info_impl.h"
- #include "content/public/common/content_descriptors.h"
- 
--#if !BUILDFLAG(IS_MAC)
-+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
- #include "content/public/common/zygote/zygote_fork_delegate_linux.h"
- #endif
- 
- #endif  // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/files/file_path_watcher_inotify.h"
- #include "base/native_library.h"
- #include "base/rand_util.h"
- #include "content/public/common/zygote/sandbox_support_linux.h"
-+#if !BUILDFLAG(IS_BSD)
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- #include "third_party/boringssl/src/include/openssl/crypto.h"
- #include "third_party/webrtc_overrides/init_webrtc.h"  // nogncheck
- 
-@@ -186,6 +188,10 @@
- #include "media/base/media_switches.h"
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#include "base/system/sys_info.h"
-+#endif
-+
- #if BUILDFLAG(IS_ANDROID)
- #include "base/system/sys_info.h"
- #include "content/browser/android/battery_metrics.h"
-@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserPr
- }
- #endif  // BUILDFLAG(USE_ZYGOTE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- #if BUILDFLAG(ENABLE_PPAPI)
- // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -422,7 +428,10 @@ void PreloadLibraryCdms() {
- 
- void PreSandboxInit() {
-   // Ensure the /dev/urandom is opened.
-+  // we use arc4random
-+#if !BUILDFLAG(IS_BSD)
-   base::GetUrandomFD();
-+#endif
- 
-   // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
-   // files.
-@@ -434,9 +443,16 @@ void PreSandboxInit() {
-   // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
-   CRYPTO_pre_sandbox_init();
- 
-+#if BUILDFLAG(IS_BSD)
-+  // "cache" the amount of physical memory before pledge(2)
-+  base::SysInfo::AmountOfPhysicalMemoryMB();
-+#endif
-+
-+#if !BUILDFLAG(IS_BSD)
-   // Pre-read /proc/sys/fs/inotify/max_user_watches so it doesn't have to be
-   // allowed by the sandbox.
-   base::GetMaxNumberOfInotifyWatches();
-+#endif
- 
- #if BUILDFLAG(ENABLE_PPAPI)
-   // Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -750,7 +766,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProc
-     unregister_thread_closure = base::HangWatcher::RegisterThread(
-         base::HangWatcher::ThreadType::kMainThread);
-     bool start_hang_watcher_now;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is
-     // initialized, because the sandbox can't be started with multiple threads.
-     // TODO(mpdenton): start the HangWatcher after the sandbox is initialized.
-@@ -863,11 +879,10 @@ int ContentMainRunnerImpl::Initialize(Co
-                  base::GlobalDescriptors::kBaseDescriptor);
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-   g_fds->Set(kCrashDumpSignal,
-              kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor);
--#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
--        // BUILDFLAG(IS_OPENBSD)
-+#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
- #endif  // !BUILDFLAG(IS_WIN)
- 
-@@ -1048,10 +1063,22 @@ int ContentMainRunnerImpl::Initialize(Co
-       process_type == switches::kZygoteProcess) {
-     PreSandboxInit();
-   }
-+#elif BUILDFLAG(IS_BSD)
-+  PreSandboxInit();
- #elif BUILDFLAG(IS_IOS)
-   ChildProcessEnterSandbox();
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+  if (process_type.empty()) {
-+    sandbox::policy::SandboxLinux::Options sandbox_options;
-+    sandbox::policy::SandboxLinux::GetInstance()->InitializeSandbox(
-+        sandbox::policy::SandboxTypeFromCommandLine(
-+            *base::CommandLine::ForCurrentProcess()),
-+        sandbox::policy::SandboxLinux::PreSandboxHook(), sandbox_options);
-+  }
-+#endif
-+
-   delegate_->SandboxInitialized(process_type);
- 
- #if BUILDFLAG(USE_ZYGOTE)
-@@ -1149,6 +1176,11 @@ NO_STACK_PROTECTOR int ContentMainRunner
- 
-   RegisterMainThreadFactories();
- 
-+#if BUILDFLAG(IS_BSD)
-+  if (!process_type.empty())
-+    PreSandboxInit();
-+#endif 
-+
-   if (process_type.empty())
-     return RunBrowser(std::move(main_params), start_minimal_browser);
- 
diff --git a/chromium-next/patches/patch-content_browser_BUILD.gn b/chromium-next/patches/patch-content_browser_BUILD.gn
deleted file mode 100644
index 6e08f061f6..0000000000
--- a/chromium-next/patches/patch-content_browser_BUILD.gn
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/BUILD.gn
-@@ -2560,6 +2560,14 @@ source_set("browser") {
-     ]
-   }
- 
-+  if (is_bsd) {
-+    sources += [
-+      "file_system_access/file_path_watcher/file_path_watcher_bsd.cc",
-+      "file_system_access/file_path_watcher/file_path_watcher_kqueue.cc",
-+      "file_system_access/file_path_watcher/file_path_watcher_kqueue.h",
-+    ]
-+  }
-+
-   if (is_linux || is_chromeos) {
-     sources -=
-         [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ]
-@@ -2607,6 +2615,15 @@ source_set("browser") {
-     deps += [ "//media/mojo/mojom" ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "file_system_access/file_path_watcher/file_path_watcher_inotify.cc",
-+      "file_system_access/file_path_watcher/file_path_watcher_inotify.h",
-+      "sandbox_ipc_linux.cc",
-+      "sandbox_ipc_linux.h",
-+    ]
-+  }
-+
-   if (is_chromeos) {
-     sources += [
-       "handwriting/handwriting_recognition_service_impl_cros.cc",
diff --git a/chromium-next/patches/patch-content_browser_accessibility_browser__accessibility__state__impl.cc b/chromium-next/patches/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
deleted file mode 100644
index 1372704e85..0000000000
--- a/chromium-next/patches/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/accessibility/browser_accessibility_state_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/accessibility/browser_accessibility_state_impl.cc
-@@ -180,7 +180,7 @@ BrowserAccessibilityStateImpl* BrowserAc
- 
- // On Android, Mac, Windows and Linux there are platform-specific subclasses.
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_MAC) && \
--    !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+    !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
- // static
- std::unique_ptr<BrowserAccessibilityStateImpl>
- BrowserAccessibilityStateImpl::Create() {
diff --git a/chromium-next/patches/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc b/chromium-next/patches/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
deleted file mode 100644
index 44a2de2c6a..0000000000
--- a/chromium-next/patches/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc
-@@ -32,7 +32,15 @@ bool CheckCmdlineForOrca(const std::stri
-   std::string cmdline;
-   std::stringstream ss(cmdline_all);
-   while (std::getline(ss, cmdline, '\0')) {
-+#if BUILDFLAG(IS_BSD)
-+#if BUILDFLAG(IS_NETBSD)
-+    re2::RE2 orca_regex(R"((^|/)(usr/)?(pkg/)?bin/orca(\s|$))");
-+#else
-+    re2::RE2 orca_regex(R"((^|/)(usr/)?(local/)?bin/orca(\s|$))");
-+#endif
-+#else
-     re2::RE2 orca_regex(R"((^|/)(usr/)?bin/orca(\s|$))");
-+#endif
-     if (re2::RE2::PartialMatch(cmdline, orca_regex)) {
-       return true;  // Orca was found
-     }
-@@ -42,6 +50,10 @@ bool CheckCmdlineForOrca(const std::stri
- 
- // Returns true if Orca is active.
- bool DiscoverOrca() {
-+#if BUILDFLAG(IS_BSD)
-+  NOTIMPLEMENTED();
-+  return false;
-+#else
-   // NOTE: this method is run from another thread to reduce jank, since
-   // there's no guarantee these system calls will return quickly.
-   std::unique_ptr<DIR, decltype(&CloseDir)> proc_dir(opendir("/proc"),
-@@ -79,6 +91,7 @@ bool DiscoverOrca() {
-   }
- 
-   return is_orca_active;
-+#endif
- }
- 
- }  // namespace
diff --git a/chromium-next/patches/patch-content_browser_audio_audio__service.cc b/chromium-next/patches/patch-content_browser_audio_audio__service.cc
deleted file mode 100644
index be9317c4a9..0000000000
--- a/chromium-next/patches/patch-content_browser_audio_audio__service.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/audio/audio_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/audio/audio_service.cc
-@@ -33,7 +33,7 @@
- #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
- #include "ui/display/util/edid_parser.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/display/display_util.h"
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -201,7 +201,7 @@ audio::mojom::AudioService& GetAudioServ
-         ->PostTaskAndReplyWithResult(
-             FROM_HERE, base::BindOnce(&ScanEdidBitstreams),
-             base::BindOnce(&LaunchAudioService, std::move(receiver)));
--#elif BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) && BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-     LaunchAudioService(
-         std::move(receiver),
-         ConvertEdidBitstreams(display::DisplayUtil::GetAudioFormats()));
diff --git a/chromium-next/patches/patch-content_browser_browser__child__process__host__impl.cc b/chromium-next/patches/patch-content_browser_browser__child__process__host__impl.cc
deleted file mode 100644
index 0e2526e148..0000000000
--- a/chromium-next/patches/patch-content_browser_browser__child__process__host__impl.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/browser_child_process_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/browser_child_process_host_impl.cc
-@@ -326,6 +326,7 @@ void BrowserChildProcessHostImpl::Launch
-       switches::kLogBestEffortTasks,
-       switches::kPerfettoDisableInterning,
-       switches::kTraceToConsole,
-+      switches::kDisableUnveil,
-   };
-   cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches);
- 
-@@ -690,7 +691,7 @@ void BrowserChildProcessHostImpl::OnProc
-           ->child_process());
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   child_thread_type_switcher_.SetPid(process.Pid());
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
diff --git a/chromium-next/patches/patch-content_browser_browser__child__process__host__impl.h b/chromium-next/patches/patch-content_browser_browser__child__process__host__impl.h
deleted file mode 100644
index b667657b47..0000000000
--- a/chromium-next/patches/patch-content_browser_browser__child__process__host__impl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/browser_child_process_host_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/browser_child_process_host_impl.h
-@@ -36,7 +36,7 @@
- #include "base/win/object_watcher.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/browser/child_thread_type_switcher_linux.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -287,7 +287,7 @@ class BrowserChildProcessHostImpl
-   std::unique_ptr<tracing::SystemTracingService> system_tracing_service_;
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   ChildThreadTypeSwitcher child_thread_type_switcher_;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
diff --git a/chromium-next/patches/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc b/chromium-next/patches/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
deleted file mode 100644
index f924182f35..0000000000
--- a/chromium-next/patches/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/browser_child_process_host_impl_receiver_bindings.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/browser_child_process_host_impl_receiver_bindings.cc
-@@ -64,7 +64,7 @@ void BrowserChildProcessHostImpl::BindHo
-     }
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (auto r = receiver.As<mojom::ThreadTypeSwitcher>()) {
-     child_thread_type_switcher_.Bind(std::move(r));
-     return;
diff --git a/chromium-next/patches/patch-content_browser_browser__main__loop.cc b/chromium-next/patches/patch-content_browser_browser__main__loop.cc
deleted file mode 100644
index f367c44e8f..0000000000
--- a/chromium-next/patches/patch-content_browser_browser__main__loop.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/browser_main_loop.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/browser_main_loop.cc
-@@ -249,6 +249,12 @@
- #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#include "content/browser/sandbox_host_linux.h"
-+#include "content/public/common/zygote/sandbox_support_linux.h"
-+#include "sandbox/policy/sandbox.h"
-+#endif
-+
- // One of the linux specific headers defines this as a macro.
- #ifdef DestroyAll
- #undef DestroyAll
-@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization
-   // by now since a thread to start the ServiceManager has been created
-   // before the browser main loop starts.
-   DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
-+#elif BUILDFLAG(IS_BSD)
-+  base::FileHandleMappingVector additional_remapped_fds;
-+  base::LaunchOptions options;
-+  SandboxHostLinux::GetInstance()->Init();
-+  const int sfd = SandboxHostLinux::GetInstance()->GetChildSocket();
-+  options.fds_to_remap.push_back(std::make_pair(sfd, GetSandboxFD()));
- #endif
- 
-   // GLib's spawning of new processes is buggy, so it's important that at this
-@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization
-       base::ThreadType::kDisplayCritical);
- 
- #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   // We use quite a few file descriptors for our IPC as well as disk the disk
-   // cache, and the default limit on Apple is low (256), so bump it up.
- 
diff --git a/chromium-next/patches/patch-content_browser_child__process__launcher__helper.h b/chromium-next/patches/patch-content_browser_child__process__launcher__helper.h
deleted file mode 100644
index a08a2dadb4..0000000000
--- a/chromium-next/patches/patch-content_browser_child__process__launcher__helper.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/child_process_launcher_helper.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/child_process_launcher_helper.h
-@@ -308,7 +308,7 @@ class ChildProcessLauncherHelper
-   std::optional<base::ProcessId> process_id_ = std::nullopt;
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // The priority of the process. The state is stored to avoid changing the
-   // setting repeatedly.
-   std::optional<base::Process::Priority> priority_;
diff --git a/chromium-next/patches/patch-content_browser_child__process__launcher__helper__linux.cc b/chromium-next/patches/patch-content_browser_child__process__launcher__helper__linux.cc
deleted file mode 100644
index 597b85fe19..0000000000
--- a/chromium-next/patches/patch-content_browser_child__process__launcher__helper__linux.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/child_process_launcher_helper_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/child_process_launcher_helper_linux.cc
-@@ -22,7 +22,9 @@
- #include "content/public/common/result_codes.h"
- #include "content/public/common/sandboxed_process_launcher_delegate.h"
- #include "content/public/common/zygote/sandbox_support_linux.h"
-+#if !BUILDFLAG(IS_BSD)
- #include "content/public/common/zygote/zygote_handle.h"
-+#endif
- #include "sandbox/policy/linux/sandbox_linux.h"
- 
- namespace content {
-@@ -47,14 +49,20 @@ ChildProcessLauncherHelper::GetFilesToMa
- }
- 
- bool ChildProcessLauncherHelper::IsUsingLaunchOptions() {
-+#if !BUILDFLAG(IS_BSD)
-   return !GetZygoteForLaunch();
-+#else
-+  return true;
-+#endif
- }
- 
- bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
-     PosixFileDescriptorInfo& files_to_register,
-     base::LaunchOptions* options) {
-   if (options) {
-+#if !BUILDFLAG(IS_BSD)
-     DCHECK(!GetZygoteForLaunch());
-+#endif
-     // Convert FD mapping to FileHandleMappingVector
-     options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(
-         base::GlobalDescriptors::kBaseDescriptor);
-@@ -66,7 +74,9 @@ bool ChildProcessLauncherHelper::BeforeL
- 
-     options->environment = delegate_->GetEnvironment();
-   } else {
-+#if !BUILDFLAG(IS_BSD)
-     DCHECK(GetZygoteForLaunch());
-+#endif
-     // Environment variables could be supported in the future, but are not
-     // currently supported when launching with the zygote.
-     DCHECK(delegate_->GetEnvironment().empty());
-@@ -83,6 +93,7 @@ ChildProcessLauncherHelper::LaunchProces
-     int* launch_result) {
-   *is_synchronous_launch = true;
-   Process process;
-+#if !BUILDFLAG(IS_BSD)
-   ZygoteCommunication* zygote_handle = GetZygoteForLaunch();
-   if (zygote_handle) {
-     // TODO(crbug.com/40448989): If chrome supported multiple zygotes they could
-@@ -93,7 +104,6 @@ ChildProcessLauncherHelper::LaunchProces
-         GetProcessType());
-     *launch_result = LAUNCH_RESULT_SUCCESS;
- 
--#if !BUILDFLAG(IS_OPENBSD)
-     if (handle) {
-       // It could be a renderer process or an utility process.
-       int oom_score = content::kMiscOomScore;
-@@ -102,15 +112,17 @@ ChildProcessLauncherHelper::LaunchProces
-         oom_score = content::kLowestRendererOomScore;
-       ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score);
-     }
--#endif
- 
-     process.process = base::Process(handle);
-     process.zygote = zygote_handle;
-   } else {
-+#endif
-     process.process = base::LaunchProcess(*command_line(), *options);
-     *launch_result = process.process.IsValid() ? LAUNCH_RESULT_SUCCESS
-                                                : LAUNCH_RESULT_FAILURE;
-+#if !BUILDFLAG(IS_BSD)
-   }
-+#endif
- 
- #if BUILDFLAG(IS_CHROMEOS)
-   process_id_ = process.process.Pid();
-@@ -134,10 +146,14 @@ ChildProcessTerminationInfo ChildProcess
-     const ChildProcessLauncherHelper::Process& process,
-     bool known_dead) {
-   ChildProcessTerminationInfo info;
-+#if !BUILDFLAG(IS_BSD)
-   if (process.zygote) {
-     info.status = process.zygote->GetTerminationStatus(
-         process.process.Handle(), known_dead, &info.exit_code);
-   } else if (known_dead) {
-+#else
-+  if (known_dead) {
-+#endif
-     info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
-                                                       &info.exit_code);
-   } else {
-@@ -163,13 +179,17 @@ void ChildProcessLauncherHelper::ForceNo
-   DCHECK(CurrentlyOnProcessLauncherTaskRunner());
-   process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
-   // On POSIX, we must additionally reap the child.
-+#if !BUILDFLAG(IS_BSD)
-   if (process.zygote) {
-     // If the renderer was created via a zygote, we have to proxy the reaping
-     // through the zygote process.
-     process.zygote->EnsureProcessTerminated(process.process.Handle());
-   } else {
-+#endif
-     base::EnsureProcessTerminated(std::move(process.process));
-+#if !BUILDFLAG(IS_BSD)
-   }
-+#endif
- }
- 
- void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
-@@ -182,11 +202,13 @@ void ChildProcessLauncherHelper::SetProc
-   }
- }
- 
-+#if !BUILDFLAG(IS_BSD)
- ZygoteCommunication* ChildProcessLauncherHelper::GetZygoteForLaunch() {
-   return base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
-              ? nullptr
-              : delegate_->GetZygote();
- }
-+#endif
- 
- base::File OpenFileToShare(const base::FilePath& path,
-                            base::MemoryMappedFile::Region* region) {
diff --git a/chromium-next/patches/patch-content_browser_child__thread__type__switcher__linux.cc b/chromium-next/patches/patch-content_browser_child__thread__type__switcher__linux.cc
deleted file mode 100644
index 2647b30e8b..0000000000
--- a/chromium-next/patches/patch-content_browser_child__thread__type__switcher__linux.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/child_thread_type_switcher_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/child_thread_type_switcher_linux.cc
-@@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base:
-                                    base::ThreadType thread_type) {
-   DCHECK(CurrentlyOnProcessLauncherTaskRunner());
- 
-+#if BUILDFLAG(IS_BSD)
-+  NOTIMPLEMENTED();
-+#else
-   bool ns_pid_supported = false;
-   pid_t peer_tid =
-       base::FindThreadID(peer_pid, ns_tid.raw(), &ns_pid_supported);
-@@ -41,6 +44,7 @@ void SetThreadTypeOnLauncherThread(base:
-   base::PlatformThread::SetThreadType(peer_pid,
-                                       base::PlatformThreadId(peer_tid),
-                                       thread_type, base::IsViaIPC(true));
-+#endif
- }
- 
- }  // namespace
-@@ -69,7 +73,7 @@ void ChildThreadTypeSwitcher::SetPid(bas
-   }
- }
- 
--void ChildThreadTypeSwitcher::SetThreadType(int32_t ns_tid,
-+void ChildThreadTypeSwitcher::SetThreadType(uint64_t ns_tid,
-                                             base::ThreadType thread_type) {
-   // This function is only used on platforms with 32-bit thread ids.
-   static_assert(sizeof(ns_tid) == sizeof(base::PlatformThreadId));
diff --git a/chromium-next/patches/patch-content_browser_child__thread__type__switcher__linux.h b/chromium-next/patches/patch-content_browser_child__thread__type__switcher__linux.h
deleted file mode 100644
index 061081c457..0000000000
--- a/chromium-next/patches/patch-content_browser_child__thread__type__switcher__linux.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/child_thread_type_switcher_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/child_thread_type_switcher_linux.h
-@@ -36,7 +36,7 @@ class ChildThreadTypeSwitcher : public m
-   void SetPid(base::ProcessId child_pid);
- 
-   // mojom::ThreadTypeSwitcher:
--  void SetThreadType(int32_t ns_tid, base::ThreadType thread_type) override;
-+  void SetThreadType(uint64_t ns_tid, base::ThreadType thread_type) override;
- 
-  private:
-   base::ProcessId child_pid_ = base::kNullProcessHandle;
diff --git a/chromium-next/patches/patch-content_browser_compositor_viz__process__transport__factory.cc b/chromium-next/patches/patch-content_browser_compositor_viz__process__transport__factory.cc
deleted file mode 100644
index 129046cf07..0000000000
--- a/chromium-next/patches/patch-content_browser_compositor_viz__process__transport__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/compositor/viz_process_transport_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::Ho
-   HostDisplayClient& operator=(const HostDisplayClient&) = delete;
- 
-   // viz::HostDisplayClient:
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   void DidCompleteSwapWithNewSize(const gfx::Size& size) override {
-     compositor_->OnCompleteSwapWithNewSize(size);
-   }
diff --git a/chromium-next/patches/patch-content_browser_devtools_devtools__frontend__host__impl.cc b/chromium-next/patches/patch-content_browser_devtools_devtools__frontend__host__impl.cc
deleted file mode 100644
index 96e038f3ec..0000000000
--- a/chromium-next/patches/patch-content_browser_devtools_devtools__frontend__host__impl.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/devtools/devtools_frontend_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/devtools/devtools_frontend_host_impl.cc
-@@ -24,7 +24,7 @@
- #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
- #include "ui/base/webui/resource_path.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/crash/content/browser/error_reporting/javascript_error_report.h"  // nogncheck
- #include "components/crash/content/browser/error_reporting/js_error_report_processor.h"  // nogncheck
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -36,7 +36,7 @@ const char kCompatibilityScriptSourceURL
-     "\n//# "
-     "sourceURL=devtools://devtools/bundled/devtools_compatibility.js";
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Remove the pieces of the URL we don't want to send back with the error
- // reports. In particular, do not send query or fragments as those can have
- // privacy-sensitive information in them.
-@@ -106,7 +106,7 @@ DevToolsFrontendHostImpl::DevToolsFronte
-     const HandleMessageCallback& handle_message_callback)
-     : web_contents_(WebContents::FromRenderFrameHost(frame_host)),
-       handle_message_callback_(handle_message_callback) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   Observe(web_contents_);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-   mojo::AssociatedRemote<blink::mojom::DevToolsFrontend> frontend;
-@@ -131,7 +131,7 @@ void DevToolsFrontendHostImpl::DispatchE
-   handle_message_callback_.Run(std::move(message));
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void DevToolsFrontendHostImpl::OnDidAddMessageToConsole(
-     RenderFrameHost* source_frame,
-     blink::mojom::ConsoleMessageLevel log_level,
diff --git a/chromium-next/patches/patch-content_browser_devtools_devtools__frontend__host__impl.h b/chromium-next/patches/patch-content_browser_devtools_devtools__frontend__host__impl.h
deleted file mode 100644
index 0d20aa7475..0000000000
--- a/chromium-next/patches/patch-content_browser_devtools_devtools__frontend__host__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/devtools/devtools_frontend_host_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/devtools/devtools_frontend_host_impl.h
-@@ -34,7 +34,7 @@ class DevToolsFrontendHostImpl : public 
- 
-   void BadMessageReceived() override;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   void OnDidAddMessageToConsole(
-       RenderFrameHost* source_frame,
-       blink::mojom::ConsoleMessageLevel log_level,
diff --git a/chromium-next/patches/patch-content_browser_devtools_protocol_system__info__handler.cc b/chromium-next/patches/patch-content_browser_devtools_protocol_system__info__handler.cc
deleted file mode 100644
index 457d91634a..0000000000
--- a/chromium-next/patches/patch-content_browser_devtools_protocol_system__info__handler.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/devtools/protocol/system_info_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/devtools/protocol/system_info_handler.cc
-@@ -52,7 +52,7 @@ std::unique_ptr<SystemInfo::Size> GfxSiz
- // 1046598, and 1153667.
- // Windows builds need more time -- see Issue 873112 and 1004472.
- // Mac builds need more time - see Issue angleproject:6182.
--#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !defined(NDEBUG)) || \
-+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && !defined(NDEBUG)) || \
-     BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_OZONE)
- static constexpr int kGPUInfoWatchdogTimeoutMultiplierOS = 3;
- #else
diff --git a/chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h b/chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
deleted file mode 100644
index 223f41014f..0000000000
--- a/chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/file_system_access/file_path_watcher/file_path_watcher.h
-@@ -126,7 +126,7 @@ class CONTENT_EXPORT FilePathWatcher {
-     Type type = Type::kNonRecursive;
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     // The callback will return the full path to a changed file instead of
-     // the watched path supplied as |path| when Watch is called.
-     // So the full path can be different from the watched path when a folder is
diff --git a/chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc b/chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
deleted file mode 100644
index 13908dcdb8..0000000000
--- a/chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc.orig	2025-05-08 12:01:57.732821580 +0000
-+++ content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc
-@@ -0,0 +1,60 @@
-+// Copyright 2024 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "content/browser/file_system_access/file_path_watcher/file_path_watcher.h"
-+
-+#include <memory>
-+
-+#include "base/memory/ptr_util.h"
-+#include "build/build_config.h"
-+#include "content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h"
-+
-+namespace content {
-+
-+namespace {
-+
-+class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
-+ public:
-+  FilePathWatcherImpl() = default;
-+  FilePathWatcherImpl(const FilePathWatcherImpl&) = delete;
-+  FilePathWatcherImpl& operator=(const FilePathWatcherImpl&) = delete;
-+  ~FilePathWatcherImpl() override = default;
-+
-+  bool Watch(const base::FilePath& path,
-+             Type type,
-+             const FilePathWatcher::Callback& callback) override {
-+    DCHECK(!impl_.get());
-+    if (type == Type::kRecursive) {
-+      if (!FilePathWatcher::RecursiveWatchAvailable()) {
-+        return false;
-+      }
-+    } else {
-+      impl_ = std::make_unique<FilePathWatcherKQueue>();
-+    }
-+    DCHECK(impl_.get());
-+    return impl_->Watch(path, type, callback);
-+  }
-+
-+  void Cancel() override {
-+    if (impl_.get()) {
-+      impl_->Cancel();
-+    }
-+    set_cancelled();
-+  }
-+
-+ private:
-+  std::unique_ptr<PlatformDelegate> impl_;
-+};
-+
-+}  // namespace
-+
-+FilePathWatcher::FilePathWatcher()
-+    : FilePathWatcher(std::make_unique<FilePathWatcherImpl>()) {}
-+
-+// static
-+size_t FilePathWatcher::GetQuotaLimitImpl() {
-+  return std::numeric_limits<size_t>::max();
-+}
-+
-+}  // namespace content
diff --git a/chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h b/chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
deleted file mode 100644
index a33b73c196..0000000000
--- a/chromium-next/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h
-@@ -5,6 +5,7 @@
- #ifndef CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_PATH_WATCHER_FILE_PATH_WATCHER_KQUEUE_H_
- #define CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_PATH_WATCHER_FILE_PATH_WATCHER_KQUEUE_H_
- 
-+#include <sys/time.h>
- #include <sys/event.h>
- 
- #include <memory>
diff --git a/chromium-next/patches/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc b/chromium-next/patches/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
deleted file mode 100644
index 5915d56af4..0000000000
--- a/chromium-next/patches/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/file_system_access/file_system_access_local_path_watcher.cc
-@@ -67,7 +67,7 @@ void FileSystemAccessLocalPathWatcher::I
-       .type = scope().IsRecursive() ? FilePathWatcher::Type::kRecursive
-                                     : FilePathWatcher::Type::kNonRecursive,
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       // Note: `report_modified_path` is also present on Android
-       // and Fuchsia. Update this switch if support for watching
-       // the local file system is added on those platforms.
diff --git a/chromium-next/patches/patch-content_browser_font__access_font__enumeration__data__source.cc b/chromium-next/patches/patch-content_browser_font__access_font__enumeration__data__source.cc
deleted file mode 100644
index 8e36ff4f6b..0000000000
--- a/chromium-next/patches/patch-content_browser_font__access_font__enumeration__data__source.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/font_access/font_enumeration_data_source.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/font_access/font_enumeration_data_source.cc
-@@ -16,7 +16,7 @@
- #include "content/browser/font_access/font_enumeration_data_source_win.h"
- #elif BUILDFLAG(IS_APPLE)
- #include "content/browser/font_access/font_enumeration_data_source_mac.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/browser/font_access/font_enumeration_data_source_linux.h"
- #endif  // BUILDFLAG(IS_WIN)
- 
-@@ -61,7 +61,7 @@ std::unique_ptr<FontEnumerationDataSourc
-   return std::make_unique<FontEnumerationDataSourceWin>();
- #elif BUILDFLAG(IS_APPLE)
-   return std::make_unique<FontEnumerationDataSourceMac>();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return std::make_unique<FontEnumerationDataSourceLinux>();
- #else
-   return std::make_unique<FontEnumerationDataSourceNull>();
-@@ -76,7 +76,7 @@ bool FontEnumerationDataSource::IsOsSupp
-   return true;
- #elif BUILDFLAG(IS_APPLE)
-   return true;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
diff --git a/chromium-next/patches/patch-content_browser_gpu_compositor__util.cc b/chromium-next/patches/patch-content_browser_gpu_compositor__util.cc
deleted file mode 100644
index e5064ca548..0000000000
--- a/chromium-next/patches/patch-content_browser_gpu_compositor__util.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/gpu/compositor_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/gpu/compositor_util.cc
-@@ -142,7 +142,7 @@ std::vector<GpuFeatureData> GetGpuFeatur
-       "video_decode",
-       SafeGetFeatureStatus(
-           gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-           !base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) ||
- #endif  // BUILDFLAG(IS_LINUX)
-               command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)),
-@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatur
-       "video_encode",
-       SafeGetFeatureStatus(
-           gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE,
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-           !base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux)),
- #else
-           command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode)),
diff --git a/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl.cc b/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl.cc
deleted file mode 100644
index ffa856f383..0000000000
--- a/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/gpu/gpu_data_manager_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/gpu/gpu_data_manager_impl.cc
-@@ -412,7 +412,7 @@ void GpuDataManagerImpl::OnDisplayMetric
-   private_->OnDisplayMetricsChanged(display, changed_metrics);
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool GpuDataManagerImpl::IsGpuMemoryBufferNV12Supported() {
-   base::AutoLock auto_lock(lock_);
-   return private_->IsGpuMemoryBufferNV12Supported();
diff --git a/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl.h b/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl.h
deleted file mode 100644
index 79e76a2b8e..0000000000
--- a/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/gpu/gpu_data_manager_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/gpu/gpu_data_manager_impl.h
-@@ -225,7 +225,7 @@ class CONTENT_EXPORT GpuDataManagerImpl 
-   void OnDisplayMetricsChanged(const display::Display& display,
-                                uint32_t changed_metrics) override;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool IsGpuMemoryBufferNV12Supported();
-   void SetGpuMemoryBufferNV12Supported(bool supported);
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
deleted file mode 100644
index c8a772a9d7..0000000000
--- a/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1692,7 +1692,7 @@ void GpuDataManagerImplPrivate::RecordCo
-   UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool GpuDataManagerImplPrivate::IsGpuMemoryBufferNV12Supported() {
-   return is_gpu_memory_buffer_NV12_supported_;
- }
diff --git a/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.h
deleted file mode 100644
index 7285a472e9..0000000000
--- a/chromium-next/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
-   void OnDisplayMetricsChanged(const display::Display& display,
-                                uint32_t changed_metrics);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool IsGpuMemoryBufferNV12Supported();
-   void SetGpuMemoryBufferNV12Supported(bool supported);
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -313,7 +313,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
-   bool application_is_visible_ = true;
- 
-   bool disable_gpu_compositing_ = false;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool is_gpu_memory_buffer_NV12_supported_ = false;
- #endif  // BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/chromium-next/patches/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
deleted file mode 100644
index 0f8da20c57..0000000000
--- a/chromium-next/patches/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
-@@ -46,7 +46,7 @@ scoped_refptr<base::SingleThreadTaskRunn
- #endif
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool IsGpuMemoryBufferNV12Supported() {
-   static bool is_computed = false;
-   static bool supported = false;
-@@ -111,7 +111,7 @@ void GpuMemoryBufferManagerSingleton::Re
- }
- 
- void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUpdate() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Dynamic check whether the NV12 format is supported as it may be
-   // inconsistent between the system GBM (Generic Buffer Management) and
-   // chromium miniGBM.
diff --git a/chromium-next/patches/patch-content_browser_gpu_gpu__process__host.cc b/chromium-next/patches/patch-content_browser_gpu_gpu__process__host.cc
deleted file mode 100644
index b102ad9424..0000000000
--- a/chromium-next/patches/patch-content_browser_gpu_gpu__process__host.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/gpu/gpu_process_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/gpu/gpu_process_host.cc
-@@ -275,6 +275,7 @@ static const char* const kSwitchNames[] 
-     switches::kDisableSkiaGraphite,
-     switches::kDisableSkiaGraphitePrecompilation,
-     switches::kDisableLowEndDeviceMode,
-+    switches::kDisableUnveil,
-     switches::kProfilingAtStart,
-     switches::kProfilingFile,
-     switches::kProfilingFlush,
-@@ -304,7 +305,7 @@ static const char* const kSwitchNames[] 
-     switches::kEnableNativeGpuMemoryBuffers,
-     switches::kRenderNodeOverride,
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     switches::kX11Display,
-     switches::kNoXshm,
- #endif
diff --git a/chromium-next/patches/patch-content_browser_media_frameless__media__interface__proxy.h b/chromium-next/patches/patch-content_browser_media_frameless__media__interface__proxy.h
deleted file mode 100644
index a8ca9113dd..0000000000
--- a/chromium-next/patches/patch-content_browser_media_frameless__media__interface__proxy.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/media/frameless_media_interface_proxy.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/media/frameless_media_interface_proxy.h
-@@ -19,7 +19,7 @@
- #include "mojo/public/cpp/bindings/receiver_set.h"
- #include "mojo/public/cpp/bindings/remote.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "media/mojo/mojom/video_decoder.mojom.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -104,7 +104,7 @@ class FramelessMediaInterfaceProxy final
-   // Connections to the renderer.
-   mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Connection to the InterfaceFactory that lives in a utility process.
-   // This is only used for out-of-process video decoding and only when the
-   // FramelessMediaInterfaceProxy is created without a RenderProcessHost
diff --git a/chromium-next/patches/patch-content_browser_media_media__keys__listener__manager__impl.cc b/chromium-next/patches/patch-content_browser_media_media__keys__listener__manager__impl.cc
deleted file mode 100644
index 175d911c51..0000000000
--- a/chromium-next/patches/patch-content_browser_media_media__keys__listener__manager__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/media/media_keys_listener_manager_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/media/media_keys_listener_manager_impl.cc
-@@ -332,7 +332,7 @@ void MediaKeysListenerManagerImpl::Start
-     return;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // Create SystemMediaControls with the SingletonHwnd.
-   browser_system_media_controls_ =
-       system_media_controls::SystemMediaControls::Create(
diff --git a/chromium-next/patches/patch-content_browser_network__service__instance__impl.cc b/chromium-next/patches/patch-content_browser_network__service__instance__impl.cc
deleted file mode 100644
index bc7fe09e4c..0000000000
--- a/chromium-next/patches/patch-content_browser_network__service__instance__impl.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/network_service_instance_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/network_service_instance_impl.cc
-@@ -83,7 +83,7 @@
- #include "content/browser/network/network_service_process_tracker_win.h"
- #endif
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/browser/system_dns_resolution/system_dns_resolver.h"
- #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
- #endif
-@@ -341,7 +341,7 @@ void CreateInProcessNetworkService(
-                                 std::move(receiver)));
- }
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a
- // high-priority thread pool.
- void RunSystemDnsResolverOnThreadPool(
-@@ -410,7 +410,7 @@ network::mojom::NetworkServiceParamsPtr 
-   }
- #endif  // BUILDFLAG(IS_POSIX)
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (GetContentClient()
-           ->browser()
-           ->ShouldRunOutOfProcessSystemDnsResolution() &&
diff --git a/chromium-next/patches/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/chromium-next/patches/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
deleted file mode 100644
index 6664aa5ce8..0000000000
--- a/chromium-next/patches/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/ppapi_plugin_process_host_receiver_bindings.cc
-@@ -8,7 +8,7 @@
- 
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
- #include "content/browser/font_service.h"  // nogncheck
- #endif
-@@ -17,7 +17,7 @@ namespace content {
- 
- void PpapiPluginProcessHost::BindHostReceiver(
-     mojo::GenericPendingReceiver receiver) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (auto font_receiver = receiver.As<font_service::mojom::FontService>())
-     ConnectToFontService(std::move(font_receiver));
- #endif
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_delegated__frame__host.cc b/chromium-next/patches/patch-content_browser_renderer__host_delegated__frame__host.cc
deleted file mode 100644
index 8fdea53acd..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_delegated__frame__host.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/delegated_frame_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -333,7 +333,7 @@ void DelegatedFrameHost::EmbedSurface(
- 
-   if (!primary_surface_id ||
-       primary_surface_id->local_surface_id() != local_surface_id_) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // On Windows and Linux, we would like to produce new content as soon as
-     // possible or the OS will create an additional black gutter. Until we can
-     // block resize on surface synchronization on these platforms, we will not
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc b/chromium-next/patches/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
deleted file mode 100644
index aa925516db..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc
-@@ -26,7 +26,7 @@
- #include "media/base/media_switches.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "content/browser/gpu/gpu_data_manager_impl.h"
- #endif
- 
-@@ -183,7 +183,7 @@ void ServiceVideoCaptureDeviceLauncher::
-   }
- #else
-   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // On Linux, additionally check whether the NV12 GPU memory buffer is
-     // supported.
-     if (GpuDataManagerImpl::GetInstance()->IsGpuMemoryBufferNV12Supported())
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/chromium-next/patches/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
deleted file mode 100644
index d37cd1f34b..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/pepper/pepper_file_io_host.cc
-@@ -462,7 +462,7 @@ void PepperFileIOHost::OnLocalFileOpened
-     ppapi::host::ReplyMessageContext reply_context,
-     const base::FilePath& path,
-     base::File::Error error_code) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Quarantining a file before its contents are available is only supported on
-   // Windows and Linux.
-   if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) {
-@@ -496,7 +496,7 @@ void PepperFileIOHost::OnLocalFileOpened
- #endif
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void PepperFileIOHost::OnLocalFileQuarantined(
-     ppapi::host::ReplyMessageContext reply_context,
-     const base::FilePath& path,
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl.cc b/chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
deleted file mode 100644
index 35f0ce28d9..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -224,7 +224,7 @@
- #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <sys/resource.h>
- 
- #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
-@@ -1122,7 +1122,7 @@ static constexpr size_t kUnknownPlatform
- // to indicate failure and std::numeric_limits<size_t>::max() to indicate
- // unlimited.
- size_t GetPlatformProcessLimit() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   struct rlimit limit;
-   if (getrlimit(RLIMIT_NPROC, &limit) != 0)
-     return kUnknownPlatformProcessLimit;
-@@ -1317,7 +1317,7 @@ RenderProcessHostImpl::IOThreadHostImpl:
- 
- void RenderProcessHostImpl::IOThreadHostImpl::SetPid(
-     base::ProcessId child_pid) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   child_thread_type_switcher_.SetPid(child_pid);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- }
-@@ -3410,7 +3410,7 @@ void RenderProcessHostImpl::AppendRender
-             base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
-   // for NV12 GPU memory buffer.
-   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
-@@ -3465,6 +3465,7 @@ void RenderProcessHostImpl::PropagateBro
-       switches::kDisableSpeechAPI,
-       switches::kDisableThreadedCompositing,
-       switches::kDisableTouchDragDrop,
-+      switches::kDisableUnveil,
-       switches::kDisableV8IdleTasks,
-       switches::kDisableVideoCaptureUseGpuMemoryBuffer,
-       switches::kDisableWebGLImageChromium,
-@@ -5310,7 +5311,7 @@ uint64_t RenderProcessHostImpl::GetPriva
-   // - Win: https://crbug.com/707022 .
-   uint64_t total_size = 0;
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   total_size = dump->platform_private_footprint->rss_anon_bytes +
-                dump->platform_private_footprint->vm_swap_bytes;
- #elif BUILDFLAG(IS_APPLE)
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl.h b/chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl.h
deleted file mode 100644
index 309a68b6ae..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/render_process_host_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -102,7 +102,7 @@
- #include "media/fuchsia_media_codec_provider_impl.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/browser/child_thread_type_switcher_linux.h"
- #include "media/mojo/mojom/video_encode_accelerator.mojom.h"
- #endif
-@@ -986,7 +986,7 @@ class CONTENT_EXPORT RenderProcessHostIm
-     std::unique_ptr<service_manager::BinderRegistry> binders_;
-     mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
-         video_encode_accelerator_factory_remote_;
-     ChildThreadTypeSwitcher child_thread_type_switcher_;
-@@ -1235,7 +1235,7 @@ class CONTENT_EXPORT RenderProcessHostIm
-   // if the request isn't handled on the IO thread.
-   void OnBindHostReceiver(mojo::GenericPendingReceiver receiver);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Provides /proc/{renderer pid}/status and statm files for the renderer,
-   // because the files are required to calculate the renderer's private
-   // footprint on Chromium Linux. Regarding MacOS X and Windows, we have
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc b/chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
deleted file mode 100644
index 4e1f721f4e..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc
-@@ -52,7 +52,7 @@
- #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
- #include "content/browser/font_service.h"  // nogncheck
- #include "content/browser/media/video_encode_accelerator_provider_launcher.h"
-@@ -343,7 +343,7 @@ void RenderProcessHostImpl::IOThreadHost
-   }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
-     ConnectToFontService(std::move(font_receiver));
-     return;
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_render__view__host__impl.cc b/chromium-next/patches/patch-content_browser_renderer__host_render__view__host__impl.cc
deleted file mode 100644
index 6f309d1133..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/render_view_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -275,7 +275,7 @@ void RenderViewHostImpl::GetPlatformSpec
-       display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
-   prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
-       display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-   if (command_line->HasSwitch(switches::kSystemFontFamily)) {
-     prefs->system_font_family_name =
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
deleted file mode 100644
index 10e4418ef6..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -121,7 +121,7 @@
- #include "ui/gfx/gdi_util.h"
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/accessibility/platform/browser_accessibility_auralinux.h"
- #include "ui/base/ime/linux/text_edit_command_auralinux.h"
- #include "ui/base/ime/text_input_flags.h"
-@@ -478,7 +478,7 @@ gfx::NativeViewAccessible RenderWidgetHo
-     return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot())
-         ->GetCOM();
- 
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ui::BrowserAccessibilityManager* manager =
-       host()->GetOrCreateRootBrowserAccessibilityManager();
-   if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1882,7 +1882,7 @@ bool RenderWidgetHostViewAura::ShouldDoL
-   return host() && host()->delegate() && host()->delegate()->ShouldDoLearning();
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
-     const gfx::Range& range,
-     const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2858,7 +2858,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
- }
- 
- bool RenderWidgetHostViewAura::NeedsMouseCapture() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return NeedsInputGrab();
- #else
-   return false;
-@@ -3042,7 +3042,7 @@ void RenderWidgetHostViewAura::ForwardKe
-   if (!target_host)
-     return;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* linux_ui = ui::LinuxUi::instance();
-   if (!event.skip_if_unhandled && linux_ui && event.os_event) {
-     const auto command = linux_ui->GetTextEditCommandForEvent(
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.h
deleted file mode 100644
index 4344cc255c..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/render_widget_host_view_aura.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/render_widget_host_view_aura.h
-@@ -276,7 +276,7 @@ class CONTENT_EXPORT RenderWidgetHostVie
-   ukm::SourceId GetClientSourceForMetrics() const override;
-   bool ShouldDoLearning() override;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool SetCompositionFromExistingText(
-       const gfx::Range& range,
-       const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override;
diff --git a/chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
deleted file mode 100644
index d691a494f6..0000000000
--- a/chromium-next/patches/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -602,7 +602,7 @@ bool RenderWidgetHostViewEventHandler::C
-   if (event->type() == ui::EventType::kMouseExited) {
-     if (mouse_locked || selection_popup)
-       return false;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // Don't forward the mouse leave message which is received when the context
-     // menu is displayed by the page. This confuses the page and causes state
-     // changes.
diff --git a/chromium-next/patches/patch-content_browser_sandbox__host__linux.cc b/chromium-next/patches/patch-content_browser_sandbox__host__linux.cc
deleted file mode 100644
index 540dbaff39..0000000000
--- a/chromium-next/patches/patch-content_browser_sandbox__host__linux.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/sandbox_host_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/sandbox_host_linux.cc
-@@ -45,6 +45,7 @@ void SandboxHostLinux::Init() {
-   // Instead, it replies on a temporary socket provided by the caller.
-   PCHECK(0 == shutdown(browser_socket, SHUT_WR)) << "shutdown";
- 
-+#if !BUILDFLAG(IS_BSD) 
-   int pipefds[2];
-   CHECK(0 == pipe(pipefds));
-   const int child_lifeline_fd = pipefds[0];
-@@ -55,6 +56,7 @@ void SandboxHostLinux::Init() {
-   ipc_thread_ = std::make_unique<base::DelegateSimpleThread>(
-       ipc_handler_.get(), "sandbox_ipc_thread");
-   ipc_thread_->Start();
-+#endif
- }
- 
- }  // namespace content
diff --git a/chromium-next/patches/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/chromium-next/patches/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
deleted file mode 100644
index 79c75d9eac..0000000000
--- a/chromium-next/patches/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc
-@@ -337,7 +337,7 @@ void JankMonitorImpl::ThreadExecutionSta
-     // in context menus, among others). Simply ignore the mismatches for now.
-     // See https://crbug.com/929813 for the details of why the mismatch
-     // happens.
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE)
-     task_execution_metadata_.clear();
- #endif
-     return;
diff --git a/chromium-next/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.cc b/chromium-next/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
deleted file mode 100644
index 4af9a78136..0000000000
--- a/chromium-next/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/scheduler/responsiveness/native_event_observer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/scheduler/responsiveness/native_event_observer.cc
-@@ -15,7 +15,7 @@
- 
- #include "ui/events/platform/platform_event_source.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "ui/aura/env.h"
- #include "ui/events/event.h"
- #endif
-@@ -39,7 +39,7 @@ NativeEventObserver::~NativeEventObserve
-   DeregisterObserver();
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void NativeEventObserver::RegisterObserver() {
-   aura::Env::GetInstance()->AddWindowEventDispatcherObserver(this);
- }
diff --git a/chromium-next/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.h b/chromium-next/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.h
deleted file mode 100644
index a14e6b363f..0000000000
--- a/chromium-next/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/scheduler/responsiveness/native_event_observer.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/scheduler/responsiveness/native_event_observer.h
-@@ -16,7 +16,7 @@
- #include "content/public/browser/native_event_processor_observer_mac.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "ui/aura/window_event_dispatcher_observer.h"
- #endif
- 
-@@ -41,7 +41,7 @@ namespace responsiveness {
- class CONTENT_EXPORT NativeEventObserver
- #if BUILDFLAG(IS_MAC)
-     : public NativeEventProcessorObserver
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     : public aura::WindowEventDispatcherObserver
- #elif BUILDFLAG(IS_WIN)
-     : public base::MessagePumpForUI::Observer
-@@ -58,7 +58,7 @@ class CONTENT_EXPORT NativeEventObserver
-   NativeEventObserver(WillRunEventCallback will_run_event_callback,
-                       DidRunEventCallback did_run_event_callback);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
-   NativeEventObserver(const NativeEventObserver&) = delete;
-   NativeEventObserver& operator=(const NativeEventObserver&) = delete;
-@@ -74,7 +74,7 @@ class CONTENT_EXPORT NativeEventObserver
-   // Exposed for tests.
-   void WillRunNativeEvent(const void* opaque_identifier) override;
-   void DidRunNativeEvent(const void* opaque_identifier) override;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // aura::WindowEventDispatcherObserver overrides:
-   void OnWindowEventDispatcherStartedProcessing(
-       aura::WindowEventDispatcher* dispatcher,
-@@ -91,7 +91,7 @@ class CONTENT_EXPORT NativeEventObserver
-   void RegisterObserver();
-   void DeregisterObserver();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   struct EventInfo {
-     raw_ptr<const void> unique_id;
-   };
diff --git a/chromium-next/patches/patch-content_browser_service__host_utility__process__host.cc b/chromium-next/patches/patch-content_browser_service__host_utility__process__host.cc
deleted file mode 100644
index 577e5a14d4..0000000000
--- a/chromium-next/patches/patch-content_browser_service__host_utility__process__host.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/service_host/utility_process_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/service_host/utility_process_host.cc
-@@ -68,7 +68,7 @@
- #include "content/browser/v8_snapshot_files.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/files/file_util.h"
- #include "base/files/scoped_file.h"
- #include "base/pickle.h"
-@@ -96,7 +96,7 @@ namespace content {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- base::ScopedFD PassNetworkContextParentDirs(
-     std::vector<base::FilePath> network_context_parent_dirs) {
-   base::Pickle pickle;
-@@ -427,7 +427,7 @@ bool UtilityProcessHost::StartProcess() 
-     file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line));
- #endif  // BUILDFLAG(IS_POSIX)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // The network service should have access to the parent directories
-     // necessary for its usage.
-     if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
-@@ -444,7 +444,7 @@ bool UtilityProcessHost::StartProcess() 
-     if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
-       bool pass_gpu_buffer_flag =
-           switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       // Check if NV12 GPU memory buffer supported at the same time.
-       pass_gpu_buffer_flag =
-           pass_gpu_buffer_flag &&
diff --git a/chromium-next/patches/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc b/chromium-next/patches/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc
deleted file mode 100644
index 0765de51e3..0000000000
--- a/chromium-next/patches/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/service_host/utility_process_host_receiver_bindings.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/service_host/utility_process_host_receiver_bindings.cc
-@@ -10,7 +10,7 @@
- #include "content/public/common/content_client.h"
- #include "media/media_buildflags.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
- #include "content/browser/font_service.h"  // nogncheck
- #endif
-@@ -24,7 +24,7 @@ namespace content {
- 
- void UtilityProcessHost::BindHostReceiver(
-     mojo::GenericPendingReceiver receiver) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
-     ConnectToFontService(std::move(font_receiver));
-     return;
diff --git a/chromium-next/patches/patch-content_browser_service__host_utility__sandbox__delegate.cc b/chromium-next/patches/patch-content_browser_service__host_utility__sandbox__delegate.cc
deleted file mode 100644
index bcb9a32b13..0000000000
--- a/chromium-next/patches/patch-content_browser_service__host_utility__sandbox__delegate.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/service_host/utility_sandbox_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/service_host/utility_sandbox_delegate.cc
-@@ -77,7 +77,7 @@ UtilitySandboxedProcessLauncherDelegate:
- #if BUILDFLAG(IS_FUCHSIA)
-       sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture ||
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
-       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -90,14 +90,14 @@ UtilitySandboxedProcessLauncherDelegate:
- #endif  // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
- #endif  // BUILDFLAG(IS_CHROMEOS)
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI ||
-       sandbox_type_ == sandbox::mojom::Sandbox::kPrintBackend ||
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kVideoEffects ||
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation ||
- #endif
-       sandbox_type_ == sandbox::mojom::Sandbox::kAudio ||
-@@ -144,7 +144,7 @@ ZygoteCommunication* UtilitySandboxedPro
-   // process upon startup.
-   if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
-       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution ||
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
-       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -158,11 +158,11 @@ ZygoteCommunication* UtilitySandboxedPro
- #endif  // BUILDFLAG(IS_CHROMEOS)
-       sandbox_type_ == sandbox::mojom::Sandbox::kAudio ||
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kPrintBackend ||
-       sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI ||
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kVideoEffects ||
-       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation ||
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-content_browser_v8__snapshot__files.cc b/chromium-next/patches/patch-content_browser_v8__snapshot__files.cc
deleted file mode 100644
index 1137a90968..0000000000
--- a/chromium-next/patches/patch-content_browser_v8__snapshot__files.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/v8_snapshot_files.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/v8_snapshot_files.cc
-@@ -19,7 +19,7 @@ namespace content {
- std::map<std::string, std::variant<base::FilePath, base::ScopedFD>>
- GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) {
-   std::map<std::string, std::variant<base::FilePath, base::ScopedFD>> files;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT)
-   files[kV8ContextSnapshotDataDescriptor] = base::FilePath(
-       FILE_PATH_LITERAL(BUILDFLAG(V8_CONTEXT_SNAPSHOT_FILENAME)));
diff --git a/chromium-next/patches/patch-content_browser_web__contents_slow__web__preference__cache.cc b/chromium-next/patches/patch-content_browser_web__contents_slow__web__preference__cache.cc
deleted file mode 100644
index 92e3e7bf3f..0000000000
--- a/chromium-next/patches/patch-content_browser_web__contents_slow__web__preference__cache.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/web_contents/slow_web_preference_cache.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/web_contents/slow_web_preference_cache.cc
-@@ -17,7 +17,7 @@
- 
- #if BUILDFLAG(IS_WIN)
- #include "ui/events/devices/input_device_observer_win.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "ui/events/devices/device_data_manager.h"
- #elif BUILDFLAG(IS_ANDROID)
- #include "ui/base/device_form_factor.h"
-@@ -57,7 +57,7 @@ SlowWebPreferenceCache::SlowWebPreferenc
- 
- #if BUILDFLAG(IS_WIN)
-   ui::InputDeviceObserverWin::GetInstance()->AddObserver(this);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   ui::DeviceDataManager::GetInstance()->AddObserver(this);
- #elif BUILDFLAG(IS_ANDROID)
-   ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this);
-@@ -69,7 +69,7 @@ SlowWebPreferenceCache::SlowWebPreferenc
- SlowWebPreferenceCache::~SlowWebPreferenceCache() {
- #if BUILDFLAG(IS_WIN)
-   ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
- #elif BUILDFLAG(IS_ANDROID)
-   ui::InputDeviceObserverAndroid::GetInstance()->RemoveObserver(this);
diff --git a/chromium-next/patches/patch-content_browser_web__contents_web__contents__view__aura.cc b/chromium-next/patches/patch-content_browser_web__contents_web__contents__view__aura.cc
deleted file mode 100644
index 95146ab022..0000000000
--- a/chromium-next/patches/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/web_contents/web_contents_view_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/web_contents/web_contents_view_aura.cc
-@@ -173,7 +173,7 @@ class WebDragSourceAura : public content
-   raw_ptr<aura::Window> window_;
- };
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Fill out the OSExchangeData with a file contents, synthesizing a name if
- // necessary.
- void PrepareDragForFileContents(const DropData& drop_data,
-@@ -258,7 +258,7 @@ void PrepareDragData(const DropData& dro
-   if (!drop_data.download_metadata.empty())
-     PrepareDragForDownload(drop_data, provider, web_contents);
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // We set the file contents before the URL because the URL also sets file
-   // contents (to a .URL shortcut).  We want to prefer file content data over
-   // a shortcut so we add it first.
-@@ -1327,7 +1327,7 @@ void WebContentsViewAura::OnMouseEvent(u
-     // Linux window managers like to handle raise-on-click themselves.  If we
-     // raise-on-click manually, this may override user settings that prevent
-     // focus-stealing.
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-     // It is possible for the web-contents to be destroyed while it is being
-     // activated. Use a weak-ptr to track whether that happened or not.
-     // More in https://crbug.com/1040725
diff --git a/chromium-next/patches/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc b/chromium-next/patches/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
deleted file mode 100644
index 53efe7f312..0000000000
--- a/chromium-next/patches/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/web_contents/web_contents_view_aura_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/web_contents/web_contents_view_aura_unittest.cc
-@@ -40,7 +40,7 @@
- #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
- #include "ui/base/x/selection_utils.h"
- #include "ui/base/x/x11_os_exchange_data_provider.h"
- #include "ui/gfx/x/atom_cache.h"
-@@ -96,7 +96,7 @@ class TestDragDropClient : public aura::
-     drag_drop_data_ = std::move(data);
-     return DragOperation::kCopy;
-   }
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void UpdateDragImage(const gfx::ImageSkia& image,
-                        const gfx::Vector2d& offset) override {}
- #endif
-@@ -231,7 +231,7 @@ TEST_F(WebContentsViewAuraTest, WebConte
-                              ui::EF_LEFT_MOUSE_BUTTON, 0);
-   ui::EventHandler* event_handler = GetView();
-   event_handler->OnMouseEvent(&mouse_event);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // The web-content is not activated during mouse-press on Linux.
-   // See comment in WebContentsViewAura::OnMouseEvent() for more details.
-   EXPECT_NE(web_contents(), nullptr);
-@@ -297,7 +297,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
-   view->OnDragEntered(event);
-   ASSERT_NE(nullptr, view->current_drag_data_);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // By design, Linux implementations return an empty string if file data
-   // is also present.
-   EXPECT_TRUE(!view->current_drag_data_->text ||
-@@ -337,7 +337,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
- 
-   CheckDropData(view);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // By design, Linux implementations returns an empty string if file data
-   // is also present.
-   EXPECT_TRUE(!drop_complete_data_->drop_data.text ||
-@@ -395,7 +395,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
-   view->OnDragEntered(event);
-   ASSERT_NE(nullptr, view->current_drag_data_);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // By design, Linux implementations return an empty string if file data
-   // is also present.
-   EXPECT_TRUE(!view->current_drag_data_->text ||
-@@ -427,7 +427,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
- 
-   CheckDropData(view);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // By design, Linux implementations returns an empty string if file data is
-   // also present.
-   EXPECT_TRUE(!drop_complete_data_->drop_data.text ||
-@@ -458,7 +458,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
- 
-   auto data = std::make_unique<ui::OSExchangeData>();
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   // FileContents drag-drop in X relies on XDragDropClient::InitDrag() setting
-   // window property 'XdndDirectSave0' to filename. Since XDragDropClient is not
-   // created in this unittest, we will set this property manually to allow
diff --git a/chromium-next/patches/patch-content_browser_webui_web__ui__main__frame__observer.cc b/chromium-next/patches/patch-content_browser_webui_web__ui__main__frame__observer.cc
deleted file mode 100644
index 9d3c208ffd..0000000000
--- a/chromium-next/patches/patch-content_browser_webui_web__ui__main__frame__observer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/webui/web_ui_main_frame_observer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/webui/web_ui_main_frame_observer.cc
-@@ -47,7 +47,7 @@ std::string RedactURL(const GURL& url) {
- bool IsWebUIJavaScriptErrorReportingSupported() {
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-   return false;
--#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return base::FeatureList::IsEnabled(features::kWebUIJSErrorReportingExtended);
diff --git a/chromium-next/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/chromium-next/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
deleted file mode 100644
index 6686a43ede..0000000000
--- a/chromium-next/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/zygote_host/zygote_host_impl_linux.cc
-@@ -23,8 +23,10 @@
- #include "build/build_config.h"
- #include "content/common/zygote/zygote_commands_linux.h"
- #include "content/common/zygote/zygote_communication_linux.h"
-+#if !BUILDFLAG(IS_BSD)
- #include "content/common/zygote/zygote_handle_impl_linux.h"
- #include "content/public/common/zygote/zygote_handle.h"
-+#endif
- #include "sandbox/linux/services/credentials.h"
- #include "sandbox/linux/services/namespace_sandbox.h"
- #include "sandbox/linux/suid/client/setuid_sandbox_host.h"
-@@ -42,6 +44,7 @@ namespace content {
- 
- namespace {
- 
-+#if !BUILDFLAG(IS_BSD)
- // Receive a fixed message on fd and return the sender's PID.
- // Returns true if the message received matches the expected message.
- bool ReceiveFixedMessage(int fd,
-@@ -64,6 +67,7 @@ bool ReceiveFixedMessage(int fd,
-     return false;
-   return true;
- }
-+#endif
- 
- }  // namespace
- 
-@@ -73,9 +77,13 @@ ZygoteHost* ZygoteHost::GetInstance() {
- }
- 
- ZygoteHostImpl::ZygoteHostImpl()
-+#if !BUILDFLAG(IS_BSD)
-     : use_namespace_sandbox_(false),
-       use_suid_sandbox_(false),
-       use_suid_sandbox_for_adj_oom_score_(false),
-+#else
-+    :
-+#endif
-       sandbox_binary_(),
-       zygote_pids_lock_(),
-       zygote_pids_() {}
-@@ -88,6 +96,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInsta
- }
- 
- void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
-+#if !BUILDFLAG(IS_BSD)
-   if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) {
-     return;
-   }
-@@ -142,6 +151,7 @@ void ZygoteHostImpl::Init(const base::Co
-            "you can try using --"
-         << sandbox::policy::switches::kNoSandbox << ".";
-   }
-+#endif
- }
- 
- void ZygoteHostImpl::AddZygotePid(pid_t pid) {
-@@ -166,6 +176,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
-     base::CommandLine* cmd_line,
-     base::ScopedFD* control_fd,
-     base::FileHandleMappingVector additional_remapped_fds) {
-+#if !BUILDFLAG(IS_BSD)
-   int fds[2];
-   CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds));
-   CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0]));
-@@ -234,9 +245,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
- 
-   AddZygotePid(pid);
-   return pid;
-+#else
-+  return 0;
-+#endif
- }
- 
--#if !BUILDFLAG(IS_OPENBSD)
-+#if !BUILDFLAG(IS_BSD)
- void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,
-                                             int score) {
-   // 1) You can't change the oom_score_adj of a non-dumpable process
diff --git a/chromium-next/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.h b/chromium-next/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.h
deleted file mode 100644
index 380047a775..0000000000
--- a/chromium-next/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/zygote_host/zygote_host_impl_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/browser/zygote_host/zygote_host_impl_linux.h
-@@ -46,12 +46,14 @@ class CONTENT_EXPORT ZygoteHostImpl : pu
-                      base::ScopedFD* control_fd,
-                      base::FileHandleMappingVector additional_remapped_fds);
- 
-+#if !BUILDFLAG(IS_BSD)
-   void AdjustRendererOOMScore(base::ProcessHandle process_handle,
-                               int score) override;
- #if BUILDFLAG(IS_CHROMEOS)
-   void ReinitializeLogging(uint32_t logging_dest,
-                            base::PlatformFile log_file_fd) override;
- #endif  // BUILDFLAG(IS_CHROMEOS)
-+#endif
- 
-   bool HasZygote() { return !zygote_pids_.empty(); }
- 
-@@ -66,9 +68,11 @@ class CONTENT_EXPORT ZygoteHostImpl : pu
- 
-   int renderer_sandbox_status_;
- 
-+#if !BUILDFLAG(IS_BSD)
-   bool use_namespace_sandbox_;
-   bool use_suid_sandbox_;
-   bool use_suid_sandbox_for_adj_oom_score_;
-+#endif
-   std::string sandbox_binary_;
- 
-   // This lock protects the |zygote_pids_| set.
diff --git a/chromium-next/patches/patch-content_child_BUILD.gn b/chromium-next/patches/patch-content_child_BUILD.gn
deleted file mode 100644
index 9c66b4f476..0000000000
--- a/chromium-next/patches/patch-content_child_BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/child/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/child/BUILD.gn
-@@ -135,6 +135,13 @@ target(link_target_type, "child") {
-     ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "sandboxed_process_thread_type_handler.cc",
-+      "sandboxed_process_thread_type_handler.h",
-+    ]
-+  }
-+
-   if (is_win) {
-     sources += [
-       "child_process_sandbox_support_impl_win.cc",
diff --git a/chromium-next/patches/patch-content_child_child__process.cc b/chromium-next/patches/patch-content_child_child__process.cc
deleted file mode 100644
index bcc5608492..0000000000
--- a/chromium-next/patches/patch-content_child_child__process.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/child/child_process.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/child/child_process.cc
-@@ -31,7 +31,7 @@
- #include "content/common/android/cpu_time_metrics.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/child/sandboxed_process_thread_type_handler.h"
- #endif
- 
-@@ -177,7 +177,7 @@ void ChildProcess::set_main_thread(Child
-   main_thread_.reset(thread);
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void ChildProcess::SetIOThreadType(base::ThreadType thread_type) {
-   if (!io_thread_) {
-     return;
diff --git a/chromium-next/patches/patch-content_child_child__process.h b/chromium-next/patches/patch-content_child_child__process.h
deleted file mode 100644
index e3b6b489e8..0000000000
--- a/chromium-next/patches/patch-content_child_child__process.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/child/child_process.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/child/child_process.h
-@@ -79,7 +79,7 @@ class CONTENT_EXPORT ChildProcess {
-     return io_thread_runner_.get();
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Changes the thread type of the child process IO thread.
-   void SetIOThreadType(base::ThreadType thread_type);
- #endif
diff --git a/chromium-next/patches/patch-content_common_BUILD.gn b/chromium-next/patches/patch-content_common_BUILD.gn
deleted file mode 100644
index b8efe73446..0000000000
--- a/chromium-next/patches/patch-content_common_BUILD.gn
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/common/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/common/BUILD.gn
-@@ -382,19 +382,28 @@ source_set("common") {
-   }
- 
-   if (is_linux || is_chromeos) {
--    sources += [
--      "gpu_pre_sandbox_hook_linux.cc",
--      "gpu_pre_sandbox_hook_linux.h",
--    ]
-+    if (is_bsd) {
-+      sources += [
-+        "gpu_pre_sandbox_hook_bsd.cc",
-+        "gpu_pre_sandbox_hook_bsd.h",
-+      ]
-+    } else {
-+      sources += [
-+        "gpu_pre_sandbox_hook_linux.cc",
-+        "gpu_pre_sandbox_hook_linux.h",
-+      ]
-+    }
-     public_deps += [ "//sandbox/policy" ]
-     deps += [
-       ":sandbox_support_linux",
-       "//media/gpu:buildflags",
-       "//sandbox/linux:sandbox_services",
--      "//sandbox/linux:seccomp_bpf",
-       "//sandbox/policy:chromecast_sandbox_allowlist_buildflags",
-       "//third_party/fontconfig",
-     ]
-+    if (use_seccomp_bpf) {
-+      deps += [ "//sandbox/linux:seccomp_bpf" ]
-+    }
-     if (use_v4l2_codec) {
-       deps += [ "//media/gpu/v4l2" ]
-     }
diff --git a/chromium-next/patches/patch-content_common_features.cc b/chromium-next/patches/patch-content_common_features.cc
deleted file mode 100644
index 944020b4d1..0000000000
--- a/chromium-next/patches/patch-content_common_features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/common/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/common/features.cc
-@@ -124,7 +124,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- // Enables error reporting for JS errors inside DevTools frontend host
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kEnableDevToolsJsErrorReporting,
-              "EnableDevToolsJsErrorReporting",
-              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-content_common_features.h b/chromium-next/patches/patch-content_common_features.h
deleted file mode 100644
index 89230d375f..0000000000
--- a/chromium-next/patches/patch-content_common_features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/common/features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/common/features.h
-@@ -27,7 +27,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCom
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn);
diff --git a/chromium-next/patches/patch-content_common_font__list__unittest.cc b/chromium-next/patches/patch-content_common_font__list__unittest.cc
deleted file mode 100644
index e0db1ac5ba..0000000000
--- a/chromium-next/patches/patch-content_common_font__list__unittest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/common/font_list_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/common/font_list_unittest.cc
-@@ -48,7 +48,7 @@ TEST(FontList, GetFontList) {
-         EXPECT_TRUE(HasFontWithName(fonts, "MS Gothic", "MS Gothic"));
-         EXPECT_TRUE(HasFontWithName(fonts, "Segoe UI", "Segoe UI"));
-         EXPECT_TRUE(HasFontWithName(fonts, "Verdana", "Verdana"));
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-         EXPECT_TRUE(HasFontWithName(fonts, "Arimo", "Arimo"));
- #else
-         EXPECT_TRUE(HasFontWithName(fonts, "Arial", "Arial"));
diff --git a/chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.cc b/chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
deleted file mode 100644
index 5576dad4aa..0000000000
--- a/chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/common/gpu_pre_sandbox_hook_bsd.cc.orig	2025-05-08 12:01:57.747693258 +0000
-+++ content/common/gpu_pre_sandbox_hook_bsd.cc
-@@ -0,0 +1,68 @@
-+// Copyright 2023 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "content/common/gpu_pre_sandbox_hook_bsd.h"
-+
-+#include <dlfcn.h>
-+#include <errno.h>
-+#include <sys/stat.h>
-+
-+#include <memory>
-+#include <sstream>
-+#include <utility>
-+#include <vector>
-+
-+#include "base/base_paths.h"
-+#include "base/files/file_enumerator.h"
-+#include "base/files/file_path.h"
-+#include "base/files/scoped_file.h"
-+#include "base/functional/bind.h"
-+#include "base/logging.h"
-+#include "base/path_service.h"
-+#include "base/strings/stringprintf.h"
-+#include "build/build_config.h"
-+#include "build/buildflag.h"
-+#include "build/chromeos_buildflags.h"
-+#include "content/public/common/content_switches.h"
-+#include "media/gpu/buildflags.h"
-+
-+namespace content {
-+namespace {
-+
-+constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
-+
-+void LoadVulkanLibraries() {
-+  // Try to preload Vulkan libraries. Failure is not an error as not all may be
-+  // present.
-+  const char* kLibraries[] = {
-+      "libvulkan.so",
-+      "libvulkan_intel.so",
-+      "libvulkan_intel_hasvk.so",
-+      "libvulkan_radeon.so",
-+  };
-+  for (const auto* library : kLibraries) {
-+    dlopen(library, dlopen_flag);
-+  }
-+}
-+
-+bool LoadLibrariesForGpu(
-+    const sandbox::policy::SandboxSeccompBPF::Options& options) {
-+  LoadVulkanLibraries();
-+
-+  return true;
-+}
-+
-+}  // namespace
-+
-+bool GpuPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
-+  if (!LoadLibrariesForGpu(options))
-+    return false;
-+
-+  // TODO(tsepez): enable namspace sandbox here once crashes are understood.
-+
-+  errno = 0;
-+  return true;
-+}
-+
-+}  // namespace content
diff --git a/chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.h b/chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.h
deleted file mode 100644
index 24e791ad70..0000000000
--- a/chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/common/gpu_pre_sandbox_hook_bsd.h.orig	2025-05-08 12:01:57.747848236 +0000
-+++ content/common/gpu_pre_sandbox_hook_bsd.h
-@@ -0,0 +1,20 @@
-+// Copyright 2017 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_
-+#define CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_
-+
-+#include "base/component_export.h"
-+#include "sandbox/policy/sandbox.h"
-+
-+namespace content {
-+
-+// A pre-sandbox hook to use on Linux-based systems in sandboxed processes that
-+// require general GPU usage.
-+COMPONENT_EXPORT(GPU_PRE_SANDBOX_HOOK)
-+bool GpuPreSandboxHook(sandbox::policy::SandboxLinux::Options options);
-+
-+}  // namespace content
-+
-+#endif  // CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_
diff --git a/chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__linux.h b/chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__linux.h
deleted file mode 100644
index 47c468c207..0000000000
--- a/chromium-next/patches/patch-content_common_gpu__pre__sandbox__hook__linux.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/common/gpu_pre_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/common/gpu_pre_sandbox_hook_linux.h
-@@ -5,8 +5,13 @@
- #ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_
- #define CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_
- 
-+#include "build/build_config.h"
- #include "base/component_export.h"
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace content {
- 
diff --git a/chromium-next/patches/patch-content_common_thread__type__switcher.mojom b/chromium-next/patches/patch-content_common_thread__type__switcher.mojom
deleted file mode 100644
index 8eb7bab380..0000000000
--- a/chromium-next/patches/patch-content_common_thread__type__switcher.mojom
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/common/thread_type_switcher.mojom.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/common/thread_type_switcher.mojom
-@@ -10,6 +10,6 @@ import "mojo/public/mojom/base/thread_ty
- // occur in a child process due to its sandbox, e.g. on Linux and ChromeOS.
- interface ThreadTypeSwitcher {
-   // Asks the browser to change the type of thread.
--  SetThreadType(int32 platform_thread_id,
-+  SetThreadType(uint64 platform_thread_id,
-                 mojo_base.mojom.ThreadType thread_type);
- };
diff --git a/chromium-next/patches/patch-content_gpu_gpu__child__thread.cc b/chromium-next/patches/patch-content_gpu_gpu__child__thread.cc
deleted file mode 100644
index 2c5e594a07..0000000000
--- a/chromium-next/patches/patch-content_gpu_gpu__child__thread.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/gpu/gpu_child_thread.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/gpu/gpu_child_thread.cc
-@@ -57,7 +57,7 @@
- #include "third_party/skia/include/ports/SkFontConfigInterface.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/child/sandboxed_process_thread_type_handler.h"
- #endif
- 
-@@ -147,7 +147,8 @@ void GpuChildThread::Init(const base::Ti
- 
-   viz_main_.gpu_service()->set_start_time(process_start_time);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+// XXX BSD
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
-   SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated();
- #endif
- 
diff --git a/chromium-next/patches/patch-content_gpu_gpu__main.cc b/chromium-next/patches/patch-content_gpu_gpu__main.cc
deleted file mode 100644
index 1aa233e283..0000000000
--- a/chromium-next/patches/patch-content_gpu_gpu__main.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/gpu/gpu_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/gpu/gpu_main.cc
-@@ -95,10 +95,14 @@
- #include "sandbox/win/src/sandbox.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/child/sandboxed_process_thread_type_handler.h"
- #include "content/common/gpu_pre_sandbox_hook_linux.h"
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- #include "sandbox/policy/sandbox_type.h"
- #endif
- 
-@@ -117,7 +121,7 @@ namespace content {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- bool StartSandboxLinux(gpu::GpuWatchdogThread*,
-                        const gpu::GPUInfo*,
-                        const gpu::GpuPreferences&);
-@@ -177,7 +181,7 @@ class ContentSandboxHelper : public gpu:
-                                 const gpu::GPUInfo* gpu_info,
-                                 const gpu::GpuPreferences& gpu_prefs) override {
-     GPU_STARTUP_TRACE_EVENT("gpu_main::EnsureSandboxInitialized");
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
- #elif BUILDFLAG(IS_WIN)
-     return StartSandboxWindows(sandbox_info_);
-@@ -303,7 +307,7 @@ int GpuMain(MainFunctionParams parameter
-           std::make_unique<base::SingleThreadTaskExecutor>(
-               gpu_preferences.message_pump_type);
-     }
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #error "Unsupported Linux platform."
- #elif BUILDFLAG(IS_MAC)
-     // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -329,7 +333,8 @@ int GpuMain(MainFunctionParams parameter
-   base::PlatformThread::SetName("CrGpuMain");
-   mojo::InterfaceEndpointClient::SetThreadNameSuffixForMetrics("GpuMain");
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+// XXX BSD
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
-   // Thread type delegate of the process should be registered before
-   // thread type change below for the main thread and for thread pool in
-   // ChildProcess constructor.
-@@ -462,7 +467,7 @@ int GpuMain(MainFunctionParams parameter
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
-                        const gpu::GPUInfo* gpu_info,
-                        const gpu::GpuPreferences& gpu_prefs) {
-@@ -502,7 +507,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogT
-   sandbox_options.accelerated_video_encode_enabled =
-       !gpu_prefs.disable_accelerated_video_encode;
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Video decoding of many video streams can use thousands of FDs as well as
-   // Exo clients.
-   // See https://crbug.com/1417237
diff --git a/chromium-next/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/chromium-next/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
deleted file mode 100644
index f401b6abc7..0000000000
--- a/chromium-next/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
-@@ -21,7 +21,7 @@
- 
- #if BUILDFLAG(IS_MAC)
- #include "content/child/child_process_sandbox_support_impl_mac.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/child/child_process_sandbox_support_impl_linux.h"
- #include "mojo/public/cpp/bindings/pending_remote.h"
- #endif
-@@ -36,7 +36,7 @@ typedef struct CGFont* CGFontRef;
- namespace content {
- 
- PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   mojo::PendingRemote<font_service::mojom::FontService> font_service;
-   ChildThread::Get()->BindHostReceiver(
-       font_service.InitWithNewPipeAndPassReceiver());
-@@ -55,7 +55,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatf
- void PpapiBlinkPlatformImpl::Shutdown() {}
- 
- blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   return sandbox_support_.get();
- #else
-   return nullptr;
diff --git a/chromium-next/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/chromium-next/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
deleted file mode 100644
index 257ce335c3..0000000000
--- a/chromium-next/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/ppapi_plugin/ppapi_blink_platform_impl.h
-@@ -36,7 +36,7 @@ class PpapiBlinkPlatformImpl : public Bl
-   blink::WebString DefaultLocale() override;
- 
-  private:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
- #endif
- };
diff --git a/chromium-next/patches/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/chromium-next/patches/patch-content_ppapi__plugin_ppapi__plugin__main.cc
deleted file mode 100644
index 22b6ac2d05..0000000000
--- a/chromium-next/patches/patch-content_ppapi__plugin_ppapi__plugin__main.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/ppapi_plugin/ppapi_plugin_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/ppapi_plugin/ppapi_plugin_main.cc
-@@ -52,6 +52,11 @@
- #include "gin/v8_initializer.h"
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#include "sandbox/policy/sandbox_type.h"
-+#endif
-+
- #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
- #include <stdlib.h>
- #endif
-@@ -139,7 +144,7 @@ int PpapiPluginMain(MainFunctionParams p
-   gin::V8Initializer::LoadV8Snapshot();
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
-   sandbox::policy::SandboxLinux::GetInstance()->InitializeSandbox(
-       sandbox::policy::SandboxTypeFromCommandLine(command_line),
-       sandbox::policy::SandboxLinux::PreSandboxHook(),
diff --git a/chromium-next/patches/patch-content_public_browser_content__browser__client.cc b/chromium-next/patches/patch-content_public_browser_content__browser__client.cc
deleted file mode 100644
index fb1222fddc..0000000000
--- a/chromium-next/patches/patch-content_public_browser_content__browser__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/public/browser/content_browser_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/public/browser/content_browser_client.cc
-@@ -1395,7 +1395,7 @@ bool ContentBrowserClient::ShouldRunOutO
- // that can be adequately sandboxed.
- // Currently Android's network service will not run out of process or sandboxed,
- // so OutOfProcessSystemDnsResolution is not currently enabled on Android.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
diff --git a/chromium-next/patches/patch-content_public_browser_zygote__host_zygote__host__linux.h b/chromium-next/patches/patch-content_public_browser_zygote__host_zygote__host__linux.h
deleted file mode 100644
index bd22942e8f..0000000000
--- a/chromium-next/patches/patch-content_public_browser_zygote__host_zygote__host__linux.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/public/browser/zygote_host/zygote_host_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/public/browser/zygote_host/zygote_host_linux.h
-@@ -34,11 +34,13 @@ class ZygoteHost {
-   // after the first render has been forked.
-   virtual int GetRendererSandboxStatus() = 0;
- 
-+#if !BUILDFLAG(IS_BSD)
-   // Adjust the OOM score of the given renderer's PID.  The allowed
-   // range for the score is [0, 1000], where higher values are more
-   // likely to be killed by the OOM killer.
-   virtual void AdjustRendererOOMScore(base::ProcessHandle process_handle,
-                                       int score) = 0;
-+#endif
- 
- #if BUILDFLAG(IS_CHROMEOS)
-   // Reinitialize logging for the Zygote processes. Needed on ChromeOS, which
diff --git a/chromium-next/patches/patch-content_public_common_content__features.cc b/chromium-next/patches/patch-content_public_common_content__features.cc
deleted file mode 100644
index c971808abd..0000000000
--- a/chromium-next/patches/patch-content_public_common_content__features.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/public/common/content_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/public/common/content_features.cc
-@@ -75,7 +75,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartu
- // Runs the audio service in a separate process.
- BASE_FEATURE(kAudioServiceOutOfProcess,
-              "AudioServiceOutOfProcess",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1271,9 +1271,9 @@ BASE_FEATURE(kWebAssemblyTiering,
- BASE_FEATURE(kWebAssemblyTrapHandler,
-              "WebAssemblyTrapHandler",
- #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ||  \
--      BUILDFLAG(IS_MAC)) &&                                                  \
-+      BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) &&                             \
-      defined(ARCH_CPU_X86_64)) ||                                            \
--    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) && \
-+    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \
-      defined(ARCH_CPU_ARM64))
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-@@ -1330,7 +1330,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExten
- 
- // Controls whether the WebUSB API is enabled:
- // https://wicg.github.io/webusb
-+#if BUILDFLAG(IS_BSD)
-+BASE_FEATURE(kWebUsb, "WebUSB", base::FEATURE_DISABLED_BY_DEFAULT);
-+#else
- BASE_FEATURE(kWebUsb, "WebUSB", base::FEATURE_ENABLED_BY_DEFAULT);
-+#endif
- 
- // Controls whether the WebXR Device API is enabled.
- BASE_FEATURE(kWebXr, "WebXR", base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-content_public_common_content__switches.cc b/chromium-next/patches/patch-content_public_common_content__switches.cc
deleted file mode 100644
index 16e41a6175..0000000000
--- a/chromium-next/patches/patch-content_public_common_content__switches.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/public/common/content_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/public/common/content_switches.cc
-@@ -339,6 +339,8 @@ const char kEnableIsolatedWebAppsInRende
- // builds.
- const char kEnableLogging[]                 = "enable-logging";
- 
-+const char kDisableUnveil[]                 = "disable-unveil";
-+
- // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
- // triggering of change attribute of the NetInfo API when there is a change in
- // the connection type.
-@@ -946,7 +948,7 @@ const char kPreventResizingContentsForTe
-     "prevent-resizing-contents-for-testing";
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Allows sending text-to-speech requests to speech-dispatcher, a common
- // Linux speech service. Because it's buggy, the user must explicitly
- // enable it so that visiting a random webpage can't cause instability.
diff --git a/chromium-next/patches/patch-content_public_common_content__switches.h b/chromium-next/patches/patch-content_public_common_content__switches.h
deleted file mode 100644
index cb41276a59..0000000000
--- a/chromium-next/patches/patch-content_public_common_content__switches.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/public/common/content_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/public/common/content_switches.h
-@@ -107,6 +107,7 @@ CONTENT_EXPORT extern const char kEnable
- CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
- CONTENT_EXPORT extern const char kEnableLCDText[];
- CONTENT_EXPORT extern const char kEnableLogging[];
-+CONTENT_EXPORT extern const char kDisableUnveil[];
- CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
- CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
- CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -258,7 +259,7 @@ CONTENT_EXPORT extern const char kRender
- CONTENT_EXPORT extern const char kPreventResizingContentsForTesting[];
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
- #endif
- 
diff --git a/chromium-next/patches/patch-content_public_common_zygote_features.gni b/chromium-next/patches/patch-content_public_common_zygote_features.gni
deleted file mode 100644
index cb51a9b592..0000000000
--- a/chromium-next/patches/patch-content_public_common_zygote_features.gni
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/public/common/zygote/features.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/public/common/zygote/features.gni
-@@ -2,4 +2,4 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
--use_zygote = is_posix && !is_android && !is_apple
-+use_zygote = is_posix && !is_android && !is_mac && !is_bsd
diff --git a/chromium-next/patches/patch-content_renderer_render__thread__impl.cc b/chromium-next/patches/patch-content_renderer_render__thread__impl.cc
deleted file mode 100644
index 1582852c95..0000000000
--- a/chromium-next/patches/patch-content_renderer_render__thread__impl.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/renderer/render_thread_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/renderer/render_thread_impl.cc
-@@ -207,6 +207,8 @@
- 
- #if BUILDFLAG(IS_APPLE)
- #include <malloc/malloc.h>
-+#elif BUILDFLAG(IS_BSD)
-+#include <stdlib.h>
- #else
- #include <malloc.h>
- #endif
-@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* Ren
-                              kGpuStreamIdMedia, kGpuStreamPriorityMedia);
- 
-   const bool enable_video_decode_accelerator =
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) &&
- #endif  // BUILDFLAG(IS_LINUX)
-       !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* Ren
-        gpu::kGpuFeatureStatusEnabled);
- 
-   const bool enable_video_encode_accelerator =
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux) &&
- #else
-       !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1870,7 +1872,7 @@ RenderThreadImpl::CreateMediaMojoCodecFa
-     bool enable_video_encode_accelerator) {
-   mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
-       vea_provider;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoEncoding)) {
-     BindHostReceiver(vea_provider.InitWithNewPipeAndPassReceiver());
-   } else {
diff --git a/chromium-next/patches/patch-content_renderer_renderer__blink__platform__impl.cc b/chromium-next/patches/patch-content_renderer_renderer__blink__platform__impl.cc
deleted file mode 100644
index 383593120d..0000000000
--- a/chromium-next/patches/patch-content_renderer_renderer__blink__platform__impl.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/renderer/renderer_blink_platform_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -124,7 +124,7 @@
- 
- #if BUILDFLAG(IS_MAC)
- #include "content/child/child_process_sandbox_support_impl_mac.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/child/child_process_sandbox_support_impl_linux.h"
- #include "content/child/sandboxed_process_thread_type_handler.h"
- #endif
-@@ -192,13 +192,13 @@ RendererBlinkPlatformImpl::RendererBlink
-       is_locked_to_site_(false),
-       main_thread_scheduler_(main_thread_scheduler),
-       next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   sk_sp<font_service::FontLoader> font_loader;
- #endif
- 
-   // RenderThread may not exist in some tests.
-   if (RenderThreadImpl::current()) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     mojo::PendingRemote<font_service::mojom::FontService> font_service;
-     RenderThreadImpl::current()->BindHostReceiver(
-         font_service.InitWithNewPipeAndPassReceiver());
-@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlink
-   }
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (sandboxEnabled()) {
- #if BUILDFLAG(IS_MAC)
-     sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -296,7 +296,7 @@ RendererBlinkPlatformImpl::GetWebUIBundl
- 
- blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return sandbox_support_.get();
- #else
-   // These platforms do not require sandbox support.
diff --git a/chromium-next/patches/patch-content_renderer_renderer__blink__platform__impl.h b/chromium-next/patches/patch-content_renderer_renderer__blink__platform__impl.h
deleted file mode 100644
index e13483a6af..0000000000
--- a/chromium-next/patches/patch-content_renderer_renderer__blink__platform__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/renderer/renderer_blink_platform_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/renderer/renderer_blink_platform_impl.h
-@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
-                                    const gpu::GPUInfo& gpu_info) const;
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
- #endif
- 
diff --git a/chromium-next/patches/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/chromium-next/patches/patch-content_renderer_renderer__main__platform__delegate__linux.cc
deleted file mode 100644
index dd37e24227..0000000000
--- a/chromium-next/patches/patch-content_renderer_renderer__main__platform__delegate__linux.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/renderer/renderer_main_platform_delegate_linux.cc
-@@ -44,6 +44,7 @@ bool RendererMainPlatformDelegate::Enabl
-   // any renderer has been started.
-   // Here, we test that the status of SeccompBpf in the renderer is consistent
-   // with what SandboxLinux::GetStatus() said we would do.
-+#if !BUILDFLAG(IS_BSD)
-   auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance();
-   if (linux_sandbox->GetStatus() & sandbox::policy::SandboxLinux::kSeccompBPF) {
-     CHECK(linux_sandbox->seccomp_bpf_started());
-@@ -65,6 +66,7 @@ bool RendererMainPlatformDelegate::Enabl
-     CHECK_EQ(errno, EPERM);
-   }
- #endif  // __x86_64__
-+#endif
- 
-   return true;
- }
diff --git a/chromium-next/patches/patch-content_shell_BUILD.gn b/chromium-next/patches/patch-content_shell_BUILD.gn
deleted file mode 100644
index b9c0fa579d..0000000000
--- a/chromium-next/patches/patch-content_shell_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/shell/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/shell/BUILD.gn
-@@ -1099,7 +1099,7 @@ group("content_shell_crash_test") {
-   if (is_win) {
-     data_deps += [ "//build/win:copy_cdb_to_output" ]
-   }
--  if (is_posix) {
-+  if (is_posix && !is_bsd) {
-     data_deps += [
-       "//third_party/breakpad:dump_syms",
-       "//third_party/breakpad:minidump_stackwalk",
diff --git a/chromium-next/patches/patch-content_shell_app_shell__main__delegate.cc b/chromium-next/patches/patch-content_shell_app_shell__main__delegate.cc
deleted file mode 100644
index aa56b30d60..0000000000
--- a/chromium-next/patches/patch-content_shell_app_shell__main__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/shell/app/shell_main_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/shell/app/shell_main_delegate.cc
-@@ -269,7 +269,7 @@ void ShellMainDelegate::PreSandboxStartu
-     // Reporting for sub-processes will be initialized in ZygoteForked.
-     if (process_type != switches::kZygoteProcess) {
-       crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       crash_reporter::SetFirstChanceExceptionHandler(
-           v8::TryHandleWebAssemblyTrapPosix);
- #endif
diff --git a/chromium-next/patches/patch-content_shell_browser_shell__browser__main__parts.cc b/chromium-next/patches/patch-content_shell_browser_shell__browser__main__parts.cc
deleted file mode 100644
index 2c1308a626..0000000000
--- a/chromium-next/patches/patch-content_shell_browser_shell__browser__main__parts.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/shell/browser/shell_browser_main_parts.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/shell/browser/shell_browser_main_parts.cc
-@@ -50,7 +50,7 @@
- #include "net/base/network_change_notifier.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && defined(USE_AURA)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_AURA)
- #include "ui/base/ime/init/input_method_initializer.h"
- #endif
- 
-@@ -61,7 +61,7 @@
- #include "device/bluetooth/floss/floss_features.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
- #include "ui/linux/linux_ui.h"          // nogncheck
- #include "ui/linux/linux_ui_factory.h"  // nogncheck
-@@ -128,7 +128,7 @@ void ShellBrowserMainParts::PostCreateMa
- }
- 
- int ShellBrowserMainParts::PreEarlyInitialization() {
--#if BUILDFLAG(IS_LINUX) && defined(USE_AURA)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_AURA)
-   ui::InitializeInputMethodForTesting();
- #elif BUILDFLAG(IS_ANDROID)
-   net::NetworkChangeNotifier::SetFactory(
-@@ -156,7 +156,7 @@ void ShellBrowserMainParts::ToolkitIniti
-   if (switches::IsRunWebTestsSwitchPresent())
-     return;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi());
- #endif
- }
-@@ -203,7 +203,7 @@ void ShellBrowserMainParts::PostMainMess
-   ShellDevToolsManagerDelegate::StopHttpHandler();
-   browser_context_.reset();
-   off_the_record_browser_context_.reset();
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ui::LinuxUi::SetInstance(nullptr);
- #endif
-   performance_manager_lifetime_.reset();
diff --git a/chromium-next/patches/patch-content_shell_browser_shell__paths.cc b/chromium-next/patches/patch-content_shell_browser_shell__paths.cc
deleted file mode 100644
index fab8041706..0000000000
--- a/chromium-next/patches/patch-content_shell_browser_shell__paths.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/shell/browser/shell_paths.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/shell/browser/shell_paths.cc
-@@ -13,7 +13,7 @@
- 
- #if BUILDFLAG(IS_FUCHSIA)
- #include "base/fuchsia/file_utils.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/nix/xdg_util.h"
- #endif
- 
-@@ -25,7 +25,7 @@ bool GetDefaultUserDataDirectory(base::F
- #if BUILDFLAG(IS_WIN)
-   CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, result));
-   *result = result->Append(std::wstring(L"content_shell"));
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<base::Environment> env(base::Environment::Create());
-   base::FilePath config_dir(base::nix::GetXDGDirectory(
-       env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir));
diff --git a/chromium-next/patches/patch-content_shell_browser_shell__platform__delegate__views.cc b/chromium-next/patches/patch-content_shell_browser_shell__platform__delegate__views.cc
deleted file mode 100644
index be53c1c5f7..0000000000
--- a/chromium-next/patches/patch-content_shell_browser_shell__platform__delegate__views.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/shell/browser/shell_platform_delegate_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/shell/browser/shell_platform_delegate_views.cc
-@@ -373,7 +373,7 @@ void ShellPlatformDelegate::CreatePlatfo
-       views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET);
-   params.bounds = gfx::Rect(initial_size);
-   params.delegate = delegate.release();
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   params.wm_class_class = "chromium-content_shell";
-   params.wm_class_name = params.wm_class_class;
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-content_shell_renderer_shell__content__renderer__client.cc b/chromium-next/patches/patch-content_shell_renderer_shell__content__renderer__client.cc
deleted file mode 100644
index 782ccd7494..0000000000
--- a/chromium-next/patches/patch-content_shell_renderer_shell__content__renderer__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/shell/renderer/shell_content_renderer_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/shell/renderer/shell_content_renderer_client.cc
-@@ -55,7 +55,7 @@
- #include "media/base/media_switches.h"
- #endif
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
-     (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64))
- #define ENABLE_WEB_ASSEMBLY_TRAP_HANDLER_LINUX
- #include "base/debug/stack_trace.h"
diff --git a/chromium-next/patches/patch-content_shell_utility_shell__content__utility__client.cc b/chromium-next/patches/patch-content_shell_utility_shell__content__utility__client.cc
deleted file mode 100644
index dfab87a237..0000000000
--- a/chromium-next/patches/patch-content_shell_utility_shell__content__utility__client.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/shell/utility/shell_content_utility_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/shell/utility/shell_content_utility_client.cc
-@@ -43,7 +43,7 @@
- #include "sandbox/policy/sandbox.h"
- #include "services/test/echo/echo_service.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/test/sandbox_status_service.h"
- #endif
- 
-@@ -192,7 +192,7 @@ void ShellContentUtilityClient::ExposeIn
-   binders->Add<mojom::PowerMonitorTest>(
-       base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver),
-       base::SingleThreadTaskRunner::GetCurrentDefault());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (register_sandbox_status_helper_) {
-     binders->Add<content::mojom::SandboxStatusService>(
-         base::BindRepeating(
diff --git a/chromium-next/patches/patch-content_test_BUILD.gn b/chromium-next/patches/patch-content_test_BUILD.gn
deleted file mode 100644
index e9a639c88a..0000000000
--- a/chromium-next/patches/patch-content_test_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/test/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/test/BUILD.gn
-@@ -1764,7 +1764,7 @@ test("content_browsertests") {
-     "../test/url_loader_interceptor_browsertest.cc",
-   ]
- 
--  if (is_linux) {
-+  if ((is_linux) && !is_bsd) {
-     sources += [ "../browser/network/address_map_linux_browsertest.cc" ]
-   }
- 
diff --git a/chromium-next/patches/patch-content_utility_services.cc b/chromium-next/patches/patch-content_utility_services.cc
deleted file mode 100644
index 2affcf8587..0000000000
--- a/chromium-next/patches/patch-content_utility_services.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/utility/services.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/utility/services.cc
-@@ -73,7 +73,7 @@
- extern sandbox::TargetServices* g_utility_target_services;
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h"
- #include "sandbox/linux/services/libc_interceptor.h"
- #include "sandbox/policy/mojom/sandbox.mojom.h"
-@@ -101,7 +101,7 @@ extern sandbox::TargetServices* g_utilit
- #endif  // BUILDFLAG(IS_CHROMEOS) && (BUILDFLAG(USE_VAAPI) ||
-         // BUILDFLAG(USE_V4L2_CODEC))
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
-     (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- #include "content/common/features.h"
- #include "media/mojo/services/oop_video_decoder_factory_process_service.h"  // nogncheck
-@@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver<audi
-       << "task_policy_set TASK_QOS_POLICY";
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   auto* command_line = base::CommandLine::ForCurrentProcess();
-   if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
-       sandbox::mojom::Sandbox::kNoSandbox) {
-@@ -381,7 +381,7 @@ auto RunOOPArcVideoAcceleratorFactorySer
- #endif  // BUILDFLAG(IS_CHROMEOS) && \
-         // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
-     (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- auto RunOOPVideoDecoderFactoryProcessService(
-     mojo::PendingReceiver<media::mojom::VideoDecoderFactoryProcess> receiver) {
-@@ -391,7 +391,7 @@ auto RunOOPVideoDecoderFactoryProcessSer
- #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
-         // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- auto RunVideoEncodeAcceleratorProviderFactory(
-     mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
-         receiver) {
-@@ -414,7 +414,7 @@ void RegisterIOThreadServices(mojo::Serv
-   // loop of type IO that can get notified when pipes have data.
-   services.Add(RunNetworkService);
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
-     (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
-   services.Add(RunOOPVideoDecoderFactoryProcessService);
- #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
-@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::Se
- #endif  // BUILDFLAG(IS_CHROMEOS) && \
-         // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   services.Add(RunVideoEncodeAcceleratorProviderFactory);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
diff --git a/chromium-next/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc b/chromium-next/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
deleted file mode 100644
index d0d30e6cf9..0000000000
--- a/chromium-next/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/utility/speech/speech_recognition_sandbox_hook_linux.cc
-@@ -12,11 +12,14 @@
- #include "sandbox/linux/syscall_broker/broker_command.h"
- #include "sandbox/linux/syscall_broker/broker_file_permission.h"
- 
-+#if !BUILDFLAG(IS_BSD)
- using sandbox::syscall_broker::BrokerFilePermission;
- using sandbox::syscall_broker::MakeBrokerCommandSet;
-+#endif
- 
- namespace speech {
- 
-+#if !BUILDFLAG(IS_BSD)
- namespace {
- 
- // Gets the file permissions required by the Speech On-Device API (SODA).
-@@ -50,9 +53,11 @@ std::vector<BrokerFilePermission> GetSod
- }
- 
- }  // namespace
-+#endif
- 
- bool SpeechRecognitionPreSandboxHook(
-     sandbox::policy::SandboxLinux::Options options) {
-+#if !BUILDFLAG(IS_BSD)
- #if BUILDFLAG(ENABLE_SODA_INTEGRATION_TESTS)
-   base::FilePath test_binary_path = GetSodaTestBinaryPath();
-   DVLOG(0) << "SODA test binary path: " << test_binary_path.value().c_str();
-@@ -75,6 +80,7 @@ bool SpeechRecognitionPreSandboxHook(
-                                }),
-                                GetSodaFilePermissions(), options);
-   instance->EngageNamespaceSandboxIfPossible();
-+#endif
- 
-   return true;
- }
diff --git a/chromium-next/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h b/chromium-next/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
deleted file mode 100644
index 4aaf6975dc..0000000000
--- a/chromium-next/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/utility/speech/speech_recognition_sandbox_hook_linux.h
-@@ -5,7 +5,13 @@
- #ifndef CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_
- #define CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_
- 
-+#include "build/build_config.h"
-+
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace speech {
- 
diff --git a/chromium-next/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/chromium-next/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
deleted file mode 100644
index f6298883d3..0000000000
--- a/chromium-next/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc
-@@ -9,7 +9,7 @@
- 
- #if BUILDFLAG(IS_MAC)
- #include "content/child/child_process_sandbox_support_impl_mac.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/child/child_process_sandbox_support_impl_linux.h"
- #elif BUILDFLAG(IS_WIN)
- #include "content/child/child_process_sandbox_support_impl_win.h"
-@@ -19,7 +19,7 @@ namespace content {
- 
- UtilityBlinkPlatformWithSandboxSupportImpl::
-     UtilityBlinkPlatformWithSandboxSupportImpl() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   mojo::PendingRemote<font_service::mojom::FontService> font_service;
-   UtilityThread::Get()->BindHostReceiver(
-       font_service.InitWithNewPipeAndPassReceiver());
-@@ -40,7 +40,7 @@ UtilityBlinkPlatformWithSandboxSupportIm
- blink::WebSandboxSupport*
- UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return sandbox_support_.get();
- #else
-   return nullptr;
diff --git a/chromium-next/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/chromium-next/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
deleted file mode 100644
index e060738b97..0000000000
--- a/chromium-next/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/utility/utility_blink_platform_with_sandbox_support_impl.h
-@@ -34,7 +34,7 @@ class UtilityBlinkPlatformWithSandboxSup
- 
-  private:
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
- #endif
- };
diff --git a/chromium-next/patches/patch-content_utility_utility__main.cc b/chromium-next/patches/patch-content_utility_utility__main.cc
deleted file mode 100644
index 9a7cb0feb2..0000000000
--- a/chromium-next/patches/patch-content_utility_utility__main.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/utility/utility_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/utility/utility_main.cc
-@@ -36,18 +36,22 @@
- #include "services/tracing/public/cpp/trace_startup.h"
- #include "services/video_effects/public/cpp/buildflags.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/file_descriptor_store.h"
- #include "base/files/file_util.h"
- #include "base/pickle.h"
- #include "content/child/sandboxed_process_thread_type_handler.h"
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "content/common/gpu_pre_sandbox_hook_linux.h"
-+#endif
- #include "content/public/common/content_descriptor_keys.h"
- #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h"
- #include "gpu/config/gpu_info_collector.h"
- #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h"
- #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h"
-+#if !BUILDFLAG(IS_BSD)
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- #include "services/audio/audio_sandbox_hook_linux.h"
- #include "services/network/network_sandbox_hook_linux.h"
- #include "services/screen_ai/buildflags/buildflags.h"
-@@ -66,7 +70,12 @@
- 
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#include "content/common/gpu_pre_sandbox_hook_bsd.h"
-+#endif
-+
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "services/video_effects/video_effects_sandbox_hook_linux.h"  // nogncheck
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -101,7 +110,7 @@
- sandbox::TargetServices* g_utility_target_services = nullptr;
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
- #include "components/services/on_device_translation/sandbox_hook.h"
- #endif  // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX)
- 
-@@ -109,7 +118,7 @@ namespace content {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- std::vector<std::string> GetNetworkContextsParentDirectories() {
-   base::MemoryMappedFile::Region region;
-   base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD(
-@@ -247,7 +256,8 @@ int UtilityMain(MainFunctionParams param
-     CHECK(on_device_model::OnDeviceModelService::PreSandboxInit());
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+// XXX BSD
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
-   // Thread type delegate of the process should be registered before first
-   // thread type change in ChildProcess constructor. It also needs to be
-   // registered before the process has multiple threads, which may race with
-@@ -255,7 +265,7 @@ int UtilityMain(MainFunctionParams param
-   SandboxedProcessThreadTypeHandler::Create();
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Initializes the sandbox before any threads are created.
-   // TODO(jorgelo): move this after GTK initialization when we enable a strict
-   // Seccomp-BPF policy.
-@@ -287,7 +297,7 @@ int UtilityMain(MainFunctionParams param
-       pre_sandbox_hook =
-           base::BindOnce(&speech::SpeechRecognitionPreSandboxHook);
-       break;
--#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-     case sandbox::mojom::Sandbox::kOnDeviceTranslation:
-       pre_sandbox_hook = base::BindOnce(
-           &on_device_translation::OnDeviceTranslationSandboxHook);
-@@ -303,13 +313,13 @@ int UtilityMain(MainFunctionParams param
- #else
-       NOTREACHED();
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case sandbox::mojom::Sandbox::kVideoEffects:
-       pre_sandbox_hook =
-           base::BindOnce(&video_effects::VideoEffectsPreSandboxHook);
-       break;
- #endif  // BUILDFLAG(IS_LINUX)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
-       pre_sandbox_hook =
-           base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -336,6 +346,7 @@ int UtilityMain(MainFunctionParams param
-     default:
-       break;
-   }
-+#if !BUILDFLAG(IS_BSD)
-   if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
-       (parameters.zygote_child || !pre_sandbox_hook.is_null())) {
-     sandbox_options.use_amd_specific_policies =
-@@ -343,6 +354,11 @@ int UtilityMain(MainFunctionParams param
-     sandbox::policy::Sandbox::Initialize(
-         sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
-   }
-+#else
-+  sandbox::policy::Sandbox::Initialize(
-+      sandbox_type, std::move(pre_sandbox_hook),
-+      sandbox::policy::SandboxLinux::Options());
-+#endif
- 
-   // Start the HangWatcher now that the sandbox is engaged, if it hasn't
-   // already been started.
diff --git a/chromium-next/patches/patch-content_utility_utility__thread__impl.cc b/chromium-next/patches/patch-content_utility_utility__thread__impl.cc
deleted file mode 100644
index 0f649fe58e..0000000000
--- a/chromium-next/patches/patch-content_utility_utility__thread__impl.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/utility/utility_thread_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/utility/utility_thread_impl.cc
-@@ -31,7 +31,7 @@
- #include "mojo/public/cpp/bindings/pending_receiver.h"
- #include "mojo/public/cpp/bindings/service_factory.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/child/sandboxed_process_thread_type_handler.h"
- #endif
- 
-@@ -251,7 +251,8 @@ void UtilityThreadImpl::Init() {
- 
-   GetContentClient()->utility()->UtilityThreadStarted();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+// XXX BSD
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
-   SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated();
- #endif
- 
diff --git a/chromium-next/patches/patch-content_zygote_BUILD.gn b/chromium-next/patches/patch-content_zygote_BUILD.gn
deleted file mode 100644
index 27c58fadbc..0000000000
--- a/chromium-next/patches/patch-content_zygote_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/zygote/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/zygote/BUILD.gn
-@@ -5,7 +5,7 @@
- import("//build/config/nacl/config.gni")
- import("//content/public/common/zygote/features.gni")
- 
--if (is_linux || is_chromeos) {
-+if ((is_linux || is_chromeos) && !is_bsd) {
-   source_set("zygote") {
-     sources = [
-       "zygote_linux.cc",
diff --git a/chromium-next/patches/patch-content_zygote_zygote__linux.cc b/chromium-next/patches/patch-content_zygote_zygote__linux.cc
deleted file mode 100644
index 62d7076bdc..0000000000
--- a/chromium-next/patches/patch-content_zygote_zygote__linux.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/zygote/zygote_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/zygote/zygote_linux.cc
-@@ -1,6 +1,7 @@
- // Copyright 2012 The Chromium Authors
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-+#if 0
- 
- #include "content/zygote/zygote_linux.h"
- 
-@@ -705,3 +706,4 @@ void Zygote::HandleReinitializeLoggingRe
- }
- 
- }  // namespace content
-+#endif
diff --git a/chromium-next/patches/patch-content_zygote_zygote__main__linux.cc b/chromium-next/patches/patch-content_zygote_zygote__main__linux.cc
deleted file mode 100644
index 01cc80d050..0000000000
--- a/chromium-next/patches/patch-content_zygote_zygote__main__linux.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/zygote/zygote_main_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ content/zygote/zygote_main_linux.cc
-@@ -11,7 +11,9 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <string.h>
-+#if !BUILDFLAG(IS_BSD)
- #include <sys/prctl.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -41,7 +43,9 @@
- #include "sandbox/linux/services/thread_helpers.h"
- #include "sandbox/linux/suid/client/setuid_sandbox_client.h"
- #include "sandbox/policy/linux/sandbox_debug_handling_linux.h"
-+#if !BUILDFLAG(IS_BSD)
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- #include "sandbox/policy/sandbox.h"
- #include "sandbox/policy/switches.h"
- #include "third_party/icu/source/i18n/unicode/timezone.h"
-@@ -50,11 +54,13 @@ namespace content {
- 
- namespace {
- 
-+#if !BUILDFLAG(IS_BSD)
- void CloseFds(const std::vector<int>& fds) {
-   for (const auto& it : fds) {
-     PCHECK(0 == IGNORE_EINTR(close(it)));
-   }
- }
-+#endif
- 
- base::OnceClosure ClosureFromTwoClosures(base::OnceClosure one,
-                                          base::OnceClosure two) {
-@@ -157,9 +163,11 @@ static void EnterLayerOneSandbox(sandbox
-     CHECK(!using_layer1_sandbox);
-   }
- }
-+#endif
- 
- bool ZygoteMain(
-     std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) {
-+#if !BUILDFLAG(IS_BSD)
-   sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
- 
-   auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance();
-@@ -224,6 +232,9 @@ bool ZygoteMain(
- 
-   // This function call can return multiple times, once per fork().
-   return zygote.ProcessRequests();
-+#else
-+  return false;
-+#endif
- }
- 
- }  // namespace content
diff --git a/chromium-next/patches/patch-device_bluetooth_bluetooth__adapter.cc b/chromium-next/patches/patch-device_bluetooth_bluetooth__adapter.cc
deleted file mode 100644
index 94cefe25f8..0000000000
--- a/chromium-next/patches/patch-device_bluetooth_bluetooth__adapter.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- device/bluetooth/bluetooth_adapter.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ device/bluetooth/bluetooth_adapter.cc
-@@ -32,7 +32,7 @@ namespace device {
- BluetoothAdapter::ServiceOptions::ServiceOptions() = default;
- BluetoothAdapter::ServiceOptions::~ServiceOptions() = default;
- 
--#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && \
-+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) && \
-     !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
- // static
- scoped_refptr<BluetoothAdapter> BluetoothAdapter::CreateAdapter() {
diff --git a/chromium-next/patches/patch-device_bluetooth_cast__bluetooth.gni b/chromium-next/patches/patch-device_bluetooth_cast__bluetooth.gni
deleted file mode 100644
index 119ce3b357..0000000000
--- a/chromium-next/patches/patch-device_bluetooth_cast__bluetooth.gni
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- device/bluetooth/cast_bluetooth.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ device/bluetooth/cast_bluetooth.gni
-@@ -2,5 +2,5 @@ import("//build/config/features.gni")
- 
- declare_args() {
-   force_cast_bluetooth = false
--  use_bluez = (is_linux && !is_castos && use_dbus) || is_chromeos
-+  use_bluez = use_dbus && !is_bsd
- }
diff --git a/chromium-next/patches/patch-device_gamepad_BUILD.gn b/chromium-next/patches/patch-device_gamepad_BUILD.gn
deleted file mode 100644
index 0456109af8..0000000000
--- a/chromium-next/patches/patch-device_gamepad_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- device/gamepad/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ device/gamepad/BUILD.gn
-@@ -98,7 +98,7 @@ component("gamepad") {
-       "hid_writer_linux.cc",
-       "hid_writer_linux.h",
-     ]
--    if (use_udev) {
-+    if (use_udev && !is_bsd) {
-       sources += [
-         "gamepad_device_linux.cc",
-         "gamepad_device_linux.h",
diff --git a/chromium-next/patches/patch-device_gamepad_gamepad__provider.cc b/chromium-next/patches/patch-device_gamepad_gamepad__provider.cc
deleted file mode 100644
index b23bb31ff6..0000000000
--- a/chromium-next/patches/patch-device_gamepad_gamepad__provider.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- device/gamepad/gamepad_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ device/gamepad/gamepad_provider.cc
-@@ -159,7 +159,7 @@ void GamepadProvider::Initialize(std::un
- 
-   if (!polling_thread_)
-     polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread");
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // On Linux, the data fetcher needs to watch file descriptors, so the message
-   // loop needs to be a libevent loop.
-   const base::MessagePumpType kMessageLoopType = base::MessagePumpType::IO;
diff --git a/chromium-next/patches/patch-device_gamepad_hid__writer__linux.cc b/chromium-next/patches/patch-device_gamepad_hid__writer__linux.cc
deleted file mode 100644
index c7dcb0d7d5..0000000000
--- a/chromium-next/patches/patch-device_gamepad_hid__writer__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- device/gamepad/hid_writer_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ device/gamepad/hid_writer_linux.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include <unistd.h>
-+
- #include "device/gamepad/hid_writer_linux.h"
- 
- #include <unistd.h>
diff --git a/chromium-next/patches/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/chromium-next/patches/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
deleted file mode 100644
index 86d55a831e..0000000000
--- a/chromium-next/patches/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/browser/api/api_browser_context_keyed_service_factories.cc
-@@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedService
-   MediaPerceptionAPIManager::GetFactoryInstance();
- #endif
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   NetworkingPrivateEventRouterFactory::GetInstance();
- #endif
-   PrinterProviderAPIFactory::GetInstance();
diff --git a/chromium-next/patches/patch-extensions_browser_api_management_management__api.cc b/chromium-next/patches/patch-extensions_browser_api_management_management__api.cc
deleted file mode 100644
index 78a9d92235..0000000000
--- a/chromium-next/patches/patch-extensions_browser_api_management_management__api.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/browser/api/management/management_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/browser/api/management/management_api.cc
-@@ -286,7 +286,7 @@ bool PlatformSupportsApprovalFlowForExte
- #if BUILDFLAG(IS_CHROMEOS)
-   // ChromeOS devices have this feature already shipped.
-   return true;
--#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(
-       supervised_user::kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
- #else
diff --git a/chromium-next/patches/patch-extensions_browser_api_messaging_message__service.cc b/chromium-next/patches/patch-extensions_browser_api_messaging_message__service.cc
deleted file mode 100644
index 35c237a3c3..0000000000
--- a/chromium-next/patches/patch-extensions_browser_api_messaging_message__service.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/browser/api/messaging/message_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/browser/api/messaging/message_service.cc
-@@ -81,7 +81,7 @@ namespace {
- const char kReceivingEndDoesntExistError[] =
-     "Could not establish connection. Receiving end does not exist.";
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kMissingPermissionError[] =
-     "Access to native messaging requires nativeMessaging permission.";
- const char kProhibitedByPoliciesError[] =
-@@ -673,7 +673,7 @@ void MessageService::OpenChannelToNative
-     return;
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool has_permission = extension->permissions_data()->HasAPIPermission(
-       mojom::APIPermissionID::kNativeMessaging);
-   if (!has_permission) {
diff --git a/chromium-next/patches/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/chromium-next/patches/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
deleted file mode 100644
index 8c6bcb094f..0000000000
--- a/chromium-next/patches/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc
-@@ -12,7 +12,7 @@
- 
- #if BUILDFLAG(IS_CHROMEOS)
- #include "extensions/browser/api/networking_private/networking_private_chromeos.h"
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "extensions/browser/api/networking_private/networking_private_linux.h"
- #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
- #include "components/wifi/wifi_service.h"
-@@ -63,7 +63,7 @@ NetworkingPrivateDelegateFactory::BuildS
-   std::unique_ptr<NetworkingPrivateDelegate> delegate;
- #if BUILDFLAG(IS_CHROMEOS)
-   delegate = std::make_unique<NetworkingPrivateChromeOS>(browser_context);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   delegate = std::make_unique<NetworkingPrivateLinux>();
- #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-   std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create());
-@@ -74,7 +74,7 @@ NetworkingPrivateDelegateFactory::BuildS
- #endif
- 
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (ui_factory_) {
-     delegate->set_ui_delegate(ui_factory_->CreateDelegate());
-   }
diff --git a/chromium-next/patches/patch-extensions_common_api___permission__features.json b/chromium-next/patches/patch-extensions_common_api___permission__features.json
deleted file mode 100644
index 0240266232..0000000000
--- a/chromium-next/patches/patch-extensions_common_api___permission__features.json
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/common/api/_permission_features.json.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/common/api/_permission_features.json
-@@ -134,7 +134,7 @@
-     {
-       "channel": "stable",
-       "extension_types": ["platform_app"],
--      "platforms": ["chromeos", "win", "mac", "linux"],
-+      "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd", "netbsd"],
-       "allowlist": [
-         "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/387169
-         "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/387169
-@@ -419,7 +419,7 @@
-   }, {
-     "channel": "stable",
-     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
--    "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"],
-+    "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd", "netbsd"],
-     "allowlist": [
-       "0DE0F05680A4A056BCEC864ED8DDA84296F82B40",  // http://crbug.com/434651
-       "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/293683
-@@ -463,7 +463,7 @@
-   "networkingPrivate": {
-     "channel": "stable",
-     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
--    "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"],
-+    "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd", "netbsd"],
-     "allowlist": [
-       // DO NOT ADD ANY MORE ENTRIES HERE.
-       // networkingPrivate is being migrated to networking.onc.
diff --git a/chromium-next/patches/patch-extensions_common_api_runtime.json b/chromium-next/patches/patch-extensions_common_api_runtime.json
deleted file mode 100644
index 64e6d1da07..0000000000
--- a/chromium-next/patches/patch-extensions_common_api_runtime.json
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/common/api/runtime.json.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/common/api/runtime.json
-@@ -86,6 +86,8 @@
-             {"name": "cros", "description": "Specifies the Chrome operating system."},
-             {"name": "linux", "description": "Specifies the Linux operating system."},
-             {"name": "openbsd", "description": "Specifies the OpenBSD operating system."},
-+            {"name": "freebsd", "description": "Specifies the FreeBSD operating system."},
-+            {"name": "netbsd", "description": "Specifies the NetBSD operating system."},
-             {"name": "fuchsia", "description": "Specifies the Fuchsia operating system."}
-         ]
-       },
diff --git a/chromium-next/patches/patch-extensions_common_command.cc b/chromium-next/patches/patch-extensions_common_command.cc
deleted file mode 100644
index d74b3484d6..0000000000
--- a/chromium-next/patches/patch-extensions_common_command.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/common/command.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/common/command.cc
-@@ -116,7 +116,7 @@ std::string Command::CommandPlatform() {
-   return ui::kKeybindingPlatformMac;
- #elif BUILDFLAG(IS_CHROMEOS)
-   return ui::kKeybindingPlatformChromeOs;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return ui::kKeybindingPlatformLinux;
- #elif BUILDFLAG(IS_FUCHSIA)
-   // TODO(crbug.com/40220501): Change this once we decide what string should be
diff --git a/chromium-next/patches/patch-extensions_common_features_feature.cc b/chromium-next/patches/patch-extensions_common_features_feature.cc
deleted file mode 100644
index 6c5e38efd0..0000000000
--- a/chromium-next/patches/patch-extensions_common_features_feature.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/common/features/feature.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/common/features/feature.cc
-@@ -29,6 +29,8 @@ Feature::Platform Feature::GetCurrentPla
-   return WIN_PLATFORM;
- #elif BUILDFLAG(IS_FUCHSIA)
-   return FUCHSIA_PLATFORM;
-+#elif BUILDFLAG(IS_BSD)
-+  return LINUX_PLATFORM;
- #else
-   return UNSPECIFIED_PLATFORM;
- #endif
diff --git a/chromium-next/patches/patch-extensions_renderer_bindings_api__binding__util.cc b/chromium-next/patches/patch-extensions_renderer_bindings_api__binding__util.cc
deleted file mode 100644
index 467413a7b1..0000000000
--- a/chromium-next/patches/patch-extensions_renderer_bindings_api__binding__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/renderer/bindings/api_binding_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/renderer/bindings/api_binding_util.cc
-@@ -129,7 +129,7 @@ void InvalidateContext(v8::Local<v8::Con
- std::string GetPlatformString() {
- #if BUILDFLAG(IS_CHROMEOS)
-   return "chromeos";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "linux";
- #elif BUILDFLAG(IS_MAC)
-   return "mac";
diff --git a/chromium-next/patches/patch-extensions_renderer_bindings_argument__spec.cc b/chromium-next/patches/patch-extensions_renderer_bindings_argument__spec.cc
deleted file mode 100644
index 4fba482a1b..0000000000
--- a/chromium-next/patches/patch-extensions_renderer_bindings_argument__spec.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/renderer/bindings/argument_spec.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/renderer/bindings/argument_spec.cc
-@@ -18,6 +18,8 @@
- #include "gin/data_object_builder.h"
- #include "gin/dictionary.h"
- 
-+#include <cmath>
-+
- namespace extensions {
- 
- namespace {
diff --git a/chromium-next/patches/patch-extensions_shell_app_shell__main__delegate.cc b/chromium-next/patches/patch-extensions_shell_app_shell__main__delegate.cc
deleted file mode 100644
index 7d47b14c99..0000000000
--- a/chromium-next/patches/patch-extensions_shell_app_shell__main__delegate.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/shell/app/shell_main_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/shell/app/shell_main_delegate.cc
-@@ -40,7 +40,7 @@
- #if BUILDFLAG(IS_WIN)
- #include "base/base_paths_win.h"
- #include "base/process/process_info.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/nix/xdg_util.h"
- #elif BUILDFLAG(IS_MAC)
- #include "base/base_paths_mac.h"
-@@ -60,7 +60,7 @@ base::FilePath GetDataPath() {
-   }
- 
-   base::FilePath data_dir;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<base::Environment> env(base::Environment::Create());
-   data_dir = base::nix::GetXDGDirectory(
-       env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir);
diff --git a/chromium-next/patches/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/chromium-next/patches/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
deleted file mode 100644
index ccf78addea..0000000000
--- a/chromium-next/patches/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc
-@@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(co
- bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
- #if BUILDFLAG(IS_CHROMEOS)
-   info->os = api::runtime::PlatformOs::kCros;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   info->os = api::runtime::PlatformOs::kLinux;
- #endif
-   return true;
diff --git a/chromium-next/patches/patch-extensions_shell_browser_shell__browser__main__parts.cc b/chromium-next/patches/patch-extensions_shell_browser_shell__browser__main__parts.cc
deleted file mode 100644
index 6fc382baaf..0000000000
--- a/chromium-next/patches/patch-extensions_shell_browser_shell__browser__main__parts.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/shell/browser/shell_browser_main_parts.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/shell/browser/shell_browser_main_parts.cc
-@@ -137,7 +137,7 @@ void ShellBrowserMainParts::PostCreateMa
-       switches::kAppShellAllowRoaming)) {
-     network_controller_->SetCellularAllowRoaming(true);
-   }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // app_shell doesn't need GTK, so the fake input method context can work.
-   // See crbug.com/381852 and revision fb69f142.
-   // TODO(michaelpg): Verify this works for target environments.
diff --git a/chromium-next/patches/patch-extensions_shell_browser_shell__extensions__api__client.cc b/chromium-next/patches/patch-extensions_shell_browser_shell__extensions__api__client.cc
deleted file mode 100644
index ab52987ff1..0000000000
--- a/chromium-next/patches/patch-extensions_shell_browser_shell__extensions__api__client.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/shell/browser/shell_extensions_api_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/shell/browser/shell_extensions_api_client.cc
-@@ -18,7 +18,7 @@
- #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h"
- #include "extensions/shell/browser/shell_web_view_guest_delegate.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h"
- #endif
- 
-@@ -56,7 +56,7 @@ ShellExtensionsAPIClient::CreateDisplayI
-   return std::make_unique<ShellDisplayInfoProvider>();
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() {
-   if (!file_system_delegate_)
-     file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>();
diff --git a/chromium-next/patches/patch-extensions_shell_browser_shell__extensions__api__client.h b/chromium-next/patches/patch-extensions_shell_browser_shell__extensions__api__client.h
deleted file mode 100644
index c553696793..0000000000
--- a/chromium-next/patches/patch-extensions_shell_browser_shell__extensions__api__client.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- extensions/shell/browser/shell_extensions_api_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ extensions/shell/browser/shell_extensions_api_client.h
-@@ -36,14 +36,14 @@ class ShellExtensionsAPIClient : public 
-       content::BrowserContext* browser_context) const override;
-   std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider()
-       const override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   FileSystemDelegate* GetFileSystemDelegate() override;
- #endif
-   MessagingDelegate* GetMessagingDelegate() override;
-   FeedbackPrivateDelegate* GetFeedbackPrivateDelegate() override;
- 
-  private:
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<FileSystemDelegate> file_system_delegate_;
- #endif
-   std::unique_ptr<MessagingDelegate> messaging_delegate_;
diff --git a/chromium-next/patches/patch-google__apis_gcm_engine_heartbeat__manager.cc b/chromium-next/patches/patch-google__apis_gcm_engine_heartbeat__manager.cc
deleted file mode 100644
index 422c3eab5c..0000000000
--- a/chromium-next/patches/patch-google__apis_gcm_engine_heartbeat__manager.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- google_apis/gcm/engine/heartbeat_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ google_apis/gcm/engine/heartbeat_manager.cc
-@@ -31,7 +31,7 @@ const int kMinClientHeartbeatIntervalMs 
- // Minimum time spent sleeping before we force a new heartbeat.
- const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds.
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // The period at which to check if the heartbeat time has passed. Used to
- // protect against platforms where the timer is delayed by the system being
- // suspended.  Only needed on linux because the other OSes provide a standard
-@@ -190,7 +190,7 @@ void HeartbeatManager::RestartTimer() {
-       base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered,
-                           weak_ptr_factory_.GetWeakPtr()));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified
-   // when the system is suspending or resuming.  The only one that does not is
-   // Linux so we need to poll to check for missed heartbeats.
-@@ -213,7 +213,7 @@ void HeartbeatManager::CheckForMissedHea
-     return;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Otherwise check again later.
-   io_task_runner_->PostDelayedTask(
-       FROM_HERE,
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_dawn__context__provider.cc b/chromium-next/patches/patch-gpu_command__buffer_service_dawn__context__provider.cc
deleted file mode 100644
index a65bf08aa4..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_dawn__context__provider.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/dawn_context_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/dawn_context_provider.cc
-@@ -377,7 +377,7 @@ wgpu::BackendType DawnContextProvider::G
-   return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12)
-              ? wgpu::BackendType::D3D12
-              : wgpu::BackendType::D3D11;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   return wgpu::BackendType::Vulkan;
- #elif BUILDFLAG(IS_APPLE)
-   return wgpu::BackendType::Metal;
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/chromium-next/patches/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
deleted file mode 100644
index 788920bee2..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/gles2_cmd_decoder.cc
-@@ -2862,7 +2862,7 @@ GLES2Decoder* GLES2Decoder::Create(
-   }
- 
- // Allow linux to run fuzzers.
--#if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return new GLES2DecoderImpl(client, command_buffer_service, outputter, group);
- #else
-   LOG(FATAL) << "Validating command decoder is not supported.";
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc b/chromium-next/patches/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc
deleted file mode 100644
index 8fdc7edf6f..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/raster_decoder_unittest_context_lost.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/raster_decoder_unittest_context_lost.cc
-@@ -15,6 +15,18 @@ using ::testing::Return;
- using ::testing::SaveArg;
- using ::testing::SetArrayArgument;
- 
-+#ifndef GL_CONTEXT_LOST_KHR
-+#define GL_CONTEXT_LOST_KHR 0x0507
-+#endif
-+
-+#ifndef GL_GUILTY_CONTEXT_RESET_KHR
-+#define GL_GUILTY_CONTEXT_RESET_KHR 0x8253
-+#endif
-+
-+#ifndef GL_INNOCENT_CONTEXT_RESET_KHR
-+#define GL_INNOCENT_CONTEXT_RESET_KHR 0x8254
-+#endif
-+
- namespace gpu {
- namespace raster {
- 
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_shared__context__state.cc b/chromium-next/patches/patch-gpu_command__buffer_service_shared__context__state.cc
deleted file mode 100644
index 8f0ecf1b5d..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_shared__context__state.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/shared_context_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/shared_context_state.cc
-@@ -64,7 +64,7 @@
- #include "gpu/vulkan/vulkan_implementation.h"
- #include "gpu/vulkan/vulkan_util.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "gpu/command_buffer/service/external_semaphore_pool.h"
- #endif
- 
-@@ -322,7 +322,7 @@ SharedContextState::SharedContextState(
-   if (gr_context_type_ == GrContextType::kVulkan) {
-     if (vk_context_provider_) {
- #if BUILDFLAG(ENABLE_VULKAN) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))
-       external_semaphore_pool_ = std::make_unique<ExternalSemaphorePool>(this);
- #endif
-       use_virtualized_gl_contexts_ = false;
-@@ -359,7 +359,7 @@ SharedContextState::~SharedContextState(
-   }
- 
- #if BUILDFLAG(ENABLE_VULKAN) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))
-   external_semaphore_pool_.reset();
- #endif
- 
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_shared__context__state.h b/chromium-next/patches/patch-gpu_command__buffer_service_shared__context__state.h
deleted file mode 100644
index 3dfb8b53c9..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_shared__context__state.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/shared_context_state.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/shared_context_state.h
-@@ -236,7 +236,7 @@ class GPU_GLES2_EXPORT SharedContextStat
-     return &memory_type_tracker_;
-   }
- #if BUILDFLAG(ENABLE_VULKAN) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))
-   ExternalSemaphorePool* external_semaphore_pool() {
-     return external_semaphore_pool_.get();
-   }
-@@ -449,7 +449,7 @@ class GPU_GLES2_EXPORT SharedContextStat
-   bool disable_check_reset_status_throttling_for_test_ = false;
- 
- #if BUILDFLAG(ENABLE_VULKAN) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))
-   std::unique_ptr<ExternalSemaphorePool> external_semaphore_pool_;
- #endif
- 
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
deleted file mode 100644
index e6476c0b22..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
-@@ -20,7 +20,7 @@ namespace {
- // TODO(penghuang): verify the scanout is the right usage for video playback.
- // crbug.com/1280798
- constexpr SharedImageUsageSet kSupportedUsage =
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     SHARED_IMAGE_USAGE_SCANOUT |
- #endif
-     SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE |
-@@ -121,7 +121,7 @@ bool AngleVulkanImageBackingFactory::IsG
-   switch (gmb_type) {
-     case gfx::EMPTY_BUFFER:
-       return true;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     case gfx::NATIVE_PIXMAP: {
-       auto* vulkan_implementation =
-           context_state_->vk_context_provider()->GetVulkanImplementation();
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
deleted file mode 100644
index 0dcd5a76cf..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
-@@ -57,7 +57,7 @@
- #include "ui/gl/gl_version_info.h"
- #include "ui/gl/scoped_binders.h"
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
- #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
- #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES)
- #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h"
-@@ -702,7 +702,7 @@ std::unique_ptr<DawnImageRepresentation>
-     wgpu::BackendType backend_type,
-     std::vector<wgpu::TextureFormat> view_formats,
-     scoped_refptr<SharedContextState> context_state) {
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
-   auto wgpu_format = ToDawnFormat(format());
- 
-   if (wgpu_format == wgpu::TextureFormat::Undefined) {
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
deleted file mode 100644
index f199adef41..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
-@@ -143,7 +143,7 @@ bool IsFormatSupported(viz::SharedImageF
- 
- SharedImageUsageSet SupportedUsage() {
-   SharedImageUsageSet supported_usage =
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
-       SHARED_IMAGE_USAGE_WEBGPU_READ | SHARED_IMAGE_USAGE_WEBGPU_WRITE |
-       SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE |
-       SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE |
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
deleted file mode 100644
index 05ab2f6e82..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/shared_image/shared_image_factory.cc
-@@ -48,7 +48,7 @@
- #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h"
- #include "gpu/vulkan/vulkan_device_queue.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h"
- #endif
- 
-@@ -102,7 +102,7 @@ const char* GmbTypeToString(gfx::GpuMemo
-     case gfx::IO_SURFACE_BUFFER:
-       return "platform";
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     case gfx::NATIVE_PIXMAP:
-       return "platform";
- #endif
-@@ -123,7 +123,7 @@ gfx::GpuMemoryBufferType GetNativeBuffer
-   return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER;
- #elif BUILDFLAG(IS_ANDROID)
-   return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   return gfx::GpuMemoryBufferType::NATIVE_PIXMAP;
- #elif BUILDFLAG(IS_WIN)
-   return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE;
-@@ -326,7 +326,7 @@ SharedImageFactory::SharedImageFactory(
-         context_state_, workarounds_);
-     factories_.push_back(std::move(ozone_factory));
-   }
--#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA))
-+#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD))
-   if (gr_context_type_ == GrContextType::kVulkan) {
-     auto external_vk_image_factory =
-         std::make_unique<ExternalVkImageBackingFactory>(context_state_);
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
deleted file mode 100644
index 8ff659ffa9..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/shared_image/shared_image_manager.cc
-@@ -756,7 +756,7 @@ bool SharedImageManager::SupportsScanout
-   return true;
- #elif BUILDFLAG(IS_ANDROID)
-   return base::AndroidHardwareBufferCompat::IsSupportAvailable();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   return supports_overlays_on_ozone_;
- #elif BUILDFLAG(IS_WIN)
-   return gl::DirectCompositionTextureSupported();
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
deleted file mode 100644
index d608407314..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
-@@ -214,7 +214,7 @@ bool WrappedSkImageBacking::Initialize(c
- 
-     constexpr GrRenderable is_renderable = GrRenderable::kYes;
-     constexpr GrProtected is_protected = GrProtected::kNo;
--#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX)
-+#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-     // Blue for single-planar and magenta-ish for multi-planar.
-     SkColor4f fallback_color =
-         format().is_single_plane() ? SkColors::kBlue : SkColors::kWhite;
diff --git a/chromium-next/patches/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/chromium-next/patches/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
deleted file mode 100644
index b6f6859977..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1754,7 +1754,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreateP
-       backend_types = {wgpu::BackendType::D3D12};
- #elif BUILDFLAG(IS_MAC)
-       backend_types = {wgpu::BackendType::Metal};
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       if (shared_context_state_->GrContextIsVulkan() ||
-           shared_context_state_->IsGraphiteDawnVulkan()) {
-         backend_types = {wgpu::BackendType::Vulkan};
-@@ -1996,7 +1996,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
-   }
- 
- #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
--    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX)
-+    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   if (usage & wgpu::TextureUsage::StorageBinding) {
-     LOG(ERROR) << "AssociateMailbox: wgpu::TextureUsage::StorageBinding is NOT "
-                   "supported yet on this platform.";
diff --git a/chromium-next/patches/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/chromium-next/patches/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
deleted file mode 100644
index 5343bdd89c..0000000000
--- a/chromium-next/patches/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
-@@ -32,7 +32,7 @@
- #include "ui/gfx/half_float.h"
- #include "ui/gl/test/gl_test_support.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
- #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h"
- #endif
-@@ -75,7 +75,7 @@ class GpuMemoryBufferTest : public testi
-   GLManager gl_;
- };
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- class GpuMemoryBufferTestEGL : public testing::Test,
-                                public gpu::GpuCommandBufferTestEGL {
-  public:
diff --git a/chromium-next/patches/patch-gpu_config_gpu__control__list.cc b/chromium-next/patches/patch-gpu_config_gpu__control__list.cc
deleted file mode 100644
index ec5860e659..0000000000
--- a/chromium-next/patches/patch-gpu_config_gpu__control__list.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/config/gpu_control_list.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/config/gpu_control_list.cc
-@@ -831,7 +831,7 @@ GpuControlList::OsType GpuControlList::G
-   return kOsAndroid;
- #elif BUILDFLAG(IS_FUCHSIA)
-   return kOsFuchsia;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return kOsLinux;
- #elif BUILDFLAG(IS_MAC)
-   return kOsMacosx;
diff --git a/chromium-next/patches/patch-gpu_config_gpu__finch__features.cc b/chromium-next/patches/patch-gpu_config_gpu__finch__features.cc
deleted file mode 100644
index 36331564fd..0000000000
--- a/chromium-next/patches/patch-gpu_config_gpu__finch__features.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/config/gpu_finch_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/config/gpu_finch_features.cc
-@@ -155,7 +155,8 @@ BASE_FEATURE(kAllowHardwareBufferUsageFl
- BASE_FEATURE(kDefaultEnableGpuRasterization,
-              "DefaultEnableGpuRasterization",
- #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
-+    BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium-next/patches/patch-gpu_config_gpu__info__collector.cc b/chromium-next/patches/patch-gpu_config_gpu__info__collector.cc
deleted file mode 100644
index b2baa0b395..0000000000
--- a/chromium-next/patches/patch-gpu_config_gpu__info__collector.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/config/gpu_info_collector.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/config/gpu_info_collector.cc
-@@ -349,7 +349,7 @@ void ReportWebGPUAdapterMetrics(dawn::na
- void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) {
-   static BASE_FEATURE(kCollectWebGPUSupportMetrics,
-                       "CollectWebGPUSupportMetrics",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-                       base::FEATURE_DISABLED_BY_DEFAULT);
- #else
-                       base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-gpu_config_gpu__test__config.cc b/chromium-next/patches/patch-gpu_config_gpu__test__config.cc
deleted file mode 100644
index 5e9b9918df..0000000000
--- a/chromium-next/patches/patch-gpu_config_gpu__test__config.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/config/gpu_test_config.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/config/gpu_test_config.cc
-@@ -27,7 +27,7 @@ namespace {
- GPUTestConfig::OS GetCurrentOS() {
- #if BUILDFLAG(IS_CHROMEOS)
-   return GPUTestConfig::kOsChromeOS;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return GPUTestConfig::kOsLinux;
- #elif BUILDFLAG(IS_WIN)
-   int32_t major_version = 0;
diff --git a/chromium-next/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/chromium-next/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
deleted file mode 100644
index 0cb2ad991e..0000000000
--- a/chromium-next/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/ipc/common/gpu_memory_buffer_support.cc
-@@ -26,7 +26,7 @@
- #include "ui/ozone/public/ozone_platform.h"
- #endif
- 
--#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
- #endif
- 
-@@ -55,7 +55,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemo
-   return gfx::IO_SURFACE_BUFFER;
- #elif BUILDFLAG(IS_ANDROID)
-   return gfx::ANDROID_HARDWARE_BUFFER;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
-   return gfx::NATIVE_PIXMAP;
- #elif BUILDFLAG(IS_WIN)
-   return gfx::DXGI_SHARED_HANDLE;
diff --git a/chromium-next/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/chromium-next/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.h
deleted file mode 100644
index e8c66a12d8..0000000000
--- a/chromium-next/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/ipc/common/gpu_memory_buffer_support.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/ipc/common/gpu_memory_buffer_support.h
-@@ -21,7 +21,7 @@
- #include "ui/gfx/geometry/size.h"
- #include "ui/gfx/gpu_memory_buffer.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
- namespace gfx {
- class ClientNativePixmapFactory;
- }  // namespace gfx
diff --git a/chromium-next/patches/patch-gpu_ipc_service_gpu__init.cc b/chromium-next/patches/patch-gpu_ipc_service_gpu__init.cc
deleted file mode 100644
index b0cf9f608c..0000000000
--- a/chromium-next/patches/patch-gpu_ipc_service_gpu__init.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/ipc/service/gpu_init.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/ipc/service/gpu_init.cc
-@@ -153,7 +153,7 @@ void InitializePlatformOverlaySettings(G
- 
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CASTOS)
- bool CanAccessDeviceFile(const GPUInfo& gpu_info) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (gpu_info.gpu.vendor_id != 0x10de ||  // NVIDIA
-       gpu_info.gpu.driver_vendor != "NVIDIA")
-     return true;
-@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(
-   enable_watchdog = false;
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
- #else   // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-   // For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -427,7 +427,7 @@ bool GpuInit::InitializeAndStartSandbox(
-   }
- 
-   bool attempted_startsandbox = false;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // On Chrome OS ARM Mali, GPU driver userspace creates threads when
-   // initializing a GL context, so start the sandbox early.
-   // TODO(zmo): Need to collect OS version before this.
-@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(
-     gpu_preferences_.gr_context_type = GrContextType::kGL;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // The ContentSandboxHelper is currently the only one implementation of
-   // GpuSandboxHelper and it has no dependency. Except on Linux where
-   // VaapiWrapper checks the GL implementation to determine which display
-@@ -586,7 +586,7 @@ bool GpuInit::InitializeAndStartSandbox(
-           command_line, gpu_feature_info_,
-           gpu_preferences_.disable_software_rasterizer, false);
-       if (gl_use_swiftshader_) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-         VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
-                 << "on Linux";
-         return false;
-@@ -754,7 +754,7 @@ bool GpuInit::InitializeAndStartSandbox(
-               ->GetSupportedFormatsForGLNativePixmapImport();
- #endif  // BUILDFLAG(IS_OZONE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Driver may create a compatibility profile context when collect graphics
-   // information on Linux platform. Try to collect graphics information
-   // based on core profile context after disabling platform extensions.
-@@ -806,7 +806,7 @@ bool GpuInit::InitializeAndStartSandbox(
-       }
-     }
-   }
--#if BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
-   if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
-     // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1008,7 +1008,7 @@ void GpuInit::InitializeInProcess(base::
-   }
-   bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
- 
--#if BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
-   if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
-     // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1063,7 +1063,7 @@ void GpuInit::InitializeInProcess(base::
-     }
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Driver may create a compatibility profile context when collect graphics
-   // information on Linux platform. Try to collect graphics information
-   // based on core profile context after disabling platform extensions.
diff --git a/chromium-next/patches/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/chromium-next/patches/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
deleted file mode 100644
index 04a819cb59..0000000000
--- a/chromium-next/patches/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/ipc/service/gpu_memory_buffer_factory.cc
-@@ -14,7 +14,7 @@
- #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h"
- #endif
- 
-@@ -71,7 +71,7 @@ GpuMemoryBufferFactory::CreateNativeType
-   // to have a factory that vends invalid GMB handles rather than having no
-   // factory at all.
-   return std::make_unique<GpuMemoryBufferFactoryStub>();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   return std::make_unique<GpuMemoryBufferFactoryNativePixmap>(
-       vulkan_context_provider);
- #elif BUILDFLAG(IS_WIN)
diff --git a/chromium-next/patches/patch-gpu_ipc_service_x__util.h b/chromium-next/patches/patch-gpu_ipc_service_x__util.h
deleted file mode 100644
index 8cc1192335..0000000000
--- a/chromium-next/patches/patch-gpu_ipc_service_x__util.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/ipc/service/x_util.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/ipc/service/x_util.h
-@@ -12,7 +12,7 @@
- #include "gpu/ipc/service/gpu_config.h"
- #include "ui/base/ozone_buildflags.h"
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
- 
- namespace gpu {
- 
diff --git a/chromium-next/patches/patch-gpu_vulkan_generate__bindings.py b/chromium-next/patches/patch-gpu_vulkan_generate__bindings.py
deleted file mode 100644
index da1b5a0fd6..0000000000
--- a/chromium-next/patches/patch-gpu_vulkan_generate__bindings.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/vulkan/generate_bindings.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/vulkan/generate_bindings.py
-@@ -271,7 +271,7 @@ VULKAN_DEVICE_FUNCTIONS = [
-     ]
-   },
-   {
--    'ifdef': 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)',
-+    'ifdef': 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)',
-     'extension': 'VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME',
-     'functions': [
-       'vkGetImageDrmFormatModifierPropertiesEXT',
diff --git a/chromium-next/patches/patch-gpu_vulkan_semaphore__handle.cc b/chromium-next/patches/patch-gpu_vulkan_semaphore__handle.cc
deleted file mode 100644
index 34dcdc9f5e..0000000000
--- a/chromium-next/patches/patch-gpu_vulkan_semaphore__handle.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/vulkan/semaphore_handle.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/vulkan/semaphore_handle.cc
-@@ -39,7 +39,7 @@ SemaphoreHandle::SemaphoreHandle(gfx::Gp
-   // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic.
-   Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_ZIRCON_EVENT_BIT_FUCHSIA,
-        fence_handle.Release());
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR,
-        fence_handle.Release());
- #elif BUILDFLAG(IS_POSIX)
-@@ -64,7 +64,7 @@ gfx::GpuFenceHandle SemaphoreHandle::ToG
-   // VkSemaphore, which can then be used to submit present work, see
-   // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic.
-   fence_handle.Adopt(TakeHandle());
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   if (type_ == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR) {
-     fence_handle.Adopt(TakeHandle());
-   } else {
diff --git a/chromium-next/patches/patch-gpu_vulkan_vulkan__device__queue.cc b/chromium-next/patches/patch-gpu_vulkan_vulkan__device__queue.cc
deleted file mode 100644
index d0f5ef670d..0000000000
--- a/chromium-next/patches/patch-gpu_vulkan_vulkan__device__queue.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/vulkan/vulkan_device_queue.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/vulkan/vulkan_device_queue.cc
-@@ -156,7 +156,7 @@ bool VulkanDeviceQueue::Initialize(
- 
-       // In dual-CPU cases, we cannot detect the active GPU correctly on Linux,
-       // so don't select GPU device based on the |gpu_info|.
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-     // If gpu_info is provided, the device should match it.
-     if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id ||
-                      device_properties.deviceID != gpu_info->gpu.device_id)) {
-@@ -303,7 +303,7 @@ bool VulkanDeviceQueue::Initialize(
-   // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler
-   // support.
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (!physical_device_info.feature_sampler_ycbcr_conversion) {
-     LOG(ERROR) << "samplerYcbcrConversion is not supported.";
-     return false;
diff --git a/chromium-next/patches/patch-gpu_vulkan_vulkan__device__queue.h b/chromium-next/patches/patch-gpu_vulkan_vulkan__device__queue.h
deleted file mode 100644
index 549a469b55..0000000000
--- a/chromium-next/patches/patch-gpu_vulkan_vulkan__device__queue.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/vulkan/vulkan_device_queue.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/vulkan/vulkan_device_queue.h
-@@ -182,7 +182,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDev
- #endif
- 
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   VkPhysicalDeviceSamplerYcbcrConversionFeatures
-       sampler_ycbcr_conversion_features_{
-           VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES};
diff --git a/chromium-next/patches/patch-gpu_vulkan_vulkan__function__pointers.cc b/chromium-next/patches/patch-gpu_vulkan_vulkan__function__pointers.cc
deleted file mode 100644
index 5b29350e45..0000000000
--- a/chromium-next/patches/patch-gpu_vulkan_vulkan__function__pointers.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/vulkan/vulkan_function_pointers.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/vulkan/vulkan_function_pointers.cc
-@@ -1297,7 +1297,7 @@ bool VulkanFunctionPointers::BindDeviceF
-     }
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (gfx::HasExtension(enabled_extensions,
-                         VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) {
-     constexpr char kvkGetImageDrmFormatModifierPropertiesEXT[] =
-@@ -1498,7 +1498,7 @@ void VulkanFunctionPointers::ResetForTes
-   vkGetSwapchainImagesKHR = nullptr;
-   vkQueuePresentKHR = nullptr;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   vkGetImageDrmFormatModifierPropertiesEXT = nullptr;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- }
diff --git a/chromium-next/patches/patch-gpu_vulkan_vulkan__function__pointers.h b/chromium-next/patches/patch-gpu_vulkan_vulkan__function__pointers.h
deleted file mode 100644
index 786352c0c0..0000000000
--- a/chromium-next/patches/patch-gpu_vulkan_vulkan__function__pointers.h
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/vulkan/vulkan_function_pointers.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/vulkan/vulkan_function_pointers.h
-@@ -391,7 +391,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFu
-   VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
-   VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
-       vkGetImageDrmFormatModifierPropertiesEXT;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1405,7 +1405,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR
-                                                              pPresentInfo);
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
-     VkDevice device,
-     VkImage image,
-@@ -1415,4 +1415,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmForm
- }
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#endif  // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_
-\ No newline at end of file
-+#endif  // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_
diff --git a/chromium-next/patches/patch-gpu_vulkan_vulkan__image.h b/chromium-next/patches/patch-gpu_vulkan_vulkan__image.h
deleted file mode 100644
index 6d6d4ce6cc..0000000000
--- a/chromium-next/patches/patch-gpu_vulkan_vulkan__image.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/vulkan/vulkan_image.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/vulkan/vulkan_image.h
-@@ -87,7 +87,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanIma
-       VkImageUsageFlags usage,
-       VkImageCreateFlags flags);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static std::unique_ptr<VulkanImage> CreateWithExternalMemoryAndModifiers(
-       VulkanDeviceQueue* device_queue,
-       const gfx::Size& size,
-@@ -199,7 +199,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanIma
-       VkImageTiling image_tiling,
-       uint32_t queue_family_index);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool InitializeWithExternalMemoryAndModifiers(VulkanDeviceQueue* device_queue,
-                                                 const gfx::Size& size,
-                                                 VkFormat format,
diff --git a/chromium-next/patches/patch-gpu_vulkan_vulkan__util.cc b/chromium-next/patches/patch-gpu_vulkan_vulkan__util.cc
deleted file mode 100644
index e5c5364ff6..0000000000
--- a/chromium-next/patches/patch-gpu_vulkan_vulkan__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- gpu/vulkan/vulkan_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ gpu/vulkan/vulkan_util.cc
-@@ -467,7 +467,7 @@ bool CheckVulkanCompatibilities(
-     }
-   }
- 
--#if BUILDFLAG(IS_LINUX) && !defined(OZONE_PLATFORM_IS_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !defined(OZONE_PLATFORM_IS_X11)
-   // Vulkan is only supported with X11 on Linux for now.
-   return false;
- #else
diff --git a/chromium-next/patches/patch-headless_BUILD.gn b/chromium-next/patches/patch-headless_BUILD.gn
deleted file mode 100644
index a09ce5eee2..0000000000
--- a/chromium-next/patches/patch-headless_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- headless/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ headless/BUILD.gn
-@@ -475,7 +475,7 @@ component("headless_non_renderer") {
-     }
-   }
- 
--  if (!is_fuchsia) {
-+  if (!is_fuchsia && !is_bsd) {
-     deps += [
-       "//components/crash/content/browser",
-       "//components/crash/core/app",
diff --git a/chromium-next/patches/patch-headless_lib_browser_headless__browser__main__parts__posix.cc b/chromium-next/patches/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
deleted file mode 100644
index 29d1b7aaa3..0000000000
--- a/chromium-next/patches/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- headless/lib/browser/headless_browser_main_parts_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ headless/lib/browser/headless_browser_main_parts_posix.cc
-@@ -26,13 +26,13 @@
- #include "content/public/browser/browser_thread.h"
- #include "headless/lib/browser/headless_browser_impl.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/command_line.h"
- #include "components/os_crypt/sync/key_storage_config_linux.h"
- #include "components/os_crypt/sync/os_crypt.h"
- #include "headless/public/switches.h"
- 
--#if BUILDFLAG(USE_DBUS)
-+#if BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_BSD)
- #include "device/bluetooth/dbus/bluez_dbus_manager.h"
- #endif
- 
-@@ -166,7 +166,7 @@ class BrowserShutdownHandler {
- 
- }  // namespace
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr char kProductName[] = "HeadlessChrome";
- #endif
- 
-@@ -174,9 +174,9 @@ void HeadlessBrowserMainParts::PostCreat
-   BrowserShutdownHandler::Install(base::BindOnce(
-       &HeadlessBrowserImpl::ShutdownWithExitCode, browser_->GetWeakPtr()));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
--#if BUILDFLAG(USE_DBUS)
-+#if BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_BSD)
-   bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr);
- #endif
- 
diff --git a/chromium-next/patches/patch-headless_lib_browser_headless__content__browser__client.cc b/chromium-next/patches/patch-headless_lib_browser_headless__content__browser__client.cc
deleted file mode 100644
index 01aa646f68..0000000000
--- a/chromium-next/patches/patch-headless_lib_browser_headless__content__browser__client.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- headless/lib/browser/headless_content_browser_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ headless/lib/browser/headless_content_browser_client.cc
-@@ -58,7 +58,7 @@
- #include "content/public/common/content_descriptors.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS)
-+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS)
- #include "components/os_crypt/sync/os_crypt.h"  // nogncheck
- #include "content/public/browser/network_service_util.h"
- #endif
-@@ -520,7 +520,7 @@ void HeadlessContentBrowserClient::Handl
- 
- void HeadlessContentBrowserClient::SetEncryptionKey(
-     ::network::mojom::NetworkService* network_service) {
--#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS)
-+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS)
-   // The OSCrypt keys are process bound, so if network service is out of
-   // process, send it the required key if it is available.
-   if (content::IsOutOfProcessNetworkService()
diff --git a/chromium-next/patches/patch-headless_lib_browser_headless__content__browser__client.h b/chromium-next/patches/patch-headless_lib_browser_headless__content__browser__client.h
deleted file mode 100644
index 205366430b..0000000000
--- a/chromium-next/patches/patch-headless_lib_browser_headless__content__browser__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- headless/lib/browser/headless_content_browser_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ headless/lib/browser/headless_content_browser_client.h
-@@ -47,7 +47,7 @@ class HeadlessContentBrowserClient : pub
-   CreateDevToolsManagerDelegate() override;
-   content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings(
-       content::BrowserContext* context) override;
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
-   void GetAdditionalMappedFilesForChildProcess(
-       const base::CommandLine& command_line,
-       int child_process_id,
diff --git a/chromium-next/patches/patch-headless_lib_browser_headless__web__contents__impl.cc b/chromium-next/patches/patch-headless_lib_browser_headless__web__contents__impl.cc
deleted file mode 100644
index 94ce9aafbb..0000000000
--- a/chromium-next/patches/patch-headless_lib_browser_headless__web__contents__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- headless/lib/browser/headless_web_contents_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ headless/lib/browser/headless_web_contents_impl.cc
-@@ -70,7 +70,7 @@ BASE_FEATURE(kPrerender2InHeadlessMode,
- namespace {
- 
- void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   content::UpdateFontRendererPreferencesFromSystemSettings(prefs);
- #endif
- 
diff --git a/chromium-next/patches/patch-headless_lib_headless__content__main__delegate.cc b/chromium-next/patches/patch-headless_lib_headless__content__main__delegate.cc
deleted file mode 100644
index f9fc7d0575..0000000000
--- a/chromium-next/patches/patch-headless_lib_headless__content__main__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- headless/lib/headless_content_main_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ headless/lib/headless_content_main_delegate.cc
-@@ -407,7 +407,7 @@ void HeadlessContentMainDelegate::InitCr
-   if (process_type != ::switches::kZygoteProcess) {
-     g_headless_crash_client.Pointer()->set_crash_dumps_dir(
-         command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
--#if !BUILDFLAG(IS_WIN)
-+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD)
-     crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
- #endif  // !BUILDFLAG(IS_WIN)
-     crash_keys::SetSwitchesFromCommandLine(command_line, nullptr);
diff --git a/chromium-next/patches/patch-ipc_ipc__channel.h b/chromium-next/patches/patch-ipc_ipc__channel.h
deleted file mode 100644
index 3881e13848..0000000000
--- a/chromium-next/patches/patch-ipc_ipc__channel.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ipc/ipc_channel.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ipc/ipc_channel.h
-@@ -218,7 +218,7 @@ class COMPONENT_EXPORT(IPC) Channel : pu
-   static std::string GenerateUniqueRandomChannelID();
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Sandboxed processes live in a PID namespace, so when sending the IPC hello
-   // message from client to server we need to send the PID from the global
-   // PID namespace.
diff --git a/chromium-next/patches/patch-ipc_ipc__channel__common.cc b/chromium-next/patches/patch-ipc_ipc__channel__common.cc
deleted file mode 100644
index ee362e870f..0000000000
--- a/chromium-next/patches/patch-ipc_ipc__channel__common.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ipc/ipc_channel_common.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ipc/ipc_channel_common.cc
-@@ -10,7 +10,7 @@
- 
- namespace IPC {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- namespace {
- int g_global_pid = 0;
diff --git a/chromium-next/patches/patch-ipc_ipc__channel__mojo.cc b/chromium-next/patches/patch-ipc_ipc__channel__mojo.cc
deleted file mode 100644
index 91de62b28a..0000000000
--- a/chromium-next/patches/patch-ipc_ipc__channel__mojo.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ipc/ipc_channel_mojo.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ipc/ipc_channel_mojo.cc
-@@ -105,7 +105,7 @@ class ThreadSafeChannelProxy : public mo
- };
- 
- base::ProcessId GetSelfPID() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (int global_pid = Channel::GetGlobalPid())
-     return global_pid;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium-next/patches/patch-ipc_ipc__message__utils.cc b/chromium-next/patches/patch-ipc_ipc__message__utils.cc
deleted file mode 100644
index d681c190cb..0000000000
--- a/chromium-next/patches/patch-ipc_ipc__message__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ipc/ipc_message_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ipc/ipc_message_utils.cc
-@@ -399,7 +399,7 @@ void ParamTraits<unsigned int>::Log(cons
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_FUCHSIA) ||                                              \
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) ||                         \
-     (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS))
- void ParamTraits<long>::Log(const param_type& p, std::string* l) {
-   l->append(base::NumberToString(p));
diff --git a/chromium-next/patches/patch-ipc_ipc__message__utils.h b/chromium-next/patches/patch-ipc_ipc__message__utils.h
deleted file mode 100644
index 728aeaf7dc..0000000000
--- a/chromium-next/patches/patch-ipc_ipc__message__utils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ipc/ipc_message_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ipc/ipc_message_utils.h
-@@ -216,7 +216,7 @@ struct ParamTraits<unsigned int> {
- // Since we want to support Android 32<>64 bit IPC, as long as we don't have
- // these traits for 32 bit ARM then that'll catch any errors.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_FUCHSIA) ||                                              \
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) ||                         \
-     (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS))
- template <>
- struct ParamTraits<long> {
diff --git a/chromium-next/patches/patch-media_BUILD.gn b/chromium-next/patches/patch-media_BUILD.gn
deleted file mode 100644
index 59ed126b60..0000000000
--- a/chromium-next/patches/patch-media_BUILD.gn
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/BUILD.gn
-@@ -105,6 +105,12 @@ config("media_config") {
-       defines += [ "DLOPEN_PULSEAUDIO" ]
-     }
-   }
-+  if (use_sndio) {
-+    defines += [ "USE_SNDIO" ]
-+  }
-+#  if (use_audioio) {
-+#    defines += [ "USE_AUDIOIO" ]
-+#  }
- }
- 
- # Internal grouping of the configs necessary to support sub-folders having their
diff --git a/chromium-next/patches/patch-media_audio_BUILD.gn b/chromium-next/patches/patch-media_audio_BUILD.gn
deleted file mode 100644
index ab14ee635d..0000000000
--- a/chromium-next/patches/patch-media_audio_BUILD.gn
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/audio/BUILD.gn
-@@ -275,10 +275,35 @@ source_set("audio") {
-     deps += [ "//media/base/android:media_jni_headers" ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [ "linux/audio_manager_linux.cc" ]
-   }
- 
-+  if (is_bsd && !use_audioio) {
-+    sources += [ "sndio/audio_manager_sndio.cc" ]
-+  }
-+
-+  if (use_sndio) {
-+    libs += [ "sndio" ]
-+    sources += [
-+      "sndio/sndio_input.cc",
-+      "sndio/sndio_input.h",
-+      "sndio/sndio_output.cc",
-+      "sndio/sndio_output.h"
-+    ]
-+   }
-+
-+  if (use_audioio) {
-+    sources += [
-+      "audioio/audio_manager_audioio.cc",
-+      "audioio/audio_manager_audioio.h",
-+      "audioio/audioio_input.cc",
-+      "audioio/audioio_input.h",
-+      "audioio/audioio_output.cc",
-+      "audioio/audioio_output.h"
-+    ]
-+   }
-+
-   if (use_alsa) {
-     libs += [ "asound" ]
-     sources += [
diff --git a/chromium-next/patches/patch-media_audio_alsa_audio__manager__alsa.cc b/chromium-next/patches/patch-media_audio_alsa_audio__manager__alsa.cc
deleted file mode 100644
index a95af89d4e..0000000000
--- a/chromium-next/patches/patch-media_audio_alsa_audio__manager__alsa.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/alsa/audio_manager_alsa.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/audio/alsa/audio_manager_alsa.cc
-@@ -106,7 +106,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
-   int card = -1;
- 
-   // Loop through the physical sound cards to get ALSA device hints.
-+#if !BUILDFLAG(IS_BSD) 
-   while (!wrapper_->CardNext(&card) && card >= 0) {
-+#endif
-     void** hints = NULL;
-     int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
-     if (!error) {
-@@ -118,7 +120,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
-       DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
-                     << wrapper_->StrError(error);
-     }
-+#if !BUILDFLAG(IS_BSD) 
-   }
-+#endif
- }
- 
- void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type,
-@@ -201,7 +205,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
-   // goes through software conversion if needed (e.g. incompatible
-   // sample rate).
-   // TODO(joi): Should we prefer "hw" instead?
-+#if BUILDFLAG(IS_BSD)
-+  static const char kDeviceTypeDesired[] = "plug";
-+#else
-   static const char kDeviceTypeDesired[] = "plughw";
-+#endif
-   return strncmp(kDeviceTypeDesired, device_name,
-                  std::size(kDeviceTypeDesired) - 1) == 0;
- }
-@@ -253,7 +261,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
-   // Loop through the sound cards.
-   // Don't use snd_device_name_hint(-1,..) since there is an access violation
-   // inside this ALSA API with libasound.so.2.0.0.
-+#if !BUILDFLAG(IS_BSD)
-   while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) {
-+#endif
-     int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
-     if (!error) {
-       for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
-@@ -277,7 +287,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
-       DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
-                     << wrapper_->StrError(error);
-     }
-+#if !BUILDFLAG(IS_BSD)
-   }
-+#endif
- 
-   return has_device;
- }
diff --git a/chromium-next/patches/patch-media_audio_audio__input__device.cc b/chromium-next/patches/patch-media_audio_audio__input__device.cc
deleted file mode 100644
index 9a710d7864..0000000000
--- a/chromium-next/patches/patch-media_audio_audio__input__device.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/audio_input_device.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/audio/audio_input_device.cc
-@@ -275,7 +275,7 @@ void AudioInputDevice::OnStreamCreated(
- // here. See comments in AliveChecker and PowerObserverHelper for details and
- // todos.
-   if (detect_dead_stream_ == DeadStreamDetection::kEnabled) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     const bool stop_at_first_alive_notification = true;
-     const bool pause_check_during_suspend = false;
- #else
diff --git a/chromium-next/patches/patch-media_audio_audio__output__proxy__unittest.cc b/chromium-next/patches/patch-media_audio_audio__output__proxy__unittest.cc
deleted file mode 100644
index b55dcfc1f1..0000000000
--- a/chromium-next/patches/patch-media_audio_audio__output__proxy__unittest.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/audio_output_proxy_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/audio/audio_output_proxy_unittest.cc
-@@ -443,7 +443,11 @@ class AudioOutputProxyTest : public test
-     // |stream| is closed at this point. Start() should reopen it again.
-     EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _))
-         .Times(2)
-+#if BUILDFLAG(IS_BSD)
-+        .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
-+#else
-         .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL)));
-+#endif
- 
-     EXPECT_CALL(callback_, OnError(_)).Times(2);
- 
diff --git a/chromium-next/patches/patch-media_audio_pulse_pulse__util.cc b/chromium-next/patches/patch-media_audio_pulse_pulse__util.cc
deleted file mode 100644
index c15c02140c..0000000000
--- a/chromium-next/patches/patch-media_audio_pulse_pulse__util.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/pulse/pulse_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/audio/pulse/pulse_util.cc
-@@ -50,8 +50,12 @@ constexpr char kBrowserDisplayName[] = "
- 
- #if defined(DLOPEN_PULSEAUDIO)
- static const base::FilePath::CharType kPulseLib[] =
-+#if BUILDFLAG(IS_BSD)
-+    FILE_PATH_LITERAL("libpulse.so");
-+#else
-     FILE_PATH_LITERAL("libpulse.so.0");
- #endif
-+#endif
- 
- void DestroyMainloop(pa_threaded_mainloop* mainloop) {
-   pa_threaded_mainloop_stop(mainloop);
diff --git a/chromium-next/patches/patch-media_audio_sndio_audio__manager__sndio.cc b/chromium-next/patches/patch-media_audio_sndio_audio__manager__sndio.cc
deleted file mode 100644
index 2a5d4e650e..0000000000
--- a/chromium-next/patches/patch-media_audio_sndio_audio__manager__sndio.cc
+++ /dev/null
@@ -1,222 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/sndio/audio_manager_sndio.cc.orig	2025-05-08 12:01:57.767307090 +0000
-+++ media/audio/sndio/audio_manager_sndio.cc
-@@ -0,0 +1,213 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/command_line.h"
-+#include "base/metrics/histogram_macros.h"
-+#include "base/memory/ptr_util.h"
-+
-+#include "media/audio/sndio/audio_manager_sndio.h"
-+
-+#include "media/audio/audio_device_description.h"
-+#include "media/audio/audio_output_dispatcher.h"
-+#if defined(USE_SNDIO)
-+#include "media/audio/sndio/sndio_input.h"
-+#include "media/audio/sndio/sndio_output.h"
-+#endif
-+#if defined(USE_PULSEAUDIO)
-+#include "media/audio/pulse/audio_manager_pulse.h"
-+#include "media/audio/pulse/pulse_util.h"
-+#endif
-+#if defined(USE_ALSA)
-+#include "media/audio/alsa/audio_manager_alsa.h"
-+#endif
-+#include "media/audio/fake_audio_manager.h"
-+#include "media/base/limits.h"
-+#include "media/base/media_switches.h"
-+
-+namespace media {
-+
-+#if defined(USE_SNDIO)
-+// Maximum number of output streams that can be open simultaneously.
-+static const int kMaxOutputStreams = 50;
-+
-+// Default sample rate for input and output streams.
-+static const int kDefaultSampleRate = 48000;
-+
-+void AddDefaultDevice(AudioDeviceNames* device_names) {
-+  DCHECK(device_names->empty());
-+  device_names->push_front(AudioDeviceName::CreateDefault());
-+}
-+
-+bool AudioManagerSndio::HasAudioOutputDevices() {
-+  return true;
-+}
-+
-+bool AudioManagerSndio::HasAudioInputDevices() {
-+  return true;
-+}
-+
-+void AudioManagerSndio::GetAudioInputDeviceNames(
-+    AudioDeviceNames* device_names) {
-+  DCHECK(device_names->empty());
-+  AddDefaultDevice(device_names);
-+}
-+
-+void AudioManagerSndio::GetAudioOutputDeviceNames(
-+    AudioDeviceNames* device_names) {
-+  AddDefaultDevice(device_names);
-+}
-+
-+#if defined(USE_SNDIO)
-+const char* AudioManagerSndio::GetName() {
-+  return "SNDIO";
-+}
-+#endif
-+
-+AudioParameters AudioManagerSndio::GetInputStreamParameters(
-+    const std::string& device_id) {
-+  static const int kDefaultInputBufferSize = 1024;
-+
-+  int user_buffer_size = GetUserBufferSize();
-+  int buffer_size = user_buffer_size ?
-+      user_buffer_size : kDefaultInputBufferSize;
-+
-+  return AudioParameters(
-+      AudioParameters::AUDIO_PCM_LOW_LATENCY, ChannelLayoutConfig::Stereo(),
-+      kDefaultSampleRate, buffer_size);
-+}
-+
-+AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
-+                                         AudioLogFactory* audio_log_factory)
-+    : AudioManagerBase(std::move(audio_thread),
-+                       audio_log_factory) {
-+  DLOG(WARNING) << "AudioManagerSndio";
-+  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
-+}
-+
-+AudioManagerSndio::~AudioManagerSndio() = default;
-+
-+AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
-+    const AudioParameters& params,
-+    const LogCallback& log_callback) {
-+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
-+  return MakeOutputStream(params);
-+}
-+
-+AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
-+    const AudioParameters& params,
-+    const std::string& device_id,
-+    const LogCallback& log_callback) {
-+  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
-+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
-+  return MakeOutputStream(params);
-+}
-+
-+AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
-+    const AudioParameters& params,
-+    const std::string& device_id,
-+    const LogCallback& log_callback) {
-+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
-+  return MakeInputStream(params);
-+}
-+
-+AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
-+    const AudioParameters& params,
-+    const std::string& device_id,
-+    const LogCallback& log_callback) {
-+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
-+  return MakeInputStream(params);
-+}
-+
-+AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
-+    const std::string& output_device_id,
-+    const AudioParameters& input_params) {
-+  // TODO(tommi): Support |output_device_id|.
-+  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
-+  static const int kDefaultOutputBufferSize = 2048;
-+
-+  ChannelLayoutConfig channel_layout_config = ChannelLayoutConfig::Stereo();
-+  int sample_rate = kDefaultSampleRate;
-+  int buffer_size = kDefaultOutputBufferSize;
-+  if (input_params.IsValid()) {
-+    sample_rate = input_params.sample_rate();
-+    channel_layout_config = input_params.channel_layout_config();
-+    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
-+  }
-+
-+  int user_buffer_size = GetUserBufferSize();
-+  if (user_buffer_size)
-+    buffer_size = user_buffer_size;
-+
-+  return AudioParameters(
-+      AudioParameters::AUDIO_PCM_LOW_LATENCY,
-+      channel_layout_config, sample_rate, buffer_size);
-+}
-+
-+AudioInputStream* AudioManagerSndio::MakeInputStream(
-+    const AudioParameters& params) {
-+  DLOG(WARNING) << "MakeInputStream";
-+  return new SndioAudioInputStream(this,
-+             AudioDeviceDescription::kDefaultDeviceId, params);
-+}
-+
-+AudioOutputStream* AudioManagerSndio::MakeOutputStream(
-+    const AudioParameters& params) {
-+  DLOG(WARNING) << "MakeOutputStream";
-+  return new SndioAudioOutputStream(params, this);
-+}
-+#endif
-+
-+std::unique_ptr<media::AudioManager> CreateAudioManager(
-+    std::unique_ptr<AudioThread> audio_thread,
-+    AudioLogFactory* audio_log_factory) {
-+  DLOG(WARNING) << "CreateAudioManager";
-+
-+  auto _ab = kAudioBackendParam.Get();
-+
-+  // For testing allow audio output to be disabled.
-+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-+          switches::kDisableAudioOutput) ||
-+	  !base::FeatureList::IsEnabled(media::kAudioBackend)) {
-+    return std::make_unique<FakeAudioManager>(std::move(audio_thread),
-+                                              audio_log_factory);
-+  }
-+
-+#if defined(USE_PULSEAUDIO)
-+  pa_threaded_mainloop* pa_mainloop = nullptr;
-+  pa_context* pa_context = nullptr;
-+  if (_ab != AudioBackend::kSndio && _ab != AudioBackend::kAlsa &&
-+          pulse::InitPulse(&pa_mainloop, &pa_context)) {
-+    return std::make_unique<AudioManagerPulse>(
-+        std::move(audio_thread), audio_log_factory, pa_mainloop, pa_context);
-+  } else if (_ab == AudioBackend::kAuto) {
-+    LOG(WARNING) << "Falling back to SNDIO for audio output. PulseAudio is not "
-+                    "available or could not be initialized.";
-+  }
-+#endif
-+
-+#if defined(USE_SNDIO)
-+  if (_ab != AudioBackend::kPulseAudio && _ab != AudioBackend::kAlsa) {
-+    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
-+                                              audio_log_factory);
-+  } else if (_ab == AudioBackend::kAuto) {
-+    LOG(WARNING) << "Falling back to ALSA audio output. SNDIO is not "
-+                    "available or could not be initialized.";
-+  }
-+#endif
-+
-+#if defined(USE_ALSA)
-+  if (_ab != AudioBackend::kPulseAudio && _ab != AudioBackend::kSndio) {
-+    return std::make_unique<AudioManagerAlsa>(std::move(audio_thread),
-+                                              audio_log_factory);
-+  } else if (_ab == AudioBackend::kAuto) {
-+    LOG(WARNING) << "Falling back to fake audio output. ALSA is not "
-+                    "available or could not be initialized.";
-+  }
-+#endif
-+
-+  return std::make_unique<FakeAudioManager>(std::move(audio_thread),
-+                                            audio_log_factory);
-+}
-+
-+}  // namespace media
diff --git a/chromium-next/patches/patch-media_audio_sndio_audio__manager__sndio.h b/chromium-next/patches/patch-media_audio_sndio_audio__manager__sndio.h
deleted file mode 100644
index bd0ae7972c..0000000000
--- a/chromium-next/patches/patch-media_audio_sndio_audio__manager__sndio.h
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/sndio/audio_manager_sndio.h.orig	2025-05-08 12:01:57.767453152 +0000
-+++ media/audio/sndio/audio_manager_sndio.h
-@@ -0,0 +1,66 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
-+#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
-+
-+#include <set>
-+
-+#include "base/compiler_specific.h"
-+#include "base/memory/ref_counted.h"
-+#include "base/threading/thread.h"
-+#include "media/audio/audio_manager_base.h"
-+
-+namespace media {
-+
-+class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
-+ public:
-+  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
-+                   AudioLogFactory* audio_log_factory);
-+
-+  AudioManagerSndio(const AudioManagerSndio&) = delete;
-+  AudioManagerSndio& operator=(const AudioManagerSndio&) = delete;
-+
-+  ~AudioManagerSndio() override;
-+
-+  // Implementation of AudioManager.
-+  bool HasAudioOutputDevices() override;
-+  bool HasAudioInputDevices() override;
-+  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
-+  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
-+  AudioParameters GetInputStreamParameters(
-+      const std::string& device_id) override;
-+  const char* GetName() override;
-+
-+  // Implementation of AudioManagerBase.
-+  AudioOutputStream* MakeLinearOutputStream(
-+      const AudioParameters& params,
-+      const LogCallback& log_callback) override;
-+  AudioOutputStream* MakeLowLatencyOutputStream(
-+      const AudioParameters& params,
-+      const std::string& device_id,
-+      const LogCallback& log_callback) override;
-+  AudioInputStream* MakeLinearInputStream(
-+      const AudioParameters& params,
-+      const std::string& device_id,
-+      const LogCallback& log_callback) override;
-+  AudioInputStream* MakeLowLatencyInputStream(
-+      const AudioParameters& params,
-+      const std::string& device_id,
-+      const LogCallback& log_callback) override;
-+
-+ protected:
-+  AudioParameters GetPreferredOutputStreamParameters(
-+      const std::string& output_device_id,
-+      const AudioParameters& input_params) override;
-+
-+ private:
-+  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
-+  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
-+  AudioInputStream* MakeInputStream(const AudioParameters& params);
-+};
-+
-+}  // namespace media
-+
-+#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
diff --git a/chromium-next/patches/patch-media_audio_sndio_sndio__input.cc b/chromium-next/patches/patch-media_audio_sndio_sndio__input.cc
deleted file mode 100644
index a4469a6951..0000000000
--- a/chromium-next/patches/patch-media_audio_sndio_sndio__input.cc
+++ /dev/null
@@ -1,209 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/sndio/sndio_input.cc.orig	2025-05-08 12:01:57.767584675 +0000
-+++ media/audio/sndio/sndio_input.cc
-@@ -0,0 +1,200 @@
-+// Copyright 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/logging.h"
-+#include "media/base/audio_timestamp_helper.h"
-+#include "media/audio/sndio/audio_manager_sndio.h"
-+#include "media/audio/audio_manager.h"
-+#include "media/audio/sndio/sndio_input.h"
-+
-+namespace media {
-+
-+static const SampleFormat kSampleFormat = kSampleFormatS16;
-+
-+void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
-+{
-+  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
-+
-+  self->hw_delay += delta;
-+}
-+
-+void *SndioAudioInputStream::ThreadEntry(void *arg) {
-+  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
-+
-+  self->ThreadLoop();
-+  return NULL;
-+}
-+
-+SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
-+                                             const std::string& device_name,
-+                                             const AudioParameters& params)
-+    : manager(manager),
-+      params(params),
-+      audio_bus(AudioBus::Create(params)),
-+      state(kClosed) {
-+}
-+
-+SndioAudioInputStream::~SndioAudioInputStream() {
-+  if (state != kClosed)
-+    Close();
-+}
-+
-+AudioInputStream::OpenOutcome SndioAudioInputStream::Open() {
-+  struct sio_par par;
-+  int sig;
-+
-+  if (state != kClosed)
-+    return OpenOutcome::kFailed;
-+
-+  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
-+      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
-+    LOG(WARNING) << "Unsupported audio format.";
-+    return OpenOutcome::kFailed;
-+  }
-+
-+  sio_initpar(&par);
-+  par.rate = params.sample_rate();
-+  par.rchan = params.channels();
-+  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
-+  par.bps = par.bits / 8;
-+  par.sig = sig = par.bits != 8 ? 1 : 0;
-+  par.le = SIO_LE_NATIVE;
-+  par.appbufsz = params.frames_per_buffer();
-+
-+  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
-+
-+  if (hdl == NULL) {
-+    LOG(ERROR) << "Couldn't open audio device.";
-+    return OpenOutcome::kFailed;
-+  }
-+
-+  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
-+    LOG(ERROR) << "Couldn't set audio parameters.";
-+    goto bad_close;
-+  }
-+
-+  if (par.rate  != (unsigned int)params.sample_rate() ||
-+      par.rchan != (unsigned int)params.channels() ||
-+      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
-+      par.sig   != (unsigned int)sig ||
-+      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
-+      (par.bits != par.bps * 8)) {
-+    LOG(ERROR) << "Unsupported audio parameters.";
-+    goto bad_close;
-+  }
-+  state = kStopped;
-+  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
-+  sio_onmove(hdl, &OnMoveCallback, this);
-+  return OpenOutcome::kSuccess;
-+bad_close:
-+  sio_close(hdl);
-+  return OpenOutcome::kFailed;
-+}
-+
-+void SndioAudioInputStream::Start(AudioInputCallback* cb) {
-+
-+  StartAgc();
-+
-+  state = kRunning;
-+  hw_delay = 0;
-+  callback = cb;
-+  sio_start(hdl);
-+  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
-+    LOG(ERROR) << "Failed to create real-time thread for recording.";
-+    sio_stop(hdl);
-+    state = kStopped;
-+  }
-+}
-+
-+void SndioAudioInputStream::Stop() {
-+
-+  if (state == kStopped)
-+    return;
-+
-+  state = kStopWait;
-+  pthread_join(thread, NULL);
-+  sio_stop(hdl);
-+  state = kStopped;
-+
-+  StopAgc();
-+}
-+
-+void SndioAudioInputStream::Close() {
-+
-+  if (state == kClosed)
-+    goto release;
-+
-+  if (state == kRunning)
-+    Stop();
-+
-+  state = kClosed;
-+  delete [] buffer;
-+  sio_close(hdl);
-+
-+release:
-+  manager->ReleaseInputStream(this);
-+}
-+
-+double SndioAudioInputStream::GetMaxVolume() {
-+  // Not supported
-+  return 0.0;
-+}
-+
-+void SndioAudioInputStream::SetVolume(double volume) {
-+  // Not supported. Do nothing.
-+}
-+
-+double SndioAudioInputStream::GetVolume() {
-+  // Not supported.
-+  return 0.0;
-+}
-+
-+bool SndioAudioInputStream::IsMuted() {
-+  // Not supported.
-+  return false;
-+}
-+
-+void SndioAudioInputStream::SetOutputDeviceForAec(
-+    const std::string& output_device_id) {
-+  // Not supported.
-+}
-+
-+void SndioAudioInputStream::ThreadLoop(void) {
-+  size_t todo, n;
-+  char *data;
-+  unsigned int nframes;
-+  double normalized_volume = 0.0;
-+
-+  nframes = audio_bus->frames();
-+
-+  while (state == kRunning && !sio_eof(hdl)) {
-+
-+    GetAgcVolume(&normalized_volume);
-+
-+    // read one block
-+    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
-+    data = buffer;
-+    while (todo > 0) {
-+      n = sio_read(hdl, data, todo);
-+      if (n == 0)
-+        return;	// unrecoverable I/O error
-+      todo -= n;
-+      data += n;
-+    }
-+    hw_delay -= nframes;
-+
-+    // convert frames count to TimeDelta
-+    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
-+      params.sample_rate());
-+
-+    // push into bus
-+    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
-+
-+
-+    // invoke callback
-+    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1., {});
-+  }
-+}
-+
-+}  // namespace media
diff --git a/chromium-next/patches/patch-media_audio_sndio_sndio__input.h b/chromium-next/patches/patch-media_audio_sndio_sndio__input.h
deleted file mode 100644
index 71900f322b..0000000000
--- a/chromium-next/patches/patch-media_audio_sndio_sndio__input.h
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/sndio/sndio_input.h.orig	2025-05-08 12:01:57.767726248 +0000
-+++ media/audio/sndio/sndio_input.h
-@@ -0,0 +1,91 @@
-+// Copyright 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
-+#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
-+
-+#include <stdint.h>
-+#include <string>
-+#include <sndio.h>
-+
-+#include "base/compiler_specific.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/time/time.h"
-+#include "media/audio/agc_audio_stream.h"
-+#include "media/audio/audio_io.h"
-+#include "media/audio/audio_device_description.h"
-+#include "media/base/audio_parameters.h"
-+
-+namespace media {
-+
-+class AudioManagerBase;
-+
-+// Implementation of AudioOutputStream using sndio(7)
-+class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
-+ public:
-+  // Pass this to the constructor if you want to attempt auto-selection
-+  // of the audio recording device.
-+  static const char kAutoSelectDevice[];
-+
-+  // Create a PCM Output stream for the SNDIO device identified by
-+  // |device_name|. If unsure of what to use for |device_name|, use
-+  // |kAutoSelectDevice|.
-+  SndioAudioInputStream(AudioManagerBase* audio_manager,
-+                     const std::string& device_name,
-+                     const AudioParameters& params);
-+
-+  SndioAudioInputStream(const SndioAudioInputStream&) = delete;
-+  SndioAudioInputStream& operator=(const SndioAudioInputStream&) = delete;
-+
-+  ~SndioAudioInputStream() override;
-+
-+  // Implementation of AudioInputStream.
-+  OpenOutcome Open() override;
-+  void Start(AudioInputCallback* callback) override;
-+  void Stop() override;
-+  void Close() override;
-+  double GetMaxVolume() override;
-+  void SetVolume(double volume) override;
-+  double GetVolume() override;
-+  bool IsMuted() override;
-+  void SetOutputDeviceForAec(const std::string& output_device_id) override;
-+
-+ private:
-+
-+  enum StreamState {
-+    kClosed,            // Not opened yet
-+    kStopped,           // Device opened, but not started yet
-+    kRunning,           // Started, device playing
-+    kStopWait           // Stopping, waiting for the real-time thread to exit
-+  };
-+
-+  // C-style call-backs
-+  static void OnMoveCallback(void *arg, int delta);
-+  static void* ThreadEntry(void *arg);
-+
-+  // Continuously moves data from the device to the consumer
-+  void ThreadLoop();
-+  // Our creator, the audio manager needs to be notified when we close.
-+  AudioManagerBase* manager;
-+  // Parameters of the source
-+  AudioParameters params;
-+  // We store data here for consumer
-+  std::unique_ptr<AudioBus> audio_bus;
-+  // Call-back that consumes recorded data
-+  AudioInputCallback* callback;  // Valid during a recording session.
-+  // Handle of the audio device
-+  struct sio_hdl* hdl;
-+  // Current state of the stream
-+  enum StreamState state;
-+  // High priority thread running ThreadLoop()
-+  pthread_t thread;
-+  // Number of frames buffered in the hardware
-+  int hw_delay;
-+  // Temporary buffer where data is stored sndio-compatible format
-+  char* buffer;
-+};
-+
-+}  // namespace media
-+
-+#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
diff --git a/chromium-next/patches/patch-media_audio_sndio_sndio__output.cc b/chromium-next/patches/patch-media_audio_sndio_sndio__output.cc
deleted file mode 100644
index 148c2dc98e..0000000000
--- a/chromium-next/patches/patch-media_audio_sndio_sndio__output.cc
+++ /dev/null
@@ -1,196 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/sndio/sndio_output.cc.orig	2025-05-08 12:01:57.767858883 +0000
-+++ media/audio/sndio/sndio_output.cc
-@@ -0,0 +1,187 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/logging.h"
-+#include "base/time/time.h"
-+#include "base/time/default_tick_clock.h"
-+#include "media/audio/audio_manager_base.h"
-+#include "media/base/audio_timestamp_helper.h"
-+#include "media/audio/sndio/sndio_output.h"
-+
-+namespace media {
-+
-+static const SampleFormat kSampleFormat = kSampleFormatS16;
-+
-+void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
-+  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-+
-+  self->hw_delay -= delta;
-+}
-+
-+void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
-+  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-+
-+  self->vol = vol;
-+}
-+
-+void *SndioAudioOutputStream::ThreadEntry(void *arg) {
-+  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-+
-+  self->ThreadLoop();
-+  return NULL;
-+}
-+
-+SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
-+                                               AudioManagerBase* manager)
-+    : manager(manager),
-+      params(params),
-+      audio_bus(AudioBus::Create(params)),
-+      state(kClosed),
-+      mutex(PTHREAD_MUTEX_INITIALIZER) {
-+}
-+
-+SndioAudioOutputStream::~SndioAudioOutputStream() {
-+  if (state != kClosed)
-+    Close();
-+}
-+
-+bool SndioAudioOutputStream::Open() {
-+  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
-+      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
-+    LOG(WARNING) << "Unsupported audio format.";
-+    return false;
-+  }
-+  state = kStopped;
-+  volpending = 0;
-+  vol = SIO_MAXVOL;
-+  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
-+  return true;
-+}
-+
-+void SndioAudioOutputStream::Close() {
-+  if (state == kClosed)
-+    goto release;
-+  if (state == kRunning)
-+    Stop();
-+  state = kClosed;
-+  delete [] buffer;
-+release:
-+  manager->ReleaseOutputStream(this);  // Calls the destructor
-+}
-+
-+void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
-+  struct sio_par par;
-+  int sig;
-+
-+  sio_initpar(&par);
-+  par.rate = params.sample_rate();
-+  par.pchan = params.channels();
-+  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
-+  par.bps = par.bits / 8;
-+  par.sig = sig = par.bits != 8 ? 1 : 0;
-+  par.le = SIO_LE_NATIVE;
-+  par.appbufsz = params.frames_per_buffer();
-+
-+  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
-+  if (hdl == NULL) {
-+    LOG(ERROR) << "Couldn't open audio device.";
-+    return;
-+  }
-+  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
-+    LOG(ERROR) << "Couldn't set audio parameters.";
-+    sio_close(hdl);
-+    return;
-+  }
-+  if (par.rate  != (unsigned int)params.sample_rate() ||
-+      par.pchan != (unsigned int)params.channels() ||
-+      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
-+      par.sig   != (unsigned int)sig ||
-+      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
-+      (par.bits != par.bps * 8)) {
-+    LOG(ERROR) << "Unsupported audio parameters.";
-+    sio_close(hdl);
-+    return;
-+  }
-+
-+  sio_onmove(hdl, &OnMoveCallback, this);
-+  sio_onvol(hdl, &OnVolCallback, this);
-+
-+  state = kRunning;
-+  hw_delay = 0;
-+  source = callback;
-+  sio_start(hdl);
-+
-+  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
-+    LOG(ERROR) << "Failed to create real-time thread.";
-+    sio_stop(hdl);
-+    sio_close(hdl);
-+    state = kStopped;
-+  }
-+}
-+
-+void SndioAudioOutputStream::Stop() {
-+  if (state == kStopped)
-+    return;
-+  state = kStopWait;
-+  pthread_join(thread, NULL);
-+  sio_stop(hdl);
-+  sio_close(hdl);
-+  state = kStopped;
-+}
-+
-+void SndioAudioOutputStream::SetVolume(double v) {
-+  pthread_mutex_lock(&mutex);
-+  vol = v * SIO_MAXVOL;
-+  volpending = 1;
-+  pthread_mutex_unlock(&mutex);
-+}
-+
-+void SndioAudioOutputStream::GetVolume(double* v) {
-+  pthread_mutex_lock(&mutex);
-+  *v = vol * (1. / SIO_MAXVOL);
-+  pthread_mutex_unlock(&mutex);
-+}
-+
-+// This stream is always used with sub second buffer sizes, where it's
-+// sufficient to simply always flush upon Start().
-+void SndioAudioOutputStream::Flush() {}
-+
-+void SndioAudioOutputStream::ThreadLoop(void) {
-+  int avail, count, result;
-+
-+  while (state == kRunning) {
-+    // Update volume if needed
-+    pthread_mutex_lock(&mutex);
-+    if (volpending) {
-+      volpending = 0;
-+      sio_setvol(hdl, vol);
-+    }
-+    pthread_mutex_unlock(&mutex);
-+
-+    // Get data to play
-+    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
-+	params.sample_rate());
-+    count = source->OnMoreData(delay, base::TimeTicks::Now(), {}, audio_bus.get());
-+    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
-+    if (count == 0) {
-+      // We have to submit something to the device
-+      count = audio_bus->frames();
-+      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
-+      LOG(WARNING) << "No data to play, running empty cycle.";
-+    }
-+
-+    // Submit data to the device
-+    avail = count * params.GetBytesPerFrame(kSampleFormat);
-+    result = sio_write(hdl, buffer, avail);
-+    if (result == 0) {
-+      LOG(WARNING) << "Audio device disconnected.";
-+      break;
-+    }
-+
-+    // Update hardware pointer
-+    hw_delay += count;
-+  }
-+}
-+
-+}  // namespace media
diff --git a/chromium-next/patches/patch-media_audio_sndio_sndio__output.h b/chromium-next/patches/patch-media_audio_sndio_sndio__output.h
deleted file mode 100644
index 5fef34e2a3..0000000000
--- a/chromium-next/patches/patch-media_audio_sndio_sndio__output.h
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/audio/sndio/sndio_output.h.orig	2025-05-08 12:01:57.768000827 +0000
-+++ media/audio/sndio/sndio_output.h
-@@ -0,0 +1,88 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
-+#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
-+
-+#include <pthread.h>
-+#include <sndio.h>
-+
-+#include "base/time/tick_clock.h"
-+#include "base/time/time.h"
-+#include "media/audio/audio_io.h"
-+
-+namespace media {
-+
-+class AudioManagerBase;
-+
-+// Implementation of AudioOutputStream using sndio(7)
-+class SndioAudioOutputStream : public AudioOutputStream {
-+ public:
-+  // The manager is creating this object
-+  SndioAudioOutputStream(const AudioParameters& params,
-+                         AudioManagerBase* manager);
-+
-+  SndioAudioOutputStream(const SndioAudioOutputStream&) = delete;
-+  SndioAudioOutputStream& operator=(const SndioAudioOutputStream&) = delete;
-+
-+  virtual ~SndioAudioOutputStream();
-+
-+  // Implementation of AudioOutputStream.
-+  bool Open() override;
-+  void Close() override;
-+  void Start(AudioSourceCallback* callback) override;
-+  void Stop() override;
-+  void SetVolume(double volume) override;
-+  void GetVolume(double* volume) override;
-+  void Flush() override;
-+
-+  friend void sndio_onmove(void *arg, int delta);
-+  friend void sndio_onvol(void *arg, unsigned int vol);
-+  friend void *sndio_threadstart(void *arg);
-+
-+ private:
-+  enum StreamState {
-+    kClosed,            // Not opened yet
-+    kStopped,           // Device opened, but not started yet
-+    kRunning,           // Started, device playing
-+    kStopWait           // Stopping, waiting for the real-time thread to exit
-+  };
-+
-+  // C-style call-backs
-+  static void OnMoveCallback(void *arg, int delta);
-+  static void OnVolCallback(void *arg, unsigned int vol);
-+  static void* ThreadEntry(void *arg);
-+
-+  // Continuously moves data from the producer to the device
-+  void ThreadLoop(void);
-+
-+  // Our creator, the audio manager needs to be notified when we close.
-+  AudioManagerBase* manager;
-+  // Parameters of the source
-+  AudioParameters params;
-+  // Source stores data here
-+  std::unique_ptr<AudioBus> audio_bus;
-+  // Call-back that produces data to play
-+  AudioSourceCallback* source;
-+  // Handle of the audio device
-+  struct sio_hdl* hdl;
-+  // Current state of the stream
-+  enum StreamState state;
-+  // High priority thread running ThreadLoop()
-+  pthread_t thread;
-+  // Protects vol, volpending and hw_delay
-+  pthread_mutex_t mutex;
-+  // Current volume in the 0..SIO_MAXVOL range
-+  int vol;
-+  // Set to 1 if volumes must be refreshed in the realtime thread
-+  int volpending;
-+  // Number of frames buffered in the hardware
-+  int hw_delay;
-+  // Temporary buffer where data is stored sndio-compatible format
-+  char* buffer;
-+};
-+
-+}  // namespace media
-+
-+#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
diff --git a/chromium-next/patches/patch-media_base_audio__latency.cc b/chromium-next/patches/patch-media_base_audio__latency.cc
deleted file mode 100644
index 9a07f2af97..0000000000
--- a/chromium-next/patches/patch-media_base_audio__latency.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/base/audio_latency.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/base/audio_latency.cc
-@@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int s
-   }
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // On Linux, MacOS and Fuchsia, the low level IO implementations on the
-   // browser side supports all buffer size the clients want. We use the native
-   // peer connection buffer size (10ms) to achieve best possible performance.
diff --git a/chromium-next/patches/patch-media_base_libaom__thread__wrapper.cc b/chromium-next/patches/patch-media_base_libaom__thread__wrapper.cc
deleted file mode 100644
index 5752c71ec4..0000000000
--- a/chromium-next/patches/patch-media_base_libaom__thread__wrapper.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/base/libaom_thread_wrapper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/base/libaom_thread_wrapper.cc
-@@ -5,17 +5,21 @@
- #include "base/logging.h"
- #include "media/base/codec_worker_impl.h"
- #include "media/base/libvpx_thread_wrapper.h"
-+#if !BUILDFLAG(IS_BSD)
- #include "third_party/libaom/source/libaom/aom_util/aom_thread.h"
-+#endif
- 
- namespace media {
- 
- void InitLibAomThreadWrapper() {
-+#if !BUILDFLAG(IS_BSD)
-   const AVxWorkerInterface interface =
-       CodecWorkerImpl<AVxWorkerInterface, AVxWorkerImpl, AVxWorker,
-                       AVxWorkerStatus, AVX_WORKER_STATUS_NOT_OK,
-                       AVX_WORKER_STATUS_OK,
-                       AVX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface();
-   CHECK(aom_set_worker_interface(&interface));
-+#endif
- }
- 
- }  // namespace media
diff --git a/chromium-next/patches/patch-media_base_libvpx__thread__wrapper.cc b/chromium-next/patches/patch-media_base_libvpx__thread__wrapper.cc
deleted file mode 100644
index e3cb81a4b3..0000000000
--- a/chromium-next/patches/patch-media_base_libvpx__thread__wrapper.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/base/libvpx_thread_wrapper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/base/libvpx_thread_wrapper.cc
-@@ -5,11 +5,14 @@
- #include "media/base/libvpx_thread_wrapper.h"
- 
- #include "media/base/codec_worker_impl.h"
-+#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_NETBSD)
- #include "third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h"
-+#endif
- 
- namespace media {
- 
- void InitLibVpxThreadWrapper() {
-+#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_NETBSD)
-   const VPxWorkerInterface interface =
-       CodecWorkerImpl<VPxWorkerInterface, VPxWorkerImpl, VPxWorker,
-                       VPxWorkerStatus, VPX_WORKER_STATUS_NOT_OK,
-@@ -17,6 +20,7 @@ void InitLibVpxThreadWrapper() {
-                       VPX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface();
- 
-   CHECK(vpx_set_worker_interface(&interface));
-+#endif
- }
- 
- }  // namespace media
diff --git a/chromium-next/patches/patch-media_base_media__switches.cc b/chromium-next/patches/patch-media_base_media__switches.cc
deleted file mode 100644
index 87685eab48..0000000000
--- a/chromium-next/patches/patch-media_base_media__switches.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/base/media_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/base/media_switches.cc
-@@ -19,7 +19,7 @@
- #include "ui/gl/gl_features.h"
- #include "ui/gl/gl_utils.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/cpu.h"
- #endif
- 
-@@ -59,7 +59,7 @@ const char kReportVp9AsAnUnsupportedMime
-     "report-vp9-as-an-unsupported-mime-type";
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \
--    BUILDFLAG(IS_SOLARIS)
-+    BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_NETBSD)
- // The Alsa device to use when opening an audio input stream.
- const char kAlsaInputDevice[] = "alsa-input-device";
- // The Alsa device to use when opening an audio stream.
-@@ -358,8 +358,8 @@ BASE_FEATURE(kUseSCContentSharingPicker,
-              "UseSCContentSharingPicker",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_MAC)
--
--#if BUILDFLAG(IS_LINUX)
-+ 
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Enables system audio mirroring using pulseaudio.
- BASE_FEATURE(kPulseaudioLoopbackForCast,
-              "PulseaudioLoopbackForCast",
-@@ -369,6 +369,31 @@ BASE_FEATURE(kPulseaudioLoopbackForCast,
- BASE_FEATURE(kPulseaudioLoopbackForScreenShare,
-              "PulseaudioLoopbackForScreenShare",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-+
-+BASE_FEATURE(kAudioBackend,
-+             "AudioBackend",
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+
-+constexpr base::FeatureParam<AudioBackend>::Option
-+    kAudioBackendOptions[] = {
-+        {AudioBackend::kAuto,
-+         "auto"},
-+        {AudioBackend::kAudioIO, "audioio"},
-+        {AudioBackend::kPulseAudio, "pulseaudio"},
-+        {AudioBackend::kSndio, "sndio"},
-+        {AudioBackend::kAlsa, "alsa"}};
-+
-+const base::FeatureParam<AudioBackend>
-+    kAudioBackendParam{
-+        &kAudioBackend, "audio-backend",
-+#if BUILDFLAG(IS_OPENBSD)
-+        AudioBackend::kSndio,
-+#elif BUILDFLAG(IS_NETBSD)
-+        AudioBackend::kAudioIO,
-+#elif BUILDFLAG(IS_FREEBSD)
-+        AudioBackend::kAuto,
-+#endif
-+        &kAudioBackendOptions};
- #endif  // BUILDFLAG(IS_LINUX)
- 
- // When enabled, MediaCapabilities will check with GPU Video Accelerator
-@@ -636,7 +661,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInP
- // Show toolbar button that opens dialog for controlling media sessions.
- BASE_FEATURE(kGlobalMediaControls,
-              "GlobalMediaControls",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -659,7 +684,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdated
- // If enabled, users can request Media Remoting without fullscreen-in-tab.
- BASE_FEATURE(kMediaRemotingWithoutFullscreen,
-              "MediaRemotingWithoutFullscreen",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -671,7 +696,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullsc
- BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
-              "GlobalMediaControlsPictureInPicture",
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -700,7 +725,7 @@ BASE_FEATURE(kUnifiedAutoplay,
-              "UnifiedAutoplay",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default
- // on chromeos, but needs an experiment on linux.
- BASE_FEATURE(kAcceleratedVideoDecodeLinux,
-@@ -800,7 +825,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
-              "VSyncMjpegDecoding",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS.
- BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding,
-              "V4L2H264TemporalLayerHWEncoding",
-@@ -1361,7 +1386,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecodi
- );
- #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Spawn utility processes to perform hardware encode acceleration instead of
- // using the GPU process.
- BASE_FEATURE(kUseOutOfProcessVideoEncoding,
-@@ -1443,7 +1468,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
-              "RecordWebAudioEngagement",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Reduces the number of buffers needed in the output video frame pool to
- // populate the Renderer pipeline for hardware accelerated VideoDecoder in
- // non-low latency scenarios.
diff --git a/chromium-next/patches/patch-media_base_media__switches.h b/chromium-next/patches/patch-media_base_media__switches.h
deleted file mode 100644
index 3731af8d24..0000000000
--- a/chromium-next/patches/patch-media_base_media__switches.h
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/base/media_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/base/media_switches.h
-@@ -43,7 +43,7 @@ MEDIA_EXPORT extern const char kDisableB
- MEDIA_EXPORT extern const char kReportVp9AsAnUnsupportedMimeType[];
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \
--    BUILDFLAG(IS_SOLARIS)
-+    BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_NETBSD)
- MEDIA_EXPORT extern const char kAlsaInputDevice[];
- MEDIA_EXPORT extern const char kAlsaOutputDevice[];
- #endif
-@@ -329,13 +329,26 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMedia
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare);
-+
-+enum class AudioBackend {
-+  kAuto,
-+  kPulseAudio,
-+  kSndio,
-+  kAudioIO,
-+  kAlsa
-+};
-+
-+MEDIA_EXPORT BASE_DECLARE_FEATURE(kAudioBackend);
-+MEDIA_EXPORT extern const base::FeatureParam<
-+    AudioBackend>
-+    kAudioBackendParam;
- #endif  // BUILDFLAG(IS_LINUX)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordMediaEngagementScores);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordWebAudioEngagement);
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers);
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo);
-@@ -349,7 +362,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspe
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux);
-@@ -371,7 +384,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapi
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding);
- #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding);
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
-@@ -497,7 +510,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackg
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
- #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoEncoding);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
diff --git a/chromium-next/patches/patch-media_base_video__frame.cc b/chromium-next/patches/patch-media_base_video__frame.cc
deleted file mode 100644
index 8c8b4d6fd0..0000000000
--- a/chromium-next/patches/patch-media_base_video__frame.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/base/video_frame.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/base/video_frame.cc
-@@ -92,7 +92,7 @@ std::string VideoFrame::StorageTypeToStr
-       return "OWNED_MEMORY";
-     case VideoFrame::STORAGE_SHMEM:
-       return "SHMEM";
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     case VideoFrame::STORAGE_DMABUFS:
-       return "DMABUFS";
- #endif
-@@ -106,7 +106,7 @@ std::string VideoFrame::StorageTypeToStr
- // static
- bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
-   return
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // This is not strictly needed but makes explicit that, at VideoFrame
-       // level, DmaBufs are not mappable from userspace.
-       storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -420,7 +420,7 @@ VideoFrame::CreateFrameForGpuMemoryBuffe
-         plane_size.width() * VideoFrame::BytesPerElement(*format, plane);
-   }
-   uint64_t modifier = gfx::NativePixmapHandle::kNoModifier;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool is_native_buffer =
-       gpu_memory_buffer
-           ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER)
-@@ -938,7 +938,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr
-   return frame;
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
-     const VideoFrameLayout& layout,
-@@ -1625,7 +1625,7 @@ scoped_refptr<gpu::ClientSharedImage> Vi
-   return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_;
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- size_t VideoFrame::NumDmabufFds() const {
-   if (wrapped_frame_) {
-     return wrapped_frame_->NumDmabufFds();
diff --git a/chromium-next/patches/patch-media_base_video__frame.h b/chromium-next/patches/patch-media_base_video__frame.h
deleted file mode 100644
index f8d8dca871..0000000000
--- a/chromium-next/patches/patch-media_base_video__frame.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/base/video_frame.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/base/video_frame.h
-@@ -42,7 +42,7 @@
- #include "ui/gfx/geometry/size.h"
- #include "ui/gfx/hdr_metadata.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/files/scoped_file.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -88,7 +88,7 @@ class MEDIA_EXPORT VideoFrame : public b
-     STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
-     STORAGE_OWNED_MEMORY = 3,  // VideoFrame has allocated its own data buffer.
-     STORAGE_SHMEM = 4,         // Backed by read-only shared memory.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     STORAGE_DMABUFS = 5,  // Each plane is stored into a DmaBuf.
- #endif
-     STORAGE_GPU_MEMORY_BUFFER = 6,
-@@ -435,7 +435,7 @@ class MEDIA_EXPORT VideoFrame : public b
-       ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
-       base::TimeDelta timestamp);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Wraps provided dmabufs
-   // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
-   // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -748,7 +748,7 @@ class MEDIA_EXPORT VideoFrame : public b
-   // wait for the included sync point.
-   scoped_refptr<gpu::ClientSharedImage> shared_image() const;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // The number of DmaBufs will be equal or less than the number of planes of
-   // the frame. If there are less, this means that the last FD contains the
-   // remaining planes. Should be > 0 for STORAGE_DMABUFS.
-@@ -988,7 +988,7 @@ class MEDIA_EXPORT VideoFrame : public b
-   // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame.
-   bool is_mappable_si_enabled_ = false;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either
-   // equal or less than the number of planes of the frame. If it is less, then
-   // the memory area represented by the last FD contains the remaining planes.
diff --git a/chromium-next/patches/patch-media_capture_video_create__video__capture__device__factory.cc b/chromium-next/patches/patch-media_capture_video_create__video__capture__device__factory.cc
deleted file mode 100644
index d9b80a9ef3..0000000000
--- a/chromium-next/patches/patch-media_capture_video_create__video__capture__device__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/create_video_capture_device_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/create_video_capture_device_factory.cc
-@@ -12,7 +12,7 @@
- #include "media/capture/video/fake_video_capture_device_factory.h"
- #include "media/capture/video/file_video_capture_device_factory.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "media/capture/video/linux/video_capture_device_factory_linux.h"
- #elif BUILDFLAG(IS_CHROMEOS)
- #include "media/capture/video/chromeos/public/cros_features.h"
-@@ -55,7 +55,7 @@ CreateFakeVideoCaptureDeviceFactory() {
- std::unique_ptr<VideoCaptureDeviceFactory>
- CreatePlatformSpecificVideoCaptureDeviceFactory(
-     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner);
- #elif BUILDFLAG(IS_CHROMEOS)
-   if (base::SysInfo::IsRunningOnChromeOS())
diff --git a/chromium-next/patches/patch-media_capture_video_fake__video__capture__device__factory.cc b/chromium-next/patches/patch-media_capture_video_fake__video__capture__device__factory.cc
deleted file mode 100644
index feb5184029..0000000000
--- a/chromium-next/patches/patch-media_capture_video_fake__video__capture__device__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/fake_video_capture_device_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/fake_video_capture_device_factory.cc
-@@ -231,7 +231,7 @@ void FakeVideoCaptureDeviceFactory::GetD
-   int entry_index = 0;
-   for (const auto& entry : devices_config_) {
-     VideoCaptureApi api =
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-         VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE;
- #elif BUILDFLAG(IS_IOS)
-         VideoCaptureApi::UNKNOWN;
diff --git a/chromium-next/patches/patch-media_capture_video_file__video__capture__device__factory.cc b/chromium-next/patches/patch-media_capture_video_file__video__capture__device__factory.cc
deleted file mode 100644
index 757998c29f..0000000000
--- a/chromium-next/patches/patch-media_capture_video_file__video__capture__device__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/file_video_capture_device_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/file_video_capture_device_factory.cc
-@@ -52,7 +52,7 @@ void FileVideoCaptureDeviceFactory::GetD
-       VideoCaptureApi::WIN_DIRECT_SHOW;
- #elif BUILDFLAG(IS_MAC)
-       VideoCaptureApi::MACOSX_AVFOUNDATION;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE;
- #else
-       VideoCaptureApi::UNKNOWN;
diff --git a/chromium-next/patches/patch-media_capture_video_linux_fake__v4l2__impl.cc b/chromium-next/patches/patch-media_capture_video_linux_fake__v4l2__impl.cc
deleted file mode 100644
index 189e4cb16e..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_fake__v4l2__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/fake_v4l2_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/fake_v4l2_impl.cc
-@@ -569,7 +569,7 @@ int FakeV4L2Impl::close(int fd) {
-   return kSuccessReturnValue;
- }
- 
--int FakeV4L2Impl::ioctl(int fd, int request, void* argp) {
-+int FakeV4L2Impl::ioctl(int fd, unsigned long request, void* argp) {
-   base::AutoLock lock(lock_);
-   auto device_iter = opened_devices_.find(fd);
-   if (device_iter == opened_devices_.end())
diff --git a/chromium-next/patches/patch-media_capture_video_linux_fake__v4l2__impl.h b/chromium-next/patches/patch-media_capture_video_linux_fake__v4l2__impl.h
deleted file mode 100644
index 87707ca521..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_fake__v4l2__impl.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/fake_v4l2_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/fake_v4l2_impl.h
-@@ -8,7 +8,13 @@
- #include <map>
- #include <string>
- 
-+#include "build/build_config.h"
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
-+#include <sys/videoio.h>
-+typedef __uint32_t __u32;
-+#else
- #include <linux/videodev2.h>
-+#endif
- 
- #include "base/synchronization/lock.h"
- #include "media/capture/capture_export.h"
-@@ -38,7 +44,7 @@ class CAPTURE_EXPORT FakeV4L2Impl : publ
-   // Implementation of V4L2CaptureDevice interface:
-   int open(const char* device_name, int flags) override;
-   int close(int fd) override;
--  int ioctl(int fd, int request, void* argp) override;
-+  int ioctl(int fd, unsigned long request, void* argp) override;
-   void* mmap(void* start,
-              size_t length,
-              int prot,
diff --git a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__delegate.cc
deleted file mode 100644
index 256b50edc4..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__delegate.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/v4l2_capture_delegate.cc
-@@ -10,8 +10,10 @@
- #include "media/capture/video/linux/v4l2_capture_delegate.h"
- 
- #include <fcntl.h>
-+#if !BUILDFLAG(IS_BSD)
- #include <linux/version.h>
- #include <linux/videodev2.h>
-+#endif
- #include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-@@ -34,17 +36,19 @@
- #include "media/capture/video/blob_utils.h"
- #include "media/capture/video/linux/video_capture_device_linux.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "media/capture/capture_switches.h"
- #include "media/capture/video/linux/v4l2_capture_delegate_gpu_helper.h"
- #endif  // BUILDFLAG(IS_LINUX)
- 
- using media::mojom::MeteringMode;
- 
-+#if !BUILDFLAG(IS_BSD)
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
- // 16 bit depth, Realsense F200.
- #define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ')
- #endif
-+#endif
- 
- // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the
- // format is introduced to kernel.
-@@ -54,6 +58,14 @@ using media::mojom::MeteringMode;
- #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z')
- #endif
- 
-+#ifndef V4L2_COLORSPACE_OPRGB
-+#define V4L2_COLORSPACE_OPRGB V4L2_COLORSPACE_ADOBERGB
-+#endif
-+
-+#ifndef V4L2_XFER_FUNC_OPRGB
-+#define V4L2_XFER_FUNC_OPRGB V4L2_XFER_FUNC_ADOBERGB
-+#endif
-+
- namespace media {
- 
- namespace {
-@@ -273,7 +285,7 @@ bool V4L2CaptureDelegate::IsBlockedContr
- // static
- bool V4L2CaptureDelegate::IsControllableControl(
-     int control_id,
--    const base::RepeatingCallback<int(int, void*)>& do_ioctl) {
-+    const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl) {
-   const int special_control_id = GetControllingSpecialControl(control_id);
-   if (!special_control_id) {
-     // The control is not controlled by a special control thus the control is
-@@ -329,7 +341,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate
-       is_capturing_(false),
-       timeout_count_(0),
-       rotation_(rotation) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
- #endif  // BUILDFLAG(IS_LINUX)
- }
-@@ -456,7 +468,7 @@ void V4L2CaptureDelegate::AllocateAndSta
- 
-   client_->OnStarted();
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (use_gpu_buffer_) {
-     v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>();
-   }
-@@ -800,7 +812,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2C
- 
- V4L2CaptureDelegate::~V4L2CaptureDelegate() = default;
- 
--bool V4L2CaptureDelegate::RunIoctl(int request, void* argp) {
-+bool V4L2CaptureDelegate::RunIoctl(unsigned int request, void* argp) {
-   int num_retries = 0;
-   for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries;
-        ++num_retries) {
-@@ -810,7 +822,7 @@ bool V4L2CaptureDelegate::RunIoctl(int r
-   return num_retries != kMaxIOCtrlRetries;
- }
- 
--int V4L2CaptureDelegate::DoIoctl(int request, void* argp) {
-+int V4L2CaptureDelegate::DoIoctl(unsigned int request, void* argp) {
-   return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp));
- }
- 
-@@ -821,6 +833,7 @@ bool V4L2CaptureDelegate::IsControllable
- }
- 
- void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() {
-+#if !BUILDFLAG(IS_BSD)
-   constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS,
-                                       V4L2_CID_AUTO_WHITE_BALANCE,
-                                       V4L2_CID_BRIGHTNESS,
-@@ -848,6 +861,7 @@ void V4L2CaptureDelegate::ReplaceControl
-                   << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}";
-     }
-   }
-+#endif
- }
- 
- mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) {
-@@ -1028,7 +1042,11 @@ void V4L2CaptureDelegate::DoCapture() {
- 
-   pollfd device_pfd = {};
-   device_pfd.fd = device_fd_.get();
-+#if !BUILDFLAG(IS_BSD)
-   device_pfd.events = POLLIN | POLLPRI;
-+#else
-+  device_pfd.events = POLLIN;
-+#endif
- 
-   const int result =
-       HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs));
-@@ -1048,6 +1066,12 @@ void V4L2CaptureDelegate::DoCapture() {
-       // in older kernels, and stopping and starting the stream gets the camera
-       // out of this bad state. Upgrading the kernel is difficult so this is our
-       // way out for now.
-+#if BUILDFLAG(IS_NETBSD)
-+      // On NetBSD cause: StartStream@media/capture/video/linux/v4l2_capture_delegate.cc:1017,
-+      // Error requesting MMAP buffers from V4L2, OS message: Device busy (16)
-+      // so do nothing, just wait for timeout_count_ >= kContinuousTimeoutLimit
-+      DLOG(WARNING) << "DoCapture: poll timeout";
-+#else
-       DLOG(WARNING) << "Restarting camera stream";
-       if (!StopStream() || !StartStream())
-         return;
-@@ -1055,6 +1079,7 @@ void V4L2CaptureDelegate::DoCapture() {
-           FROM_HERE,
-           base::BindOnce(&V4L2CaptureDelegate::DoCapture, GetWeakPtr()));
-       return;
-+#endif
-     } else if (timeout_count_ >= kContinuousTimeoutLimit) {
-       SetErrorState(
-           VideoCaptureError::kV4L2MultipleContinuousTimeoutsWhileReadPolling,
-@@ -1066,6 +1091,7 @@ void V4L2CaptureDelegate::DoCapture() {
-     timeout_count_ = 0;
-   }
- 
-+#if !BUILDFLAG(IS_BSD)
-   // Dequeue events if the driver has filled in some.
-   if (device_pfd.revents & POLLPRI) {
-     bool controls_changed = false;
-@@ -1099,6 +1125,7 @@ void V4L2CaptureDelegate::DoCapture() {
-       client_->OnCaptureConfigurationChanged();
-     }
-   }
-+#endif
- 
-   // Deenqueue, send and reenqueue a buffer if the driver has filled one in.
-   if (device_pfd.revents & POLLIN) {
-@@ -1152,7 +1179,7 @@ void V4L2CaptureDelegate::DoCapture() {
-       // workable on Linux.
- 
-       // See http://crbug.com/959919.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       if (use_gpu_buffer_) {
-         v4l2_gpu_helper_->OnIncomingCapturedData(
-             client_.get(), buffer_tracker->start(),
-@@ -1226,7 +1253,7 @@ void V4L2CaptureDelegate::SetErrorState(
-   client_->OnError(error, from_here, reason);
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- gfx::ColorSpace V4L2CaptureDelegate::BuildColorSpaceFromv4l2() {
-   v4l2_colorspace v4l2_primary = (v4l2_colorspace)video_fmt_.fmt.pix.colorspace;
-   v4l2_quantization v4l2_range =
diff --git a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__delegate.h b/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__delegate.h
deleted file mode 100644
index 6f2df79e77..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__delegate.h
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/v4l2_capture_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/v4l2_capture_delegate.h
-@@ -22,7 +22,7 @@
- #include "media/capture/video/linux/v4l2_capture_device_impl.h"
- #include "media/capture/video/video_capture_device.h"
- 
--#if BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_OPENBSD) || defined(OS_NETBSD)
- #include <sys/videoio.h>
- #else
- #include <linux/videodev2.h>
-@@ -34,7 +34,7 @@ class Location;
- 
- namespace media {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- class V4L2CaptureDelegateGpuHelper;
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -85,7 +85,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
-   static bool IsBlockedControl(int control_id);
-   static bool IsControllableControl(
-       int control_id,
--      const base::RepeatingCallback<int(int, void*)>& do_ioctl);
-+      const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl);
- 
-  private:
-   friend class V4L2CaptureDelegateTest;
-@@ -96,10 +96,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
-   // device file descriptor or (re)starting streaming, can fail but works after
-   // retrying (https://crbug.com/670262). Returns false if the |request| ioctl
-   // fails too many times.
--  bool RunIoctl(int request, void* argp);
-+  bool RunIoctl(unsigned int request, void* argp);
- 
-   // Simple wrapper to do HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), ...)).
--  int DoIoctl(int request, void* argp);
-+  int DoIoctl(unsigned int request, void* argp);
- 
-   // Check whether the control is controllable (and not changed automatically).
-   bool IsControllableControl(int control_id);
-@@ -129,7 +129,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
-                      const base::Location& from_here,
-                      const std::string& reason);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Systems which describe a "color space" usually map that to one or more of
-   // {primary, matrix, transfer, range}. BuildColorSpaceFromv4l2() will use the
-   // matched value as first priority. Otherwise, if there is no best matching
-@@ -163,7 +163,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
-   // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270.
-   int rotation_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Support GPU memory buffer.
-   bool use_gpu_buffer_;
-   std::unique_ptr<V4L2CaptureDelegateGpuHelper> v4l2_gpu_helper_;
diff --git a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device.h b/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device.h
deleted file mode 100644
index 04a7c998b0..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/v4l2_capture_device.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/v4l2_capture_device.h
-@@ -23,7 +23,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice
- 
-   virtual int open(const char* device_name, int flags) = 0;
-   virtual int close(int fd) = 0;
--  virtual int ioctl(int fd, int request, void* argp) = 0;
-+  virtual int ioctl(int fd, unsigned long request, void* argp) = 0;
-   virtual void* mmap(void* start,
-                      size_t length,
-                      int prot,
diff --git a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.cc b/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
deleted file mode 100644
index 58267c32fd..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/v4l2_capture_device_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/v4l2_capture_device_impl.cc
-@@ -22,7 +22,7 @@ int V4L2CaptureDeviceImpl::close(int fd)
-   return ::close(fd);
- }
- 
--int V4L2CaptureDeviceImpl::ioctl(int fd, int request, void* argp) {
-+int V4L2CaptureDeviceImpl::ioctl(int fd, unsigned long request, void* argp) {
-   return ::ioctl(fd, request, argp);
- }
- 
diff --git a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.h b/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.h
deleted file mode 100644
index b71dd5306b..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/v4l2_capture_device_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/v4l2_capture_device_impl.h
-@@ -19,7 +19,7 @@ class CAPTURE_EXPORT V4L2CaptureDeviceIm
-  public:
-   int open(const char* device_name, int flags) override;
-   int close(int fd) override;
--  int ioctl(int fd, int request, void* argp) override;
-+  int ioctl(int fd, unsigned long request, void* argp) override;
-   void* mmap(void* start,
-              size_t length,
-              int prot,
diff --git a/chromium-next/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc b/chromium-next/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
deleted file mode 100644
index 0986881a87..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/video_capture_device_factory_v4l2.cc
-@@ -28,7 +28,7 @@
- #include "media/capture/video/linux/scoped_v4l2_device_fd.h"
- #include "media/capture/video/linux/video_capture_device_linux.h"
- 
--#if BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
- #include <sys/videoio.h>
- #else
- #include <linux/videodev2.h>
-@@ -43,6 +43,7 @@ bool CompareCaptureDevices(const VideoCa
-   return a.descriptor < b.descriptor;
- }
- 
-+#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_NETBSD)
- // USB VID and PID are both 4 bytes long.
- const size_t kVidPidSize = 4;
- const size_t kMaxInterfaceNameSize = 256;
-@@ -75,11 +76,24 @@ std::string ExtractFileNameFromDeviceId(
-   DCHECK(base::StartsWith(device_id, kDevDir, base::CompareCase::SENSITIVE));
-   return device_id.substr(strlen(kDevDir), device_id.length());
- }
-+#endif
- 
- class DevVideoFilePathsDeviceProvider
-     : public VideoCaptureDeviceFactoryV4L2::DeviceProvider {
-  public:
-   void GetDeviceIds(std::vector<std::string>* target_container) override {
-+#if BUILDFLAG(IS_OPENBSD)
-+    char device[12];
-+    int fd;
-+    /* unveil(2) limits access to /dev/, try /dev/video[0-7] */
-+    for (int n = 0; n < 8; n++) {
-+      snprintf(device, sizeof(device), "/dev/video%d", n);
-+      if ((fd = open(device, O_RDONLY)) != -1) {
-+        close(fd);
-+        target_container->emplace_back(device);
-+      }
-+    }
-+#else
-     const base::FilePath path("/dev/");
-     base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES,
-                                     "video*");
-@@ -87,9 +101,13 @@ class DevVideoFilePathsDeviceProvider
-       const base::FileEnumerator::FileInfo info = enumerator.GetInfo();
-       target_container->emplace_back(path.value() + info.GetName().value());
-     }
-+#endif
-   }
- 
-   std::string GetDeviceModelId(const std::string& device_id) override {
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
-+    return std::string();
-+#else
-     const std::string file_name = ExtractFileNameFromDeviceId(device_id);
-     std::string usb_id;
-     const std::string vid_path =
-@@ -106,9 +124,13 @@ class DevVideoFilePathsDeviceProvider
-     }
- 
-     return usb_id;
-+#endif
-   }
- 
-   std::string GetDeviceDisplayName(const std::string& device_id) override {
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
-+    return std::string();
-+#else
-     const std::string file_name = ExtractFileNameFromDeviceId(device_id);
-     const std::string interface_path =
-         base::StringPrintf(kInterfacePathTemplate, file_name.c_str());
-@@ -119,6 +141,7 @@ class DevVideoFilePathsDeviceProvider
-       return std::string();
-     }
-     return display_name;
-+#endif
-   }
- };
- 
-@@ -224,7 +247,7 @@ void VideoCaptureDeviceFactoryV4L2::GetD
-   std::move(callback).Run(std::move(devices_info));
- }
- 
--int VideoCaptureDeviceFactoryV4L2::DoIoctl(int fd, int request, void* argp) {
-+int VideoCaptureDeviceFactoryV4L2::DoIoctl(int fd, unsigned int request, void* argp) {
-   return HANDLE_EINTR(v4l2_->ioctl(fd, request, argp));
- }
- 
-@@ -284,6 +307,11 @@ std::vector<float> VideoCaptureDeviceFac
-         frame_rates.push_back(
-             frame_interval.discrete.denominator /
-             static_cast<float>(frame_interval.discrete.numerator));
-+#if BUILDFLAG(IS_NETBSD)
-+        // On NetBSD VIDIOC_ENUM_FRAMEINTERVALS(video_enum_frameival) always return the same values
-+        // and not handle index, what is cause infinity loop. One round is enough.
-+        break;
-+#endif
-       }
-     } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS ||
-                frame_interval.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
diff --git a/chromium-next/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h b/chromium-next/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
deleted file mode 100644
index d8fb8a892c..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/video_capture_device_factory_v4l2.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/video_capture_device_factory_v4l2.h
-@@ -51,7 +51,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceF
- 
-  private:
-   // Simple wrapper to do HANDLE_EINTR(v4l2_->ioctl(fd, ...)).
--  int DoIoctl(int fd, int request, void* argp);
-+  int DoIoctl(int fd, unsigned int request, void* argp);
- 
-   VideoCaptureControlSupport GetControlSupport(int fd);
-   bool GetControlSupport(int fd, int control_id);
diff --git a/chromium-next/patches/patch-media_capture_video_linux_video__capture__device__linux.cc b/chromium-next/patches/patch-media_capture_video_linux_video__capture__device__linux.cc
deleted file mode 100644
index 587250511a..0000000000
--- a/chromium-next/patches/patch-media_capture_video_linux_video__capture__device__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/linux/video_capture_device_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/linux/video_capture_device_linux.cc
-@@ -15,7 +15,7 @@
- #include "build/build_config.h"
- #include "media/capture/video/linux/v4l2_capture_delegate.h"
- 
--#if BUILDFLAG(IS_OPENBSD)
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
- #include <sys/videoio.h>
- #else
- #include <linux/videodev2.h>
diff --git a/chromium-next/patches/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc b/chromium-next/patches/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
deleted file mode 100644
index ff77229720..0000000000
--- a/chromium-next/patches/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/video_capture_buffer_tracker_factory_impl.cc
-@@ -13,7 +13,7 @@
- #include "media/capture/video/chromeos/gpu_memory_buffer_tracker_cros.h"
- #elif BUILDFLAG(IS_APPLE)
- #include "media/capture/video/apple/gpu_memory_buffer_tracker_apple.h"
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "media/capture/video/linux/v4l2_gpu_memory_buffer_tracker.h"
- #elif BUILDFLAG(IS_WIN)
- #include "media/capture/video/win/gpu_memory_buffer_tracker_win.h"
-@@ -41,7 +41,7 @@ VideoCaptureBufferTrackerFactoryImpl::Cr
-       return std::make_unique<GpuMemoryBufferTrackerCros>();
- #elif BUILDFLAG(IS_APPLE)
-       return std::make_unique<GpuMemoryBufferTrackerApple>();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       return std::make_unique<V4L2GpuMemoryBufferTracker>();
- #elif BUILDFLAG(IS_WIN)
-       if (!dxgi_device_manager_) {
diff --git a/chromium-next/patches/patch-media_capture_video_video__capture__device__client.cc b/chromium-next/patches/patch-media_capture_video_video__capture__device__client.cc
deleted file mode 100644
index 9dc09ecae1..0000000000
--- a/chromium-next/patches/patch-media_capture_video_video__capture__device__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/capture/video/video_capture_device_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/capture/video/video_capture_device_client.cc
-@@ -172,7 +172,7 @@ FourccAndFlip GetFourccAndFlipFromPixelF
-       CHECK(!is_width_odd && !is_height_odd);
-       return {libyuv::FOURCC_UYVY};
-     case media::PIXEL_FORMAT_RGB24:
--      if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) {
-+      if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) {
-         // Linux RGB24 defines red at lowest byte address,
-         // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
-         return {libyuv::FOURCC_RAW};
diff --git a/chromium-next/patches/patch-media_cdm_cdm__paths__unittest.cc b/chromium-next/patches/patch-media_cdm_cdm__paths__unittest.cc
deleted file mode 100644
index 8e5a4acf09..0000000000
--- a/chromium-next/patches/patch-media_cdm_cdm__paths__unittest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/cdm/cdm_paths_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/cdm/cdm_paths_unittest.cc
-@@ -26,7 +26,7 @@ const char kComponentPlatform[] =
-     "win";
- #elif BUILDFLAG(IS_CHROMEOS)
-     "cros";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     "linux";
- #elif BUILDFLAG(IS_FUCHSIA)
-     "fuchsia";
diff --git a/chromium-next/patches/patch-media_cdm_library__cdm_cdm__paths.gni b/chromium-next/patches/patch-media_cdm_library__cdm_cdm__paths.gni
deleted file mode 100644
index 1374b9286a..0000000000
--- a/chromium-next/patches/patch-media_cdm_library__cdm_cdm__paths.gni
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/cdm/library_cdm/cdm_paths.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/cdm/library_cdm/cdm_paths.gni
-@@ -14,7 +14,7 @@ assert(enable_library_cdms)
- # Explicitly define what we use to avoid confusion.
- if (is_chromeos) {
-   component_os = "cros"
--} else if (is_linux) {
-+} else if (is_linux || is_bsd) {
-   component_os = "linux"
- } else if (is_win) {
-   component_os = "win"
diff --git a/chromium-next/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py b/chromium-next/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py
deleted file mode 100644
index 790580ba21..0000000000
--- a/chromium-next/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/ffmpeg/scripts/build_ffmpeg.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/ffmpeg/scripts/build_ffmpeg.py
-@@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath(
- SUCCESS_TOKEN = 'THIS_BUILD_WORKED'
- 
- sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build'))
--import gn_helpers
-+#import gn_helpers
- 
- BRANDINGS = [
-     'Chrome',
-@@ -43,6 +43,9 @@ BRANDINGS = [
- ARCH_MAP = {
-     'android': ['ia32', 'x64', 'arm-neon', 'arm64'],
-     'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'],
-+    'openbsd': ['x64', 'arm64', 'ia32'],
-+    'freebsd': ['x64', 'arm64', 'ia32'],
-+    'netbsd': ['x64', 'arm64', 'ia32'],
-     'mac': ['x64', 'arm64'],
-     'win': ['ia32', 'x64', 'arm64'],
- }
-@@ -122,7 +125,7 @@ def PrintAndCheckCall(argv, *args, **kwa
- 
- 
- def GetDsoName(target_os, dso_name, dso_version):
--    if target_os in ('linux', 'linux-noasm', 'android'):
-+    if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd', 'netbsd'):
-         return 'lib%s.so.%s' % (dso_name, dso_version)
-     elif target_os == 'mac':
-         return 'lib%s.%s.dylib' % (dso_name, dso_version)
-@@ -475,7 +478,7 @@ def BuildFFmpeg(target_os, target_arch, 
-     # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation
-     # #warning which will be converted to an error via -Werror.
-     # There is also no prctl.h
--    if target_os in ['linux', 'linux-noasm']:
-+    if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd', 'netbsd']:
-         pre_make_rewrites += [
-             (r'(#define HAVE_SYSCTL [01])',
-              r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'),
-@@ -598,7 +601,7 @@ def main(argv):
-     configure_args = args[2:]
- 
-     if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win',
--                         'all'):
-+                         'all', 'openbsd', 'freebsd', 'netbsd'):
-         parser.print_help()
-         return 1
- 
-@@ -712,7 +715,7 @@ def ConfigureAndBuild(target_arch, targe
-             '--optflags="-O2"',
-         ])
- 
--    if target_os in ('linux', 'linux-noasm', 'android'):
-+    if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd', 'netbsd'):
-         if target_arch == 'x64':
-             if target_os == 'android':
-                 configure_flags['Common'].extend([
-@@ -827,9 +830,6 @@ def ConfigureAndBuild(target_arch, targe
- 
-                 configure_flags['Common'].extend([
-                     '--target-os=linux',
--                    '--sysroot=' +
--                    os.path.join(CHROMIUM_ROOT_DIR,
--                                 'build/linux/debian_bullseye_arm64-sysroot'),
-                     # See crbug.com/1467681. These could be removed eventually
-                     '--disable-dotprod',
-                     '--disable-i8mm',
-@@ -921,7 +921,7 @@ def ConfigureAndBuild(target_arch, targe
-         # typically be the system one, so explicitly configure use of Clang's
-         # ld.lld, to ensure that things like cross-compilation and LTO work.
-         # This does not work for ia32 and is always used on mac.
--        if target_arch != 'ia32' and target_os != 'mac':
-+        if target_arch != 'ia32' and target_os != 'mac' and target_os != 'netbsd':
-             configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
- 
-     # Should be run on Mac, unless we're cross-compiling on Linux.
diff --git a/chromium-next/patches/patch-media_ffmpeg_scripts_robo__lib_config.py b/chromium-next/patches/patch-media_ffmpeg_scripts_robo__lib_config.py
deleted file mode 100644
index 7e9c54e33a..0000000000
--- a/chromium-next/patches/patch-media_ffmpeg_scripts_robo__lib_config.py
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/ffmpeg/scripts/robo_lib/config.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/ffmpeg/scripts/robo_lib/config.py
-@@ -56,19 +56,13 @@ class RoboConfiguration:
-         self._llvm_path = os.path.join(self.chrome_src(), "third_party",
-                                        "llvm-build", "Release+Asserts", "bin")
- 
--        self.EnsurePathContainsLLVM()
--        self.EnsureNoMakeInfo()
-         self.EnsureFFmpegHome()
-         self.EnsureGNConfig()
--        self.ComputeBranchName()
- 
-         if not quiet:
-             shell.log(f"Using chrome src: {self.chrome_src()}")
-             shell.log(f"Using script dir: {self._script_directory}")
-             shell.log(f"Using ffmpeg home: {self.ffmpeg_home()}")
--            shell.log(f"On branch: {self.branch_name()}")
--            if self.sushi_branch_name():
--                shell.log(f"On sushi branch: {self.sushi_branch_name()}")
- 
-         # Filename that we'll ask generate_gn.py to write git commands to.
-         # TODO: Should this use script_directory, or stay with ffmpeg?  As long
-@@ -187,9 +181,9 @@ class RoboConfiguration:
- 
-         if re.match(r"i.86", platform.machine()):
-             self._host_architecture = "ia32"
--        elif platform.machine() == "x86_64" or platform.machine() == "AMD64":
-+        elif platform.machine() == "x86_64" or platform.machine() == "AMD64" or platform.machine() == "amd64":
-             self._host_architecture = "x64"
--        elif platform.machine() == "aarch64":
-+        elif platform.machine() == "aarch64" or platform.machine() == "arm64":
-             self._host_architecture = "arm64"
-         elif platform.machine() == "mips32":
-             self._host_architecture = "mipsel"
-@@ -224,6 +218,12 @@ class RoboConfiguration:
-         elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system(
-         ):
-             self._host_operating_system = "win"
-+        elif platform.system() == "OpenBSD":
-+            self._host_operating_system = "openbsd"
-+        elif platform.system() == "FreeBSD":
-+            self._host_operating_system = "freebsd"
-+        elif platform.system() == "NetBSD":
-+            self._host_operating_system = "netbsd"
-         else:
-             raise ValueError(f"Unsupported platform: {platform.system()}")
- 
-@@ -232,8 +232,8 @@ class RoboConfiguration:
-         wd = os.getcwd()
-         # Walk up the tree until we find src/AUTHORS
-         while wd != "/":
--            if os.path.isfile(os.path.join(wd, "src", "AUTHORS")):
--                self._chrome_src = os.path.join(wd, "src")
-+            if os.path.isfile(os.path.join(wd, "third_party", "DEPS")):
-+                self._chrome_src = wd
-                 return
-             wd = os.path.dirname(wd)
-         raise Exception("could not find src/AUTHORS in any parent of the wd")
diff --git a/chromium-next/patches/patch-media_gpu_chromeos_gl__image__processor__backend.cc b/chromium-next/patches/patch-media_gpu_chromeos_gl__image__processor__backend.cc
deleted file mode 100644
index 6dacac29d3..0000000000
--- a/chromium-next/patches/patch-media_gpu_chromeos_gl__image__processor__backend.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/chromeos/gl_image_processor_backend.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/chromeos/gl_image_processor_backend.cc
-@@ -28,6 +28,10 @@
- #include "ui/ozone/public/ozone_platform.h"
- #include "ui/ozone/public/surface_factory_ozone.h"
- 
-+#ifndef GL_CONTEXT_LOST_KHR
-+#define GL_CONTEXT_LOST_KHR 0x0507
-+#endif
-+
- namespace media {
- 
- namespace {
diff --git a/chromium-next/patches/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/chromium-next/patches/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
deleted file mode 100644
index 1467a44672..0000000000
--- a/chromium-next/patches/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/chromeos/libyuv_image_processor_backend.cc
-@@ -53,7 +53,7 @@ static constexpr struct {
- #define CONV(in, out, trans, result) \
-   {Fourcc::in, Fourcc::out, Transform::trans, SupportResult::result}
-     // Conversion.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     CONV(NV12, AR24, kConversion, Supported),
- #endif
-     CONV(NV12, NV12, kConversion, Supported),
-@@ -412,7 +412,7 @@ int LibYUVImageProcessorBackend::DoConve
-           fr->GetWritableVisibleData(VideoFrame::Plane::kUV)), \
-       fr->stride(VideoFrame::Plane::kUV)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define ARGB_DATA(fr)                                   \
-   fr->GetWritableVisibleData(VideoFrame::Plane::kARGB), \
-       fr->stride(VideoFrame::Plane::kARGB)
-@@ -574,7 +574,7 @@ int LibYUVImageProcessorBackend::DoConve
-     }
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (output->format() == PIXEL_FORMAT_ARGB) {
-     if (input_config_.fourcc == Fourcc(Fourcc::NV12)) {
-       return LIBYUV_FUNC(NV12ToARGB, Y_UV_DATA(input),
diff --git a/chromium-next/patches/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/chromium-next/patches/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
deleted file mode 100644
index 4f5cf72174..0000000000
--- a/chromium-next/patches/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/chromeos/mailbox_video_frame_converter.cc
-@@ -68,7 +68,7 @@ viz::SharedImageFormat GetSharedImageFor
-                     << static_cast<int>(buffer_format);
-       NOTREACHED();
-   }
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // If format is true multiplanar format, we prefer external sampler on
-   // ChromeOS and Linux.
-   if (format.is_multi_plane()) {
diff --git a/chromium-next/patches/patch-media_gpu_chromeos_platform__video__frame__utils.cc b/chromium-next/patches/patch-media_gpu_chromeos_platform__video__frame__utils.cc
deleted file mode 100644
index 2b972a00fa..0000000000
--- a/chromium-next/patches/patch-media_gpu_chromeos_platform__video__frame__utils.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/chromeos/platform_video_frame_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/chromeos/platform_video_frame_utils.cc
-@@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> Cr
-     const base::FilePath dev_path(FILE_PATH_LITERAL(
-         base::StrCat({drm_node_file_prefix, base::NumberToString(i)})));
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC)
-     const bool is_render_node = base::Contains(drm_node_file_prefix, "render");
- 
-     // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind
-@@ -193,7 +193,7 @@ class GbmDeviceWrapper {
-       const base::FilePath dev_path(
-           base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
-               switches::kRenderNodeOverride));
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC)
-       const bool is_render_node = base::Contains(dev_path.value(), "render");
- 
-       // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind
diff --git a/chromium-next/patches/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/chromium-next/patches/patch-media_gpu_chromeos_video__decoder__pipeline.cc
deleted file mode 100644
index 05166084d4..0000000000
--- a/chromium-next/patches/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -1122,7 +1122,7 @@ VideoDecoderPipeline::PickDecoderOutputF
-   }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_VAAPI)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_VAAPI)
-   // Linux should always use a custom allocator (to allocate buffers using
-   // libva) and a PlatformVideoFramePool.
-   CHECK(allocator.has_value());
-@@ -1131,7 +1131,7 @@ VideoDecoderPipeline::PickDecoderOutputF
-   // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS.
-   main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
-       *allocator, VideoFrame::STORAGE_DMABUFS);
--#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC)
-   // Linux w/ V4L2 should not use a custom allocator
-   // Only tested with video_decode_accelerator_tests
-   // TODO(wenst@) Test with full Chromium Browser
-@@ -1305,7 +1305,7 @@ VideoDecoderPipeline::PickDecoderOutputF
-              << " VideoFrames";
-     auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // The custom allocator creates frames backed by NativePixmap, which uses a
-     // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS.
-     auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
diff --git a/chromium-next/patches/patch-media_gpu_gpu__video__decode__accelerator__factory.cc b/chromium-next/patches/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
deleted file mode 100644
index 0b12a6cf72..0000000000
--- a/chromium-next/patches/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/gpu_video_decode_accelerator_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/gpu_video_decode_accelerator_factory.cc
-@@ -13,7 +13,7 @@
- #include "media/gpu/media_gpu_export.h"
- #include "media/media_buildflags.h"
- 
--#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- #include "media/gpu/v4l2/legacy/v4l2_video_decode_accelerator.h"
- #include "media/gpu/v4l2/v4l2_device.h"
- #endif
-@@ -29,7 +29,7 @@ GpuVideoDecodeAcceleratorFactory::Create
-   if (gpu_preferences.disable_accelerated_video_decode)
-     return nullptr;
- 
--#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- 
-   std::unique_ptr<VideoDecodeAccelerator> vda;
-   vda.reset(new V4L2VideoDecodeAccelerator(base::MakeRefCounted<V4L2Device>()));
diff --git a/chromium-next/patches/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/chromium-next/patches/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
deleted file mode 100644
index d081b90160..0000000000
--- a/chromium-next/patches/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -160,7 +160,7 @@ std::vector<VEAFactoryFunction> GetVEAFa
-   }
- 
- #if BUILDFLAG(USE_VAAPI)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
-   }
-@@ -168,7 +168,7 @@ std::vector<VEAFactoryFunction> GetVEAFa
-   vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
- #endif
- #elif BUILDFLAG(USE_V4L2_CODEC)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions->push_back(base::BindRepeating(&CreateV4L2VEA));
-   }
diff --git a/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
deleted file mode 100644
index 7603dd7cd3..0000000000
--- a/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
-@@ -17,7 +17,9 @@
- #include "media/gpu/vaapi/vaapi_wrapper.h"
- #endif
- 
-+#if !BUILDFLAG(IS_BSD)
- using sandbox::syscall_broker::BrokerFilePermission;
-+#endif
- 
- // TODO(b/195769334): the hardware video decoding sandbox is really only useful
- // when building with VA-API or V4L2 (otherwise, we're not really doing hardware
-@@ -33,6 +35,7 @@ using sandbox::syscall_broker::BrokerFil
- namespace media {
- namespace {
- 
-+#if !BUILDFLAG(IS_BSD)
- void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions,
-                               bool include_sys_dev_char,
-                               bool read_write) {
-@@ -189,6 +192,7 @@ bool HardwareVideoDecodingPreSandboxHook
-   NOTREACHED();
- #endif  // BUILDFLAG(USE_V4L2_CODEC)
- }
-+#endif
- 
- }  // namespace
- 
-@@ -204,6 +208,7 @@ bool HardwareVideoDecodingPreSandboxHook
- //   (at least).
- bool HardwareVideoDecodingPreSandboxHook(
-     sandbox::policy::SandboxLinux::Options options) {
-+#if !BUILDFLAG(IS_BSD)
-   using HardwareVideoDecodingProcessPolicy =
-       sandbox::policy::HardwareVideoDecodingProcessPolicy;
-   using PolicyType =
-@@ -249,6 +254,7 @@ bool HardwareVideoDecodingPreSandboxHook
-   // |permissions| is empty?
-   sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess(
-       command_set, permissions, options);
-+#endif
-   return true;
- }
- 
diff --git a/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h b/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
deleted file mode 100644
index a22c9b8453..0000000000
--- a/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h
-@@ -5,7 +5,13 @@
- #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_DECODING_SANDBOX_HOOK_LINUX_H_
- #define MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_DECODING_SANDBOX_HOOK_LINUX_H_
- 
-+#include "build/build_config.h"
-+
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace media {
- 
diff --git a/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
deleted file mode 100644
index 6bbc01339d..0000000000
--- a/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc
-@@ -18,12 +18,15 @@
- #include "media/gpu/v4l2/v4l2_device.h"
- #endif
- 
-+#if !BUILDFLAG(IS_BSD)
- using sandbox::syscall_broker::BrokerFilePermission;
-+#endif
- 
- namespace media {
- 
- bool HardwareVideoEncodingPreSandboxHook(
-     sandbox::policy::SandboxLinux::Options options) {
-+#if !BUILDFLAG(IS_BSD)
-   sandbox::syscall_broker::BrokerCommandSet command_set;
-   std::vector<BrokerFilePermission> permissions;
- 
-@@ -132,6 +135,7 @@ bool HardwareVideoEncodingPreSandboxHook
-     dlopen("libvulkan_radeon.so", kDlopenFlags);
-   }
- #endif
-+#endif
-   return true;
- }
- 
diff --git a/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h b/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
deleted file mode 100644
index 97c7359845..0000000000
--- a/chromium-next/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h
-@@ -5,7 +5,13 @@
- #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_
- #define MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_
- 
-+#include "build/build_config.h"
-+
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace media {
- 
-@@ -14,4 +20,4 @@ bool HardwareVideoEncodingPreSandboxHook
- 
- }  // namespace media
- 
--#endif  // MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_
-\ No newline at end of file
-+#endif  // MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium-next/patches/patch-media_gpu_test_raw__video.cc b/chromium-next/patches/patch-media_gpu_test_raw__video.cc
deleted file mode 100644
index 8adc00a070..0000000000
--- a/chromium-next/patches/patch-media_gpu_test_raw__video.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/test/raw_video.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/test/raw_video.cc
-@@ -61,7 +61,7 @@ std::unique_ptr<base::MemoryMappedFile> 
-                              base::File::FLAG_READ | base::File::FLAG_WRITE
- // On Windows FLAG_CREATE_ALWAYS will require FLAG_WRITE, and FLAG_APPEND
- // must not be specified.
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-                              | base::File::FLAG_APPEND
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-           ),
diff --git a/chromium-next/patches/patch-media_gpu_test_video__frame__file__writer.cc b/chromium-next/patches/patch-media_gpu_test_video__frame__file__writer.cc
deleted file mode 100644
index abf8b426d4..0000000000
--- a/chromium-next/patches/patch-media_gpu_test_video__frame__file__writer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/test/video_frame_file_writer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/test/video_frame_file_writer.cc
-@@ -25,7 +25,7 @@
- #include "testing/gtest/include/gtest/gtest.h"
- #include "ui/gfx/codec/png_codec.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include <sys/mman.h>
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-media_gpu_test_video__frame__helpers.cc b/chromium-next/patches/patch-media_gpu_test_video__frame__helpers.cc
deleted file mode 100644
index c01c8dcf54..0000000000
--- a/chromium-next/patches/patch-media_gpu_test_video__frame__helpers.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/test/video_frame_helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/test/video_frame_helpers.cc
-@@ -23,7 +23,7 @@
- #include "ui/gfx/buffer_format_util.h"
- #include "ui/gfx/gpu_memory_buffer.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include <sys/mman.h>
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-media_gpu_test_video__frame__validator.cc b/chromium-next/patches/patch-media_gpu_test_video__frame__validator.cc
deleted file mode 100644
index b42eec007e..0000000000
--- a/chromium-next/patches/patch-media_gpu_test_video__frame__validator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/test/video_frame_validator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/test/video_frame_validator.cc
-@@ -34,7 +34,7 @@
- #include "testing/gtest/include/gtest/gtest.h"
- #include "ui/gfx/gpu_memory_buffer.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include <sys/mman.h>
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/chromium-next/patches/patch-media_gpu_vaapi_vaapi__video__decoder.cc
deleted file mode 100644
index fdf251b2e3..0000000000
--- a/chromium-next/patches/patch-media_gpu_vaapi_vaapi__video__decoder.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -784,7 +784,7 @@ void VaapiVideoDecoder::ApplyResolutionC
-   const gfx::Size decoder_natural_size =
-       aspect_ratio_.GetNaturalSize(decoder_visible_rect);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::optional<DmabufVideoFramePool::CreateFrameCB> allocator =
-       base::BindRepeating(&AllocateCustomFrameProxy, weak_this_);
-   std::vector<ImageProcessor::PixelLayoutCandidate> candidates = {
diff --git a/chromium-next/patches/patch-media_gpu_vaapi_vaapi__wrapper.cc b/chromium-next/patches/patch-media_gpu_vaapi_vaapi__wrapper.cc
deleted file mode 100644
index 078c773903..0000000000
--- a/chromium-next/patches/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/vaapi/vaapi_wrapper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -81,7 +81,7 @@
- using media_gpu_vaapi::kModuleVa_prot;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/files/file_util.h"
- #include "base/strings/string_split.h"
- #endif
diff --git a/chromium-next/patches/patch-media_media__options.gni b/chromium-next/patches/patch-media_media__options.gni
deleted file mode 100644
index c3350bc522..0000000000
--- a/chromium-next/patches/patch-media_media__options.gni
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/media_options.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/media_options.gni
-@@ -201,12 +201,18 @@ declare_args() {
-   # Enables runtime selection of ALSA library for audio.
-   use_alsa = false
- 
-+  # Enable runtime selection of sndio(7)
-+  use_sndio = false
-+
-+  # Enable runtime selection of audio(4)
-+  use_audioio = false
-+
-   # Alsa should be used on all non-Android, non-Mac POSIX systems - with the
-   # exception of CastOS desktop builds.
-   #
-   # TODO(crbug.com/1336055): Remove legacy target_cpu hack used for targeting
-   # desktop Chromecast builds.
--  if (is_posix && !is_android && !is_apple &&
-+  if (is_posix && !is_android && !is_apple && !is_bsd &&
-       (!is_castos || (target_cpu == "x86" || target_cpu == "x64") ||
-        is_cast_audio_only)) {
-     use_alsa = true
diff --git a/chromium-next/patches/patch-media_mojo_mojom_BUILD.gn b/chromium-next/patches/patch-media_mojo_mojom_BUILD.gn
deleted file mode 100644
index 01efbb4bcd..0000000000
--- a/chromium-next/patches/patch-media_mojo_mojom_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/mojo/mojom/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/mojo/mojom/BUILD.gn
-@@ -959,7 +959,7 @@ source_set("test_support") {
-   sources = []
-   deps = []
- 
--  if (is_linux || is_chromeos) {
-+  if (!is_bsd && (is_linux || is_chromeos)) {
-     sources += [
-       "buffer_handle_test_util.cc",
-       "buffer_handle_test_util.h",
diff --git a/chromium-next/patches/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/chromium-next/patches/patch-media_mojo_mojom_video__frame__mojom__traits.cc
deleted file mode 100644
index bf9f5a793e..0000000000
--- a/chromium-next/patches/patch-media_mojo_mojom_video__frame__mojom__traits.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/mojo/mojom/video_frame_mojom_traits.cc
-@@ -24,7 +24,7 @@
- #include "ui/gfx/mojom/color_space_mojom_traits.h"
- #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/posix/eintr_wrapper.h"
- #include "media/gpu/buffer_validation.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -166,7 +166,7 @@ media::mojom::VideoFrameDataPtr MakeVide
-         media::mojom::OpaqueVideoFrameData::New());
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
-     // Duplicates the DMA buffer FDs to a new vector since this cannot take
-     // ownership of the FDs in |input| due to constness.
-@@ -197,7 +197,7 @@ media::mojom::VideoFrameDataPtr MakeVide
- 
- }  // namespace
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- bool StructTraits<
-     media::mojom::ColorPlaneLayoutDataView,
-@@ -436,7 +436,7 @@ bool StructTraits<media::mojom::VideoFra
-     frame = media::VideoFrame::WrapTrackingToken(
-         format, *metadata.tracking_token, coded_size, visible_rect,
-         natural_size, timestamp);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   } else if (data.is_dmabuf_data()) {
-     media::mojom::DmabufVideoFrameDataDataView dmabuf_data;
-     data.GetDmabufDataDataView(&dmabuf_data);
diff --git a/chromium-next/patches/patch-media_mojo_mojom_video__frame__mojom__traits.h b/chromium-next/patches/patch-media_mojo_mojom_video__frame__mojom__traits.h
deleted file mode 100644
index ca4fb89959..0000000000
--- a/chromium-next/patches/patch-media_mojo_mojom_video__frame__mojom__traits.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/mojo/mojom/video_frame_mojom_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/mojo/mojom/video_frame_mojom_traits.h
-@@ -21,7 +21,7 @@
- 
- namespace mojo {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- template <>
- struct StructTraits<media::mojom::ColorPlaneLayoutDataView,
-                     media::ColorPlaneLayout> {
diff --git a/chromium-next/patches/patch-media_video_fake__gpu__memory__buffer.cc b/chromium-next/patches/patch-media_video_fake__gpu__memory__buffer.cc
deleted file mode 100644
index de57f031f6..0000000000
--- a/chromium-next/patches/patch-media_video_fake__gpu__memory__buffer.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/video/fake_gpu_memory_buffer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/video/fake_gpu_memory_buffer.cc
-@@ -14,7 +14,7 @@
- #include "media/base/format_utils.h"
- #include "media/base/video_frame.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-@@ -29,7 +29,7 @@ namespace media {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- base::ScopedFD GetDummyFD() {
-   base::ScopedFD fd(open("/dev/zero", O_RDWR));
-   DCHECK(fd.is_valid());
-@@ -73,7 +73,7 @@ static base::AtomicSequenceNumber buffer
- 
- }  // namespace
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- gfx::GpuMemoryBufferHandle CreatePixmapHandleForTesting(
-     const gfx::Size& size,
-     gfx::BufferFormat format,
diff --git a/chromium-next/patches/patch-media_video_fake__gpu__memory__buffer.h b/chromium-next/patches/patch-media_video_fake__gpu__memory__buffer.h
deleted file mode 100644
index d3ec8682bb..0000000000
--- a/chromium-next/patches/patch-media_video_fake__gpu__memory__buffer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/video/fake_gpu_memory_buffer.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/video/fake_gpu_memory_buffer.h
-@@ -13,7 +13,7 @@
- 
- namespace media {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // This method is used by tests to create a fake pixmap handle instead of
- // creating a FakeGpuMemoryBuffer. Once all tests are converted to use it,
- // FakeGpuMemoryBuffer will be removed and this file will be renamed
diff --git a/chromium-next/patches/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/chromium-next/patches/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
deleted file mode 100644
index 9eb8e22652..0000000000
--- a/chromium-next/patches/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -647,7 +647,7 @@ void GpuMemoryBufferVideoFramePool::Pool
-   }
- 
-   bool is_software_backed_video_frame = !video_frame->HasSharedImage();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   is_software_backed_video_frame &= !video_frame->HasDmaBufs();
- #endif
- 
-@@ -1057,7 +1057,7 @@ scoped_refptr<VideoFrame> GpuMemoryBuffe
-       media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get());
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   is_webgpu_compatible =
-       handle.native_pixmap_handle.supports_zero_copy_webgpu_import;
- #endif
-@@ -1228,7 +1228,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl:
-       si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT;
-     }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/40194712): Always add the flag once the
-     // OzoneImageBacking is by default turned on.
-     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
diff --git a/chromium-next/patches/patch-media_video_video__encode__accelerator__adapter.cc b/chromium-next/patches/patch-media_video_video__encode__accelerator__adapter.cc
deleted file mode 100644
index de91a5ddfb..0000000000
--- a/chromium-next/patches/patch-media_video_video__encode__accelerator__adapter.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/video/video_encode_accelerator_adapter.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/video/video_encode_accelerator_adapter.cc
-@@ -468,7 +468,7 @@ void VideoEncodeAcceleratorAdapter::Init
- 
-   auto format = PIXEL_FORMAT_I420;
-   auto storage_type = VideoEncodeAccelerator::Config::StorageType::kShmem;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Linux/ChromeOS require a special configuration to use dmabuf storage.
-   // We need to keep sending frames with the same storage type.
-   // Other platforms will happily mix GpuMemoryBuffer storage with shared-mem
diff --git a/chromium-next/patches/patch-media_video_video__encode__accelerator__adapter__test.cc b/chromium-next/patches/patch-media_video_video__encode__accelerator__adapter__test.cc
deleted file mode 100644
index e4333f6dbb..0000000000
--- a/chromium-next/patches/patch-media_video_video__encode__accelerator__adapter__test.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/video/video_encode_accelerator_adapter_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/video/video_encode_accelerator_adapter_test.cc
-@@ -260,7 +260,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest
-       });
- 
-   VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   expected_input_format = PIXEL_FORMAT_NV12;
- #endif
-   vea()->SetEncodingCallback(base::BindLambdaForTesting(
-@@ -369,7 +369,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest
-       });
- 
-   VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   expected_input_format = PIXEL_FORMAT_NV12;
- #endif
- 
-@@ -467,7 +467,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest
-       CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2));
- 
-   VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     expected_input_format = PIXEL_FORMAT_NV12;
- #endif
-   const gfx::ColorSpace expected_color_space =
-@@ -674,7 +674,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest
-       });
- 
-   VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   expected_input_format = PIXEL_FORMAT_NV12;
- #endif
-   vea()->SetEncodingCallback(base::BindLambdaForTesting(
diff --git a/chromium-next/patches/patch-media_webrtc_audio__processor.cc b/chromium-next/patches/patch-media_webrtc_audio__processor.cc
deleted file mode 100644
index 7201b9ab63..0000000000
--- a/chromium-next/patches/patch-media_webrtc_audio__processor.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/webrtc/audio_processor.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/webrtc/audio_processor.cc
-@@ -509,7 +509,7 @@ std::optional<double> AudioProcessor::Pr
-   // controller.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-   DCHECK_LE(volume, 1.0);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // We have a special situation on Linux where the microphone volume can be
-   // "higher than maximum". The input volume slider in the sound preference
-   // allows the user to set a scaling that is higher than 100%. It means that
diff --git a/chromium-next/patches/patch-media_webrtc_helpers.cc b/chromium-next/patches/patch-media_webrtc_helpers.cc
deleted file mode 100644
index c97d006b4b..0000000000
--- a/chromium-next/patches/patch-media_webrtc_helpers.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/webrtc/helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/webrtc/helpers.cc
-@@ -43,14 +43,14 @@ void ConfigAutomaticGainControl(const Au
-     return;
-   }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const bool kInputVolumeAdjustmentOverrideAllowed = true;
- #elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-   const bool kInputVolumeAdjustmentOverrideAllowed = false;
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // Use AGC2 digital and input volume controller.
-   // TODO(crbug.com/40872787): Remove `kWebRtcAllowInputVolumeAdjustment` safely
-   // and set `input_volume_controller.enabled` true.
diff --git a/chromium-next/patches/patch-media_webrtc_helpers__unittests.cc b/chromium-next/patches/patch-media_webrtc_helpers__unittests.cc
deleted file mode 100644
index eb6581400d..0000000000
--- a/chromium-next/patches/patch-media_webrtc_helpers__unittests.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/webrtc/helpers_unittests.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ media/webrtc/helpers_unittests.cc
-@@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
-   EXPECT_TRUE(config.echo_canceller.enabled);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   EXPECT_FALSE(config.gain_controller1.enabled);
-   EXPECT_TRUE(config.gain_controller2.enabled);
- #elif BUILDFLAG(IS_CASTOS) || BUILDFLAG(IS_CAST_ANDROID)
-@@ -66,7 +66,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- TEST(CreateWebRtcAudioProcessingModuleTest,
-      InputVolumeAdjustmentEnabledWithAgc2) {
-   ::base::test::ScopedFeatureList feature_list;
-@@ -82,7 +82,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- TEST(CreateWebRtcAudioProcessingModuleTest,
-      CanDisableInputVolumeAdjustmentWithAgc2) {
-   ::base::test::ScopedFeatureList feature_list;
-@@ -99,7 +99,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- TEST(CreateWebRtcAudioProcessingModuleTest,
-      OnlyOneInputVolumeControllerEnabledOnDesktopPlatforms) {
-   auto config = CreateApmGetConfig(
diff --git a/chromium-next/patches/patch-mojo_core_BUILD.gn b/chromium-next/patches/patch-mojo_core_BUILD.gn
deleted file mode 100644
index bc99b852d1..0000000000
--- a/chromium-next/patches/patch-mojo_core_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- mojo/core/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ mojo/core/BUILD.gn
-@@ -163,7 +163,7 @@ source_set("impl_for_embedder") {
-       ]
-     }
- 
--    if ((is_linux || is_chromeos || is_android) && !is_nacl) {
-+    if ((is_linux || is_chromeos || is_android) && !is_nacl && !is_bsd) {
-       sources += [
-         "channel_linux.cc",
-         "channel_linux.h",
diff --git a/chromium-next/patches/patch-mojo_core_channel.cc b/chromium-next/patches/patch-mojo_core_channel.cc
deleted file mode 100644
index d95ea711c1..0000000000
--- a/chromium-next/patches/patch-mojo_core_channel.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- mojo/core/channel.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ mojo/core/channel.cc
-@@ -83,7 +83,11 @@ const size_t kMaxAttachedHandles = 64;
- const size_t kMaxAttachedHandles = 253;
- #endif  // BUILDFLAG(IS_FUCHSIA)
- 
-+#if defined(__i386__) && defined(OS_FREEBSD)
-+const size_t kChannelMessageAlignment = 4;
-+#else
- static_assert(alignof(std::max_align_t) >= kChannelMessageAlignment, "");
-+#endif
- Channel::AlignedBuffer MakeAlignedBuffer(size_t size) {
-   // Generic allocators (such as malloc) return a pointer that is suitably
-   // aligned for storing any type of object with a fundamental alignment
diff --git a/chromium-next/patches/patch-mojo_core_embedder_features.h b/chromium-next/patches/patch-mojo_core_embedder_features.h
deleted file mode 100644
index 6b21c76b5f..0000000000
--- a/chromium-next/patches/patch-mojo_core_embedder_features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- mojo/core/embedder/features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ mojo/core/embedder/features.h
-@@ -16,7 +16,7 @@ namespace core {
- 
- #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && \
-     !BUILDFLAG(MOJO_USE_APPLE_CHANNEL)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(MOJO_CORE_EMBEDDER_FEATURES)
- BASE_DECLARE_FEATURE(kMojoLinuxChannelSharedMem);
- 
diff --git a/chromium-next/patches/patch-mojo_public_cpp_platform_socket__utils__posix.cc b/chromium-next/patches/patch-mojo_public_cpp_platform_socket__utils__posix.cc
deleted file mode 100644
index 127857243f..0000000000
--- a/chromium-next/patches/patch-mojo_public_cpp_platform_socket__utils__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- mojo/public/cpp/platform/socket_utils_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ mojo/public/cpp/platform/socket_utils_posix.cc
-@@ -34,7 +34,7 @@ bool IsRecoverableError() {
- }
- 
- bool GetPeerEuid(base::PlatformFile fd, uid_t* peer_euid) {
--#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FREEBSD)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
-   uid_t socket_euid;
-   gid_t socket_gid;
-   if (getpeereid(fd, &socket_euid, &socket_gid) < 0) {
diff --git a/chromium-next/patches/patch-mojo_public_tools_bindings_mojom.gni b/chromium-next/patches/patch-mojo_public_tools_bindings_mojom.gni
deleted file mode 100644
index e1e746d1f8..0000000000
--- a/chromium-next/patches/patch-mojo_public_tools_bindings_mojom.gni
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- mojo/public/tools/bindings/mojom.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ mojo/public/tools/bindings/mojom.gni
-@@ -774,6 +774,21 @@ template("mojom") {
-       enabled_features += [ "is_apple" ]
-     }
- 
-+    if (is_openbsd) {
-+      enabled_features += [ "is_openbsd" ]
-+      enabled_features += [ "is_bsd" ]
-+    }
-+
-+    if (is_netbsd) {
-+      enabled_features += [ "is_netbsd" ]
-+      enabled_features += [ "is_bsd" ]
-+    }
-+
-+    if (is_freebsd) {
-+      enabled_features += [ "is_freebsd" ]
-+      enabled_features += [ "is_bsd" ]
-+    }
-+
-     action_outputs = []
-     foreach(base_path, output_file_base_paths) {
-       filename = get_path_info(base_path, "file")
diff --git a/chromium-next/patches/patch-net_BUILD.gn b/chromium-next/patches/patch-net_BUILD.gn
deleted file mode 100644
index b9626757f6..0000000000
--- a/chromium-next/patches/patch-net_BUILD.gn
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/BUILD.gn
-@@ -125,7 +125,7 @@ net_configs = [
-   "//build/config/compiler:wexit_time_destructors",
- ]
- 
--if (is_linux || is_chromeos) {
-+if ((is_linux || is_chromeos) && !is_bsd) {
-   net_configs += [ "//build/config/linux:libresolv" ]
- }
- 
-@@ -1320,6 +1320,19 @@ component("net") {
-     ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "base/address_map_cache_linux.cc",
-+      "base/address_map_cache_linux.h",
-+      "base/address_map_linux.cc",
-+      "base/address_map_linux.h",
-+      "base/address_tracker_linux.cc",
-+      "base/address_tracker_linux.h",
-+      "base/network_change_notifier_linux.cc",
-+      "base/network_interfaces_linux.cc",
-+    ]
-+  }   
-+
-   if (is_mac) {
-     sources += [
-       "base/network_notification_thread_mac.cc",
-@@ -1483,7 +1496,7 @@ component("net") {
-   }
- 
-   # Use getifaddrs() on POSIX platforms, except Linux.
--  if (is_posix && !is_linux && !is_chromeos) {
-+  if ((is_posix && !is_linux && !is_chromeos) || is_bsd) {
-     sources += [
-       "base/network_interfaces_getifaddrs.cc",
-       "base/network_interfaces_getifaddrs.h",
-@@ -2182,7 +2195,7 @@ static_library("test_support") {
-     ]
-   }
- 
--  if (is_linux || is_chromeos || is_android) {
-+  if (!is_bsd && (is_linux || is_chromeos || is_android)) {
-     sources += [
-       "base/address_tracker_linux_test_util.cc",
-       "base/address_tracker_linux_test_util.h",
-@@ -3001,14 +3014,14 @@ target(_test_target_type, "net_unittests
-     ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux && !is_bsd) {
-     sources += [
-       "base/network_change_notifier_linux_unittest.cc",
-       "proxy_resolution/proxy_config_service_linux_unittest.cc",
-     ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [
-       "base/address_tracker_linux_unittest.cc",
-       "base/network_interfaces_linux_unittest.cc",
-@@ -3104,6 +3117,10 @@ target(_test_target_type, "net_unittests
-     ]
-   }
- 
-+  if (is_bsd) {
-+    deps += [ "//sandbox/policy" ]
-+  }
-+
-   if (enable_websockets) {
-     sources += [
-       "server/http_connection_unittest.cc",
-@@ -3170,7 +3187,7 @@ target(_test_target_type, "net_unittests
-     ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [ "tools/quic/quic_simple_server_test.cc" ]
-   }
- 
-@@ -3309,7 +3326,7 @@ target(_test_target_type, "net_unittests
-   }
- 
-   # Use getifaddrs() on POSIX platforms, except Linux.
--  if (is_posix && !is_linux && !is_chromeos) {
-+  if (is_posix && !is_linux && !is_chromeos && !is_bsd) {
-     sources += [ "base/network_interfaces_getifaddrs_unittest.cc" ]
-   }
- 
diff --git a/chromium-next/patches/patch-net_base_features.cc b/chromium-next/patches/patch-net_base_features.cc
deleted file mode 100644
index e05fb83d9d..0000000000
--- a/chromium-next/patches/patch-net_base_features.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/base/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/base/features.cc
-@@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCross
- BASE_FEATURE(kAsyncDns,
-              "AsyncDns",
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -548,7 +548,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseU
-              "SpdyHeadersToHttpResponseUseBuilder",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
-+// No IP_RECVTOS support
-+BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT);
-+#else
- BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_ENABLED_BY_DEFAULT);
-+#endif
- 
- BASE_FEATURE(kUseNewAlpsCodepointHttp2,
-              "UseNewAlpsCodepointHttp2",
diff --git a/chromium-next/patches/patch-net_base_network__change__notifier.cc b/chromium-next/patches/patch-net_base_network__change__notifier.cc
deleted file mode 100644
index b3cd0ec3d1..0000000000
--- a/chromium-next/patches/patch-net_base_network__change__notifier.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/base/network_change_notifier.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/base/network_change_notifier.cc
-@@ -36,7 +36,7 @@
- #include "net/base/network_change_notifier_linux.h"
- #elif BUILDFLAG(IS_APPLE)
- #include "net/base/network_change_notifier_apple.h"
--#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "net/base/network_change_notifier_passive.h"
- #elif BUILDFLAG(IS_FUCHSIA)
- #include "net/base/network_change_notifier_fuchsia.h"
-@@ -323,6 +323,9 @@ std::unique_ptr<NetworkChangeNotifier> N
- #elif BUILDFLAG(IS_FUCHSIA)
-   return std::make_unique<NetworkChangeNotifierFuchsia>(
-       /*require_wlan=*/false);
-+#elif BUILDFLAG(IS_BSD)
-+  return std::make_unique<MockNetworkChangeNotifier>(
-+      /*dns_config_notifier*/nullptr);
- #else
-   NOTIMPLEMENTED();
-   return nullptr;
-@@ -519,7 +522,7 @@ base::cstring_view NetworkChangeNotifier
-   return kConnectionTypeNames[type];
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- AddressMapOwnerLinux* NetworkChangeNotifier::GetAddressMapOwner() {
-   return g_network_change_notifier
-@@ -865,7 +868,7 @@ NetworkChangeNotifier::NetworkChangeNoti
-   }
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- AddressMapOwnerLinux* NetworkChangeNotifier::GetAddressMapOwnerInternal() {
-   return nullptr;
- }
diff --git a/chromium-next/patches/patch-net_base_network__change__notifier.h b/chromium-next/patches/patch-net_base_network__change__notifier.h
deleted file mode 100644
index c26680b62d..0000000000
--- a/chromium-next/patches/patch-net_base_network__change__notifier.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/base/network_change_notifier.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/base/network_change_notifier.h
-@@ -19,7 +19,7 @@
- #include "net/base/net_export.h"
- #include "net/base/network_handle.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "net/base/address_map_linux.h"
- #endif
- 
-@@ -451,7 +451,7 @@ class NET_EXPORT NetworkChangeNotifier {
-   // packets sent lazily.
-   static bool IsDefaultNetworkActive();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Returns the AddressTrackerLinux if present.
-   static AddressMapOwnerLinux* GetAddressMapOwner();
- #endif
-@@ -621,7 +621,7 @@ class NET_EXPORT NetworkChangeNotifier {
-       SystemDnsConfigChangeNotifier* system_dns_config_notifier = nullptr,
-       bool omit_observers_in_constructor_for_testing = false);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Returns the AddressMapOwnerLinux if present.
-   virtual AddressMapOwnerLinux* GetAddressMapOwnerInternal();
- #endif
diff --git a/chromium-next/patches/patch-net_base_network__change__notifier__passive.cc b/chromium-next/patches/patch-net_base_network__change__notifier__passive.cc
deleted file mode 100644
index 5c19845bc8..0000000000
--- a/chromium-next/patches/patch-net_base_network__change__notifier__passive.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/base/network_change_notifier_passive.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/base/network_change_notifier_passive.cc
-@@ -106,7 +106,7 @@ NetworkChangeNotifierPassive::GetAddress
- NetworkChangeNotifier::NetworkChangeCalculatorParams
- NetworkChangeNotifierPassive::NetworkChangeCalculatorParamsPassive() {
-   NetworkChangeCalculatorParams params;
--#if BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Delay values arrived at by simple experimentation and adjusted so as to
-   // produce a single signal when switching between network connections.
-   params.ip_address_offline_delay_ = base::Milliseconds(4000);
diff --git a/chromium-next/patches/patch-net_base_network__interfaces__posix.h b/chromium-next/patches/patch-net_base_network__interfaces__posix.h
deleted file mode 100644
index 1e0c791c03..0000000000
--- a/chromium-next/patches/patch-net_base_network__interfaces__posix.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/base/network_interfaces_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/base/network_interfaces_posix.h
-@@ -8,6 +8,8 @@
- // This file provides some basic functionality shared between
- // network_interfaces_linux.cc and network_interfaces_getifaddrs.cc.
- 
-+#include <sys/socket.h>
-+
- #include <string>
- 
- struct sockaddr;
diff --git a/chromium-next/patches/patch-net_base_sockaddr__util__posix.cc b/chromium-next/patches/patch-net_base_sockaddr__util__posix.cc
deleted file mode 100644
index a4c7e49c64..0000000000
--- a/chromium-next/patches/patch-net_base_sockaddr__util__posix.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/base/sockaddr_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/base/sockaddr_util_posix.cc
-@@ -45,7 +45,8 @@ bool FillUnixAddress(const std::string& 
-     return true;
-   }
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-+  // XXX ?
-   // Convert the path given into abstract socket name. It must start with
-   // the '\0' character, so we are adding it. |addr_len| must specify the
-   // length of the structure exactly, as potentially the socket name may
diff --git a/chromium-next/patches/patch-net_base_sockaddr__util__posix__unittest.cc b/chromium-next/patches/patch-net_base_sockaddr__util__posix__unittest.cc
deleted file mode 100644
index 51d3a340e2..0000000000
--- a/chromium-next/patches/patch-net_base_sockaddr__util__posix__unittest.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/base/sockaddr_util_posix_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/base/sockaddr_util_posix_unittest.cc
-@@ -88,7 +88,8 @@ TEST(FillUnixAddressTest, AbstractLinuxA
-   size_t path_max = MaxPathLength(&storage);
-   std::string path(path_max, '0');
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-+  // XXX?
-   EXPECT_TRUE(FillUnixAddress(path, /*use_abstract_namespace=*/true, &storage));
- 
-   EXPECT_EQ(path.size() + 1U + offsetof(struct sockaddr_un, sun_path),
diff --git a/chromium-next/patches/patch-net_cert_cert__verify__proc.h b/chromium-next/patches/patch-net_cert_cert__verify__proc.h
deleted file mode 100644
index 9533e7c7ec..0000000000
--- a/chromium-next/patches/patch-net_cert_cert__verify__proc.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/cert/cert_verify_proc.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/cert/cert_verify_proc.h
-@@ -182,7 +182,7 @@ class NET_EXPORT CertVerifyProc
-     kMaxValue = kChainLengthOne
-   };
- 
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-       BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
-   // Creates and returns a CertVerifyProc that uses the system verifier.
-   // |cert_net_fetcher| may not be used, depending on the implementation.
diff --git a/chromium-next/patches/patch-net_disk__cache_backend__experiment.h b/chromium-next/patches/patch-net_disk__cache_backend__experiment.h
deleted file mode 100644
index 0fa1221b2e..0000000000
--- a/chromium-next/patches/patch-net_disk__cache_backend__experiment.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/disk_cache/backend_experiment.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/disk_cache/backend_experiment.h
-@@ -14,7 +14,7 @@ namespace disk_cache {
- // default.
- constexpr bool IsSimpleBackendEnabledByDefaultPlatform() {
-   return BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
--         BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC);
-+         BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD);
- }
- 
- // True if assigned to any of disk cache backend experiment groups.
diff --git a/chromium-next/patches/patch-net_disk__cache_simple_simple__file__tracker.cc b/chromium-next/patches/patch-net_disk__cache_simple_simple__file__tracker.cc
deleted file mode 100644
index 1c5cd84c8a..0000000000
--- a/chromium-next/patches/patch-net_disk__cache_simple_simple__file__tracker.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/disk_cache/simple/simple_file_tracker.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/disk_cache/simple/simple_file_tracker.cc
-@@ -37,7 +37,17 @@ bool SimpleFileTracker::TrackedFiles::In
- }
- 
- SimpleFileTracker::SimpleFileTracker(int file_limit)
-+#if defined(OS_OPENBSD)
-+{
-+  // cap the file descriptor limit at 85% of the size of the
-+  // file descriptor table and also substract the amount of
-+  // currently used file descriptors as this should give us
-+  // enough reserve to avoid hitting the limit 
-+  file_limit_ = (getdtablesize() * 0.85) -  getdtablecount();
-+}
-+#else
-     : file_limit_(file_limit) {}
-+#endif
- 
- SimpleFileTracker::~SimpleFileTracker() {
-   DCHECK(lru_.empty());
diff --git a/chromium-next/patches/patch-net_dns_BUILD.gn b/chromium-next/patches/patch-net_dns_BUILD.gn
deleted file mode 100644
index 2c26f40482..0000000000
--- a/chromium-next/patches/patch-net_dns_BUILD.gn
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/BUILD.gn
-@@ -140,7 +140,7 @@ source_set("dns") {
-       "dns_config_service_android.cc",
-       "dns_config_service_android.h",
-     ]
--  } else if (is_linux) {
-+  } else if (is_linux && !is_bsd) {
-     sources += [
-       "dns_config_service_linux.cc",
-       "dns_config_service_linux.h",
-@@ -173,7 +173,10 @@ source_set("dns") {
-     ]
-   }
- 
--  deps = [ "//net:net_deps" ]
-+  deps = [
-+    "//net:net_deps",
-+    "///services/screen_ai/buildflags",
-+  ]
- 
-   public_deps = [
-     ":dns_client",
-@@ -181,6 +184,7 @@ source_set("dns") {
-     ":host_resolver_manager",
-     ":mdns_client",
-     "//net:net_public_deps",
-+    "//printing/buildflags",
-   ]
- 
-   allow_circular_includes_from = [
-@@ -450,9 +454,9 @@ source_set("tests") {
- 
-   if (is_android) {
-     sources += [ "dns_config_service_android_unittest.cc" ]
--  } else if (is_linux) {
-+  } else if (is_linux && !is_bsd) {
-     sources += [ "dns_config_service_linux_unittest.cc" ]
--  } else if (is_posix) {
-+  } else if (is_posix && !is_bsd) {
-     sources += [ "dns_config_service_posix_unittest.cc" ]
-   }
- 
diff --git a/chromium-next/patches/patch-net_dns_address__info.cc b/chromium-next/patches/patch-net_dns_address__info.cc
deleted file mode 100644
index f6b72480a6..0000000000
--- a/chromium-next/patches/patch-net_dns_address__info.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/address_info.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/address_info.cc
-@@ -83,8 +83,12 @@ AddressInfo::AddressInfoAndResult Addres
-     // error.
-     // http://crbug.com/134142
-     err = ERR_NAME_NOT_RESOLVED;
--#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
-+#elif BUILDFLAG(IS_POSIX)
-+#ifdef EAI_NODATA
-     if (os_error != EAI_NONAME && os_error != EAI_NODATA)
-+#else
-+    if (os_error != EAI_NONAME)
-+#endif
-       err = ERR_NAME_RESOLUTION_FAILED;
- #endif
- 
diff --git a/chromium-next/patches/patch-net_dns_address__sorter__posix.cc b/chromium-next/patches/patch-net_dns_address__sorter__posix.cc
deleted file mode 100644
index 38fbaa7c9c..0000000000
--- a/chromium-next/patches/patch-net_dns_address__sorter__posix.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/address_sorter_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/address_sorter_posix.cc
-@@ -32,6 +32,7 @@
- #include "net/dns/netinet_in_var_ios.h"
- #else
- #include <netinet/in_var.h>
-+#include <netinet6/in6_var.h>
- #endif  // BUILDFLAG(IS_IOS)
- #endif
- #include <vector>
diff --git a/chromium-next/patches/patch-net_dns_dns__config__service__posix.cc b/chromium-next/patches/patch-net_dns_dns__config__service__posix.cc
deleted file mode 100644
index c712e18982..0000000000
--- a/chromium-next/patches/patch-net_dns_dns__config__service__posix.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/dns_config_service_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/dns_config_service_posix.cc
-@@ -39,6 +39,11 @@
- #include "net/dns/dns_config_watcher_mac.h"
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#include "base/command_line.h"
-+#include "sandbox/policy/switches.h"
-+#endif
-+
- namespace net {
- 
- namespace internal {
-@@ -136,6 +141,11 @@ class DnsConfigServicePosix::Watcher : p
-   bool Watch() override {
-     CheckOnCorrectSequence();
- 
-+// pledge + unveil
-+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+    if (!command_line->HasSwitch(sandbox::policy::switches::kNoSandbox))
-+      return false;
-+
-     bool success = true;
-     if (!config_watcher_.Watch(base::BindRepeating(&Watcher::OnConfigChanged,
-                                                    base::Unretained(this)))) {
diff --git a/chromium-next/patches/patch-net_dns_dns__reloader.cc b/chromium-next/patches/patch-net_dns_dns__reloader.cc
deleted file mode 100644
index f14fb83f75..0000000000
--- a/chromium-next/patches/patch-net_dns_dns__reloader.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/dns_reloader.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/dns_reloader.cc
-@@ -10,6 +10,7 @@
- // - there's not guarantee it exists at all. :(
- #if BUILDFLAG(IS_POSIX)
- 
-+#include <netinet/in.h>
- #include <resolv.h>
- 
- // This code only works on systems where the C library provides res_ninit(3) and
-@@ -31,7 +32,7 @@
- // an old musl bug that was fixed by musl c8fdcfe5, but Fuchsia's SDK doesn't
- // have that change.
- #if defined(__RES) && __RES >= 19991006 && !BUILDFLAG(IS_APPLE) && \
--    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
-+    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_NETBSD)
- // We define this so we don't need to restate the complex condition here twice
- // below - it would be easy for the copies below to get out of sync.
- #define USE_RES_NINIT
diff --git a/chromium-next/patches/patch-net_dns_dns__util.cc b/chromium-next/patches/patch-net_dns_dns__util.cc
deleted file mode 100644
index 4fde9fc76f..0000000000
--- a/chromium-next/patches/patch-net_dns_dns__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/dns_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/dns_util.cc
-@@ -29,6 +29,8 @@
- #include "net/dns/public/util.h"
- #include "net/third_party/uri_template/uri_template.h"
- 
-+#include <sys/socket.h>
-+
- #if BUILDFLAG(IS_POSIX)
- #include <net/if.h>
- #include <netinet/in.h>
diff --git a/chromium-next/patches/patch-net_dns_host__resolver__proc.cc b/chromium-next/patches/patch-net_dns_host__resolver__proc.cc
deleted file mode 100644
index 58b0fc147b..0000000000
--- a/chromium-next/patches/patch-net_dns_host__resolver__proc.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/host_resolver_proc.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/host_resolver_proc.cc
-@@ -15,10 +15,6 @@
- #include "net/base/net_errors.h"
- #include "net/dns/host_resolver_system_task.h"
- 
--#if BUILDFLAG(IS_OPENBSD)
--#define AI_ADDRCONFIG 0
--#endif
--
- namespace net {
- 
- HostResolverProc* HostResolverProc::default_proc_ = nullptr;
diff --git a/chromium-next/patches/patch-net_dns_public_BUILD.gn b/chromium-next/patches/patch-net_dns_public_BUILD.gn
deleted file mode 100644
index 0d7280e675..0000000000
--- a/chromium-next/patches/patch-net_dns_public_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/public/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/public/BUILD.gn
-@@ -78,7 +78,7 @@ source_set("tests") {
-     "doh_provider_entry_unittest.cc",
-   ]
- 
--  if (is_posix && !is_android) {
-+  if (is_posix && !is_android && !is_bsd) {
-     sources += [ "resolv_reader_unittest.cc" ]
-   }
- 
diff --git a/chromium-next/patches/patch-net_dns_public_resolv__reader.cc b/chromium-next/patches/patch-net_dns_public_resolv__reader.cc
deleted file mode 100644
index d8e595dfd4..0000000000
--- a/chromium-next/patches/patch-net_dns_public_resolv__reader.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/public/resolv_reader.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/public/resolv_reader.cc
-@@ -40,7 +40,7 @@ std::optional<std::vector<IPEndPoint>> G
-   if (!(res.options & RES_INIT))
-     return std::nullopt;
- 
--#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
-   union res_sockaddr_union addresses[MAXNS];
-   int nscount = res_getservers(const_cast<res_state>(&res), addresses, MAXNS);
-   DCHECK_GE(nscount, 0);
diff --git a/chromium-next/patches/patch-net_dns_public_resolv__reader.h b/chromium-next/patches/patch-net_dns_public_resolv__reader.h
deleted file mode 100644
index 063f2156d6..0000000000
--- a/chromium-next/patches/patch-net_dns_public_resolv__reader.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/public/resolv_reader.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/public/resolv_reader.h
-@@ -5,6 +5,7 @@
- #ifndef NET_DNS_PUBLIC_RESOLV_READER_H_
- #define NET_DNS_PUBLIC_RESOLV_READER_H_
- 
-+#include <netinet/in.h>
- #include <resolv.h>
- 
- #include <memory>
diff --git a/chromium-next/patches/patch-net_dns_public_scoped__res__state.cc b/chromium-next/patches/patch-net_dns_public_scoped__res__state.cc
deleted file mode 100644
index e567db9692..0000000000
--- a/chromium-next/patches/patch-net_dns_public_scoped__res__state.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/public/scoped_res_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/public/scoped_res_state.cc
-@@ -33,7 +33,7 @@ ScopedResState::~ScopedResState() {
- #if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
- 
-   // Prefer res_ndestroy where available.
--#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
-   res_ndestroy(&res_);
- #else
-   res_nclose(&res_);
diff --git a/chromium-next/patches/patch-net_dns_public_scoped__res__state.h b/chromium-next/patches/patch-net_dns_public_scoped__res__state.h
deleted file mode 100644
index b4ae860e89..0000000000
--- a/chromium-next/patches/patch-net_dns_public_scoped__res__state.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/dns/public/scoped_res_state.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/dns/public/scoped_res_state.h
-@@ -5,6 +5,7 @@
- #ifndef NET_DNS_PUBLIC_SCOPED_RES_STATE_H_
- #define NET_DNS_PUBLIC_SCOPED_RES_STATE_H_
- 
-+#include <netinet/in.h>
- #include <resolv.h>
- 
- #include <optional>
diff --git a/chromium-next/patches/patch-net_filter_zstd__source__stream.cc b/chromium-next/patches/patch-net_filter_zstd__source__stream.cc
deleted file mode 100644
index a5741659fa..0000000000
--- a/chromium-next/patches/patch-net_filter_zstd__source__stream.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/filter/zstd_source_stream.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/filter/zstd_source_stream.cc
-@@ -7,6 +7,7 @@
- #include <algorithm>
- #include <unordered_map>
- #include <utility>
-+#include <unordered_map>
- 
- #define ZSTD_STATIC_LINKING_ONLY
- 
diff --git a/chromium-next/patches/patch-net_http_http__auth__gssapi__posix.cc b/chromium-next/patches/patch-net_http_http__auth__gssapi__posix.cc
deleted file mode 100644
index f8917a8979..0000000000
--- a/chromium-next/patches/patch-net_http_http__auth__gssapi__posix.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/http/http_auth_gssapi_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/http/http_auth_gssapi_posix.cc
-@@ -366,7 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary:
-   } else {
- #if BUILDFLAG(IS_APPLE)
-     library_names.emplace_back("/System/Library/Frameworks/GSS.framework/GSS");
--#elif BUILDFLAG(IS_OPENBSD)
-+#elif BUILDFLAG(IS_BSD)
-+    // MIT Kerberos - FreeBSD
-+    library_names.emplace_back("libgssapi_krb5.so.2");
-     // Heimdal - OpenBSD
-     library_names.emplace_back("libgssapi.so");
- #else
diff --git a/chromium-next/patches/patch-net_http_http__auth__gssapi__posix.h b/chromium-next/patches/patch-net_http_http__auth__gssapi__posix.h
deleted file mode 100644
index 601730ddff..0000000000
--- a/chromium-next/patches/patch-net_http_http__auth__gssapi__posix.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/http/http_auth_gssapi_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/http/http_auth_gssapi_posix.h
-@@ -21,6 +21,9 @@
- #if BUILDFLAG(IS_APPLE)
- #include <GSS/gssapi.h>
- #elif BUILDFLAG(IS_FREEBSD)
-+#ifndef GSS_C_DELEG_POLICY_FLAG
-+#define GSS_C_DELEG_POLICY_FLAG 32768
-+#endif
- #include <gssapi/gssapi.h>
- #else
- #include <gssapi.h>
diff --git a/chromium-next/patches/patch-net_http_http__auth__handler__negotiate.cc b/chromium-next/patches/patch-net_http_http__auth__handler__negotiate.cc
deleted file mode 100644
index d80af1337f..0000000000
--- a/chromium-next/patches/patch-net_http_http__auth__handler__negotiate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/http/http_auth_handler_negotiate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/http/http_auth_handler_negotiate.cc
-@@ -119,7 +119,7 @@ int HttpAuthHandlerNegotiate::Factory::C
- #elif BUILDFLAG(IS_POSIX)
-   if (is_unsupported_)
-     return ERR_UNSUPPORTED_AUTH_SCHEME;
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Note: Don't set is_unsupported_ = true here. AllowGssapiLibraryLoad()
-   // might change to true during a session.
-   if (!http_auth_preferences() ||
diff --git a/chromium-next/patches/patch-net_http_http__auth__preferences.cc b/chromium-next/patches/patch-net_http_http__auth__preferences.cc
deleted file mode 100644
index b143e8de55..0000000000
--- a/chromium-next/patches/patch-net_http_http__auth__preferences.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/http/http_auth_preferences.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/http/http_auth_preferences.cc
-@@ -38,7 +38,7 @@ std::string HttpAuthPreferences::AuthAnd
- }
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool HttpAuthPreferences::AllowGssapiLibraryLoad() const {
-   return allow_gssapi_library_load_;
- }
diff --git a/chromium-next/patches/patch-net_http_http__auth__preferences.h b/chromium-next/patches/patch-net_http_http__auth__preferences.h
deleted file mode 100644
index 575ef2ee0e..0000000000
--- a/chromium-next/patches/patch-net_http_http__auth__preferences.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/http/http_auth_preferences.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/http/http_auth_preferences.h
-@@ -49,7 +49,7 @@ class NET_EXPORT HttpAuthPreferences {
- #if BUILDFLAG(IS_ANDROID)
-   virtual std::string AuthAndroidNegotiateAccountType() const;
- #endif
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   virtual bool AllowGssapiLibraryLoad() const;
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-   virtual bool CanUseDefaultCredentials(
-@@ -85,7 +85,7 @@ class NET_EXPORT HttpAuthPreferences {
-   }
- #endif  // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void set_allow_gssapi_library_load(bool allow_gssapi_library_load) {
-     allow_gssapi_library_load_ = allow_gssapi_library_load;
-   }
-@@ -136,7 +136,7 @@ class NET_EXPORT HttpAuthPreferences {
-   std::string auth_android_negotiate_account_type_;
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool allow_gssapi_library_load_ = true;
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-net_http_http__network__session.cc b/chromium-next/patches/patch-net_http_http__network__session.cc
deleted file mode 100644
index 41c852b025..0000000000
--- a/chromium-next/patches/patch-net_http_http__network__session.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/http/http_network_session.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/http/http_network_session.cc
-@@ -20,7 +20,9 @@
- #include "build/build_config.h"
- #include "net/base/features.h"
- #include "net/dns/host_resolver.h"
-+#if defined(USE_KERBEROS)
- #include "net/http/http_auth_handler_factory.h"
-+#endif
- #include "net/http/http_response_body_drainer.h"
- #include "net/http/http_stream_factory.h"
- #include "net/http/http_stream_pool.h"
diff --git a/chromium-next/patches/patch-net_proxy__resolution_proxy__config__service.cc b/chromium-next/patches/patch-net_proxy__resolution_proxy__config__service.cc
deleted file mode 100644
index 27c617f716..0000000000
--- a/chromium-next/patches/patch-net_proxy__resolution_proxy__config__service.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/proxy_resolution/proxy_config_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/proxy_resolution/proxy_config_service.cc
-@@ -19,20 +19,20 @@
- #include "net/proxy_resolution/proxy_config_service_ios.h"
- #elif BUILDFLAG(IS_MAC)
- #include "net/proxy_resolution/proxy_config_service_mac.h"
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "net/proxy_resolution/proxy_config_service_linux.h"
- #elif BUILDFLAG(IS_ANDROID)
- #include "net/proxy_resolution/proxy_config_service_android.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "net/traffic_annotation/network_traffic_annotation.h"
- #endif
- 
- namespace net {
- 
- namespace {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
-     net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
-       semantics {
-@@ -108,7 +108,7 @@ ProxyConfigService::CreateSystemProxyCon
-              << "profile_io_data.cc::CreateProxyConfigService and this should "
-              << "be used only for examples.";
-   return std::make_unique<UnsetProxyConfigService>();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<ProxyConfigServiceLinux> linux_config_service(
-       std::make_unique<ProxyConfigServiceLinux>());
- 
diff --git a/chromium-next/patches/patch-net_proxy__resolution_proxy__config__service__linux.cc b/chromium-next/patches/patch-net_proxy__resolution_proxy__config__service__linux.cc
deleted file mode 100644
index 95f0e31f06..0000000000
--- a/chromium-next/patches/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/proxy_resolution/proxy_config_service_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/proxy_resolution/proxy_config_service_linux.cc
-@@ -11,7 +11,9 @@
- 
- #include <errno.h>
- #include <limits.h>
-+#if !BUILDFLAG(IS_BSD)
- #include <sys/inotify.h>
-+#endif
- #include <unistd.h>
- 
- #include <map>
-@@ -510,6 +512,7 @@ bool SettingGetterImplGSettings::CheckVe
- }
- #endif  // defined(USE_GIO)
- 
-+#if !BUILDFLAG(IS_BSD)
- // Converts |value| from a decimal string to an int. If there was a failure
- // parsing, returns |default_value|.
- int StringToIntOrDefault(std::string_view value, int default_value) {
-@@ -1048,6 +1051,7 @@ class SettingGetterImplKDE : public Prox
-   // events on.
-   scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
- };
-+#endif
- 
- }  // namespace
- 
-@@ -1266,9 +1270,11 @@ ProxyConfigServiceLinux::Delegate::Deleg
-     case base::nix::DESKTOP_ENVIRONMENT_KDE4:
-     case base::nix::DESKTOP_ENVIRONMENT_KDE5:
-     case base::nix::DESKTOP_ENVIRONMENT_KDE6:
-+#if !BUILDFLAG(IS_BSD)
-       setting_getter_ =
-           std::make_unique<SettingGetterImplKDE>(env_var_getter_.get());
-       break;
-+#endif
-     case base::nix::DESKTOP_ENVIRONMENT_XFCE:
-     case base::nix::DESKTOP_ENVIRONMENT_LXQT:
-     case base::nix::DESKTOP_ENVIRONMENT_OTHER:
diff --git a/chromium-next/patches/patch-net_quic_quic__network__transaction__unittest.cc b/chromium-next/patches/patch-net_quic_quic__network__transaction__unittest.cc
deleted file mode 100644
index 483d7bd665..0000000000
--- a/chromium-next/patches/patch-net_quic_quic__network__transaction__unittest.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/quic/quic_network_transaction_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/quic/quic_network_transaction_unittest.cc
-@@ -5202,10 +5202,10 @@ TEST_P(QuicNetworkTransactionTest, RstSt
- 
- TEST_P(QuicNetworkTransactionTest, BrokenAlternateProtocol) {
-   // Alternate-protocol job
--  std::unique_ptr<quic::QuicEncryptedPacket> close(
-+  std::unique_ptr<quic::QuicEncryptedPacket> test_close(
-       ConstructServerConnectionClosePacket(1));
-   MockRead quic_reads[] = {
--      MockRead(ASYNC, close->data(), close->length()),
-+      MockRead(ASYNC, test_close->data(), test_close->length()),
-       MockRead(ASYNC, ERR_IO_PENDING),  // No more data to read
-       MockRead(ASYNC, OK),              // EOF
-   };
-@@ -5248,10 +5248,10 @@ TEST_P(QuicNetworkTransactionTest,
-   http_server_properties_ = std::make_unique<HttpServerProperties>();
- 
-   // Alternate-protocol job
--  std::unique_ptr<quic::QuicEncryptedPacket> close(
-+  std::unique_ptr<quic::QuicEncryptedPacket> test_close(
-       ConstructServerConnectionClosePacket(1));
-   MockRead quic_reads[] = {
--      MockRead(ASYNC, close->data(), close->length()),
-+      MockRead(ASYNC, test_close->data(), test_close->length()),
-       MockRead(ASYNC, ERR_IO_PENDING),  // No more data to read
-       MockRead(ASYNC, OK),              // EOF
-   };
diff --git a/chromium-next/patches/patch-net_socket_socks5__client__socket.cc b/chromium-next/patches/patch-net_socket_socks5__client__socket.cc
deleted file mode 100644
index fe1d488a22..0000000000
--- a/chromium-next/patches/patch-net_socket_socks5__client__socket.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/socket/socks5_client_socket.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/socket/socks5_client_socket.cc
-@@ -23,6 +23,9 @@
- #include "net/log/net_log_event_type.h"
- #include "net/traffic_annotation/network_traffic_annotation.h"
- 
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
- namespace net {
- 
- const unsigned int SOCKS5ClientSocket::kGreetReadHeaderSize = 2;
diff --git a/chromium-next/patches/patch-net_socket_tcp__socket__posix.cc b/chromium-next/patches/patch-net_socket_tcp__socket__posix.cc
deleted file mode 100644
index c241d4b48c..0000000000
--- a/chromium-next/patches/patch-net_socket_tcp__socket__posix.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/socket/tcp_socket_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/socket/tcp_socket_posix.cc
-@@ -98,6 +98,17 @@ bool SetTCPKeepAlive(int fd, bool enable
-       PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
-       return false;
-     }
-+#elif BUILDFLAG(IS_FREEBSD)
-+  // Set seconds until first TCP keep alive.
-+  if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &delay, sizeof(delay))) {
-+    PLOG(ERROR) << "Failed to set TCP_KEEPIDLE on fd: " << fd;
-+    return false;
-+  }
-+  // Set seconds between TCP keep alives.  
-+  if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &delay, sizeof(delay))) {
-+    PLOG(ERROR) << "Failed to set TCP_KEEPINTVL on fd: " << fd;
-+    return false;
-+  }
- #endif
-   }
- 
diff --git a/chromium-next/patches/patch-net_socket_udp__socket__posix.cc b/chromium-next/patches/patch-net_socket_udp__socket__posix.cc
deleted file mode 100644
index 76d1feb5f8..0000000000
--- a/chromium-next/patches/patch-net_socket_udp__socket__posix.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/socket/udp_socket_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/socket/udp_socket_posix.cc
-@@ -78,6 +78,32 @@ constexpr int kBindRetries = 10;
- constexpr int kPortStart = 1024;
- constexpr int kPortEnd = 65535;
- 
-+#if BUILDFLAG(IS_NETBSD)
-+int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) {
-+  if (!index) {
-+    *address = htonl(INADDR_ANY);
-+    return OK;
-+  }
-+
-+  sockaddr_in* result = nullptr;
-+
-+  ifreq ifr;
-+  ifr.ifr_addr.sa_family = AF_INET;
-+  if (!if_indextoname(index, ifr.ifr_name))
-+    return MapSystemError(errno);
-+  int rv = ioctl(socket, SIOCGIFADDR, &ifr);
-+  if (rv == -1)
-+    return MapSystemError(errno);
-+  result = reinterpret_cast<sockaddr_in*>(&ifr.ifr_addr);
-+
-+  if (!result)
-+    return ERR_ADDRESS_INVALID;
-+
-+  *address = result->sin_addr.s_addr;
-+  return OK;
-+}
-+#endif
-+
- int GetSocketFDHash(int fd) {
-   return fd ^ 1595649551;
- }
-@@ -527,12 +553,17 @@ int UDPSocketPosix::SetRecvTos() {
- #endif  // BUILDFLAG(IS_APPLE)
-   }
- 
-+#ifdef IP_RECVTOS
-   int rv = setsockopt(socket_, IPPROTO_IP, IP_RECVTOS, &ecn, sizeof(ecn));
-+#else
-+  int rv = -1;
-+  errno = EOPNOTSUPP;
-+#endif
-   return rv == 0 ? OK : MapSystemError(errno);
- }
- 
- void UDPSocketPosix::SetMsgConfirm(bool confirm) {
--#if !BUILDFLAG(IS_APPLE)
-+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
-   if (confirm) {
-     sendto_flags_ |= MSG_CONFIRM;
-   } else {
-@@ -553,7 +584,7 @@ int UDPSocketPosix::SetBroadcast(bool br
-   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-   int value = broadcast ? 1 : 0;
-   int rv;
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   // SO_REUSEPORT on OSX permits multiple processes to each receive
-   // UDP multicast or broadcast datagrams destined for the bound
-   // port.
-@@ -854,9 +885,17 @@ int UDPSocketPosix::SetMulticastOptions(
-   if (multicast_interface_ != 0) {
-     switch (addr_family_) {
-       case AF_INET: {
-+#if BUILDFLAG(IS_NETBSD)
-+        ip_mreq mreq = {};
-+        int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
-+                                            &mreq.imr_interface.s_addr);
-+        if (error != OK)
-+          return error;
-+#else
-         ip_mreqn mreq = {};
-         mreq.imr_ifindex = multicast_interface_;
-         mreq.imr_address.s_addr = htonl(INADDR_ANY);
-+#endif
-         int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
-                             reinterpret_cast<const char*>(&mreq), sizeof(mreq));
-         if (rv)
-@@ -891,7 +930,7 @@ int UDPSocketPosix::DoBind(const IPEndPo
- #if BUILDFLAG(IS_CHROMEOS)
-   if (last_error == EINVAL)
-     return ERR_ADDRESS_IN_USE;
--#elif BUILDFLAG(IS_APPLE)
-+#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   if (last_error == EADDRNOTAVAIL)
-     return ERR_ADDRESS_IN_USE;
- #endif
-@@ -919,9 +958,17 @@ int UDPSocketPosix::JoinGroup(const IPAd
-     case IPAddress::kIPv4AddressSize: {
-       if (addr_family_ != AF_INET)
-         return ERR_ADDRESS_INVALID;
-+#if BUILDFLAG(IS_NETBSD)
-+      ip_mreq mreq = {};
-+      int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
-+                                          &mreq.imr_interface.s_addr);
-+      if (error != OK)
-+        return error;
-+#else
-       ip_mreqn mreq = {};
-       mreq.imr_ifindex = multicast_interface_;
-       mreq.imr_address.s_addr = htonl(INADDR_ANY);
-+#endif
-       memcpy(&mreq.imr_multiaddr, group_address.bytes().data(),
-              IPAddress::kIPv4AddressSize);
-       int rv = setsockopt(socket_, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-@@ -958,9 +1005,17 @@ int UDPSocketPosix::LeaveGroup(const IPA
-     case IPAddress::kIPv4AddressSize: {
-       if (addr_family_ != AF_INET)
-         return ERR_ADDRESS_INVALID;
-+#if BUILDFLAG(IS_NETBSD)
-+      ip_mreq mreq = {};
-+      int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
-+                                          &mreq.imr_interface.s_addr);
-+      if (error != OK)
-+        return error;
-+#else
-       ip_mreqn mreq = {};
-       mreq.imr_ifindex = multicast_interface_;
-       mreq.imr_address.s_addr = INADDR_ANY;
-+#endif
-       memcpy(&mreq.imr_multiaddr, group_address.bytes().data(),
-              IPAddress::kIPv4AddressSize);
-       int rv = setsockopt(socket_, IPPROTO_IP, IP_DROP_MEMBERSHIP,
diff --git a/chromium-next/patches/patch-net_socket_udp__socket__unittest.cc b/chromium-next/patches/patch-net_socket_udp__socket__unittest.cc
deleted file mode 100644
index c780978637..0000000000
--- a/chromium-next/patches/patch-net_socket_udp__socket__unittest.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/socket/udp_socket_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/socket/udp_socket_unittest.cc
-@@ -371,7 +371,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
-   EXPECT_EQ(second_packet, received);
- }
- 
--#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- // - MacOS: requires root permissions on OSX 10.7+.
- // - Android: devices attached to testbots don't have default network, so
- // broadcasting to 255.255.255.255 returns error -109 (Address not reachable).
-@@ -682,7 +682,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFrag
-     EXPECT_THAT(rv, IsOk());
- 
-     rv = client.SetDoNotFragment();
--#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia.
-     EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
- #else
-@@ -704,7 +704,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFrag
-     EXPECT_THAT(rv, IsOk());
- 
-     rv = server.SetDoNotFragment();
--#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia.
-     EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
- #else
-@@ -770,7 +770,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup
- 
- // TODO(crbug.com/40620614): failing on device on iOS 12.2.
- // TODO(crbug.com/40189274): flaky on Mac 11.
--#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress
- #else
- #define MAYBE_SharedMulticastAddress SharedMulticastAddress
-@@ -824,7 +824,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMultic
-                                 NetLogSource());
-   ASSERT_THAT(client_socket.Connect(send_address), IsOk());
- 
--#if !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-   // Send a message via the multicast group. That message is expected be be
-   // received by both receving sockets.
-   //
diff --git a/chromium-next/patches/patch-net_third__party_quiche_BUILD.gn b/chromium-next/patches/patch-net_third__party_quiche_BUILD.gn
deleted file mode 100644
index 0361287f90..0000000000
--- a/chromium-next/patches/patch-net_third__party_quiche_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/third_party/quiche/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/third_party/quiche/BUILD.gn
-@@ -28,7 +28,7 @@ import("//net/third_party/quiche/src/bui
- import("//testing/libfuzzer/fuzzer_test.gni")
- import("//third_party/protobuf/proto_library.gni")
- 
--build_epoll_based_tools = is_linux || is_chromeos
-+build_epoll_based_tools = (is_linux && !is_bsd) || is_chromeos
- 
- config("quiche_internal_config") {
-   cflags = []
diff --git a/chromium-next/patches/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/chromium-next/patches/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
deleted file mode 100644
index 9de7e8636e..0000000000
--- a/chromium-next/patches/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/tools/cert_verify_tool/cert_verify_tool.cc
-@@ -35,7 +35,7 @@
- #include "third_party/boringssl/src/pki/trust_store.h"
- #include "third_party/boringssl/src/pki/trust_store_collection.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "net/proxy_resolution/proxy_config.h"
- #include "net/proxy_resolution/proxy_config_service_fixed.h"
- #endif
-@@ -67,7 +67,7 @@ void SetUpOnNetworkThread(
-     base::WaitableEvent* initialization_complete_event) {
-   net::URLRequestContextBuilder url_request_context_builder;
-   url_request_context_builder.set_user_agent(GetUserAgent());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // On Linux, use a fixed ProxyConfigService, since the default one
-   // depends on glib.
-   //
-@@ -582,7 +582,7 @@ int main(int argc, char** argv) {
-   std::string impls_str = command_line.GetSwitchValueASCII("impls");
-   if (impls_str.empty()) {
-     // Default value.
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-       BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
-     impls_str = "platform,";
- #endif
diff --git a/chromium-next/patches/patch-net_tools_net__watcher_net__watcher.cc b/chromium-next/patches/patch-net_tools_net__watcher_net__watcher.cc
deleted file mode 100644
index 5a4175d8a1..0000000000
--- a/chromium-next/patches/patch-net_tools_net__watcher_net__watcher.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/tools/net_watcher/net_watcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/tools/net_watcher/net_watcher.cc
-@@ -31,7 +31,7 @@
- #include "net/proxy_resolution/proxy_config_service.h"
- #include "net/proxy_resolution/proxy_config_with_annotation.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "net/base/network_change_notifier_linux.h"
- #endif
- 
-@@ -41,7 +41,7 @@
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Flag to specifies which network interfaces to ignore. Interfaces should
- // follow as a comma seperated list.
- const char kIgnoreNetifFlag[] = "ignore-netif";
-@@ -143,7 +143,7 @@ class NetWatcher :
- }  // namespace
- 
- int main(int argc, char* argv[]) {
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::apple::ScopedNSAutoreleasePool pool;
- #endif
-   base::AtExitManager exit_manager;
-@@ -160,7 +160,7 @@ int main(int argc, char* argv[]) {
- 
-   NetWatcher net_watcher;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-   std::string ignored_netifs_str =
-       command_line->GetSwitchValueASCII(kIgnoreNetifFlag);
diff --git a/chromium-next/patches/patch-net_traffic__annotation_network__traffic__annotation.h b/chromium-next/patches/patch-net_traffic__annotation_network__traffic__annotation.h
deleted file mode 100644
index a3b1c84fd4..0000000000
--- a/chromium-next/patches/patch-net_traffic__annotation_network__traffic__annotation.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/traffic_annotation/network_traffic_annotation.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/traffic_annotation/network_traffic_annotation.h
-@@ -374,7 +374,7 @@ struct MutablePartialNetworkTrafficAnnot
- }  // namespace net
- 
- // Placeholder for unannotated usages.
--#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
- #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \
-   net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.")
- #endif
-@@ -385,7 +385,7 @@ struct MutablePartialNetworkTrafficAnnot
- //
- // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or
- // TRAFFIC_ANNOTATION_FOR_TESTS.
--#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- 
- #define NO_TRAFFIC_ANNOTATION_YET \
-   net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.")
diff --git a/chromium-next/patches/patch-net_url__request_url__request__context.cc b/chromium-next/patches/patch-net_url__request_url__request__context.cc
deleted file mode 100644
index a0b7022b22..0000000000
--- a/chromium-next/patches/patch-net_url__request_url__request__context.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/url_request/url_request_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/url_request/url_request_context.cc
-@@ -119,7 +119,7 @@ const HttpNetworkSessionContext* URLRequ
-   return &network_session->context();
- }
- 
--#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- std::unique_ptr<URLRequest> URLRequestContext::CreateRequest(
-     const GURL& url,
-     RequestPriority priority,
diff --git a/chromium-next/patches/patch-net_url__request_url__request__context.h b/chromium-next/patches/patch-net_url__request_url__request__context.h
deleted file mode 100644
index c136ec3f2f..0000000000
--- a/chromium-next/patches/patch-net_url__request_url__request__context.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/url_request/url_request_context.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/url_request/url_request_context.h
-@@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext final
-   // session.
-   const HttpNetworkSessionContext* GetNetworkSessionContext() const;
- 
--#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   // This function should not be used in Chromium, please use the version with
-   // NetworkTrafficAnnotationTag in the future.
-   //
diff --git a/chromium-next/patches/patch-net_url__request_url__request__context__builder.cc b/chromium-next/patches/patch-net_url__request_url__request__context__builder.cc
deleted file mode 100644
index c0e65943ef..0000000000
--- a/chromium-next/patches/patch-net_url__request_url__request__context__builder.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/url_request/url_request_context_builder.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/url_request/url_request_context_builder.cc
-@@ -441,7 +441,7 @@ std::unique_ptr<URLRequestContext> URLRe
-   }
- 
-   if (!proxy_resolution_service_) {
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
-     // TODO(willchan): Switch to using this code when
-     // ProxyConfigService::CreateSystemProxyConfigService()'s
-     // signature doesn't suck.
diff --git a/chromium-next/patches/patch-net_websockets_websocket__basic__stream__adapters__test.cc b/chromium-next/patches/patch-net_websockets_websocket__basic__stream__adapters__test.cc
deleted file mode 100644
index 9a76322dfc..0000000000
--- a/chromium-next/patches/patch-net_websockets_websocket__basic__stream__adapters__test.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/websockets/websocket_basic_stream_adapters_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ net/websockets/websocket_basic_stream_adapters_test.cc
-@@ -1098,10 +1098,10 @@ TEST_F(WebSocketSpdyStreamAdapterTest,
-        OnCloseOkShouldBeTranslatedToConnectionClose) {
-   spdy::SpdySerializedFrame response_headers(
-       spdy_util_.ConstructSpdyResponseHeaders(1, ResponseHeaders(), false));
--  spdy::SpdySerializedFrame close(
-+  spdy::SpdySerializedFrame test_close(
-       spdy_util_.ConstructSpdyRstStream(1, spdy::ERROR_CODE_NO_ERROR));
-   MockRead reads[] = {CreateMockRead(response_headers, 1),
--                      CreateMockRead(close, 2), MockRead(ASYNC, 0, 3)};
-+                      CreateMockRead(test_close, 2), MockRead(ASYNC, 0, 3)};
-   spdy::SpdySerializedFrame request_headers(spdy_util_.ConstructSpdyHeaders(
-       1, RequestHeaders(), DEFAULT_PRIORITY, false));
-   MockWrite writes[] = {CreateMockWrite(request_headers, 0)};
diff --git a/chromium-next/patches/patch-pdf_pdfium_pdfium__engine.cc b/chromium-next/patches/patch-pdf_pdfium_pdfium__engine.cc
deleted file mode 100644
index 9a0cefe166..0000000000
--- a/chromium-next/patches/patch-pdf_pdfium_pdfium__engine.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- pdf/pdfium/pdfium_engine.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ pdf/pdfium/pdfium_engine.cc
-@@ -111,7 +111,7 @@
- #include "ui/accessibility/ax_features.mojom-features.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "pdf/pdfium/pdfium_font_linux.h"
- #endif
- 
-@@ -567,7 +567,7 @@ void InitializeSDK(bool enable_v8,
- 
-   FPDF_InitLibraryWithConfig(&config);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   g_font_mapping_mode = font_mapping_mode;
-   InitializeLinuxFontMapper();
- #endif
diff --git a/chromium-next/patches/patch-ppapi_tests_test__utils.h b/chromium-next/patches/patch-ppapi_tests_test__utils.h
deleted file mode 100644
index 6f38973191..0000000000
--- a/chromium-next/patches/patch-ppapi_tests_test__utils.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ppapi/tests/test_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ppapi/tests/test_utils.h
-@@ -314,6 +314,8 @@ do { \
- #define PPAPI_OS_FREEBSD 1
- #elif defined(__OpenBSD__)
- #define PPAPI_OS_OPENBSD 1
-+#elif defined(__NetBSD__)
-+#define PPAPI_OS_NETBSD 1
- #elif defined(__sun)
- #define PPAPI_OS_SOLARIS 1
- #else
-@@ -322,7 +324,8 @@ do { \
- 
- /* These are used to determine POSIX-like implementations vs Windows. */
- #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
--    defined(__OpenBSD__) || defined(__sun) || defined(__native_client__)
-+    defined(__OpenBSD__) || defined(__sun) || defined(__native_client__) \
-+    defined(__NetBSD__)
- #define PPAPI_POSIX 1
- #endif
- 
diff --git a/chromium-next/patches/patch-printing_backend_cups__ipp__helper.cc b/chromium-next/patches/patch-printing_backend_cups__ipp__helper.cc
deleted file mode 100644
index 2500612822..0000000000
--- a/chromium-next/patches/patch-printing_backend_cups__ipp__helper.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/backend/cups_ipp_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/backend/cups_ipp_helper.cc
-@@ -201,7 +201,7 @@ void ExtractResolutions(const CupsOption
-   // Provide a default DPI if no valid DPI is found.
- #if BUILDFLAG(IS_MAC)
-   constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   constexpr gfx::Size kDefaultMissingDpi(kPixelsPerInch, kPixelsPerInch);
- #else
-   constexpr gfx::Size kDefaultMissingDpi(kDefaultPdfDpi, kDefaultPdfDpi);
diff --git a/chromium-next/patches/patch-printing_backend_print__backend__cups.cc b/chromium-next/patches/patch-printing_backend_print__backend__cups.cc
deleted file mode 100644
index 3adce42159..0000000000
--- a/chromium-next/patches/patch-printing_backend_print__backend__cups.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/backend/print_backend_cups.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/backend/print_backend_cups.cc
-@@ -29,7 +29,7 @@
- #include "printing/mojom/print.mojom.h"
- #include "url/gurl.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "base/feature_list.h"
- #include "printing/backend/cups_connection.h"
- #include "printing/backend/print_backend_cups_ipp.h"
-@@ -59,7 +59,7 @@ int CaptureCupsDestCallback(void* data, 
-   return 1;  // Keep going.
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- // This may be removed when Amazon Linux 2 reaches EOL (30 Jun 2025).
- bool AreNewerCupsFunctionsAvailable() {
-   return cupsFindDestDefault && cupsFindDestSupported && cupsUserAgent &&
-@@ -286,7 +286,7 @@ bool PrintBackendCUPS::IsValidPrinter(co
- #if !BUILDFLAG(IS_CHROMEOS)
- scoped_refptr<PrintBackend> PrintBackend::CreateInstanceImpl(
-     const std::string& locale) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (AreNewerCupsFunctionsAvailable() &&
-       base::FeatureList::IsEnabled(features::kCupsIppPrintingBackend)) {
-     return base::MakeRefCounted<PrintBackendCupsIpp>(CupsConnection::Create());
diff --git a/chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits.cc b/chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits.cc
deleted file mode 100644
index dca341abfd..0000000000
--- a/chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/mojom/printing_context_mojom_traits.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/mojom/printing_context_mojom_traits.cc
-@@ -19,7 +19,7 @@
- #include "base/numerics/safe_conversions.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "mojo/public/mojom/base/values.mojom.h"
- #endif
- 
-@@ -161,7 +161,7 @@ bool StructTraits<
-   }
- 
-   out->set_pages_per_sheet(data.pages_per_sheet());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   DCHECK(out->advanced_settings().empty());
-   if (!data.ReadAdvancedSettings(&out->advanced_settings()))
-     return false;
-@@ -238,7 +238,7 @@ bool StructTraits<
-     if (system_print_dialog_data.size() != dictionary_entries) {
-       return false;
-     }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // The dictionary must contain three strings.
-     const base::Value* value = system_print_dialog_data.Find(
-         printing::kLinuxSystemPrintDialogDataPrinter);
diff --git a/chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits.h b/chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits.h
deleted file mode 100644
index d530ca4784..0000000000
--- a/chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/mojom/printing_context_mojom_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/mojom/printing_context_mojom_traits.h
-@@ -166,7 +166,7 @@ struct StructTraits<printing::mojom::Pri
-     return s.pages_per_sheet();
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static const printing::PrintSettings::AdvancedSettings& advanced_settings(
-       const printing::PrintSettings& s) {
-     return s.advanced_settings();
diff --git a/chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits__unittest.cc b/chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits__unittest.cc
deleted file mode 100644
index 6fa34e6318..0000000000
--- a/chromium-next/patches/patch-printing_mojom_printing__context__mojom__traits__unittest.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/mojom/printing_context_mojom_traits_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/mojom/printing_context_mojom_traits_unittest.cc
-@@ -79,7 +79,7 @@ base::Value::Dict GenerateSampleSystemPr
-     data.Set(kMacSystemPrintDialogDataDestinationLocation, "/foo/bar.pdf");
-   }
- 
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   data.Set(kLinuxSystemPrintDialogDataPrinter, "printer-name");
-   data.Set(kLinuxSystemPrintDialogDataPrintSettings, "print-settings-foo");
-   data.Set(kLinuxSystemPrintDialogDataPageSetup, "page-setup-bar");
-@@ -114,7 +114,7 @@ const PageMargins kPrintSettingsCustomMa
-                                                       /*top=*/30,
-                                                       /*bottom=*/35);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- PrintSettings::AdvancedSettings GenerateSampleAdvancedSettings() {
-   PrintSettings::AdvancedSettings advanced_settings;
-   advanced_settings.emplace("advanced-setting-A", base::Value("setting-A"));
-@@ -207,7 +207,7 @@ PrintSettings GenerateSamplePrintSetting
-   settings.set_device_name(kPrintSettingsDeviceName);
-   settings.set_requested_media(kPrintSettingsRequestedMedia);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   PrintSettings::AdvancedSettings& advanced_settings =
-       settings.advanced_settings();
-   for (const auto& item : kPrintSettingsAdvancedSettings)
-@@ -545,7 +545,7 @@ TEST(PrintingContextMojomTraitsTest,
- 
-   EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet1);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings);
- #endif
- 
-@@ -598,7 +598,7 @@ TEST(PrintingContextMojomTraitsTest,
-                                kPrintSettingsCustomMarginsInPoints));
-   EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet2);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings);
- #endif
- 
-@@ -637,7 +637,7 @@ TEST(PrintingContextMojomTraitsTest,
-   EXPECT_EQ(output.page_setup_device_units(), kInput.page_setup_device_units());
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- TEST(PrintingContextMojomTraitsTest,
-      TestSerializeAndDeserializePrintSettingsEmptyAdvancedSettings) {
-   PrintSettings input = GenerateSamplePrintSettingsDefaultMargins();
-@@ -835,7 +835,7 @@ TEST(
- }
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- TEST(
-     PrintingContextMojomTraitsTest,
-     TestSerializeAndDeserializePrintSettingsSystemPrintDialogPrinterInvalidDataType) {
diff --git a/chromium-next/patches/patch-printing_print__settings.cc b/chromium-next/patches/patch-printing_print__settings.cc
deleted file mode 100644
index 83cb3c3ba7..0000000000
--- a/chromium-next/patches/patch-printing_print__settings.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/print_settings.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/print_settings.cc
-@@ -319,7 +319,7 @@ PrintSettings& PrintSettings::operator=(
- #endif
-   is_modifiable_ = settings.is_modifiable_;
-   pages_per_sheet_ = settings.pages_per_sheet_;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   for (const auto& item : settings.advanced_settings_)
-     advanced_settings_.emplace(item.first, item.second.Clone());
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -349,7 +349,7 @@ bool PrintSettings::operator==(const Pri
- #endif
-                   is_modifiable_, requested_custom_margins_in_points_,
-                   pages_per_sheet_
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-                   ,
-                   advanced_settings_
- #endif
-@@ -373,7 +373,7 @@ bool PrintSettings::operator==(const Pri
-                   other.is_modifiable_,
-                   other.requested_custom_margins_in_points_,
-                   other.pages_per_sheet_
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-                   ,
-                   other.advanced_settings_
- #endif
-@@ -413,7 +413,7 @@ void PrintSettings::Clear() {
- #endif
-   is_modifiable_ = true;
-   pages_per_sheet_ = 1;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   advanced_settings_.clear();
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- #if BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium-next/patches/patch-printing_print__settings.h b/chromium-next/patches/patch-printing_print__settings.h
deleted file mode 100644
index 27a8cddae1..0000000000
--- a/chromium-next/patches/patch-printing_print__settings.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/print_settings.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/print_settings.h
-@@ -25,7 +25,7 @@
- #include "base/values.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <map>
- 
- #include "base/values.h"
-@@ -51,7 +51,7 @@ inline constexpr char kMacSystemPrintDia
-     "print_settings";
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- inline constexpr char kLinuxSystemPrintDialogDataPrinter[] = "printer_name";
- inline constexpr char kLinuxSystemPrintDialogDataPrintSettings[] =
-     "print_settings";
-@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS
-     std::string vendor_id;
-   };
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   using AdvancedSettings = std::map<std::string, base::Value>;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS
-     pages_per_sheet_ = pages_per_sheet;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   AdvancedSettings& advanced_settings() { return advanced_settings_; }
-   const AdvancedSettings& advanced_settings() const {
-     return advanced_settings_;
-@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS
-   // Number of pages per sheet.
-   int pages_per_sheet_;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Advanced settings.
-   AdvancedSettings advanced_settings_;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium-next/patches/patch-printing_print__settings__conversion.cc b/chromium-next/patches/patch-printing_print__settings__conversion.cc
deleted file mode 100644
index 37e79e8ebf..0000000000
--- a/chromium-next/patches/patch-printing_print__settings__conversion.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/print_settings_conversion.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/print_settings_conversion.cc
-@@ -285,7 +285,7 @@ std::unique_ptr<PrintSettings> PrintSett
-     settings->set_is_modifiable(is_modifiable.value());
-   }
- 
--#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS))
-+#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS))
-   const base::Value::Dict* advanced_settings =
-       job_settings.FindDict(kSettingAdvancedSettings);
-   if (advanced_settings) {
diff --git a/chromium-next/patches/patch-printing_printing__context__linux.cc b/chromium-next/patches/patch-printing_printing__context__linux.cc
deleted file mode 100644
index c6a7102885..0000000000
--- a/chromium-next/patches/patch-printing_printing__context__linux.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/printing_context_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/printing_context_linux.cc
-@@ -23,7 +23,7 @@
- #endif
- 
- // Avoid using LinuxUi on Fuchsia.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
-@@ -66,7 +66,7 @@ mojom::ResultCode PrintingContextLinux::
- 
-   ResetSettings();
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!ui::LinuxUi::instance())
-     return mojom::ResultCode::kSuccess;
- 
-@@ -82,7 +82,7 @@ mojom::ResultCode PrintingContextLinux::
- }
- 
- gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (ui::LinuxUi::instance())
-     return ui::LinuxUi::instance()->GetPdfPaperSize(this);
- #endif
-@@ -95,7 +95,7 @@ mojom::ResultCode PrintingContextLinux::
-   DCHECK(!printer_settings.show_system_dialog);
-   DCHECK(!in_print_job_);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!ui::LinuxUi::instance())
-     return mojom::ResultCode::kSuccess;
- 
diff --git a/chromium-next/patches/patch-printing_printing__features.cc b/chromium-next/patches/patch-printing_printing__features.cc
deleted file mode 100644
index 485448fc35..0000000000
--- a/chromium-next/patches/patch-printing_printing__features.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/printing_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/printing_features.cc
-@@ -26,12 +26,12 @@ BASE_FEATURE(kApiPrintingMarginsAndScale
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- // Use the CUPS IPP printing backend instead of the original CUPS backend that
- // calls the deprecated PPD API.
- BASE_FEATURE(kCupsIppPrintingBackend,
-              "CupsIppPrintingBackend",
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_DISABLED_BY_DEFAULT
- #else
-              base::FEATURE_ENABLED_BY_DEFAULT
-@@ -81,7 +81,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf,
- // out-of-process.
- BASE_FEATURE(kEnableOopPrintDrivers,
-              "EnableOopPrintDrivers",
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium-next/patches/patch-printing_printing__features.h b/chromium-next/patches/patch-printing_printing__features.h
deleted file mode 100644
index 787a1e04d1..0000000000
--- a/chromium-next/patches/patch-printing_printing__features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/printing_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/printing_features.h
-@@ -24,7 +24,7 @@ COMPONENT_EXPORT(PRINTING_BASE)
- BASE_DECLARE_FEATURE(kApiPrintingMarginsAndScale);
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(PRINTING_BASE) BASE_DECLARE_FEATURE(kCupsIppPrintingBackend);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
- 
diff --git a/chromium-next/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc b/chromium-next/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
deleted file mode 100644
index 2c6c7cf1c4..0000000000
--- a/chromium-next/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/sandbox/print_backend_sandbox_hook_linux.cc
-@@ -10,20 +10,27 @@
- #include "base/path_service.h"
- #include "build/build_config.h"
- #include "printing/buildflags/buildflags.h"
-+#if !BUILDFLAG(IS_BSD)
- #include "sandbox/linux/syscall_broker/broker_command.h"
- #include "sandbox/linux/syscall_broker/broker_file_permission.h"
- #include "sandbox/policy/export.h"
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#else
-+#include "sandbox/policy/sandbox.h"
-+#endif
- 
- #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS)
- #include "printing/backend/cups_connection_pool.h"
- #endif
- 
-+#if !BUILDFLAG(IS_BSD)
- using sandbox::syscall_broker::BrokerFilePermission;
- using sandbox::syscall_broker::MakeBrokerCommandSet;
-+#endif
- 
- namespace printing {
- 
-+#if !BUILDFLAG(IS_BSD)
- namespace {
- 
- sandbox::syscall_broker::BrokerCommandSet GetPrintBackendBrokerCommandSet() {
-@@ -76,9 +83,11 @@ std::vector<BrokerFilePermission> GetPri
- }
- 
- }  // namespace
-+#endif
- 
- bool PrintBackendPreSandboxHook(
-     sandbox::policy::SandboxLinux::Options options) {
-+#if !BUILDFLAG(IS_BSD)
- #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS)
-   // Create the socket connections to the CUPS server before engaging the
-   // sandbox, since new connections cannot be made after that.
-@@ -91,6 +100,7 @@ bool PrintBackendPreSandboxHook(
-                                GetPrintBackendFilePermissions(), options);
- 
-   instance->EngageNamespaceSandboxIfPossible();
-+#endif
-   return true;
- }
- 
diff --git a/chromium-next/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.h b/chromium-next/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
deleted file mode 100644
index 9b0a0505f3..0000000000
--- a/chromium-next/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- printing/sandbox/print_backend_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ printing/sandbox/print_backend_sandbox_hook_linux.h
-@@ -5,8 +5,13 @@
- #ifndef PRINTING_SANDBOX_PRINT_BACKEND_SANDBOX_HOOK_LINUX_H_
- #define PRINTING_SANDBOX_PRINT_BACKEND_SANDBOX_HOOK_LINUX_H_
- 
-+#include "build/build_config.h"
- #include "base/component_export.h"
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace printing {
- 
diff --git a/chromium-next/patches/patch-remoting_base_chromoting__event.cc b/chromium-next/patches/patch-remoting_base_chromoting__event.cc
deleted file mode 100644
index f351b87df4..0000000000
--- a/chromium-next/patches/patch-remoting_base_chromoting__event.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/base/chromoting_event.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/base/chromoting_event.cc
-@@ -191,7 +191,7 @@ void ChromotingEvent::AddSystemInfo() {
-   SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture());
-   SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion());
-   SetString(kWebAppVersionKey, STRINGIZE(VERSION));
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   Os os = Os::CHROMOTING_LINUX;
- #elif BUILDFLAG(IS_CHROMEOS)
-   Os os = Os::CHROMOTING_CHROMEOS;
diff --git a/chromium-next/patches/patch-remoting_base_host__settings.cc b/chromium-next/patches/patch-remoting_base_host__settings.cc
deleted file mode 100644
index b7b5e5c2ec..0000000000
--- a/chromium-next/patches/patch-remoting_base_host__settings.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/base/host_settings.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/base/host_settings.cc
-@@ -7,7 +7,7 @@
- #include "base/no_destructor.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS))
-+#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
- #include "remoting/base/file_host_settings.h"
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -44,7 +44,7 @@ HostSettings::~HostSettings() = default;
- 
- // static
- HostSettings* HostSettings::GetInstance() {
--#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS))
-+#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
-   static base::NoDestructor<FileHostSettings> instance(
-       FileHostSettings::GetSettingsFilePath());
- #elif BUILDFLAG(IS_WIN)
diff --git a/chromium-next/patches/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/chromium-next/patches/patch-remoting_codec_webrtc__video__encoder__vpx.cc
deleted file mode 100644
index 8dc5297310..0000000000
--- a/chromium-next/patches/patch-remoting_codec_webrtc__video__encoder__vpx.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/codec/webrtc_video_encoder_vpx.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/codec/webrtc_video_encoder_vpx.cc
-@@ -92,7 +92,7 @@ void SetVp8CodecParameters(vpx_codec_enc
-                            const webrtc::DesktopSize& size) {
-   SetCommonCodecParameters(config, size);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On Linux, using too many threads for VP8 encoding has been linked to high
-   // CPU usage on machines that are under stress. See http://crbug.com/1151148.
-   // 5/3/2022 update: Perf testing has shown that doubling the number of threads
diff --git a/chromium-next/patches/patch-remoting_host_base_desktop__environment__options.cc b/chromium-next/patches/patch-remoting_host_base_desktop__environment__options.cc
deleted file mode 100644
index 1705e5694d..0000000000
--- a/chromium-next/patches/patch-remoting_host_base_desktop__environment__options.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/base/desktop_environment_options.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/base/desktop_environment_options.cc
-@@ -109,7 +109,7 @@ bool DesktopEnvironmentOptions::capture_
-   // TODO(joedow): Determine whether we can migrate additional platforms to
-   // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then
-   // clean up DesktopCapturerProxy::Core::CreateCapturer().
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return capture_video_on_dedicated_thread_;
- #else
-   return false;
diff --git a/chromium-next/patches/patch-remoting_host_base_switches.cc b/chromium-next/patches/patch-remoting_host_base_switches.cc
deleted file mode 100644
index 31f707145a..0000000000
--- a/chromium-next/patches/patch-remoting_host_base_switches.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/base/switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/base/switches.cc
-@@ -23,13 +23,13 @@ const char kProcessTypeEvaluateCapabilit
- const char kProcessTypeFileChooser[] = "file_chooser";
- const char kProcessTypeUrlForwarderConfigurator[] =
-     "url_forwarder_configurator";
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kProcessTypeXSessionChooser[] = "xsession_chooser";
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
- const char kEvaluateCapabilitySwitchName[] = "evaluate-type";
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kEnableUtempter[] = "enable-utempter";
- #endif
- 
diff --git a/chromium-next/patches/patch-remoting_host_base_switches.h b/chromium-next/patches/patch-remoting_host_base_switches.h
deleted file mode 100644
index 5fda1b37be..0000000000
--- a/chromium-next/patches/patch-remoting_host_base_switches.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/base/switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/base/switches.h
-@@ -35,13 +35,13 @@ extern const char kProcessTypeRdpDesktop
- extern const char kProcessTypeEvaluateCapability[];
- extern const char kProcessTypeFileChooser[];
- extern const char kProcessTypeUrlForwarderConfigurator[];
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kProcessTypeXSessionChooser[];
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
- extern const char kEvaluateCapabilitySwitchName[];
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Used to record client sessions to utmp/wtmp.
- extern const char kEnableUtempter[];
- #endif
diff --git a/chromium-next/patches/patch-remoting_host_chromoting__host.cc b/chromium-next/patches/patch-remoting_host_chromoting__host.cc
deleted file mode 100644
index 521cf77b1b..0000000000
--- a/chromium-next/patches/patch-remoting_host_chromoting__host.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/chromoting_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/chromoting_host.cc
-@@ -137,7 +137,7 @@ void ChromotingHost::Start(const std::st
-       &ChromotingHost::OnIncomingSession, base::Unretained(this)));
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void ChromotingHost::StartChromotingHostServices() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(!ipc_server_);
diff --git a/chromium-next/patches/patch-remoting_host_chromoting__host.h b/chromium-next/patches/patch-remoting_host_chromoting__host.h
deleted file mode 100644
index 4d5e6583de..0000000000
--- a/chromium-next/patches/patch-remoting_host_chromoting__host.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/chromoting_host.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/chromoting_host.h
-@@ -36,7 +36,7 @@
- #include "remoting/protocol/session_manager.h"
- #include "remoting/protocol/transport_context.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/chromoting_host_services_server.h"
- #endif
- 
-@@ -112,7 +112,7 @@ class ChromotingHost : public ClientSess
-   // This method can only be called once during the lifetime of this object.
-   void Start(const std::string& host_owner);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Starts running the ChromotingHostServices server and listening for incoming
-   // IPC binding requests.
-   // Currently only Linux runs the ChromotingHostServices server on the host
-@@ -222,7 +222,7 @@ class ChromotingHost : public ClientSess
-   // List of host extensions.
-   std::vector<std::unique_ptr<HostExtension>> extensions_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // IPC server that runs the CRD host service API. Non-null if the server name
-   // is set and the host is started.
-   // Currently only Linux runs the ChromotingHostServices server on the host
diff --git a/chromium-next/patches/patch-remoting_host_chromoting__host__context.cc b/chromium-next/patches/patch-remoting_host_chromoting__host__context.cc
deleted file mode 100644
index faf8ce831a..0000000000
--- a/chromium-next/patches/patch-remoting_host_chromoting__host__context.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/chromoting_host_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/chromoting_host_context.cc
-@@ -335,7 +335,7 @@ std::unique_ptr<ChromotingHostContext> C
-   // on a UI thread.
-   scoped_refptr<AutoThreadTaskRunner> input_task_runner =
-       AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner,
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-                                  base::MessagePumpType::UI);
- #else
-                                  base::MessagePumpType::IO);
diff --git a/chromium-next/patches/patch-remoting_host_chromoting__host__services__client.cc b/chromium-next/patches/patch-remoting_host_chromoting__host__services__client.cc
deleted file mode 100644
index bb89c0a851..0000000000
--- a/chromium-next/patches/patch-remoting_host_chromoting__host__services__client.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/chromoting_host_services_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/chromoting_host_services_client.cc
-@@ -59,7 +59,7 @@ mojo::PendingRemote<mojom::ChromotingHos
- 
- }  // namespace
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- // static
- constexpr char
-@@ -136,7 +136,7 @@ bool ChromotingHostServicesClient::Ensur
-   if (session_services_remote_.is_bound()) {
-     return true;
-   }
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!environment_->HasVar(kChromeRemoteDesktopSessionEnvVar)) {
-     LOG(WARNING) << "Current desktop environment is not remotable.";
-     return false;
diff --git a/chromium-next/patches/patch-remoting_host_client__session.cc b/chromium-next/patches/patch-remoting_host_client__session.cc
deleted file mode 100644
index 4a08e69ede..0000000000
--- a/chromium-next/patches/patch-remoting_host_client__session.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/client_session.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/client_session.cc
-@@ -188,7 +188,7 @@ void ClientSession::NotifyClientResoluti
-   if (effective_policies_.curtain_required.value_or(false)) {
-     dpi_vector.set(resolution.x_dpi(), resolution.y_dpi());
-   }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   dpi_vector.set(resolution.x_dpi(), resolution.y_dpi());
- #endif
- 
diff --git a/chromium-next/patches/patch-remoting_host_crash_crash__file__uploader.cc b/chromium-next/patches/patch-remoting_host_crash_crash__file__uploader.cc
deleted file mode 100644
index b56c5d92f4..0000000000
--- a/chromium-next/patches/patch-remoting_host_crash_crash__file__uploader.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/crash/crash_file_uploader.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/crash/crash_file_uploader.cc
-@@ -44,7 +44,7 @@ constexpr char kMinidumpFileName[] = "du
- 
- #if BUILDFLAG(IS_WIN)
- constexpr char kProductNameValue[] = "Chromoting";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr char kProductNameValue[] = "Chromoting_Linux";
- #elif BUILDFLAG(IS_MAC)
- constexpr char kProductNameValue[] = "Chromoting_Mac";
diff --git a/chromium-next/patches/patch-remoting_host_evaluate__capability.cc b/chromium-next/patches/patch-remoting_host_evaluate__capability.cc
deleted file mode 100644
index 073af827e1..0000000000
--- a/chromium-next/patches/patch-remoting_host_evaluate__capability.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/evaluate_capability.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/evaluate_capability.cc
-@@ -56,7 +56,7 @@ base::FilePath BuildHostBinaryPath() {
-   }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (path.BaseName().value() ==
-       FILE_PATH_LITERAL("chrome-remote-desktop-host")) {
-     return path;
diff --git a/chromium-next/patches/patch-remoting_host_host__attributes.cc b/chromium-next/patches/patch-remoting_host_host__attributes.cc
deleted file mode 100644
index 82965abd66..0000000000
--- a/chromium-next/patches/patch-remoting_host_host__attributes.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/host_attributes.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/host_attributes.cc
-@@ -103,7 +103,7 @@ std::string GetHostAttributes() {
-   if (media::InitializeMediaFoundation()) {
-     result.push_back("HWEncoder");
-   }
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   result.push_back("HWEncoder");
- #endif
- 
diff --git a/chromium-next/patches/patch-remoting_host_host__details.cc b/chromium-next/patches/patch-remoting_host_host__details.cc
deleted file mode 100644
index 185704d281..0000000000
--- a/chromium-next/patches/patch-remoting_host_host__details.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/host_details.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/host_details.cc
-@@ -7,7 +7,7 @@
- #include "base/system/sys_info.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/linux_util.h"
- #endif
- 
-@@ -22,7 +22,7 @@ std::string GetHostOperatingSystemName()
-   return "Mac";
- #elif BUILDFLAG(IS_CHROMEOS)
-   return "ChromeOS";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "Linux";
- #elif BUILDFLAG(IS_ANDROID)
-   return "Android";
-@@ -34,7 +34,7 @@ std::string GetHostOperatingSystemName()
- // Get the host Operating System Version, removing the need to check for OS
- // definitions and keeps the format used consistent.
- std::string GetHostOperatingSystemVersion() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return base::GetLinuxDistro();
- #else
-   return base::SysInfo::OperatingSystemVersion();
diff --git a/chromium-next/patches/patch-remoting_host_host__main.cc b/chromium-next/patches/patch-remoting_host_host__main.cc
deleted file mode 100644
index 7b2c341720..0000000000
--- a/chromium-next/patches/patch-remoting_host_host__main.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/host_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/host_main.cc
-@@ -55,7 +55,7 @@ int FileChooserMain();
- int RdpDesktopSessionMain();
- int UrlForwarderConfiguratorMain();
- #endif  // BUILDFLAG(IS_WIN)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- int XSessionChooserMain();
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -68,7 +68,7 @@ const char kUsageMessage[] =
-     "\n"
-     "Options:\n"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     "  --audio-pipe-name=<pipe> - Sets the pipe name to capture audio on "
-     "Linux.\n"
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -161,7 +161,7 @@ MainRoutineFn SelectMainRoutine(const st
-   } else if (process_type == kProcessTypeUrlForwarderConfigurator) {
-     main_routine = &UrlForwarderConfiguratorMain;
- #endif  // BUILDFLAG(IS_WIN)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   } else if (process_type == kProcessTypeXSessionChooser) {
-     main_routine = &XSessionChooserMain;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -229,7 +229,7 @@ int HostMain(int argc, char** argv) {
-   // Note that we enable crash reporting only if the user has opted in to having
-   // the crash reports uploaded.
-   if (IsUsageStatsAllowed()) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     InitializeCrashReporting();
- #elif BUILDFLAG(IS_WIN)
-     // TODO: joedow - Enable crash reporting for the RDP process.
diff --git a/chromium-next/patches/patch-remoting_host_ipc__constants.cc b/chromium-next/patches/patch-remoting_host_ipc__constants.cc
deleted file mode 100644
index 0f0304f6bf..0000000000
--- a/chromium-next/patches/patch-remoting_host_ipc__constants.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/ipc_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/ipc_constants.cc
-@@ -17,7 +17,7 @@ namespace remoting {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- #if !defined(NDEBUG)
- // Use a different IPC name for debug builds so that we can run the host
-@@ -81,7 +81,7 @@ GetChromotingHostServicesServerName() {
-   static const base::NoDestructor<mojo::NamedPlatformChannel::ServerName>
-       server_name(
-           named_mojo_ipc_server::WorkingDirectoryIndependentServerNameFromUTF8(
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-               // Linux host creates the socket file in /tmp, and it won't be
-               // deleted until reboot, so we put username in the path in case
-               // the user switches the host owner.
diff --git a/chromium-next/patches/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/chromium-next/patches/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
deleted file mode 100644
index dc92f792f8..0000000000
--- a/chromium-next/patches/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/it2me/it2me_native_messaging_host_main.cc
-@@ -30,7 +30,7 @@
- #include "remoting/host/resources.h"
- #include "remoting/host/usage_stats_consent.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #if defined(REMOTING_USE_X11)
- #include <gtk/gtk.h>
- #include "base/linux_util.h"
-@@ -75,7 +75,7 @@ bool CurrentProcessHasUiAccess() {
- // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and
- // runs the task executor until It2MeNativeMessagingHost signals shutdown.
- int It2MeNativeMessagingHostMain(int argc, char** argv) {
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   // Initialize Xlib for multi-threaded use, allowing non-Chromium code to
-   // use X11 safely (such as the WebRTC capturer, GTK ...)
-   x11::InitXlib();
-@@ -121,7 +121,7 @@ int It2MeNativeMessagingHostMain(int arg
- 
-   remoting::LoadResources("");
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   // Required for any calls into GTK functions, such as the Disconnect and
-   // Continue windows. Calling with nullptr arguments because we don't have
-   // any command line arguments for gtk to consume.
-@@ -249,7 +249,7 @@ int It2MeNativeMessagingHostMain(int arg
-       PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(),
-                                           context->management_service());
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   scoped_refptr<AutoThreadTaskRunner> input_task_runner;
-   // Create an X11EventSource on all UI threads, so the global X11 connection
-   // (x11::Connection::Get()) can dispatch X events.
-@@ -273,7 +273,7 @@ int It2MeNativeMessagingHostMain(int arg
-   // Run the loop until channel is alive.
-   run_loop.Run();
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() {
-                                 delete ui::X11EventSource::GetInstance();
-                               }));
diff --git a/chromium-next/patches/patch-remoting_host_me2me__desktop__environment.cc b/chromium-next/patches/patch-remoting_host_me2me__desktop__environment.cc
deleted file mode 100644
index 527e550895..0000000000
--- a/chromium-next/patches/patch-remoting_host_me2me__desktop__environment.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/me2me_desktop_environment.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/me2me_desktop_environment.cc
-@@ -112,7 +112,7 @@ std::string Me2MeDesktopEnvironment::Get
-     capabilities += protocol::kRemoteWebAuthnCapability;
-   }
- 
--#if BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   capabilities += " ";
-   capabilities += protocol::kMultiStreamCapability;
- 
-@@ -150,7 +150,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnv
-   // properly under Xvfb.
-   mutable_desktop_capture_options()->set_use_update_notifications(true);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Setting this option to false means that the capture differ wrapper will not
-   // be used when the X11 capturer is selected. This reduces the X11 capture
-   // time by a few milliseconds per frame and is safe because we can rely on
-@@ -178,7 +178,7 @@ bool Me2MeDesktopEnvironment::Initialize
- 
-   // Otherwise, if the session is shared with the local user start monitoring
-   // the local input and create the in-session UI.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool want_user_interface = false;
- #elif BUILDFLAG(IS_APPLE)
-   // Don't try to display any UI on top of the system's login screen as this
diff --git a/chromium-next/patches/patch-remoting_host_mojo__caller__security__checker.cc b/chromium-next/patches/patch-remoting_host_mojo__caller__security__checker.cc
deleted file mode 100644
index 5d4e5161df..0000000000
--- a/chromium-next/patches/patch-remoting_host_mojo__caller__security__checker.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/mojo_caller_security_checker.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/mojo_caller_security_checker.cc
-@@ -37,7 +37,7 @@
- namespace remoting {
- namespace {
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr auto kAllowedCallerProgramNames =
-     base::MakeFixedFlatSet<base::FilePath::StringViewType>({
-         "remote-open-url",
-@@ -98,7 +98,7 @@ bool IsTrustedMojoEndpoint(
-   return true;
- #endif
- 
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- 
-   // TODO: yuweih - see if it's possible to move away from PID-based security
-   // checks, which might be susceptible of PID reuse attacks.
-@@ -122,7 +122,7 @@ bool IsTrustedMojoEndpoint(
-   base::FilePath::StringType program_name =
-       caller_process_image_path.BaseName().value();
-   if (!kAllowedCallerProgramNames.contains(program_name)) {
--#if BUILDFLAG(IS_LINUX) && !defined(NDEBUG)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !defined(NDEBUG)
-     // Linux binaries generated in out/Debug are underscore-separated. To make
-     // debugging easier, we just check the name again with underscores replaced
-     // with hyphens.
diff --git a/chromium-next/patches/patch-remoting_host_policy__watcher.cc b/chromium-next/patches/patch-remoting_host_policy__watcher.cc
deleted file mode 100644
index f048febf3d..0000000000
--- a/chromium-next/patches/patch-remoting_host_policy__watcher.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/policy_watcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/policy_watcher.cc
-@@ -177,7 +177,7 @@ base::Value::Dict PolicyWatcher::GetDefa
-              true);
-   result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false);
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   result.Set(key::kRemoteAccessHostMatchUsername, false);
- #endif
- #if !BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium-next/patches/patch-remoting_host_remote__open__url_remote__open__url__client.cc b/chromium-next/patches/patch-remoting_host_remote__open__url_remote__open__url__client.cc
deleted file mode 100644
index f78c2c6da7..0000000000
--- a/chromium-next/patches/patch-remoting_host_remote__open__url_remote__open__url__client.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/remote_open_url/remote_open_url_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/remote_open_url/remote_open_url_client.cc
-@@ -18,7 +18,7 @@
- #include "remoting/host/mojom/chromoting_host_services.mojom.h"
- #include "remoting/host/mojom/remote_url_opener.mojom.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/remote_open_url/remote_open_url_client_delegate_linux.h"
- #elif BUILDFLAG(IS_WIN)
- #include "remoting/host/remote_open_url/remote_open_url_client_delegate_win.h"
-@@ -31,7 +31,7 @@ namespace {
- constexpr base::TimeDelta kRequestTimeout = base::Seconds(5);
- 
- std::unique_ptr<RemoteOpenUrlClient::Delegate> CreateDelegate() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return std::make_unique<RemoteOpenUrlClientDelegateLinux>();
- #elif BUILDFLAG(IS_WIN)
-   return std::make_unique<RemoteOpenUrlClientDelegateWin>();
diff --git a/chromium-next/patches/patch-remoting_host_remote__open__url_remote__open__url__util.cc b/chromium-next/patches/patch-remoting_host_remote__open__url_remote__open__url__util.cc
deleted file mode 100644
index ff598f7f88..0000000000
--- a/chromium-next/patches/patch-remoting_host_remote__open__url_remote__open__url__util.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/remote_open_url/remote_open_url_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/remote_open_url/remote_open_url_util.cc
-@@ -29,7 +29,7 @@ const wchar_t kRegisteredApplicationsKey
- #endif  // BUILDFLAG(IS_WIN)
- 
- bool IsRemoteOpenUrlSupported() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return true;
- #elif BUILDFLAG(IS_WIN)
-   // The MSI installs the ProgID and capabilities into registry, but not the
diff --git a/chromium-next/patches/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc b/chromium-next/patches/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
deleted file mode 100644
index 4d8ff395c0..0000000000
--- a/chromium-next/patches/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/remote_open_url/url_forwarder_configurator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/remote_open_url/url_forwarder_configurator.cc
-@@ -12,7 +12,7 @@ UrlForwarderConfigurator::UrlForwarderCo
- 
- UrlForwarderConfigurator::~UrlForwarderConfigurator() = default;
- 
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD)
- 
- // static
- std::unique_ptr<UrlForwarderConfigurator> UrlForwarderConfigurator::Create() {
diff --git a/chromium-next/patches/patch-remoting_host_remoting__me2me__host.cc b/chromium-next/patches/patch-remoting_host_remoting__me2me__host.cc
deleted file mode 100644
index 269e402d13..0000000000
--- a/chromium-next/patches/patch-remoting_host_remoting__me2me__host.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/remoting_me2me_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/remoting_me2me_host.cc
-@@ -138,7 +138,7 @@
- #include "remoting/host/mac/permission_utils.h"
- #endif  // BUILDFLAG(IS_APPLE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #if defined(REMOTING_USE_X11)
- #include <gtk/gtk.h>
- 
-@@ -148,7 +148,7 @@
- #endif  // defined(REMOTING_USE_X11)
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/linux_util.h"
- #include "remoting/host/linux/audio_capturer_linux.h"
- #include "remoting/host/linux/certificate_watcher.h"
-@@ -163,7 +163,7 @@
- #include "remoting/host/pairing_registry_delegate_win.h"
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/host_utmp_logger.h"
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -196,7 +196,7 @@ const char kApplicationName[] = "chromot
- const char kStdinConfigPath[] = "-";
- #endif  // !defined(REMOTING_MULTI_PROCESS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // The command line switch used to pass name of the pipe to capture audio on
- // linux.
- const char kAudioPipeSwitchName[] = "audio-pipe-name";
-@@ -441,7 +441,7 @@ class HostProcess : public ConfigWatcher
-   std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_;
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Watch for certificate changes and kill the host when changes occur
-   std::unique_ptr<CertificateWatcher> cert_watcher_;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -506,7 +506,7 @@ class HostProcess : public ConfigWatcher
-   std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_;
- 
-   std::unique_ptr<HostEventLogger> host_event_logger_;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
- #endif
-   std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
-@@ -825,7 +825,7 @@ void HostProcess::StartOnNetworkThread()
- void HostProcess::ShutdownOnNetworkThread() {
-   DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
-   config_watcher_.reset();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   cert_watcher_.reset();
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- }
-@@ -902,7 +902,7 @@ void HostProcess::CreateAuthenticatorFac
-             context_->create_client_cert_store_callback(),
-             service_account_email_, oauth_refresh_token_));
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     if (!cert_watcher_) {
-       cert_watcher_ = std::make_unique<CertificateWatcher>(
-           base::BindRepeating(&HostProcess::ShutdownHost,
-@@ -1044,7 +1044,7 @@ void HostProcess::StartOnUiThread() {
-       base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
-       base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // If an audio pipe is specific on the command-line then initialize
-   // AudioCapturerLinux to capture from it.
-   base::FilePath audio_pipe_name =
-@@ -1123,7 +1123,7 @@ void HostProcess::ShutdownOnUiThread() {
-   // It is now safe for the HostProcess to be deleted.
-   self_ = nullptr;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Cause the global AudioPipeReader to be freed, otherwise the audio
-   // thread will remain in-use and prevent the process from exiting.
-   // TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1131,7 +1131,7 @@ void HostProcess::ShutdownOnUiThread() {
-   AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   context_->input_task_runner()->PostTask(
-       FROM_HERE,
-       base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
-@@ -1873,7 +1873,7 @@ void HostProcess::StartHost() {
-     corp_host_status_logger_->StartObserving(*session_manager);
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   desktop_environment_options_.set_enable_remote_webauthn(true);
- #endif
- #if BUILDFLAG(IS_WIN)
-@@ -1900,7 +1900,7 @@ void HostProcess::StartHost() {
- 
-   host_->AddExtension(std::make_unique<TestEchoExtension>());
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-   if (cmd_line->HasSwitch(kEnableUtempter)) {
-     host_utmp_logger_ =
-@@ -1936,7 +1936,7 @@ void HostProcess::StartHost() {
-   // addresses.
-   host_->Start(*host_owner_emails_.begin());
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // For Windows, ChromotingHostServices connections are handled by the daemon
-   // process, then the message pipe is forwarded to the network process.
-   host_->StartChromotingHostServices();
-@@ -2081,7 +2081,7 @@ int HostProcessMain() {
-   HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
-   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #if defined(REMOTING_USE_X11)
-   // Initialize Xlib for multi-threaded use, allowing non-Chromium code to
-   // use X11 safely (such as the WebRTC capturer, GTK ...)
-@@ -2144,7 +2144,7 @@ int HostProcessMain() {
-   std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
-       net::NetworkChangeNotifier::CreateIfNeeded());
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   // Create an X11EventSource on all UI threads, so the global X11 connection
-   // (x11::Connection::Get()) can dispatch X events.
-   auto event_source =
diff --git a/chromium-next/patches/patch-remoting_host_session__policies__from__dict.cc b/chromium-next/patches/patch-remoting_host_session__policies__from__dict.cc
deleted file mode 100644
index 0ff257d49e..0000000000
--- a/chromium-next/patches/patch-remoting_host_session__policies__from__dict.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/session_policies_from_dict.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/session_policies_from_dict.cc
-@@ -75,7 +75,7 @@ std::optional<SessionPolicies> SessionPo
-   session_policies.curtain_required =
-       dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain);
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   session_policies.host_username_match_required =
-       dict.FindBool(policy::key::kRemoteAccessHostMatchUsername);
- #endif
diff --git a/chromium-next/patches/patch-remoting_host_setup_start__host__main.cc b/chromium-next/patches/patch-remoting_host_setup_start__host__main.cc
deleted file mode 100644
index 665aaa52e3..0000000000
--- a/chromium-next/patches/patch-remoting_host_setup_start__host__main.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/setup/start_host_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/setup/start_host_main.cc
-@@ -45,7 +45,7 @@
- #include <unistd.h>
- #endif  // BUILDFLAG(IS_POSIX)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/setup/daemon_controller_delegate_linux.h"
- #include "remoting/host/setup/start_host_as_root.h"
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -369,7 +369,7 @@ bool InitializeCloudMachineParams(HostSt
- }  // namespace
- 
- int StartHostMain(int argc, char** argv) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Minimize the amount of code that runs as root on Posix systems.
-   if (getuid() == 0) {
-     return remoting::StartHostAsRoot(argc, argv);
-@@ -394,7 +394,7 @@ int StartHostMain(int argc, char** argv)
- 
-   mojo::core::Init();
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (command_line->HasSwitch("no-start")) {
-     // On Linux, registering the host with systemd and starting it is the only
-     // reason start_host requires root. The --no-start options skips that final
diff --git a/chromium-next/patches/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc b/chromium-next/patches/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
deleted file mode 100644
index 688eb5aea1..0000000000
--- a/chromium-next/patches/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc
-@@ -10,7 +10,7 @@
- #include "base/strings/utf_string_conversions.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "base/containers/fixed_flat_set.h"
- #include "base/files/file_path.h"
- #include "base/process/process_handle.h"
-@@ -38,7 +38,7 @@ namespace {
- 
- // No static variables needed for debug builds.
- 
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- 
- constexpr auto kAllowedCallerPrograms =
-     base::MakeFixedFlatSet<base::FilePath::StringViewType>({
-@@ -83,7 +83,7 @@ bool IsLaunchedByTrustedProcess() {
- #if !defined(NDEBUG)
-   // Just return true on debug builds for the convenience of development.
-   return true;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::ProcessId parent_pid =
-       base::GetParentProcessId(base::GetCurrentProcessHandle());
-   // Note that on Linux the process image may no longer exist in its original
diff --git a/chromium-next/patches/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/chromium-next/patches/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
deleted file mode 100644
index f2a65c5f3a..0000000000
--- a/chromium-next/patches/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc
-@@ -30,7 +30,7 @@
- #include "base/task/thread_pool.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/environment.h"
- #include "base/nix/xdg_util.h"
- #include "base/strings/string_util.h"
-@@ -75,14 +75,14 @@ static constexpr char kExtensionWakeupFi
- // Caller should check if the directory exists before writing files to it. A
- // directory only exists if the corresponding Chrome version is installed.
- std::vector<base::FilePath> GetRemoteStateChangeDirPaths() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   constexpr base::FilePath::CharType kStateChangeDirName[] =
-       FILE_PATH_LITERAL("WebAuthenticationProxyRemoteSessionStateChange");
- #endif
- 
-   std::vector<base::FilePath> dirs;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // See: chrome/common/chrome_paths_linux.cc
-   auto env = base::Environment::Create();
-   base::FilePath base_path;
diff --git a/chromium-next/patches/patch-remoting_protocol_webrtc__video__stream.cc b/chromium-next/patches/patch-remoting_protocol_webrtc__video__stream.cc
deleted file mode 100644
index f05dae7861..0000000000
--- a/chromium-next/patches/patch-remoting_protocol_webrtc__video__stream.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/protocol/webrtc_video_stream.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/protocol/webrtc_video_stream.cc
-@@ -267,7 +267,7 @@ WebrtcVideoStream::WebrtcVideoStream(con
-     : session_options_(session_options) {
- // TODO(joedow): Dig into the threading model on other platforms to see if they
- // can also be updated to run on a dedicated thread.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   core_task_runner_ = base::ThreadPool::CreateSingleThreadTaskRunner(
-       {base::TaskPriority::HIGHEST},
-       base::SingleThreadTaskRunnerThreadMode::DEDICATED);
diff --git a/chromium-next/patches/patch-remoting_signaling_ftl__host__device__id__provider.cc b/chromium-next/patches/patch-remoting_signaling_ftl__host__device__id__provider.cc
deleted file mode 100644
index ba71e59587..0000000000
--- a/chromium-next/patches/patch-remoting_signaling_ftl__host__device__id__provider.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/signaling/ftl_host_device_id_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ remoting/signaling/ftl_host_device_id_provider.cc
-@@ -16,7 +16,7 @@ constexpr char kDeviceIdPrefix[] = "crd-
- constexpr char kDeviceIdPrefix[] = "crd-mac-host-";
- #elif BUILDFLAG(IS_CHROMEOS)
- constexpr char kDeviceIdPrefix[] = "crd-cros-host-";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr char kDeviceIdPrefix[] = "crd-linux-host-";
- #else
- constexpr char kDeviceIdPrefix[] = "crd-unknown-host-";
diff --git a/chromium-next/patches/patch-sandbox_BUILD.gn b/chromium-next/patches/patch-sandbox_BUILD.gn
deleted file mode 100644
index 548e78ca15..0000000000
--- a/chromium-next/patches/patch-sandbox_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/BUILD.gn
-@@ -49,7 +49,7 @@ group("sandbox") {
-       "//sandbox/mac:system_services",
-       "//sandbox/mac/mojom",
-     ]
--  } else if (is_linux || is_chromeos || is_android) {
-+  } else if ((is_linux && !is_bsd) || is_chromeos || is_android) {
-     public_deps = [ "//sandbox/linux:sandbox" ]
-   }
- }
diff --git a/chromium-next/patches/patch-sandbox_features.gni b/chromium-next/patches/patch-sandbox_features.gni
deleted file mode 100644
index 7d85e9f030..0000000000
--- a/chromium-next/patches/patch-sandbox_features.gni
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/features.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/features.gni
-@@ -6,7 +6,7 @@
- # currently.
- # Do not disable seccomp_bpf anywhere without talking to
- # security%chromium.org@localhost!
--use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
-+use_seccomp_bpf = !is_bsd && (is_linux || is_chromeos || is_android) &&
-                   (current_cpu == "x86" || current_cpu == "x64" ||
-                    current_cpu == "arm" || current_cpu == "arm64" ||
-                    current_cpu == "mipsel" || current_cpu == "mips64el")
diff --git a/chromium-next/patches/patch-sandbox_linux_BUILD.gn b/chromium-next/patches/patch-sandbox_linux_BUILD.gn
deleted file mode 100644
index c739ef872c..0000000000
--- a/chromium-next/patches/patch-sandbox_linux_BUILD.gn
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/linux/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/linux/BUILD.gn
-@@ -12,11 +12,11 @@ if (is_android) {
- }
- 
- declare_args() {
--  compile_suid_client = is_linux || is_chromeos
-+  compile_suid_client = (is_linux || is_chromeos) && !is_bsd
- 
--  compile_credentials = is_linux || is_chromeos
-+  compile_credentials = (is_linux || is_chromeos) && !is_bsd
- 
--  compile_syscall_broker = is_linux || is_chromeos
-+  compile_syscall_broker = (is_linux || is_chromeos) && !is_bsd
- 
-   # On Android, use plain GTest.
-   use_base_test_suite = is_linux || is_chromeos
-@@ -369,6 +369,17 @@ component("sandbox_services") {
-       "services/libc_interceptor.h",
-     ]
-   }
-+
-+  if (is_bsd) {
-+    sources -= [
-+      "services/scoped_process.cc",
-+      "services/scoped_process.h",
-+      "services/syscall_wrappers.cc",
-+      "services/syscall_wrappers.h",
-+      "services/yama.cc",
-+      "services/yama.h",
-+     ]
-+   }
- }
- 
- source_set("sandbox_services_headers") {
diff --git a/chromium-next/patches/patch-sandbox_linux_services_init__process__reaper.cc b/chromium-next/patches/patch-sandbox_linux_services_init__process__reaper.cc
deleted file mode 100644
index 70b1a27018..0000000000
--- a/chromium-next/patches/patch-sandbox_linux_services_init__process__reaper.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/linux/services/init_process_reaper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/linux/services/init_process_reaper.cc
-@@ -7,6 +7,7 @@
- #pragma allow_unsafe_libc_calls
- #endif
- 
-+#if 0
- #include "sandbox/linux/services/init_process_reaper.h"
- 
- #include <signal.h>
-@@ -105,3 +106,4 @@ bool CreateInitProcessReaper(base::OnceC
- }
- 
- }  // namespace sandbox.
-+#endif
diff --git a/chromium-next/patches/patch-sandbox_linux_services_libc__interceptor.cc b/chromium-next/patches/patch-sandbox_linux_services_libc__interceptor.cc
deleted file mode 100644
index edc33fbe15..0000000000
--- a/chromium-next/patches/patch-sandbox_linux_services_libc__interceptor.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/linux/services/libc_interceptor.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/linux/services/libc_interceptor.cc
-@@ -17,7 +17,9 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <string.h>
-+#if !BUILDFLAG(IS_BSD)
- #include <sys/prctl.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <time.h>
-@@ -173,7 +175,7 @@ bool ReadTimeStruct(base::PickleIterator
-   } else {
-     base::AutoLock lock(g_timezones_lock.Get());
-     auto ret_pair = g_timezones.Get().insert(timezone);
--    output->tm_zone = ret_pair.first->c_str();
-+    output->tm_zone = (char *)ret_pair.first->c_str();
-   }
- 
-   return true;
diff --git a/chromium-next/patches/patch-sandbox_policy_BUILD.gn b/chromium-next/patches/patch-sandbox_policy_BUILD.gn
deleted file mode 100644
index b8cb47dac4..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_BUILD.gn
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/policy/BUILD.gn
-@@ -43,7 +43,7 @@ component("policy") {
-       "//third_party/jni_zero",
-     ]
-   }
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [
-       "linux/bpf_audio_policy_linux.cc",
-       "linux/bpf_audio_policy_linux.h",
-@@ -114,6 +114,38 @@ component("policy") {
-       "//sandbox/linux:suid_sandbox_client",
-     ]
-   }
-+  if (is_openbsd) {
-+    sources += [
-+      "openbsd/sandbox_openbsd.cc",
-+      "openbsd/sandbox_openbsd.h",
-+    ]
-+    deps += [
-+      "//sandbox:sandbox_buildflags",
-+      "//ui/gfx/x",
-+    ]
-+    libs = [ "util" ]
-+  }
-+  if (is_netbsd) {
-+    sources += [
-+      "netbsd/sandbox_netbsd.cc",
-+      "netbsd/sandbox_netbsd.h",
-+    ]
-+    deps += [
-+      "//sandbox:sandbox_buildflags",
-+      "//ui/gfx/x",
-+    ]
-+    libs = [ "util" ]
-+  }
-+  if (is_freebsd) {
-+    sources += [
-+      "freebsd/sandbox_freebsd.cc",
-+      "freebsd/sandbox_freebsd.h",
-+    ]
-+    deps += [
-+      "//sandbox:sandbox_buildflags",
-+      "//ui/gfx/x",
-+    ]
-+  }
-   if (is_chromeos) {
-     sources += [
-       "linux/bpf_ime_policy_linux.cc",
diff --git a/chromium-next/patches/patch-sandbox_policy_features.cc b/chromium-next/patches/patch-sandbox_policy_features.cc
deleted file mode 100644
index 663765cb0d..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_features.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/policy/features.cc
-@@ -19,7 +19,11 @@ namespace sandbox::policy::features {
- // (Only causes an effect when feature kNetworkServiceInProcess is disabled.)
- BASE_FEATURE(kNetworkServiceSandbox,
-              "NetworkServiceSandbox",
-+#if BUILDFLAG(IS_BSD)
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+#else
-              base::FEATURE_DISABLED_BY_DEFAULT);
-+#endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- // Enables a fine-grained seccomp-BPF syscall filter for the network service.
diff --git a/chromium-next/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/chromium-next/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
deleted file mode 100644
index 2edf380275..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
+++ /dev/null
@@ -1,220 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig	2025-05-08 12:01:57.800207748 +0000
-+++ sandbox/policy/freebsd/sandbox_freebsd.cc
-@@ -0,0 +1,211 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "sandbox/policy/freebsd/sandbox_freebsd.h"
-+
-+#include <dirent.h>
-+#include <fcntl.h>
-+#include <stdint.h>
-+#include <sys/resource.h>
-+#include <sys/stat.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#include <limits>
-+#include <memory>
-+#include <string>
-+#include <vector>
-+
-+#include "base/command_line.h"
-+#include "base/debug/stack_trace.h"
-+#include "base/feature_list.h"
-+#include "base/files/file_path.h"
-+#include "base/files/file_util.h"
-+#include "base/files/scoped_file.h"
-+#include "base/logging.h"
-+#include "base/memory/singleton.h"
-+#include "base/path_service.h"
-+#include "base/posix/eintr_wrapper.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/system/sys_info.h"
-+#include "base/threading/thread.h"
-+#include "base/time/time.h"
-+#include "build/build_config.h"
-+#include "crypto/crypto_buildflags.h"
-+#include "ppapi/buildflags/buildflags.h"
-+#include "sandbox/constants.h"
-+#include "sandbox/linux/services/credentials.h"
-+#include "sandbox/linux/services/namespace_sandbox.h"
-+#include "sandbox/linux/services/proc_util.h"
-+#include "sandbox/linux/services/resource_limits.h"
-+#include "sandbox/linux/services/thread_helpers.h"
-+#include "sandbox/linux/syscall_broker/broker_command.h"
-+#include "sandbox/linux/syscall_broker/broker_process.h"
-+#include "sandbox/policy/sandbox.h"
-+#include "sandbox/policy/sandbox_type.h"
-+#include "sandbox/policy/mojom/sandbox.mojom.h"
-+#include "sandbox/policy/switches.h"
-+#include "sandbox/sandbox_buildflags.h" 
-+
-+#if BUILDFLAG(USING_SANITIZER)
-+#include <sanitizer/common_interface_defs.h>
-+#endif
-+
-+#if BUILDFLAG(USE_NSS_CERTS)
-+#include "crypto/nss_util.h"
-+#endif
-+
-+#include "third_party/boringssl/src/include/openssl/crypto.h"
-+
-+#include "ui/gfx/font_util.h"
-+
-+namespace sandbox {
-+namespace policy {
-+
-+SandboxLinux::SandboxLinux()
-+    : sandbox_status_flags_(kInvalid),
-+      pre_initialized_(false),
-+      initialize_sandbox_ran_(false),
-+      broker_process_(nullptr) {
-+}
-+
-+SandboxLinux::~SandboxLinux() {
-+  if (pre_initialized_) {
-+    CHECK(initialize_sandbox_ran_);
-+  }
-+}
-+
-+SandboxLinux* SandboxLinux::GetInstance() {
-+  SandboxLinux* instance = base::Singleton<SandboxLinux>::get();
-+  CHECK(instance);
-+  return instance;
-+}
-+
-+void SandboxLinux::StopThread(base::Thread* thread) {
-+  DCHECK(thread);
-+  thread->Stop();
-+}
-+
-+void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) {
-+  CHECK(!pre_initialized_);
-+#if BUILDFLAG(USING_SANITIZER)
-+  // Sanitizers need to open some resources before the sandbox is enabled.
-+  // This should not fork, not launch threads, not open a directory.
-+  __sanitizer_sandbox_on_notify(sanitizer_args());
-+  sanitizer_args_.reset();
-+#endif
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  const std::string process_type =
-+      command_line->GetSwitchValueASCII(switches::kProcessType);
-+
-+  base::SysInfo::AmountOfPhysicalMemory();
-+  base::SysInfo::NumberOfProcessors();
-+  base::SysInfo::CPUModelName();
-+
-+  switch (sandbox_type) {
-+    case sandbox::mojom::Sandbox::kNoSandbox:
-+    {
-+#if BUILDFLAG(USE_NSS_CERTS)
-+      // The main process has to initialize the ~/.pki dir which won't work
-+      // after unveil(2).
-+      crypto::EnsureNSSInit();
-+#endif
-+      CRYPTO_pre_sandbox_init();
-+
-+      base::FilePath cache_directory, local_directory;
-+
-+      base::PathService::Get(base::DIR_CACHE, &cache_directory);
-+      base::PathService::Get(base::DIR_HOME, &local_directory);   
-+
-+      cache_directory = cache_directory.AppendASCII("chromium");
-+      local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
-+
-+      if (!base::CreateDirectory(cache_directory)) {
-+        LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory.";
-+      }
-+
-+      if (!base::CreateDirectory(local_directory)) {
-+        LOG(ERROR) << "Failed to create " << local_directory.value() << " directory.";
-+      }
-+
-+      break;
-+    }
-+    case sandbox::mojom::Sandbox::kRenderer:
-+      gfx::InitializeFonts();
-+      break;
-+    default:
-+      break;
-+  }
-+
-+  pre_initialized_ = true;
-+}
-+
-+bool SandboxLinux::InitializeSandbox(sandbox::mojom::Sandbox sandbox_type,
-+                                     SandboxLinux::PreSandboxHook hook,
-+                                     const Options& options) {
-+  DCHECK(!initialize_sandbox_ran_);
-+  initialize_sandbox_ran_ = true;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  const std::string process_type =
-+      command_line->GetSwitchValueASCII(switches::kProcessType);
-+
-+  if (command_line->HasSwitch(switches::kNoSandbox))
-+    return true;
-+
-+  VLOG(1) << "SandboxLinux::InitializeSandbox: process_type="
-+      << process_type << " sandbox_type=" << sandbox_type;
-+
-+  // Only one thread is running, pre-initialize if not already done.
-+  if (!pre_initialized_)
-+    PreinitializeSandbox(sandbox_type);
-+
-+  // Attempt to limit the future size of the address space of the process.
-+  int error = 0;
-+  const bool limited_as = LimitAddressSpace(&error);
-+  if (error) {
-+    // Restore errno. Internally to |LimitAddressSpace|, the errno due to
-+    // setrlimit may be lost.
-+    errno = error;
-+    PCHECK(limited_as);
-+  }
-+
-+  if (hook)
-+    CHECK(std::move(hook).Run(options));
-+
-+  return true;
-+}
-+
-+bool SandboxLinux::LimitAddressSpace(int* error) {
-+#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \
-+    !defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER)
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) {
-+    return false;
-+  }
-+
-+  // Unfortunately, it does not appear possible to set RLIMIT_AS such that it
-+  // will both (a) be high enough to support V8's and WebAssembly's address
-+  // space requirements while also (b) being low enough to mitigate exploits
-+  // using integer overflows that require large allocations, heap spray, or
-+  // other memory-hungry attack modes.
-+
-+  *error = sandbox::ResourceLimits::Lower(
-+      RLIMIT_DATA, static_cast<rlim_t>(sandbox::kDataSizeLimit));
-+
-+  // Cache the resource limit before turning on the sandbox.
-+  base::SysInfo::AmountOfVirtualMemory();
-+  base::SysInfo::MaxSharedMemorySize();
-+
-+  return *error == 0;
-+#else
-+  base::SysInfo::AmountOfVirtualMemory();
-+  return false;
-+#endif  // !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) &&
-+        // !defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER)
-+}
-+
-+}  // namespace policy
-+}  // namespace sandbox
diff --git a/chromium-next/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.h b/chromium-next/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.h
deleted file mode 100644
index f72a240533..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.h
+++ /dev/null
@@ -1,285 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/freebsd/sandbox_freebsd.h.orig	2025-05-08 12:01:57.800356194 +0000
-+++ sandbox/policy/freebsd/sandbox_freebsd.h
-@@ -0,0 +1,276 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+#ifndef SANDBOX_POLICY_LINUX_SANDBOX_OPENBSD_H_
-+#define SANDBOX_POLICY_LINUX_SANDBOX_OPENBSD_H_
-+
-+#include <memory>
-+#include <string>
-+#include <vector>
-+
-+#include "base/logging.h"
-+#include "base/posix/global_descriptors.h"
-+#include "sandbox/policy/export.h"
-+#include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h"
-+#include "sandbox/policy/mojom/sandbox.mojom.h"
-+#include "base/sanitizer_buildflags.h"
-+
-+#if BUILDFLAG(USING_SANITIZER)
-+#include <sanitizer/common_interface_defs.h>
-+#endif
-+
-+namespace base {
-+template <typename T>
-+struct DefaultSingletonTraits;
-+class Thread;
-+}  // namespace base
-+
-+namespace sandbox {
-+namespace syscall_broker {
-+class BrokerProcess;
-+}  // namespace syscall_broker
-+}  // namespace sandbox
-+
-+namespace sandbox {
-+namespace policy {
-+
-+// A singleton class to represent and change our sandboxing state for the
-+// three main Linux sandboxes.
-+// The sandboxing model allows using two layers of sandboxing. The first layer
-+// can be implemented either with unprivileged namespaces or with the setuid
-+// sandbox. This class provides a way to engage the namespace sandbox, but does
-+// not deal with the legacy setuid sandbox directly.
-+// The second layer is mainly based on seccomp-bpf and is engaged with
-+// InitializeSandbox(). InitializeSandbox() is also responsible for "sealing"
-+// the first layer of sandboxing. That is, InitializeSandbox must always be
-+// called to have any meaningful sandboxing at all.
-+class SANDBOX_POLICY_EXPORT SandboxLinux {
-+ public:
-+  // This is a list of sandbox IPC methods which the renderer may send to the
-+  // sandbox host. See
-+  // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md
-+  // This isn't the full list, values < 32 are reserved for methods called from
-+  // Skia, and values < 64 are reserved for libc_interceptor.cc.
-+  enum LinuxSandboxIPCMethods {
-+    DEPRECATED_METHOD_GET_FALLBACK_FONT_FOR_CHAR = 64,
-+    DEPRECATED_METHOD_GET_CHILD_WITH_INODE,
-+    DEPRECATED_METHOD_GET_STYLE_FOR_STRIKE,
-+    METHOD_MAKE_SHARED_MEMORY_SEGMENT,
-+    DEPRECATED_METHOD_MATCH_WITH_FALLBACK,
-+  };
-+
-+  // These form a bitmask which describes the conditions of the Linux sandbox.
-+  // Note: this doesn't strictly give you the current status, it states
-+  // what will be enabled when the relevant processes are initialized.
-+  enum Status {
-+    // SUID sandbox active.
-+    kSUID = 1 << 0,
-+
-+    // Sandbox is using a new PID namespace.
-+    kPIDNS = 1 << 1,
-+
-+    // Sandbox is using a new network namespace.
-+    kNetNS = 1 << 2,
-+
-+    // seccomp-bpf sandbox active.
-+    kSeccompBPF = 1 << 3,
-+
-+    // The Yama LSM module is present and enforcing.
-+    kYama = 1 << 4,
-+
-+    // seccomp-bpf sandbox is active and the kernel supports TSYNC.
-+    kSeccompTSYNC = 1 << 5,
-+
-+    // User namespace sandbox active.
-+    kUserNS = 1 << 6,
-+
-+    // A flag that denotes an invalid sandbox status.
-+    kInvalid = 1 << 31,
-+  };
-+
-+  // SandboxLinux Options are a superset of SandboxSecompBPF Options.
-+  struct Options : public SandboxSeccompBPF::Options {
-+    // When running with a zygote, the namespace sandbox will have already
-+    // been engaged prior to initializing SandboxLinux itself, and need not
-+    // be done so again. Set to true to indicate that there isn't a zygote
-+    // for this process and the step is to be performed here explicitly.
-+    bool engage_namespace_sandbox = false;
-+
-+    // Allow starting the sandbox with multiple threads already running. This
-+    // will enable TSYNC for seccomp-BPF, which syncs the seccomp-BPF policy
-+    // across all running threads.
-+    bool allow_threads_during_sandbox_init = false;
-+
-+    // Enables the CHECK for open directories. The open directory check is only
-+    // useful for the chroot jail (from the semantic layer of the sandbox), and
-+    // can safely be disabled if we are only enabling the seccomp-BPF layer.
-+    bool check_for_open_directories = true;
-+  };
-+
-+  // Callers can provide this hook to run code right before the policy
-+  // is passed to the BPF compiler and the sandbox is engaged. If
-+  // pre_sandbox_hook() returns true, the sandbox will be engaged
-+  // afterwards, otherwise the process is terminated.
-+  using PreSandboxHook = base::OnceCallback<bool(Options)>;
-+
-+  // Get our singleton instance.
-+  static SandboxLinux* GetInstance();
-+
-+  SandboxLinux(const SandboxLinux&) = delete;
-+  SandboxLinux& operator=(const SandboxLinux&) = delete;
-+
-+  bool SetPledge(const char *pstring, const char *ppath);
-+  bool SetUnveil(const std::string process_type, sandbox::mojom::Sandbox sandbox_type);
-+
-+  // Do some initialization that can only be done before any of the sandboxes
-+  // are enabled. If using the setuid sandbox, this should be called manually
-+  // before the setuid sandbox is engaged.
-+  // Security: When this runs, it is imperative that either InitializeSandbox()
-+  // runs as well or that all file descriptors returned in
-+  // GetFileDescriptorsToClose() get closed.
-+  // Otherwise file descriptors that bypass the security of the setuid sandbox
-+  // would be kept open. One must be particularly careful if a process performs
-+  // a fork().
-+  void PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type);
-+
-+  // Check that the current process is the init process of a new PID
-+  // namespace and then proceed to drop access to the file system by using
-+  // a new unprivileged namespace. This is a layer-1 sandbox.
-+  // In order for this sandbox to be effective, it must be "sealed" by calling
-+  // InitializeSandbox().
-+  void EngageNamespaceSandbox(bool from_zygote);
-+
-+  // Return a list of file descriptors to close if PreinitializeSandbox() ran
-+  // but InitializeSandbox() won't. Avoid using.
-+  // TODO(jln): get rid of this hack.
-+  std::vector<int> GetFileDescriptorsToClose();
-+
-+  // Seal an eventual layer-1 sandbox and initialize the layer-2 sandbox with
-+  // an adequate policy depending on the process type and command line
-+  // arguments.
-+  // Currently the layer-2 sandbox is composed of seccomp-bpf and address space
-+  // limitations.
-+  // This function should only be called without any thread running.
-+  bool InitializeSandbox(sandbox::mojom::Sandbox sandbox_type,
-+                         PreSandboxHook hook,
-+                         const Options& options);
-+
-+  // Stop |thread| in a way that can be trusted by the sandbox.
-+  void StopThread(base::Thread* thread);
-+
-+  // Returns the status of the renderer, worker and ppapi sandbox. Can only
-+  // be queried after going through PreinitializeSandbox(). This is a bitmask
-+  // and uses the constants defined in "enum Status" above. Since the
-+  // status needs to be provided before the sandboxes are actually started,
-+  // this returns what will actually happen once InitializeSandbox()
-+  // is called from inside these processes.
-+  int GetStatus();
-+
-+  // Returns true if the current process is single-threaded or if the number
-+  // of threads cannot be determined.
-+  bool IsSingleThreaded() const;
-+
-+  // Returns true if we started Seccomp BPF.
-+  bool seccomp_bpf_started() const;
-+
-+  // Check the policy and eventually start the seccomp-bpf sandbox. This should
-+  // never be called with threads started. If we detect that threads have
-+  // started we will crash.
-+  bool StartSeccompBPF(sandbox::mojom::Sandbox sandbox_type,
-+                       PreSandboxHook hook,
-+                       const Options& options);
-+
-+  // Limit the address space of the current process (and its children) to make
-+  // some vulnerabilities harder to exploit. Writes the errno due to setrlimit
-+  // (including 0 if no error) into |error|.
-+  bool LimitAddressSpace(int* error);
-+
-+  // Returns a file descriptor to proc. The file descriptor is no longer valid
-+  // after the sandbox has been sealed.
-+  int proc_fd() const {
-+    DCHECK_NE(-1, proc_fd_);
-+    return proc_fd_;
-+  }
-+
-+#if BUILDFLAG(USING_SANITIZER)
-+  __sanitizer_sandbox_arguments* sanitizer_args() const {
-+    return sanitizer_args_.get();
-+  };
-+#endif
-+
-+  // A BrokerProcess is a helper that is started before the sandbox is engaged,
-+  // typically from a pre-sandbox hook, that will serve requests to access
-+  // files over an IPC channel. The client  of this runs from a SIGSYS handler
-+  // triggered by the seccomp-bpf sandbox.
-+  // |client_sandbox_policy| is the policy being run by the client, and is
-+  // used to derive the equivalent broker-side policy.
-+  // |broker_side_hook| is an alternate pre-sandbox hook to be run before the
-+  // broker itself gets sandboxed, to which the broker side policy and
-+  // |options| are passed.
-+  // Crashes the process if the broker can not be started since continuation
-+  // is impossible (and presumably unsafe).
-+  // This should never be destroyed, as after the sandbox is started it is
-+  // vital to the process.
-+#if 0
-+  void StartBrokerProcess(
-+      const sandbox::syscall_broker::BrokerCommandSet& allowed_command_set,
-+      std::vector<sandbox::syscall_broker::BrokerFilePermission> permissions,
-+      PreSandboxHook broker_side_hook,
-+      const Options& options);
-+
-+  sandbox::syscall_broker::BrokerProcess* broker_process() const {
-+    return broker_process_;
-+  }
-+#endif
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<SandboxLinux>;
-+
-+  SandboxLinux();
-+  ~SandboxLinux();
-+
-+  // We must have been pre_initialized_ before using these.
-+  bool seccomp_bpf_supported() const;
-+  bool seccomp_bpf_with_tsync_supported() const;
-+
-+  // Returns true if it can be determined that the current process has open
-+  // directories that are not managed by the SandboxLinux class. This would
-+  // be a vulnerability as it would allow to bypass the setuid sandbox.
-+  bool HasOpenDirectories() const;
-+
-+  // The last part of the initialization is to make sure any temporary "hole"
-+  // in the sandbox is closed. For now, this consists of closing proc_fd_.
-+  void SealSandbox();
-+
-+  // GetStatus() makes promises as to how the sandbox will behave. This
-+  // checks that no promises have been broken.
-+  void CheckForBrokenPromises(sandbox::mojom::Sandbox sandbox_type);
-+
-+  // Stop |thread| and make sure it does not appear in /proc/self/tasks/
-+  // anymore.
-+  void StopThreadAndEnsureNotCounted(base::Thread* thread) const;
-+
-+  // A file descriptor to /proc. It's dangerous to have it around as it could
-+  // allow for sandbox bypasses. It needs to be closed before we consider
-+  // ourselves sandboxed.
-+  int proc_fd_;
-+
-+  bool seccomp_bpf_started_;
-+  // The value returned by GetStatus(). Gets computed once and then cached.
-+  int sandbox_status_flags_;
-+  // Did PreinitializeSandbox() run?
-+  bool pre_initialized_;
-+  bool seccomp_bpf_supported_;             // Accurate if pre_initialized_.
-+  bool seccomp_bpf_with_tsync_supported_;  // Accurate if pre_initialized_.
-+  bool yama_is_enforcing_;                 // Accurate if pre_initialized_.
-+  bool initialize_sandbox_ran_;            // InitializeSandbox() was called.
-+#if BUILDFLAG(USING_SANITIZER)
-+  std::unique_ptr<__sanitizer_sandbox_arguments> sanitizer_args_;
-+#endif
-+  sandbox::syscall_broker::BrokerProcess* broker_process_;  // Leaked as global.
-+};
-+
-+}  // namespace policy
-+}  // namespace sandbox
-+
-+#endif  // SANDBOX_POLICY_LINUX_SANDBOX_OPENBSD_H_
diff --git a/chromium-next/patches/patch-sandbox_policy_mojom_sandbox.mojom b/chromium-next/patches/patch-sandbox_policy_mojom_sandbox.mojom
deleted file mode 100644
index 46fca4b07f..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_mojom_sandbox.mojom
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/mojom/sandbox.mojom.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/policy/mojom/sandbox.mojom
-@@ -74,6 +74,15 @@ enum Sandbox {
-   // Minimally privileged sandbox on Fuchsia.
-   [EnableIf=is_fuchsia] kVideoCapture,
- 
-+  [EnableIf=is_openbsd]
-+  kVideoCapture,
-+
-+  [EnableIf=is_netbsd]
-+  kVideoCapture,
-+
-+  [EnableIf=is_freebsd]
-+  kVideoCapture,
-+
-   // Allows access to file contents and Windows APIs for parsing icons from PE
-   // files.
-   [EnableIf=is_win] kIconReader,
diff --git a/chromium-next/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.cc b/chromium-next/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.cc
deleted file mode 100644
index ebbe2262b3..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.cc
+++ /dev/null
@@ -1,220 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/netbsd/sandbox_netbsd.cc.orig	2025-05-08 12:01:57.800681701 +0000
-+++ sandbox/policy/netbsd/sandbox_netbsd.cc
-@@ -0,0 +1,211 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "sandbox/policy/netbsd/sandbox_netbsd.h"
-+
-+#include <dirent.h>
-+#include <fcntl.h>
-+#include <stdint.h>
-+#include <sys/resource.h>
-+#include <sys/stat.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#include <limits>
-+#include <memory>
-+#include <string>
-+#include <vector>
-+
-+#include "base/command_line.h"
-+#include "base/debug/stack_trace.h"
-+#include "base/feature_list.h"
-+#include "base/files/file_path.h"
-+#include "base/files/file_util.h"
-+#include "base/files/scoped_file.h"
-+#include "base/logging.h"
-+#include "base/memory/singleton.h"
-+#include "base/path_service.h"
-+#include "base/posix/eintr_wrapper.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/system/sys_info.h"
-+#include "base/threading/thread.h"
-+#include "base/time/time.h"
-+#include "build/build_config.h"
-+#include "crypto/crypto_buildflags.h"
-+#include "ppapi/buildflags/buildflags.h"
-+#include "sandbox/constants.h"
-+#include "sandbox/linux/services/credentials.h"
-+#include "sandbox/linux/services/namespace_sandbox.h"
-+#include "sandbox/linux/services/proc_util.h"
-+#include "sandbox/linux/services/resource_limits.h"
-+#include "sandbox/linux/services/thread_helpers.h"
-+#include "sandbox/linux/syscall_broker/broker_command.h"
-+#include "sandbox/linux/syscall_broker/broker_process.h"
-+#include "sandbox/policy/sandbox.h"
-+#include "sandbox/policy/sandbox_type.h"
-+#include "sandbox/policy/mojom/sandbox.mojom.h"
-+#include "sandbox/policy/switches.h"
-+#include "sandbox/sandbox_buildflags.h"
-+
-+#if BUILDFLAG(USING_SANITIZER)
-+#include <sanitizer/common_interface_defs.h>
-+#endif
-+
-+#if BUILDFLAG(USE_NSS_CERTS)
-+#include "crypto/nss_util.h"
-+#endif
-+
-+#include "third_party/boringssl/src/include/openssl/crypto.h"
-+
-+#include "ui/gfx/font_util.h"
-+
-+namespace sandbox {
-+namespace policy {
-+
-+SandboxLinux::SandboxLinux()
-+    : sandbox_status_flags_(kInvalid),
-+      pre_initialized_(false),
-+      initialize_sandbox_ran_(false),
-+      broker_process_(nullptr) {
-+}
-+
-+SandboxLinux::~SandboxLinux() {
-+  if (pre_initialized_) {
-+    CHECK(initialize_sandbox_ran_);
-+  }
-+}
-+
-+SandboxLinux* SandboxLinux::GetInstance() {
-+  SandboxLinux* instance = base::Singleton<SandboxLinux>::get();
-+  CHECK(instance);
-+  return instance;
-+}
-+
-+void SandboxLinux::StopThread(base::Thread* thread) {
-+  DCHECK(thread);
-+  thread->Stop();
-+}
-+
-+void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) {
-+  CHECK(!pre_initialized_);
-+#if BUILDFLAG(USING_SANITIZER)
-+  // Sanitizers need to open some resources before the sandbox is enabled.
-+  // This should not fork, not launch threads, not open a directory.
-+  __sanitizer_sandbox_on_notify(sanitizer_args());
-+  sanitizer_args_.reset();
-+#endif
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  const std::string process_type =
-+      command_line->GetSwitchValueASCII(switches::kProcessType);
-+
-+  base::SysInfo::AmountOfPhysicalMemory();
-+  base::SysInfo::NumberOfProcessors();
-+  base::SysInfo::CPUModelName();
-+
-+  switch (sandbox_type) {
-+    case sandbox::mojom::Sandbox::kNoSandbox:
-+    {
-+#if BUILDFLAG(USE_NSS_CERTS)
-+      // The main process has to initialize the ~/.pki dir which won't work
-+      // after unveil(2).
-+      crypto::EnsureNSSInit();
-+#endif
-+      CRYPTO_pre_sandbox_init();
-+
-+      base::FilePath cache_directory, local_directory;
-+
-+      base::PathService::Get(base::DIR_CACHE, &cache_directory);
-+      base::PathService::Get(base::DIR_HOME, &local_directory);
-+
-+      cache_directory = cache_directory.AppendASCII("chromium");
-+      local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
-+
-+      if (!base::CreateDirectory(cache_directory)) {
-+        LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory.";
-+      }
-+
-+      if (!base::CreateDirectory(local_directory)) {
-+        LOG(ERROR) << "Failed to create " << local_directory.value() << " directory.";
-+      }
-+
-+      break;
-+    }
-+    case sandbox::mojom::Sandbox::kRenderer:
-+      gfx::InitializeFonts();
-+      break;
-+    default:
-+      break;
-+  }
-+
-+  pre_initialized_ = true;
-+}
-+
-+bool SandboxLinux::InitializeSandbox(sandbox::mojom::Sandbox sandbox_type,
-+                                     SandboxLinux::PreSandboxHook hook,
-+                                     const Options& options) {
-+  DCHECK(!initialize_sandbox_ran_);
-+  initialize_sandbox_ran_ = true;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  const std::string process_type =
-+      command_line->GetSwitchValueASCII(switches::kProcessType);
-+
-+  if (command_line->HasSwitch(switches::kNoSandbox))
-+    return true;
-+
-+  VLOG(1) << "SandboxLinux::InitializeSandbox: process_type="
-+      << process_type << " sandbox_type=" << sandbox_type;
-+
-+  // Only one thread is running, pre-initialize if not already done.
-+  if (!pre_initialized_)
-+    PreinitializeSandbox(sandbox_type);
-+
-+  // Attempt to limit the future size of the address space of the process.
-+  int error = 0;
-+  const bool limited_as = LimitAddressSpace(&error);
-+  if (error) {
-+    // Restore errno. Internally to |LimitAddressSpace|, the errno due to
-+    // setrlimit may be lost.
-+    errno = error;
-+    PCHECK(limited_as);
-+  }
-+
-+  if (hook)
-+    CHECK(std::move(hook).Run(options));
-+
-+  return true;
-+}
-+
-+bool SandboxLinux::LimitAddressSpace(int* error) {
-+#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \
-+    !defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER)
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) {
-+    return false;
-+  }
-+
-+  // Unfortunately, it does not appear possible to set RLIMIT_AS such that it
-+  // will both (a) be high enough to support V8's and WebAssembly's address
-+  // space requirements while also (b) being low enough to mitigate exploits
-+  // using integer overflows that require large allocations, heap spray, or
-+  // other memory-hungry attack modes.
-+
-+  *error = sandbox::ResourceLimits::Lower(
-+      RLIMIT_DATA, static_cast<rlim_t>(sandbox::kDataSizeLimit));
-+
-+  // Cache the resource limit before turning on the sandbox.
-+  base::SysInfo::AmountOfVirtualMemory();
-+  base::SysInfo::MaxSharedMemorySize();
-+
-+  return *error == 0;
-+#else
-+  base::SysInfo::AmountOfVirtualMemory();
-+  return false;
-+#endif  // !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) &&
-+        // !defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER)
-+}
-+
-+}  // namespace policy
-+}  // namespace sandbox
diff --git a/chromium-next/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.h b/chromium-next/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.h
deleted file mode 100644
index 41c0fafe2c..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.h
+++ /dev/null
@@ -1,285 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/netbsd/sandbox_netbsd.h.orig	2025-05-08 12:01:57.800829546 +0000
-+++ sandbox/policy/netbsd/sandbox_netbsd.h
-@@ -0,0 +1,276 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+#ifndef SANDBOX_POLICY_LINUX_SANDBOX_OPENBSD_H_
-+#define SANDBOX_POLICY_LINUX_SANDBOX_OPENBSD_H_
-+
-+#include <memory>
-+#include <string>
-+#include <vector>
-+
-+#include "base/logging.h"
-+#include "base/posix/global_descriptors.h"
-+#include "sandbox/policy/export.h"
-+#include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h"
-+#include "sandbox/policy/mojom/sandbox.mojom.h"
-+#include "base/sanitizer_buildflags.h"
-+
-+#if BUILDFLAG(USING_SANITIZER)
-+#include <sanitizer/common_interface_defs.h>
-+#endif
-+
-+namespace base {
-+template <typename T>
-+struct DefaultSingletonTraits;
-+class Thread;
-+}  // namespace base
-+
-+namespace sandbox {
-+namespace syscall_broker {
-+class BrokerProcess;
-+}  // namespace syscall_broker
-+}  // namespace sandbox
-+
-+namespace sandbox {
-+namespace policy {
-+
-+// A singleton class to represent and change our sandboxing state for the
-+// three main Linux sandboxes.
-+// The sandboxing model allows using two layers of sandboxing. The first layer
-+// can be implemented either with unprivileged namespaces or with the setuid
-+// sandbox. This class provides a way to engage the namespace sandbox, but does
-+// not deal with the legacy setuid sandbox directly.
-+// The second layer is mainly based on seccomp-bpf and is engaged with
-+// InitializeSandbox(). InitializeSandbox() is also responsible for "sealing"
-+// the first layer of sandboxing. That is, InitializeSandbox must always be
-+// called to have any meaningful sandboxing at all.
-+class SANDBOX_POLICY_EXPORT SandboxLinux {
-+ public:
-+  // This is a list of sandbox IPC methods which the renderer may send to the
-+  // sandbox host. See
-+  // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md
-+  // This isn't the full list, values < 32 are reserved for methods called from
-+  // Skia, and values < 64 are reserved for libc_interceptor.cc.
-+  enum LinuxSandboxIPCMethods {
-+    DEPRECATED_METHOD_GET_FALLBACK_FONT_FOR_CHAR = 64,
-+    DEPRECATED_METHOD_GET_CHILD_WITH_INODE,
-+    DEPRECATED_METHOD_GET_STYLE_FOR_STRIKE,
-+    METHOD_MAKE_SHARED_MEMORY_SEGMENT,
-+    DEPRECATED_METHOD_MATCH_WITH_FALLBACK,
-+  };
-+
-+  // These form a bitmask which describes the conditions of the Linux sandbox.
-+  // Note: this doesn't strictly give you the current status, it states
-+  // what will be enabled when the relevant processes are initialized.
-+  enum Status {
-+    // SUID sandbox active.
-+    kSUID = 1 << 0,
-+
-+    // Sandbox is using a new PID namespace.
-+    kPIDNS = 1 << 1,
-+
-+    // Sandbox is using a new network namespace.
-+    kNetNS = 1 << 2,
-+
-+    // seccomp-bpf sandbox active.
-+    kSeccompBPF = 1 << 3,
-+
-+    // The Yama LSM module is present and enforcing.
-+    kYama = 1 << 4,
-+
-+    // seccomp-bpf sandbox is active and the kernel supports TSYNC.
-+    kSeccompTSYNC = 1 << 5,
-+
-+    // User namespace sandbox active.
-+    kUserNS = 1 << 6,
-+
-+    // A flag that denotes an invalid sandbox status.
-+    kInvalid = 1 << 31,
-+  };
-+
-+  // SandboxLinux Options are a superset of SandboxSecompBPF Options.
-+  struct Options : public SandboxSeccompBPF::Options {
-+    // When running with a zygote, the namespace sandbox will have already
-+    // been engaged prior to initializing SandboxLinux itself, and need not
-+    // be done so again. Set to true to indicate that there isn't a zygote
-+    // for this process and the step is to be performed here explicitly.
-+    bool engage_namespace_sandbox = false;
-+
-+    // Allow starting the sandbox with multiple threads already running. This
-+    // will enable TSYNC for seccomp-BPF, which syncs the seccomp-BPF policy
-+    // across all running threads.
-+    bool allow_threads_during_sandbox_init = false;
-+
-+    // Enables the CHECK for open directories. The open directory check is only
-+    // useful for the chroot jail (from the semantic layer of the sandbox), and
-+    // can safely be disabled if we are only enabling the seccomp-BPF layer.
-+    bool check_for_open_directories = true;
-+  };
-+
-+  // Callers can provide this hook to run code right before the policy
-+  // is passed to the BPF compiler and the sandbox is engaged. If
-+  // pre_sandbox_hook() returns true, the sandbox will be engaged
-+  // afterwards, otherwise the process is terminated.
-+  using PreSandboxHook = base::OnceCallback<bool(Options)>;
-+
-+  // Get our singleton instance.
-+  static SandboxLinux* GetInstance();
-+
-+  SandboxLinux(const SandboxLinux&) = delete;
-+  SandboxLinux& operator=(const SandboxLinux&) = delete;
-+
-+  bool SetPledge(const char *pstring, const char *ppath);
-+  bool SetUnveil(const std::string process_type, sandbox::mojom::Sandbox sandbox_type);
-+
-+  // Do some initialization that can only be done before any of the sandboxes
-+  // are enabled. If using the setuid sandbox, this should be called manually
-+  // before the setuid sandbox is engaged.
-+  // Security: When this runs, it is imperative that either InitializeSandbox()
-+  // runs as well or that all file descriptors returned in
-+  // GetFileDescriptorsToClose() get closed.
-+  // Otherwise file descriptors that bypass the security of the setuid sandbox
-+  // would be kept open. One must be particularly careful if a process performs
-+  // a fork().
-+  void PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type);
-+
-+  // Check that the current process is the init process of a new PID
-+  // namespace and then proceed to drop access to the file system by using
-+  // a new unprivileged namespace. This is a layer-1 sandbox.
-+  // In order for this sandbox to be effective, it must be "sealed" by calling
-+  // InitializeSandbox().
-+  void EngageNamespaceSandbox(bool from_zygote);
-+
-+  // Return a list of file descriptors to close if PreinitializeSandbox() ran
-+  // but InitializeSandbox() won't. Avoid using.
-+  // TODO(jln): get rid of this hack.
-+  std::vector<int> GetFileDescriptorsToClose();
-+
-+  // Seal an eventual layer-1 sandbox and initialize the layer-2 sandbox with
-+  // an adequate policy depending on the process type and command line
-+  // arguments.
-+  // Currently the layer-2 sandbox is composed of seccomp-bpf and address space
-+  // limitations.
-+  // This function should only be called without any thread running.
-+  bool InitializeSandbox(sandbox::mojom::Sandbox sandbox_type,
-+                         PreSandboxHook hook,
-+                         const Options& options);
-+
-+  // Stop |thread| in a way that can be trusted by the sandbox.
-+  void StopThread(base::Thread* thread);
-+
-+  // Returns the status of the renderer, worker and ppapi sandbox. Can only
-+  // be queried after going through PreinitializeSandbox(). This is a bitmask
-+  // and uses the constants defined in "enum Status" above. Since the
-+  // status needs to be provided before the sandboxes are actually started,
-+  // this returns what will actually happen once InitializeSandbox()
-+  // is called from inside these processes.
-+  int GetStatus();
-+
-+  // Returns true if the current process is single-threaded or if the number
-+  // of threads cannot be determined.
-+  bool IsSingleThreaded() const;
-+
-+  // Returns true if we started Seccomp BPF.
-+  bool seccomp_bpf_started() const;
-+
-+  // Check the policy and eventually start the seccomp-bpf sandbox. This should
-+  // never be called with threads started. If we detect that threads have
-+  // started we will crash.
-+  bool StartSeccompBPF(sandbox::mojom::Sandbox sandbox_type,
-+                       PreSandboxHook hook,
-+                       const Options& options);
-+
-+  // Limit the address space of the current process (and its children) to make
-+  // some vulnerabilities harder to exploit. Writes the errno due to setrlimit
-+  // (including 0 if no error) into |error|.
-+  bool LimitAddressSpace(int* error);
-+
-+  // Returns a file descriptor to proc. The file descriptor is no longer valid
-+  // after the sandbox has been sealed.
-+  int proc_fd() const {
-+    DCHECK_NE(-1, proc_fd_);
-+    return proc_fd_;
-+  }
-+
-+#if BUILDFLAG(USING_SANITIZER)
-+  __sanitizer_sandbox_arguments* sanitizer_args() const {
-+    return sanitizer_args_.get();
-+  };
-+#endif
-+
-+  // A BrokerProcess is a helper that is started before the sandbox is engaged,
-+  // typically from a pre-sandbox hook, that will serve requests to access
-+  // files over an IPC channel. The client  of this runs from a SIGSYS handler
-+  // triggered by the seccomp-bpf sandbox.
-+  // |client_sandbox_policy| is the policy being run by the client, and is
-+  // used to derive the equivalent broker-side policy.
-+  // |broker_side_hook| is an alternate pre-sandbox hook to be run before the
-+  // broker itself gets sandboxed, to which the broker side policy and
-+  // |options| are passed.
-+  // Crashes the process if the broker can not be started since continuation
-+  // is impossible (and presumably unsafe).
-+  // This should never be destroyed, as after the sandbox is started it is
-+  // vital to the process.
-+#if 0
-+  void StartBrokerProcess(
-+      const sandbox::syscall_broker::BrokerCommandSet& allowed_command_set,
-+      std::vector<sandbox::syscall_broker::BrokerFilePermission> permissions,
-+      PreSandboxHook broker_side_hook,
-+      const Options& options);
-+
-+  sandbox::syscall_broker::BrokerProcess* broker_process() const {
-+    return broker_process_;
-+  }
-+#endif
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<SandboxLinux>;
-+
-+  SandboxLinux();
-+  ~SandboxLinux();
-+
-+  // We must have been pre_initialized_ before using these.
-+  bool seccomp_bpf_supported() const;
-+  bool seccomp_bpf_with_tsync_supported() const;
-+
-+  // Returns true if it can be determined that the current process has open
-+  // directories that are not managed by the SandboxLinux class. This would
-+  // be a vulnerability as it would allow to bypass the setuid sandbox.
-+  bool HasOpenDirectories() const;
-+
-+  // The last part of the initialization is to make sure any temporary "hole"
-+  // in the sandbox is closed. For now, this consists of closing proc_fd_.
-+  void SealSandbox();
-+
-+  // GetStatus() makes promises as to how the sandbox will behave. This
-+  // checks that no promises have been broken.
-+  void CheckForBrokenPromises(sandbox::mojom::Sandbox sandbox_type);
-+
-+  // Stop |thread| and make sure it does not appear in /proc/self/tasks/
-+  // anymore.
-+  void StopThreadAndEnsureNotCounted(base::Thread* thread) const;
-+
-+  // A file descriptor to /proc. It's dangerous to have it around as it could
-+  // allow for sandbox bypasses. It needs to be closed before we consider
-+  // ourselves sandboxed.
-+  int proc_fd_;
-+
-+  bool seccomp_bpf_started_;
-+  // The value returned by GetStatus(). Gets computed once and then cached.
-+  int sandbox_status_flags_;
-+  // Did PreinitializeSandbox() run?
-+  bool pre_initialized_;
-+  bool seccomp_bpf_supported_;             // Accurate if pre_initialized_.
-+  bool seccomp_bpf_with_tsync_supported_;  // Accurate if pre_initialized_.
-+  bool yama_is_enforcing_;                 // Accurate if pre_initialized_.
-+  bool initialize_sandbox_ran_;            // InitializeSandbox() was called.
-+#if BUILDFLAG(USING_SANITIZER)
-+  std::unique_ptr<__sanitizer_sandbox_arguments> sanitizer_args_;
-+#endif
-+  sandbox::syscall_broker::BrokerProcess* broker_process_;  // Leaked as global.
-+};
-+
-+}  // namespace policy
-+}  // namespace sandbox
-+
-+#endif  // SANDBOX_POLICY_LINUX_SANDBOX_OPENBSD_H_
diff --git a/chromium-next/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/chromium-next/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
deleted file mode 100644
index 44f26baec4..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
+++ /dev/null
@@ -1,401 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig	2025-05-08 12:01:57.801035963 +0000
-+++ sandbox/policy/openbsd/sandbox_openbsd.cc
-@@ -0,0 +1,392 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
-+
-+#include <dirent.h>
-+#include <fcntl.h>
-+#include <stdint.h>
-+#include <sys/resource.h>
-+#include <sys/stat.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <util.h>
-+
-+#include <limits>
-+#include <memory>
-+#include <string>
-+#include <vector>
-+
-+#include "base/command_line.h"
-+#include "base/debug/stack_trace.h"
-+#include "base/feature_list.h"
-+#include "base/files/file_path.h"
-+#include "base/files/file_util.h"
-+#include "base/files/scoped_file.h"
-+#include "base/logging.h"
-+#include "base/memory/singleton.h"
-+#include "base/path_service.h"
-+#include "base/posix/eintr_wrapper.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/system/sys_info.h"
-+#include "base/threading/thread.h"
-+#include "base/time/time.h"
-+#include "build/build_config.h"
-+#include "crypto/crypto_buildflags.h"
-+#include "ppapi/buildflags/buildflags.h"
-+#include "sandbox/constants.h"
-+#include "sandbox/linux/services/credentials.h"
-+#include "sandbox/linux/services/namespace_sandbox.h"
-+#include "sandbox/linux/services/proc_util.h"
-+#include "sandbox/linux/services/resource_limits.h"
-+#include "sandbox/linux/services/thread_helpers.h"
-+#include "sandbox/linux/syscall_broker/broker_command.h"
-+#include "sandbox/linux/syscall_broker/broker_process.h"
-+#include "sandbox/policy/sandbox.h"
-+#include "sandbox/policy/sandbox_type.h"
-+#include "sandbox/policy/mojom/sandbox.mojom.h"
-+#include "sandbox/policy/switches.h"
-+#include "sandbox/sandbox_buildflags.h" 
-+
-+#if BUILDFLAG(USING_SANITIZER)
-+#include <sanitizer/common_interface_defs.h>
-+#endif
-+
-+#if BUILDFLAG(USE_NSS_CERTS)
-+#include "crypto/nss_util.h"
-+#endif
-+
-+#include "third_party/boringssl/src/include/openssl/crypto.h"
-+
-+#include <fontconfig/fontconfig.h>
-+#include "ui/gfx/linux/fontconfig_util.h"
-+
-+#define MAXTOKENS	3
-+
-+#define _UNVEIL_MAIN		"@PKG_SYSCONFBASE@/chromium/unveil.main";
-+#define _UNVEIL_GPU		"@PKG_SYSCONFBASE@/chromium/unveil.gpu";
-+#define _UNVEIL_UTILITY_NETWORK	"@PKG_SYSCONFBASE@/chromium/unveil.utility_network";
-+#define _UNVEIL_UTILITY_AUDIO	"@PKG_SYSCONFBASE@/chromium/unveil.utility_audio";
-+#define _UNVEIL_UTILITY_VIDEO	"@PKG_SYSCONFBASE@/chromium/unveil.utility_video";
-+
-+namespace sandbox {
-+namespace policy {
-+
-+SandboxLinux::SandboxLinux()
-+    : unveil_initialized_(false),
-+      sandbox_status_flags_(kInvalid),
-+      pre_initialized_(false),
-+      initialize_sandbox_ran_(false),
-+      broker_process_(nullptr) {
-+}
-+
-+SandboxLinux::~SandboxLinux() {
-+  if (pre_initialized_) {
-+    CHECK(initialize_sandbox_ran_);
-+  }
-+}
-+
-+SandboxLinux* SandboxLinux::GetInstance() {
-+  SandboxLinux* instance = base::Singleton<SandboxLinux>::get();
-+  CHECK(instance);
-+  return instance;
-+}
-+
-+void SandboxLinux::StopThread(base::Thread* thread) {
-+  DCHECK(thread);
-+  thread->Stop();
-+}
-+
-+void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) {
-+  CHECK(!pre_initialized_);
-+#if BUILDFLAG(USING_SANITIZER)
-+  // Sanitizers need to open some resources before the sandbox is enabled.
-+  // This should not fork, not launch threads, not open a directory.
-+  __sanitizer_sandbox_on_notify(sanitizer_args());
-+  sanitizer_args_.reset();
-+#endif
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  const std::string process_type =
-+      command_line->GetSwitchValueASCII(switches::kProcessType);
-+
-+  base::SysInfo::AmountOfPhysicalMemory();
-+  base::SysInfo::NumberOfProcessors();
-+  base::SysInfo::CPUModelName();
-+
-+  switch (sandbox_type) {
-+    case sandbox::mojom::Sandbox::kNoSandbox:
-+    {
-+#if BUILDFLAG(USE_NSS_CERTS)
-+      // The main process has to initialize the ~/.pki dir which won't work
-+      // after unveil(2).
-+      crypto::EnsureNSSInit();
-+#endif
-+      CRYPTO_pre_sandbox_init();
-+
-+      base::FilePath cache_directory, local_directory;
-+
-+      base::PathService::Get(base::DIR_CACHE, &cache_directory);
-+      base::PathService::Get(base::DIR_HOME, &local_directory);   
-+
-+      cache_directory = cache_directory.AppendASCII("chromium");
-+      local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
-+
-+      if (!base::CreateDirectory(cache_directory)) {
-+        LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory.";
-+      }
-+
-+      if (!base::CreateDirectory(local_directory)) {
-+        LOG(ERROR) << "Failed to create " << local_directory.value() << " directory.";
-+      }
-+
-+      break;
-+    }
-+    case sandbox::mojom::Sandbox::kRenderer:
-+    {
-+      FcConfig* config = gfx::GetGlobalFontConfig();
-+      DCHECK(config);
-+      break;
-+    }
-+    default:
-+      break;
-+  }
-+
-+  pre_initialized_ = true;
-+}
-+
-+bool SandboxLinux::SetPledge(const char *pstring, const char *ppath) {
-+  FILE *fp;
-+  char *s = NULL;
-+  size_t len = 0;
-+  ssize_t read;
-+
-+  if (pstring != NULL) {
-+    if (pledge(pstring, NULL) == -1)
-+      goto err;
-+    VLOG(5) << "pledge " << pstring;
-+  } else if (ppath != NULL) {
-+    fp = fopen(ppath, "r");
-+    if (fp != NULL) {
-+      while ((read = getline(&s, &len, fp)) != -1 ) {
-+        if (s[strlen(s)-1] == '\n')
-+          s[strlen(s)-1] = '\0';
-+        if (pledge(s, NULL) == -1)
-+  	  goto err;
-+        VLOG(5) << "pledge " << s;
-+      }
-+      fclose(fp);
-+    } else {
-+      LOG(ERROR) << "fopen(" << ppath << ") failed, errno: " << errno;
-+      return false;
-+    }
-+  }
-+  return true;
-+err:
-+  LOG(ERROR) << "pledge() failed, errno: " << errno;
-+  return false;
-+}
-+
-+bool SandboxLinux::SetUnveil(const std::string process_type, sandbox::mojom::Sandbox sandbox_type) {
-+  FILE *fp;
-+  char *s = NULL, *cp = NULL, *home = NULL, **ap, *tokens[MAXTOKENS];
-+  char path[PATH_MAX];
-+  const char *ufile;
-+  size_t len = 0, lineno = 0;
-+
-+  switch (sandbox_type) {
-+    case sandbox::mojom::Sandbox::kNoSandbox:
-+      ufile = _UNVEIL_MAIN;
-+      break;
-+    case sandbox::mojom::Sandbox::kGpu:
-+    case sandbox::mojom::Sandbox::kOnDeviceModelExecution:
-+      ufile = _UNVEIL_GPU;
-+      break;
-+    case sandbox::mojom::Sandbox::kNetwork:
-+      ufile = _UNVEIL_UTILITY_NETWORK;
-+      break;
-+    case sandbox::mojom::Sandbox::kAudio:
-+      ufile = _UNVEIL_UTILITY_AUDIO;
-+      break;
-+    case sandbox::mojom::Sandbox::kVideoCapture:
-+      ufile = _UNVEIL_UTILITY_VIDEO;
-+      break;
-+    default:
-+      unveil("/dev/null", "r");
-+      goto done;
-+  }
-+
-+  fp = fopen(ufile, "r");
-+  if (fp != NULL) {
-+    while (!feof(fp)) {
-+      if ((s = fparseln(fp, &len, &lineno, NULL,
-+          FPARSELN_UNESCCOMM | FPARSELN_UNESCCONT)) == NULL) {
-+        if (ferror(fp)) {
-+          LOG(ERROR) << "ferror(), errno: " << errno;
-+	  _exit(1);
-+	} else {
-+          continue;
-+	}
-+      }
-+      cp = s;
-+      cp += strspn(cp, " \t\n"); /* eat whitespace */
-+      if (cp[0] == '\0')
-+        continue;
-+
-+      for (ap = tokens; ap < &tokens[MAXTOKENS - 1] &&
-+          (*ap = strsep(&cp, " \t")) != NULL;) {
-+        if (**ap != '\0')
-+          ap++;
-+      }
-+      *ap = NULL;
-+
-+      if (tokens[1] == NULL) {
-+        LOG(ERROR) << ufile << ": line " << lineno << ": must supply value to " << s;
-+        _exit(1);
-+      }
-+
-+      if (tokens[0][0] == '~') {
-+        if ((home = getenv("HOME")) == NULL || *home == '\0') {
-+          LOG(ERROR) << "failed to get home";
-+	  _exit(1);
-+	}
-+        memmove(tokens[0], tokens[0] + 1, strlen(tokens[0]));
-+        strncpy(path, home, sizeof(path) - 1);
-+        path[sizeof(path) - 1] = '\0';
-+        strncat(path, tokens[0], sizeof(path) - 1 - strlen(path));
-+      } else {
-+        strncpy(path, tokens[0], sizeof(path) - 1);
-+        path[sizeof(path) - 1] = '\0';
-+      }
-+
-+      if (unveil(path, tokens[1]) == -1) {
-+        LOG(ERROR) << "failed unveiling " << path << " with permissions " << tokens[1];
-+        _exit(1);
-+      } else {
-+        VLOG(5) << "unveiling " << path << " with permissions " << tokens[1];
-+      }
-+    }
-+    fclose(fp);
-+  } else {
-+        LOG(ERROR) << "failed to open " << ufile << " errno: " << errno;
-+        _exit(1);
-+  }
-+
-+done:
-+  unveil_initialized_ = true;
-+
-+  return true;
-+}
-+
-+bool SandboxLinux::unveil_initialized() const {
-+  return unveil_initialized_;
-+}
-+
-+bool SandboxLinux::InitializeSandbox(sandbox::mojom::Sandbox sandbox_type,
-+                                     SandboxLinux::PreSandboxHook hook,
-+                                     const Options& options) {
-+  DCHECK(!initialize_sandbox_ran_);
-+  initialize_sandbox_ran_ = true;
-+
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  const std::string process_type =
-+      command_line->GetSwitchValueASCII(switches::kProcessType);
-+
-+  if (command_line->HasSwitch(switches::kNoSandbox))
-+    return true;
-+
-+  VLOG(1) << "SandboxLinux::InitializeSandbox: process_type="
-+      << process_type << " sandbox_type=" << sandbox_type;
-+
-+  // Only one thread is running, pre-initialize if not already done.
-+  if (!pre_initialized_)
-+    PreinitializeSandbox(sandbox_type);
-+
-+  // Attempt to limit the future size of the address space of the process.
-+  int error = 0;
-+  const bool limited_as = LimitAddressSpace(&error);
-+  if (error) {
-+    // Restore errno. Internally to |LimitAddressSpace|, the errno due to
-+    // setrlimit may be lost.
-+    errno = error;
-+    PCHECK(limited_as);
-+  }
-+
-+  if (hook)
-+    CHECK(std::move(hook).Run(options));
-+
-+  if (!command_line->HasSwitch(switches::kDisableUnveil))
-+    SetUnveil(process_type, sandbox_type);
-+
-+  switch(sandbox_type) {
-+    case sandbox::mojom::Sandbox::kNoSandbox:
-+      SetPledge(NULL, "@PKG_SYSCONFBASE@/chromium/pledge.main");
-+      break;
-+    case sandbox::mojom::Sandbox::kRenderer:
-+      // prot_exec needed by v8
-+      // flock needed by sqlite3 locking
-+      SetPledge("stdio rpath flock prot_exec recvfd sendfd ps", NULL);
-+      break;
-+    case sandbox::mojom::Sandbox::kGpu:
-+    case sandbox::mojom::Sandbox::kOnDeviceModelExecution:
-+      SetPledge("stdio drm inet rpath flock cpath wpath prot_exec recvfd sendfd tmppath unix", NULL);
-+      break;
-+#if BUILDFLAG(ENABLE_PPAPI)
-+    case sandbox::mojom::Sandbox::kPpapi:
-+      // prot_exec needed by v8
-+      SetPledge("stdio rpath prot_exec recvfd sendfd", NULL);
-+      break;
-+#endif
-+    case sandbox::mojom::Sandbox::kAudio:
-+      SetPledge(NULL, "@PKG_SYSCONFBASE@/chromium/pledge.utility_audio");
-+      break;
-+    case sandbox::mojom::Sandbox::kNetwork:
-+      SetPledge(NULL, "@PKG_SYSCONFBASE@/chromium/pledge.utility_network");
-+      break;
-+    case sandbox::mojom::Sandbox::kVideoCapture:
-+      SetPledge(NULL, "@PKG_SYSCONFBASE@/chromium/pledge.utility_video");
-+      break;
-+    case sandbox::mojom::Sandbox::kUtility:
-+    case sandbox::mojom::Sandbox::kService:
-+      SetPledge("stdio rpath cpath wpath fattr flock sendfd recvfd prot_exec", NULL);
-+      break;
-+    default:
-+      LOG(ERROR) << "non-pledge()'d process: " << sandbox_type;
-+      break;
-+  }
-+
-+  return true;
-+}
-+
-+bool SandboxLinux::LimitAddressSpace(int* error) {
-+#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \
-+    !defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER)
-+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-+  if (SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) {
-+    return false;
-+  }
-+
-+  // Unfortunately, it does not appear possible to set RLIMIT_AS such that it
-+  // will both (a) be high enough to support V8's and WebAssembly's address
-+  // space requirements while also (b) being low enough to mitigate exploits
-+  // using integer overflows that require large allocations, heap spray, or
-+  // other memory-hungry attack modes.
-+
-+  *error = sandbox::ResourceLimits::Lower(
-+      RLIMIT_DATA, static_cast<rlim_t>(sandbox::kDataSizeLimit));
-+
-+  // Cache the resource limit before turning on the sandbox.
-+  base::SysInfo::AmountOfVirtualMemory();
-+  base::SysInfo::MaxSharedMemorySize();
-+
-+  return *error == 0;
-+#else
-+  base::SysInfo::AmountOfVirtualMemory();
-+  return false;
-+#endif  // !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) &&
-+        // !defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER)
-+}
-+
-+}  // namespace policy
-+}  // namespace sandbox
diff --git a/chromium-next/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.h b/chromium-next/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.h
deleted file mode 100644
index 08a507baef..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.h
+++ /dev/null
@@ -1,289 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/openbsd/sandbox_openbsd.h.orig	2025-05-08 12:01:57.801196132 +0000
-+++ sandbox/policy/openbsd/sandbox_openbsd.h
-@@ -0,0 +1,280 @@
-+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+#ifndef SANDBOX_POLICY_LINUX_SANDBOX_OPENBSD_H_
-+#define SANDBOX_POLICY_LINUX_SANDBOX_OPENBSD_H_
-+
-+#include <memory>
-+#include <string>
-+#include <vector>
-+
-+#include "base/logging.h"
-+#include "base/posix/global_descriptors.h"
-+#include "sandbox/policy/export.h"
-+#include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h"
-+#include "sandbox/policy/mojom/sandbox.mojom.h"
-+#include "base/sanitizer_buildflags.h"
-+
-+#if BUILDFLAG(USING_SANITIZER)
-+#include <sanitizer/common_interface_defs.h>
-+#endif
-+
-+namespace base {
-+template <typename T>
-+struct DefaultSingletonTraits;
-+class Thread;
-+}  // namespace base
-+
-+namespace sandbox {
-+namespace syscall_broker {
-+class BrokerProcess;
-+}  // namespace syscall_broker
-+}  // namespace sandbox
-+
-+namespace sandbox {
-+namespace policy {
-+
-+// A singleton class to represent and change our sandboxing state for the
-+// three main Linux sandboxes.
-+// The sandboxing model allows using two layers of sandboxing. The first layer
-+// can be implemented either with unprivileged namespaces or with the setuid
-+// sandbox. This class provides a way to engage the namespace sandbox, but does
-+// not deal with the legacy setuid sandbox directly.
-+// The second layer is mainly based on seccomp-bpf and is engaged with
-+// InitializeSandbox(). InitializeSandbox() is also responsible for "sealing"
-+// the first layer of sandboxing. That is, InitializeSandbox must always be
-+// called to have any meaningful sandboxing at all.
-+class SANDBOX_POLICY_EXPORT SandboxLinux {
-+ public:
-+  // This is a list of sandbox IPC methods which the renderer may send to the
-+  // sandbox host. See
-+  // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_sandbox_ipc.md
-+  // This isn't the full list, values < 32 are reserved for methods called from
-+  // Skia, and values < 64 are reserved for libc_interceptor.cc.
-+  enum LinuxSandboxIPCMethods {
-+    DEPRECATED_METHOD_GET_FALLBACK_FONT_FOR_CHAR = 64,
-+    DEPRECATED_METHOD_GET_CHILD_WITH_INODE,
-+    DEPRECATED_METHOD_GET_STYLE_FOR_STRIKE,
-+    METHOD_MAKE_SHARED_MEMORY_SEGMENT,
-+    DEPRECATED_METHOD_MATCH_WITH_FALLBACK,
-+  };
-+
-+  // These form a bitmask which describes the conditions of the Linux sandbox.
-+  // Note: this doesn't strictly give you the current status, it states
-+  // what will be enabled when the relevant processes are initialized.
-+  enum Status {
-+    // SUID sandbox active.
-+    kSUID = 1 << 0,
-+
-+    // Sandbox is using a new PID namespace.
-+    kPIDNS = 1 << 1,
-+
-+    // Sandbox is using a new network namespace.
-+    kNetNS = 1 << 2,
-+
-+    // seccomp-bpf sandbox active.
-+    kSeccompBPF = 1 << 3,
-+
-+    // The Yama LSM module is present and enforcing.
-+    kYama = 1 << 4,
-+
-+    // seccomp-bpf sandbox is active and the kernel supports TSYNC.
-+    kSeccompTSYNC = 1 << 5,
-+
-+    // User namespace sandbox active.
-+    kUserNS = 1 << 6,
-+
-+    // A flag that denotes an invalid sandbox status.
-+    kInvalid = 1 << 31,
-+  };
-+
-+  // SandboxLinux Options are a superset of SandboxSecompBPF Options.
-+  struct Options : public SandboxSeccompBPF::Options {
-+    // When running with a zygote, the namespace sandbox will have already
-+    // been engaged prior to initializing SandboxLinux itself, and need not
-+    // be done so again. Set to true to indicate that there isn't a zygote
-+    // for this process and the step is to be performed here explicitly.
-+    bool engage_namespace_sandbox = false;
-+
-+    // Allow starting the sandbox with multiple threads already running. This
-+    // will enable TSYNC for seccomp-BPF, which syncs the seccomp-BPF policy
-+    // across all running threads.
-+    bool allow_threads_during_sandbox_init = false;
-+
-+    // Enables the CHECK for open directories. The open directory check is only
-+    // useful for the chroot jail (from the semantic layer of the sandbox), and
-+    // can safely be disabled if we are only enabling the seccomp-BPF layer.
-+    bool check_for_open_directories = true;
-+  };
-+
-+  // Callers can provide this hook to run code right before the policy
-+  // is passed to the BPF compiler and the sandbox is engaged. If
-+  // pre_sandbox_hook() returns true, the sandbox will be engaged
-+  // afterwards, otherwise the process is terminated.
-+  using PreSandboxHook = base::OnceCallback<bool(Options)>;
-+
-+  // Get our singleton instance.
-+  static SandboxLinux* GetInstance();
-+
-+  SandboxLinux(const SandboxLinux&) = delete;
-+  SandboxLinux& operator=(const SandboxLinux&) = delete;
-+
-+  bool SetPledge(const char *pstring, const char *ppath);
-+  bool SetUnveil(const std::string process_type, sandbox::mojom::Sandbox sandbox_type);
-+
-+  // Do some initialization that can only be done before any of the sandboxes
-+  // are enabled. If using the setuid sandbox, this should be called manually
-+  // before the setuid sandbox is engaged.
-+  // Security: When this runs, it is imperative that either InitializeSandbox()
-+  // runs as well or that all file descriptors returned in
-+  // GetFileDescriptorsToClose() get closed.
-+  // Otherwise file descriptors that bypass the security of the setuid sandbox
-+  // would be kept open. One must be particularly careful if a process performs
-+  // a fork().
-+  void PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type);
-+
-+  // Check that the current process is the init process of a new PID
-+  // namespace and then proceed to drop access to the file system by using
-+  // a new unprivileged namespace. This is a layer-1 sandbox.
-+  // In order for this sandbox to be effective, it must be "sealed" by calling
-+  // InitializeSandbox().
-+  void EngageNamespaceSandbox(bool from_zygote);
-+
-+  // Return a list of file descriptors to close if PreinitializeSandbox() ran
-+  // but InitializeSandbox() won't. Avoid using.
-+  // TODO(jln): get rid of this hack.
-+  std::vector<int> GetFileDescriptorsToClose();
-+
-+  // Seal an eventual layer-1 sandbox and initialize the layer-2 sandbox with
-+  // an adequate policy depending on the process type and command line
-+  // arguments.
-+  // Currently the layer-2 sandbox is composed of seccomp-bpf and address space
-+  // limitations.
-+  // This function should only be called without any thread running.
-+  bool InitializeSandbox(sandbox::mojom::Sandbox sandbox_type,
-+                         PreSandboxHook hook,
-+                         const Options& options);
-+
-+  // Stop |thread| in a way that can be trusted by the sandbox.
-+  void StopThread(base::Thread* thread);
-+
-+  // Returns the status of the renderer, worker and ppapi sandbox. Can only
-+  // be queried after going through PreinitializeSandbox(). This is a bitmask
-+  // and uses the constants defined in "enum Status" above. Since the
-+  // status needs to be provided before the sandboxes are actually started,
-+  // this returns what will actually happen once InitializeSandbox()
-+  // is called from inside these processes.
-+  int GetStatus();
-+
-+  // Returns true if the current process is single-threaded or if the number
-+  // of threads cannot be determined.
-+  bool IsSingleThreaded() const;
-+
-+  // Returns true if we started Seccomp BPF.
-+  bool seccomp_bpf_started() const;
-+
-+  // Returns true if unveil(2) is used.
-+  bool unveil_initialized() const;
-+
-+  // Check the policy and eventually start the seccomp-bpf sandbox. This should
-+  // never be called with threads started. If we detect that threads have
-+  // started we will crash.
-+  bool StartSeccompBPF(sandbox::mojom::Sandbox sandbox_type,
-+                       PreSandboxHook hook,
-+                       const Options& options);
-+
-+  // Limit the address space of the current process (and its children) to make
-+  // some vulnerabilities harder to exploit. Writes the errno due to setrlimit
-+  // (including 0 if no error) into |error|.
-+  bool LimitAddressSpace(int* error);
-+
-+  // Returns a file descriptor to proc. The file descriptor is no longer valid
-+  // after the sandbox has been sealed.
-+  int proc_fd() const {
-+    DCHECK_NE(-1, proc_fd_);
-+    return proc_fd_;
-+  }
-+
-+#if BUILDFLAG(USING_SANITIZER)
-+  __sanitizer_sandbox_arguments* sanitizer_args() const {
-+    return sanitizer_args_.get();
-+  };
-+#endif
-+
-+  // A BrokerProcess is a helper that is started before the sandbox is engaged,
-+  // typically from a pre-sandbox hook, that will serve requests to access
-+  // files over an IPC channel. The client  of this runs from a SIGSYS handler
-+  // triggered by the seccomp-bpf sandbox.
-+  // |client_sandbox_policy| is the policy being run by the client, and is
-+  // used to derive the equivalent broker-side policy.
-+  // |broker_side_hook| is an alternate pre-sandbox hook to be run before the
-+  // broker itself gets sandboxed, to which the broker side policy and
-+  // |options| are passed.
-+  // Crashes the process if the broker can not be started since continuation
-+  // is impossible (and presumably unsafe).
-+  // This should never be destroyed, as after the sandbox is started it is
-+  // vital to the process.
-+#if 0
-+  void StartBrokerProcess(
-+      const sandbox::syscall_broker::BrokerCommandSet& allowed_command_set,
-+      std::vector<sandbox::syscall_broker::BrokerFilePermission> permissions,
-+      PreSandboxHook broker_side_hook,
-+      const Options& options);
-+
-+  sandbox::syscall_broker::BrokerProcess* broker_process() const {
-+    return broker_process_;
-+  }
-+#endif
-+
-+ private:
-+  friend struct base::DefaultSingletonTraits<SandboxLinux>;
-+
-+  SandboxLinux();
-+  ~SandboxLinux();
-+
-+  // We must have been pre_initialized_ before using these.
-+  bool seccomp_bpf_supported() const;
-+  bool seccomp_bpf_with_tsync_supported() const;
-+
-+  // Returns true if it can be determined that the current process has open
-+  // directories that are not managed by the SandboxLinux class. This would
-+  // be a vulnerability as it would allow to bypass the setuid sandbox.
-+  bool HasOpenDirectories() const;
-+
-+  // The last part of the initialization is to make sure any temporary "hole"
-+  // in the sandbox is closed. For now, this consists of closing proc_fd_.
-+  void SealSandbox();
-+
-+  // GetStatus() makes promises as to how the sandbox will behave. This
-+  // checks that no promises have been broken.
-+  void CheckForBrokenPromises(sandbox::mojom::Sandbox sandbox_type);
-+
-+  // Stop |thread| and make sure it does not appear in /proc/self/tasks/
-+  // anymore.
-+  void StopThreadAndEnsureNotCounted(base::Thread* thread) const;
-+
-+  // A file descriptor to /proc. It's dangerous to have it around as it could
-+  // allow for sandbox bypasses. It needs to be closed before we consider
-+  // ourselves sandboxed.
-+  int proc_fd_;
-+
-+  bool seccomp_bpf_started_;
-+  bool unveil_initialized_;
-+  // The value returned by GetStatus(). Gets computed once and then cached.
-+  int sandbox_status_flags_;
-+  // Did PreinitializeSandbox() run?
-+  bool pre_initialized_;
-+  bool seccomp_bpf_supported_;             // Accurate if pre_initialized_.
-+  bool seccomp_bpf_with_tsync_supported_;  // Accurate if pre_initialized_.
-+  bool yama_is_enforcing_;                 // Accurate if pre_initialized_.
-+  bool initialize_sandbox_ran_;            // InitializeSandbox() was called.
-+#if BUILDFLAG(USING_SANITIZER)
-+  std::unique_ptr<__sanitizer_sandbox_arguments> sanitizer_args_;
-+#endif
-+  sandbox::syscall_broker::BrokerProcess* broker_process_;  // Leaked as global.
-+};
-+
-+}  // namespace policy
-+}  // namespace sandbox
-+
-+#endif  // SANDBOX_POLICY_LINUX_SANDBOX_OPENBSD_H_
diff --git a/chromium-next/patches/patch-sandbox_policy_sandbox.cc b/chromium-next/patches/patch-sandbox_policy_sandbox.cc
deleted file mode 100644
index d53c98734e..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_sandbox.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/sandbox.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/policy/sandbox.cc
-@@ -18,6 +18,10 @@
- #include "sandbox/policy/linux/sandbox_linux.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#endif  // BUILDFLAG(IS_BSD)
-+
- #if BUILDFLAG(IS_MAC)
- #include "sandbox/mac/seatbelt.h"
- #endif  // BUILDFLAG(IS_MAC)
-@@ -32,7 +36,7 @@
- namespace sandbox {
- namespace policy {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- bool Sandbox::Initialize(sandbox::mojom::Sandbox sandbox_type,
-                          SandboxLinux::PreSandboxHook hook,
-                          const SandboxLinux::Options& options) {
diff --git a/chromium-next/patches/patch-sandbox_policy_sandbox.h b/chromium-next/patches/patch-sandbox_policy_sandbox.h
deleted file mode 100644
index 5fc044d0f7..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_sandbox.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/sandbox.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/policy/sandbox.h
-@@ -12,6 +12,14 @@
- #include "sandbox/policy/linux/sandbox_linux.h"
- #endif
- 
-+#if BUILDFLAG(IS_OPENBSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
-+#elif BUILDFLAG(IS_NETBSD)
-+#include "sandbox/policy/netbsd/sandbox_netbsd.h"
-+#elif BUILDFLAG(IS_FREEBSD)
-+#include "sandbox/policy/freebsd/sandbox_freebsd.h"
-+#endif
-+
- namespace sandbox {
- namespace mojom {
- enum class Sandbox;
-@@ -32,7 +40,7 @@ namespace policy {
- 
- class SANDBOX_POLICY_EXPORT Sandbox {
-  public:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static bool Initialize(sandbox::mojom::Sandbox sandbox_type,
-                          SandboxLinux::PreSandboxHook hook,
-                          const SandboxLinux::Options& options);
diff --git a/chromium-next/patches/patch-sandbox_policy_sandbox__type.cc b/chromium-next/patches/patch-sandbox_policy_sandbox__type.cc
deleted file mode 100644
index ba78d87b1c..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_sandbox__type.cc
+++ /dev/null
@@ -1,181 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/sandbox_type.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/policy/sandbox_type.cc
-@@ -38,7 +38,7 @@ constexpr char kPpapiSandbox[] = "ppapi"
- #endif
- 
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- constexpr char kPrintBackendSandbox[] = "print_backend";
- constexpr char kScreenAISandbox[] = "screen_ai";
- #endif
-@@ -56,15 +56,15 @@ constexpr char kWindowsSystemProxyResolv
- constexpr char kMirroringSandbox[] = "mirroring";
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr char kVideoEffectsSandbox[] = "video_effects";
- #endif
- 
--#if BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- constexpr char kVideoCaptureSandbox[] = "video_capture";
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- constexpr char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding";
- constexpr char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding";
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -78,7 +78,7 @@ constexpr char kLibassistantSandbox[] = 
- #endif  // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- constexpr char kOnDeviceTranslationSandbox[] = "on_device_translation";
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
- 
-@@ -140,7 +140,7 @@ void SetCommandLineFlagsForSandboxType(b
-     case Sandbox::kCdm:
-     case Sandbox::kPrintCompositor:
-     case Sandbox::kAudio:
--#if BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     case Sandbox::kVideoCapture:
- #endif
- #if BUILDFLAG(IS_WIN)
-@@ -151,7 +151,7 @@ void SetCommandLineFlagsForSandboxType(b
-     case Sandbox::kMediaFoundationCdm:
-     case Sandbox::kWindowsSystemProxyResolver:
- #endif  // BUILDFLAG(IS_WIN)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     case Sandbox::kHardwareVideoDecoding:
-     case Sandbox::kHardwareVideoEncoding:
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -167,15 +167,15 @@ void SetCommandLineFlagsForSandboxType(b
-     case Sandbox::kMirroring:
- #endif  // BUILDFLAG(IS_MAC)
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     case Sandbox::kPrintBackend:
-     case Sandbox::kScreenAI:
- #endif
-     case Sandbox::kSpeechRecognition:
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case Sandbox::kVideoEffects:
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     case Sandbox::kOnDeviceTranslation:
- #endif
-       DCHECK(command_line->GetSwitchValueASCII(switches::kProcessType) ==
-@@ -185,7 +185,7 @@ void SetCommandLineFlagsForSandboxType(b
-           switches::kServiceSandboxType,
-           StringFromUtilitySandboxType(sandbox_type));
-       break;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     case Sandbox::kZygoteIntermediateSandbox:
-       break;
- #endif
-@@ -225,7 +225,7 @@ sandbox::mojom::Sandbox SandboxTypeFromC
-     return Sandbox::kUtility;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Intermediate process gains a sandbox later.
-   if (process_type == switches::kZygoteProcessType)
-     return Sandbox::kZygoteIntermediateSandbox;
-@@ -267,7 +267,7 @@ std::string StringFromUtilitySandboxType
-       return kUtilitySandbox;
-     case Sandbox::kAudio:
-       return kAudioSandbox;
--#if BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     case Sandbox::kVideoCapture:
-       return kVideoCaptureSandbox;
- #endif
-@@ -278,17 +278,17 @@ std::string StringFromUtilitySandboxType
-     case Sandbox::kSpeechRecognition:
-       return kSpeechRecognitionSandbox;
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     case Sandbox::kPrintBackend:
-       return kPrintBackendSandbox;
-     case Sandbox::kScreenAI:
-       return kScreenAISandbox;
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case Sandbox::kVideoEffects:
-       return kVideoEffectsSandbox;
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     case Sandbox::kOnDeviceTranslation:
-       return kOnDeviceTranslationSandbox;
- #endif
-@@ -308,7 +308,7 @@ std::string StringFromUtilitySandboxType
-     case Sandbox::kMirroring:
-       return kMirroringSandbox;
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     case Sandbox::kHardwareVideoDecoding:
-       return kHardwareVideoDecodingSandbox;
-     case Sandbox::kHardwareVideoEncoding:
-@@ -329,7 +329,7 @@ std::string StringFromUtilitySandboxType
-       // The following are not utility processes so should not occur.
-     case Sandbox::kRenderer:
-     case Sandbox::kGpu:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     case Sandbox::kZygoteIntermediateSandbox:
- #endif
-       NOTREACHED();
-@@ -407,7 +407,7 @@ sandbox::mojom::Sandbox UtilitySandboxTy
-     return Sandbox::kSpeechRecognition;
-   }
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (sandbox_string == kPrintBackendSandbox) {
-     return Sandbox::kPrintBackend;
-   }
-@@ -415,7 +415,7 @@ sandbox::mojom::Sandbox UtilitySandboxTy
-     return Sandbox::kScreenAI;
-   }
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (sandbox_string == kVideoEffectsSandbox) {
-     return Sandbox::kVideoEffects;
-   }
-@@ -425,12 +425,12 @@ sandbox::mojom::Sandbox UtilitySandboxTy
-     return Sandbox::kOnDeviceTranslation;
-   }
- #endif
--#if BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   if (sandbox_string == kVideoCaptureSandbox) {
-     return Sandbox::kVideoCapture;
-   }
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (sandbox_string == kHardwareVideoDecodingSandbox) {
-     return Sandbox::kHardwareVideoDecoding;
-   }
diff --git a/chromium-next/patches/patch-sandbox_policy_switches.cc b/chromium-next/patches/patch-sandbox_policy_switches.cc
deleted file mode 100644
index 6f77e48a3d..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_switches.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/policy/switches.cc
-@@ -37,7 +37,9 @@ const char kGpuSandboxFailuresFatal[] = 
- // Meant to be used as a browser-level switch for testing purposes only.
- const char kNoSandbox[] = "no-sandbox";
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+const char kDisableUnveil[] = "disable-unveil";
-+
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Instructs the zygote to launch without a sandbox. Processes forked from this
- // type of zygote will apply their own custom sandboxes later.
- const char kNoZygoteSandbox[] = "no-zygote-sandbox";
diff --git a/chromium-next/patches/patch-sandbox_policy_switches.h b/chromium-next/patches/patch-sandbox_policy_switches.h
deleted file mode 100644
index 1a8e46d5eb..0000000000
--- a/chromium-next/patches/patch-sandbox_policy_switches.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ sandbox/policy/switches.h
-@@ -23,7 +23,8 @@ SANDBOX_POLICY_EXPORT extern const char 
- SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[];
- SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[];
- SANDBOX_POLICY_EXPORT extern const char kNoSandbox[];
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+SANDBOX_POLICY_EXPORT extern const char kDisableUnveil[];
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- SANDBOX_POLICY_EXPORT extern const char kNoZygoteSandbox[];
- #endif
- #if BUILDFLAG(IS_WIN)
diff --git a/chromium-next/patches/patch-services_audio_audio__sandbox__hook__linux.cc b/chromium-next/patches/patch-services_audio_audio__sandbox__hook__linux.cc
deleted file mode 100644
index 0bb6a75e3e..0000000000
--- a/chromium-next/patches/patch-services_audio_audio__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/audio/audio_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/audio/audio_sandbox_hook_linux.cc
-@@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions(
- }
- #endif
- 
-+#if !BUILDFLAG(IS_BSD)
- std::vector<BrokerFilePermission> GetAudioFilePermissions() {
-   std::vector<BrokerFilePermission> permissions{
-       BrokerFilePermission::ReadOnly("/dev/urandom"),
-@@ -171,10 +172,12 @@ void LoadAudioLibraries() {
-     }
-   }
- }
-+#endif
- 
- }  // namespace
- 
- bool AudioPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
-+#if !BUILDFLAG(IS_BSD)
-   LoadAudioLibraries();
-   auto* instance = sandbox::policy::SandboxLinux::GetInstance();
-   instance->StartBrokerProcess(MakeBrokerCommandSet({
-@@ -192,6 +195,7 @@ bool AudioPreSandboxHook(sandbox::policy
-   // TODO(crbug.com/40579955) enable namespace sandbox. Currently, if
-   // enabled, connect() on pulse native socket fails with ENOENT (called from
-   // pa_context_connect).
-+#endif
- 
-   return true;
- }
diff --git a/chromium-next/patches/patch-services_audio_audio__sandbox__hook__linux.h b/chromium-next/patches/patch-services_audio_audio__sandbox__hook__linux.h
deleted file mode 100644
index dd820d1c9e..0000000000
--- a/chromium-next/patches/patch-services_audio_audio__sandbox__hook__linux.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/audio/audio_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/audio/audio_sandbox_hook_linux.h
-@@ -5,7 +5,13 @@
- #ifndef SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_
- #define SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_
- 
-+#include "build/build_config.h"
-+
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace audio {
- 
diff --git a/chromium-next/patches/patch-services_device_BUILD.gn b/chromium-next/patches/patch-services_device_BUILD.gn
deleted file mode 100644
index 415cb5c2e8..0000000000
--- a/chromium-next/patches/patch-services_device_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/BUILD.gn
-@@ -13,7 +13,7 @@ if (is_android) {
- }
- 
- is_serial_enabled_platform =
--    is_win || ((is_linux || is_chromeos) && use_udev) || is_mac || is_android
-+    is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac || is_android
- 
- source_set("lib") {
-   # This should be visible only to embedders of the Device Service, and the
diff --git a/chromium-next/patches/patch-services_device_geolocation_location__provider__manager.cc b/chromium-next/patches/patch-services_device_geolocation_location__provider__manager.cc
deleted file mode 100644
index 108f1cd1b9..0000000000
--- a/chromium-next/patches/patch-services_device_geolocation_location__provider__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/geolocation/location_provider_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/geolocation/location_provider_manager.cc
-@@ -91,7 +91,7 @@ LocationProviderManager::LocationProvide
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
-   // On Android and iOS, default to using the platform location provider.
-   provider_manager_mode_ = kPlatformOnly;
--#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On Ash / Lacros / Linux, default to using the network location provider.
-   provider_manager_mode_ = kNetworkOnly;
- #else
diff --git a/chromium-next/patches/patch-services_device_hid_BUILD.gn b/chromium-next/patches/patch-services_device_hid_BUILD.gn
deleted file mode 100644
index fbda27c974..0000000000
--- a/chromium-next/patches/patch-services_device_hid_BUILD.gn
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/hid/BUILD.gn
-@@ -34,7 +34,33 @@ source_set("hid") {
-     "//services/device/public/mojom",
-   ]
- 
--  if ((is_linux || is_chromeos) && use_udev) {
-+  if (is_openbsd) {
-+    sources += [
-+      "hid_connection_fido.cc",
-+      "hid_connection_fido.h",
-+      "hid_service_fido.cc",
-+      "hid_service_fido.h",
-+    ]
-+    libs = ["fido2", "cbor", "usbhid", "crypto", "util"]
-+  }
-+
-+  if (is_freebsd) {
-+    sources += [
-+      "hid_connection_freebsd.cc",
-+      "hid_connection_freebsd.h",
-+      "hid_service_freebsd.cc",
-+      "hid_service_freebsd.h",
-+    ]
-+  }
-+
-+  if (is_netbsd) {
-+    sources += [
-+      "hid_service_netbsd.cc",
-+      "hid_service_netbsd.h",
-+    ]
-+  }
-+
-+  if ((is_linux || is_chromeos) && !is_bsd && use_udev) {
-     sources += [
-       "hid_connection_linux.cc",
-       "hid_connection_linux.h",
diff --git a/chromium-next/patches/patch-services_device_hid_hid__connection__fido.cc b/chromium-next/patches/patch-services_device_hid_hid__connection__fido.cc
deleted file mode 100644
index 30d6e30771..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__connection__fido.cc
+++ /dev/null
@@ -1,225 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_connection_fido.cc.orig	2025-05-08 12:01:57.802603323 +0000
-+++ services/device/hid/hid_connection_fido.cc
-@@ -0,0 +1,216 @@
-+// Copyright 2014 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "services/device/hid/hid_connection_fido.h"
-+
-+#include <errno.h>
-+#include <sys/ioctl.h>
-+
-+#include <memory>
-+#include <string>
-+#include <utility>
-+
-+#include "base/files/file_descriptor_watcher_posix.h"
-+#include "base/memory/ref_counted_memory.h"
-+#include "base/posix/eintr_wrapper.h"
-+#include "base/threading/scoped_blocking_call.h"
-+#include "components/device_event_log/device_event_log.h"
-+#include "services/device/hid/hid_service.h"
-+
-+namespace device {
-+
-+class HidConnectionFido::BlockingTaskRunnerHelper {
-+ public:
-+  BlockingTaskRunnerHelper(base::ScopedFD fd,
-+                           scoped_refptr<HidDeviceInfo> device_info,
-+                           base::WeakPtr<HidConnectionFido> connection)
-+      : fd_(std::move(fd)),
-+        connection_(connection),
-+        origin_task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
-+    DETACH_FROM_SEQUENCE(sequence_checker_);
-+    // Report buffers must always have room for the report ID.
-+    report_buffer_size_ = device_info->max_input_report_size() + 1;
-+    has_report_id_ = device_info->has_report_id();
-+  }
-+
-+  BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete;
-+  BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete;
-+
-+  ~BlockingTaskRunnerHelper() {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+  }
-+
-+  // Starts the FileDescriptorWatcher that reads input events from the device.
-+  // Must be called on a thread that has a base::MessageLoopForIO.
-+  void Start() {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+
-+    file_watcher_ = base::FileDescriptorWatcher::WatchReadable(
-+        fd_.get(), base::BindRepeating(
-+                       &BlockingTaskRunnerHelper::OnFileCanReadWithoutBlocking,
-+                       base::Unretained(this)));
-+  }
-+
-+  void Write(scoped_refptr<base::RefCountedBytes> buffer,
-+             WriteCallback callback) {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    base::ScopedBlockingCall scoped_blocking_call(
-+        FROM_HERE, base::BlockingType::MAY_BLOCK);
-+
-+    auto data = buffer->data();
-+    size_t size = buffer->size();
-+    // if report id is 0, it shouldn't be included
-+    if (data[0] == 0) {
-+      data++;
-+      size--;
-+    }
-+
-+    ssize_t result =
-+        HANDLE_EINTR(write(fd_.get(), data, size));
-+    if (result < 0) {
-+      HID_PLOG(EVENT) << "Write failed";
-+      origin_task_runner_->PostTask(FROM_HERE,
-+                                    base::BindOnce(std::move(callback), false));
-+    } else {
-+      if (static_cast<size_t>(result) != size) {
-+        HID_LOG(EVENT) << "Incomplete HID write: " << result
-+                       << " != " << buffer->size();
-+      }
-+      origin_task_runner_->PostTask(FROM_HERE,
-+                                    base::BindOnce(std::move(callback), true));
-+    }
-+  }
-+
-+  void GetFeatureReport(uint8_t report_id,
-+                        scoped_refptr<base::RefCountedBytes> buffer,
-+                        ReadCallback callback) {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    base::ScopedBlockingCall scoped_blocking_call(
-+        FROM_HERE, base::BlockingType::MAY_BLOCK);
-+    HID_PLOG(EVENT) << "GendFeatureReport not implemented on OpenBSD";
-+    origin_task_runner_->PostTask(
-+        FROM_HERE, base::BindOnce(std::move(callback), false, nullptr, 0));
-+  }
-+
-+  void SendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer,
-+                         WriteCallback callback) {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    base::ScopedBlockingCall scoped_blocking_call(
-+        FROM_HERE, base::BlockingType::MAY_BLOCK);
-+    HID_PLOG(EVENT) << "SendFeatureReport not implemented on OpenBSD";
-+    origin_task_runner_->PostTask(FROM_HERE,
-+                                    base::BindOnce(std::move(callback), false));
-+  }
-+
-+ private:
-+  void OnFileCanReadWithoutBlocking() {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+
-+    auto buffer =
-+        base::MakeRefCounted<base::RefCountedBytes>(report_buffer_size_);
-+    uint8_t* data = buffer->as_vector().data();
-+    size_t length = report_buffer_size_;
-+    if (!has_report_id_) {
-+      // Fido will not prefix the buffer with a report ID if report IDs are not
-+      // used by the device. Prefix the buffer with 0.
-+      *data++ = 0;
-+      length--;
-+    }
-+
-+    ssize_t bytes_read = HANDLE_EINTR(read(fd_.get(), data, length));
-+    if (bytes_read < 0) {
-+      if (errno != EAGAIN) {
-+        HID_PLOG(EVENT) << "Read failed";
-+        // This assumes that the error is unrecoverable and disables reading
-+        // from the device until it has been re-opened.
-+        // TODO(reillyg): Investigate starting and stopping the file descriptor
-+        // watcher in response to pending read requests so that per-request
-+        // errors can be returned to the client.
-+        file_watcher_.reset();
-+      }
-+      return;
-+    }
-+    if (!has_report_id_) {
-+      // Behave as if the byte prefixed above as the the report ID was read.
-+      bytes_read++;
-+    }
-+
-+    origin_task_runner_->PostTask(
-+        FROM_HERE, base::BindOnce(&HidConnectionFido::ProcessInputReport,
-+                                  connection_, buffer, bytes_read));
-+  }
-+
-+  SEQUENCE_CHECKER(sequence_checker_);
-+  base::ScopedFD fd_;
-+  size_t report_buffer_size_;
-+  bool has_report_id_;
-+  base::WeakPtr<HidConnectionFido> connection_;
-+  const scoped_refptr<base::SequencedTaskRunner> origin_task_runner_;
-+  std::unique_ptr<base::FileDescriptorWatcher::Controller> file_watcher_;
-+};
-+
-+HidConnectionFido::HidConnectionFido(
-+    scoped_refptr<HidDeviceInfo> device_info,
-+    base::ScopedFD fd,
-+    scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
-+    bool allow_protected_reports,
-+    bool allow_fido_reports)
-+    : HidConnection(device_info, allow_protected_reports, allow_fido_reports),
-+      helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner)),
-+      blocking_task_runner_(std::move(blocking_task_runner)) {
-+  helper_.reset(new BlockingTaskRunnerHelper(std::move(fd), device_info,
-+                                             weak_factory_.GetWeakPtr()));
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Start,
-+                                base::Unretained(helper_.get())));
-+}
-+
-+HidConnectionFido::~HidConnectionFido() {}
-+
-+void HidConnectionFido::PlatformClose() {
-+  // By closing the device on the blocking task runner 1) the requirement that
-+  // base::ScopedFD is destroyed on a thread where I/O is allowed is satisfied
-+  // and 2) any tasks posted to this task runner that refer to this file will
-+  // complete before it is closed.
-+  helper_.reset();
-+}
-+
-+void HidConnectionFido::PlatformWrite(
-+    scoped_refptr<base::RefCountedBytes> buffer,
-+    WriteCallback callback) {
-+  // Fido expects the first byte of the buffer to always be a report ID so the
-+  // buffer can be used directly.
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Write,
-+                                base::Unretained(helper_.get()), buffer,
-+                                std::move(callback)));
-+}
-+
-+void HidConnectionFido::PlatformGetFeatureReport(uint8_t report_id,
-+                                                  ReadCallback callback) {
-+  // The first byte of the destination buffer is the report ID being requested
-+  // and is overwritten by the feature report.
-+  DCHECK_GT(device_info()->max_feature_report_size(), 0u);
-+  auto buffer = base::MakeRefCounted<base::RefCountedBytes>(
-+      device_info()->max_feature_report_size() + 1);
-+  buffer->as_vector().data()[0] = report_id;
-+
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::GetFeatureReport,
-+                                base::Unretained(helper_.get()), report_id,
-+                                buffer, std::move(callback)));
-+}
-+
-+void HidConnectionFido::PlatformSendFeatureReport(
-+    scoped_refptr<base::RefCountedBytes> buffer,
-+    WriteCallback callback) {
-+  // Fido expects the first byte of the buffer to always be a report ID so the
-+  // buffer can be used directly.
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::SendFeatureReport,
-+                                base::Unretained(helper_.get()), buffer,
-+                                std::move(callback)));
-+}
-+
-+}  // namespace device
diff --git a/chromium-next/patches/patch-services_device_hid_hid__connection__fido.h b/chromium-next/patches/patch-services_device_hid_hid__connection__fido.h
deleted file mode 100644
index 752e74ff73..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__connection__fido.h
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_connection_fido.h.orig	2025-05-08 12:01:57.802753492 +0000
-+++ services/device/hid/hid_connection_fido.h
-@@ -0,0 +1,60 @@
-+// Copyright 2014 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SERVICES_DEVICE_HID_HID_CONNECTION_LINUX_H_
-+#define SERVICES_DEVICE_HID_HID_CONNECTION_LINUX_H_
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+#include "base/files/scoped_file.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/task/sequenced_task_runner.h"
-+#include "services/device/hid/hid_connection.h"
-+
-+namespace base {
-+class SequencedTaskRunner;
-+}
-+
-+namespace device {
-+
-+class HidConnectionFido : public HidConnection {
-+ public:
-+  HidConnectionFido(
-+      scoped_refptr<HidDeviceInfo> device_info,
-+      base::ScopedFD fd,
-+      scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
-+      bool allow_protected_reports,
-+      bool allow_fido_reports);
-+  HidConnectionFido(HidConnectionFido&) = delete;
-+  HidConnectionFido& operator=(HidConnectionFido&) = delete;
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<HidConnectionFido>;
-+  class BlockingTaskRunnerHelper;
-+
-+  ~HidConnectionFido() override;
-+
-+  // HidConnection implementation.
-+  void PlatformClose() override;
-+  void PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer,
-+                     WriteCallback callback) override;
-+  void PlatformGetFeatureReport(uint8_t report_id,
-+                                ReadCallback callback) override;
-+  void PlatformSendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer,
-+                                 WriteCallback callback) override;
-+
-+  // |helper_| lives on the sequence to which |blocking_task_runner_| posts
-+  // tasks so all calls must be posted there including this object's
-+  // destruction.
-+  std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_;
-+
-+  const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
-+
-+  base::WeakPtrFactory<HidConnectionFido> weak_factory_{this};
-+};
-+
-+}  // namespace device
-+
-+#endif  // SERVICES_DEVICE_HID_HID_CONNECTION_LINUX_H_
diff --git a/chromium-next/patches/patch-services_device_hid_hid__connection__freebsd.cc b/chromium-next/patches/patch-services_device_hid_hid__connection__freebsd.cc
deleted file mode 100644
index 28a364a26d..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__connection__freebsd.cc
+++ /dev/null
@@ -1,249 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_connection_freebsd.cc.orig	2025-05-08 12:01:57.802888863 +0000
-+++ services/device/hid/hid_connection_freebsd.cc
-@@ -0,0 +1,240 @@
-+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "services/device/hid/hid_connection_freebsd.h"
-+
-+#include <dev/usb/usbhid.h>
-+#include <dev/usb/usb_ioctl.h>
-+
-+#include "base/files/file_descriptor_watcher_posix.h"
-+#include "base/location.h"
-+#include "base/numerics/safe_math.h"
-+#include "base/posix/eintr_wrapper.h"
-+#include "base/strings/stringprintf.h"
-+#include "base/task/single_thread_task_runner.h"
-+#include "base/threading/scoped_blocking_call.h"
-+#include "base/threading/thread_restrictions.h"
-+#include "components/device_event_log/device_event_log.h"
-+#include "services/device/hid/hid_service.h"
-+
-+namespace device {
-+
-+class HidConnectionFreeBSD::BlockingTaskRunnerHelper {
-+ public:
-+  BlockingTaskRunnerHelper(base::ScopedFD fd,
-+                     scoped_refptr<HidDeviceInfo> device_info,
-+                     base::WeakPtr<HidConnectionFreeBSD> connection)
-+      : fd_(std::move(fd)),
-+        connection_(connection),
-+	origin_task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
-+    DETACH_FROM_SEQUENCE(sequence_checker_);
-+    // Report buffers must always have room for the report ID.
-+    report_buffer_size_ = device_info->max_input_report_size() + 1;
-+    has_report_id_ = device_info->has_report_id();
-+  }
-+
-+  BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete;
-+  BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete;
-+
-+  ~BlockingTaskRunnerHelper() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); }
-+
-+  // Starts the FileDescriptorWatcher that reads input events from the device.
-+  // Must be called on a thread that has a base::MessageLoopForIO.
-+  void Start() {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    base::AssertBlockingAllowed();
-+
-+    file_watcher_ = base::FileDescriptorWatcher::WatchReadable(
-+        fd_.get(), base::BindRepeating(&BlockingTaskRunnerHelper::OnFileCanReadWithoutBlocking,
-+                                       base::Unretained(this)));
-+  }
-+
-+  void Write(scoped_refptr<base::RefCountedBytes> buffer,
-+             WriteCallback callback) {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    base::ScopedBlockingCall scoped_blocking_call(
-+        FROM_HERE, base::BlockingType::MAY_BLOCK);
-+
-+    auto data = buffer->as_vector().data();
-+    size_t size = buffer->size();
-+    // if report id is 0, it shouldn't be included
-+    if (data[0] == 0) {
-+      data++;
-+      size--;
-+    }
-+
-+    ssize_t result = HANDLE_EINTR(write(fd_.get(), data, size));
-+    if (result < 0) {
-+      HID_PLOG(EVENT) << "Write failed";
-+      origin_task_runner_->PostTask(FROM_HERE, base::BindOnce(std::move(callback), false));
-+    } else {
-+      if (static_cast<size_t>(result) != size)
-+        HID_LOG(EVENT) << "Incomplete HID write: " << result << " != " << size;
-+      origin_task_runner_->PostTask(FROM_HERE, base::BindOnce(std::move(callback), true));
-+    }
-+  }
-+
-+  void GetFeatureReport(uint8_t report_id,
-+                        scoped_refptr<base::RefCountedBytes> buffer,
-+                        ReadCallback callback) {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    base::ScopedBlockingCall scoped_blocking_call(
-+        FROM_HERE, base::BlockingType::MAY_BLOCK);
-+    struct usb_gen_descriptor ugd;
-+    ugd.ugd_report_type = UHID_FEATURE_REPORT;
-+    ugd.ugd_data = buffer->as_vector().data();
-+    ugd.ugd_maxlen = buffer->size();
-+    int result = HANDLE_EINTR(
-+        ioctl(fd_.get(), USB_GET_REPORT, &ugd));
-+    if (result < 0) {
-+      HID_PLOG(EVENT) << "Failed to get feature report";
-+      origin_task_runner_->PostTask(FROM_HERE,
-+                                    base::BindOnce(std::move(callback), false, nullptr, 0));
-+    } else if (result == 0) {
-+      HID_LOG(EVENT) << "Get feature result too short.";
-+      origin_task_runner_->PostTask(FROM_HERE,
-+                                    base::BindOnce(std::move(callback), false, nullptr, 0));
-+    } else {
-+      origin_task_runner_->PostTask(FROM_HERE,
-+                                    base::BindOnce(std::move(callback), true, buffer, result));
-+    }
-+  }
-+
-+  void SendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer,
-+                         WriteCallback callback) {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    struct usb_gen_descriptor ugd;
-+    ugd.ugd_report_type = UHID_FEATURE_REPORT;
-+    ugd.ugd_data = buffer->as_vector().data();
-+    ugd.ugd_maxlen = buffer->size();
-+    // FreeBSD does not require report id if it's not used
-+    if (buffer->data()[0] == 0) {
-+      ugd.ugd_data = buffer->as_vector().data() + 1;
-+      ugd.ugd_maxlen = buffer->size() - 1;
-+    } else {
-+      ugd.ugd_data = buffer->as_vector().data();
-+      ugd.ugd_maxlen = buffer->size();
-+    }
-+    int result = HANDLE_EINTR(
-+        ioctl(fd_.get(), USB_SET_REPORT, &ugd));
-+    if (result < 0) {
-+      HID_PLOG(EVENT) << "Failed to send feature report";
-+      origin_task_runner_->PostTask(FROM_HERE,
-+                                    base::BindOnce(std::move(callback), false));
-+    } else {
-+      origin_task_runner_->PostTask(FROM_HERE,
-+                                    base::BindOnce(std::move(callback), true));
-+    }
-+  }
-+
-+ private:
-+  void OnFileCanReadWithoutBlocking() {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+
-+    scoped_refptr<base::RefCountedBytes> buffer(new base::RefCountedBytes(report_buffer_size_));
-+    unsigned char* data = buffer->as_vector().data();
-+    size_t length = report_buffer_size_;
-+    if (!has_report_id_) {
-+      // FreeBSD will not prefix the buffer with a report ID if report IDs are not
-+      // used by the device. Prefix the buffer with 0.
-+      *data++ = 0;
-+      length--;
-+    }
-+
-+    ssize_t bytes_read = HANDLE_EINTR(read(fd_.get(), data, length));
-+    if (bytes_read < 0) {
-+      if (errno != EAGAIN) {
-+        HID_PLOG(EVENT) << "Read failed";
-+        // This assumes that the error is unrecoverable and disables reading
-+        // from the device until it has been re-opened.
-+        // TODO(reillyg): Investigate starting and stopping the file descriptor
-+        // watcher in response to pending read requests so that per-request
-+        // errors can be returned to the client.
-+        file_watcher_.reset();
-+      }
-+      return;
-+    }
-+    if (!has_report_id_) {
-+      // Behave as if the byte prefixed above as the the report ID was read.
-+      bytes_read++;
-+    }
-+
-+    origin_task_runner_->PostTask(
-+        FROM_HERE, base::BindOnce(&HidConnectionFreeBSD::ProcessInputReport,
-+                              connection_, buffer, bytes_read));
-+  }
-+
-+  SEQUENCE_CHECKER(sequence_checker_);
-+  base::ScopedFD fd_;
-+  size_t report_buffer_size_;
-+  bool has_report_id_;
-+  base::WeakPtr<HidConnectionFreeBSD> connection_;
-+  const scoped_refptr<base::SequencedTaskRunner> origin_task_runner_;
-+  std::unique_ptr<base::FileDescriptorWatcher::Controller> file_watcher_;
-+};
-+
-+HidConnectionFreeBSD::HidConnectionFreeBSD(
-+    scoped_refptr<HidDeviceInfo> device_info,
-+    base::ScopedFD fd,
-+    scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
-+    bool allow_protected_reports,
-+    bool allow_fido_reports)
-+    : HidConnection(device_info, allow_protected_reports, allow_fido_reports),
-+      helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner)),
-+      blocking_task_runner_(std::move(blocking_task_runner)) {
-+  helper_.reset(new BlockingTaskRunnerHelper(std::move(fd), device_info,
-+                                                 weak_factory_.GetWeakPtr()));
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Start,
-+                                base::Unretained(helper_.get())));
-+}
-+
-+HidConnectionFreeBSD::~HidConnectionFreeBSD() {}
-+
-+void HidConnectionFreeBSD::PlatformClose() {
-+  // By closing the device on the blocking task runner 1) the requirement that
-+  // base::ScopedFD is destroyed on a thread where I/O is allowed is satisfied
-+  // and 2) any tasks posted to this task runner that refer to this file will
-+  // complete before it is closed.
-+  blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release());
-+}
-+
-+void HidConnectionFreeBSD::PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer,
-+                                     WriteCallback callback) {
-+
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE,
-+      base::BindOnce(&BlockingTaskRunnerHelper::Write, base::Unretained(helper_.get()),
-+                 buffer, std::move(callback)));
-+}
-+
-+void HidConnectionFreeBSD::PlatformGetFeatureReport(uint8_t report_id,
-+                                                ReadCallback callback) {
-+  // The first byte of the destination buffer is the report ID being requested
-+  // and is overwritten by the feature report.
-+  DCHECK_GT(device_info()->max_feature_report_size(), 0u);
-+  scoped_refptr<base::RefCountedBytes> buffer(
-+      new base::RefCountedBytes(device_info()->max_feature_report_size() + 1));
-+  if (report_id != 0)
-+    buffer->as_vector().data()[0] = report_id;
-+
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE,
-+      base::BindOnce(&BlockingTaskRunnerHelper::GetFeatureReport,
-+                 base::Unretained(helper_.get()), report_id,
-+                 buffer, std::move(callback)));
-+}
-+
-+void HidConnectionFreeBSD::PlatformSendFeatureReport(
-+    scoped_refptr<base::RefCountedBytes> buffer,
-+    WriteCallback callback) {
-+  base::ScopedBlockingCall scoped_blocking_call(
-+      FROM_HERE, base::BlockingType::MAY_BLOCK);
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE,
-+      base::BindOnce(&BlockingTaskRunnerHelper::SendFeatureReport,
-+                 base::Unretained(helper_.get()), buffer, std::move(callback)));
-+}
-+
-+}  // namespace device
diff --git a/chromium-next/patches/patch-services_device_hid_hid__connection__freebsd.h b/chromium-next/patches/patch-services_device_hid_hid__connection__freebsd.h
deleted file mode 100644
index c34d1f0acf..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__connection__freebsd.h
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_connection_freebsd.h.orig	2025-05-08 12:01:57.803039954 +0000
-+++ services/device/hid/hid_connection_freebsd.h
-@@ -0,0 +1,67 @@
-+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef DEVICE_HID_HID_CONNECTION_FREEBSD_H_
-+#define DEVICE_HID_HID_CONNECTION_FREEBSD_H_
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+
-+#include "base/files/scoped_file.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/memory/ref_counted_memory.h"
-+#include "base/task/sequenced_task_runner.h"
-+#include "services/device/hid/hid_connection.h"
-+
-+namespace base {
-+class SequencedTaskRunner;
-+}
-+
-+namespace net {
-+class IOBuffer;
-+}
-+
-+namespace device {
-+
-+class HidConnectionFreeBSD : public HidConnection {
-+ public:
-+  HidConnectionFreeBSD(
-+      scoped_refptr<HidDeviceInfo> device_info,
-+      base::ScopedFD fd,
-+      scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
-+      bool allow_protected_reports,
-+      bool allow_fido_reports);
-+
-+ private:
-+  friend class base::RefCountedThreadSafe<HidConnectionFreeBSD>;
-+  class BlockingTaskRunnerHelper;
-+
-+  HidConnectionFreeBSD(const HidConnectionFreeBSD&) = delete;
-+  HidConnectionFreeBSD& operator=(const HidConnectionFreeBSD&) = delete;
-+
-+  ~HidConnectionFreeBSD() override;
-+
-+  // HidConnection implementation.
-+  void PlatformClose() override;
-+  void PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer,
-+                     WriteCallback callback) override;
-+  void PlatformGetFeatureReport(uint8_t report_id,
-+                                ReadCallback callback) override;
-+  void PlatformSendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer,
-+                                 WriteCallback callback) override;
-+
-+  // |helper_| lives on the sequence to which |blocking_task_runner_| posts
-+  // tasks so all calls must be posted there including this object's
-+  // destruction.
-+  std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_;
-+
-+  const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
-+  const scoped_refptr<base::SequencedTaskRunner> task_runner_;
-+
-+  base::WeakPtrFactory<HidConnectionFreeBSD> weak_factory_{this};
-+};
-+
-+}  // namespace device
-+
-+#endif  // DEVICE_HID_HID_CONNECTION_FREEBSD_H_
diff --git a/chromium-next/patches/patch-services_device_hid_hid__service.cc b/chromium-next/patches/patch-services_device_hid_hid__service.cc
deleted file mode 100644
index c0acd2b42b..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__service.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/hid/hid_service.cc
-@@ -20,12 +20,18 @@
- 
- #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV)
- #include "services/device/hid/hid_service_linux.h"
-+#elif BUILDFLAG(IS_OPENBSD)
-+#include "services/device/hid/hid_service_fido.h"
-+#elif BUILDFLAG(IS_FREEBSD)
-+#include "services/device/hid/hid_service_freebsd.h"
- #elif BUILDFLAG(IS_MAC)
- #include "services/device/hid/hid_service_mac.h"
- #elif BUILDFLAG(IS_WIN)
- #include "services/device/hid/hid_service_win.h"
- #elif BUILDFLAG(IS_FUCHSIA)
- #include "services/device/hid/hid_service_fuchsia.h"
-+#elif BUILDFLAG(IS_NETBSD)
-+#include "services/device/hid/hid_service_netbsd.h"
- #endif
- 
- namespace device {
-@@ -68,12 +74,18 @@ constexpr base::TaskTraits HidService::k
- std::unique_ptr<HidService> HidService::Create() {
- #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV)
-   return std::make_unique<HidServiceLinux>();
-+#elif BUILDFLAG(IS_OPENBSD)
-+  return std::make_unique<HidServiceFido>();
-+#elif BUILDFLAG(IS_FREEBSD)
-+  return std::make_unique<HidServiceFreeBSD>();
- #elif BUILDFLAG(IS_MAC)
-   return std::make_unique<HidServiceMac>();
- #elif BUILDFLAG(IS_WIN)
-   return std::make_unique<HidServiceWin>();
- #elif BUILDFLAG(IS_FUCHSIA)
-   return std::make_unique<HidServiceFuchsia>();
-+#elif BUILDFLAG(IS_NETBSD)
-+  return std::make_unique<HidServiceNetBSD>();
- #else
-   return nullptr;
- #endif
diff --git a/chromium-next/patches/patch-services_device_hid_hid__service__fido.cc b/chromium-next/patches/patch-services_device_hid_hid__service__fido.cc
deleted file mode 100644
index d3e65c0bcf..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__service__fido.cc
+++ /dev/null
@@ -1,405 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_service_fido.cc.orig	2025-05-08 12:01:57.803318400 +0000
-+++ services/device/hid/hid_service_fido.cc
-@@ -0,0 +1,396 @@
-+// Copyright 2014 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "services/device/hid/hid_service_fido.h"
-+
-+#include <fcntl.h>
-+#include <poll.h>
-+#include <stdint.h>
-+
-+#include <dlfcn.h>
-+#include <fido.h>
-+
-+#include <limits>
-+#include <memory>
-+#include <string>
-+#include <utility>
-+
-+#include "base/files/file.h"
-+#include "base/files/file_path.h"
-+#include "base/files/file_util.h"
-+#include "base/files/scoped_file.h"
-+#include "base/location.h"
-+#include "base/sequence_checker.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/string_split.h"
-+#include "base/strings/string_util.h"
-+#include "base/task/sequenced_task_runner.h"
-+#include "base/task/thread_pool.h"
-+#include "base/threading/scoped_blocking_call.h"
-+#include "build/build_config.h"
-+#include "build/chromeos_buildflags.h"
-+#include "components/device_event_log/device_event_log.h"
-+#include "device/udev_linux/scoped_udev.h"
-+#include "device/udev_linux/udev_watcher.h"
-+#include "services/device/hid/hid_connection_fido.h"
-+
-+namespace device {
-+
-+namespace {
-+
-+bool terrible_ping_kludge(int fd, const std::string &path) {
-+  u_char data[256];
-+  int i, n;
-+  struct pollfd pfd;
-+
-+  for (i = 0; i < 4; i++) {
-+    memset(data, 0, sizeof(data));
-+    /* broadcast channel ID */
-+    data[1] = 0xff;
-+    data[2] = 0xff;
-+    data[3] = 0xff;
-+    data[4] = 0xff;
-+    /* Ping command */
-+    data[5] = 0x81;
-+    /* One byte ping only, Vasili */
-+    data[6] = 0;   
-+    data[7] = 1;   
-+    HID_LOG(EVENT) << "send ping " << i << " " << path;
-+    if (write(fd, data, 64) == -1) {
-+      HID_PLOG(ERROR) << "write " << path;
-+      return false;
-+    }
-+    HID_LOG(EVENT) << "wait reply " << path;
-+    memset(&pfd, 0, sizeof(pfd));
-+    pfd.fd = fd; 
-+    pfd.events = POLLIN;
-+    if ((n = poll(&pfd, 1, 100)) == -1) {
-+      HID_PLOG(EVENT) << "poll " << path;
-+      return false;
-+    } else if (n == 0) {
-+      HID_LOG(EVENT) << "timed out " << path;
-+      continue;
-+    }
-+    if (read(fd, data, 64) == -1) {  
-+      HID_PLOG(ERROR) << "read " << path;
-+      return false;
-+    }
-+    /*
-+     * Ping isn't always supported on the broadcast channel,
-+     * so we might get an error, but we don't care - we're
-+     * synched now.
-+     */
-+    HID_LOG(EVENT) << "got reply " << path;
-+    return true;
-+  }
-+  HID_LOG(ERROR) << "no response " << path;
-+  return false;
-+}
-+
-+// HID report descriptor for U2F interface. Copied from:
-+// https://chromium.googlesource.com/chromiumos/platform2/+/c6c7e4e54fce11932fedaa3ea10236bf75d85a2b%5E%21/u2fd/u2fhid.cc
-+// Apparently Chromium wants to see these bytes, but OpenBSD fido(4)
-+// devices prohibit USB_GET_REPORT_DESC ioctl that could be used to
-+// get the bytes from the USB device.
-+constexpr uint8_t kU2fReportDesc[] = {
-+    0x06, 0xD0, 0xF1, /* Usage Page (FIDO Alliance), FIDO_USAGE_PAGE */
-+    0x09, 0x01,       /* Usage (U2F HID Auth. Device) FIDO_USAGE_U2FHID */
-+    0xA1, 0x01,       /* Collection (Application), HID_APPLICATION */
-+    0x09, 0x20,       /*  Usage (Input Report Data), FIDO_USAGE_DATA_IN */
-+    0x15, 0x00,       /*  Logical Minimum (0) */
-+    0x26, 0xFF, 0x00, /*  Logical Maximum (255) */
-+    0x75, 0x08,       /*  Report Size (8) */
-+    0x95, 0x40,       /*  Report Count (64), HID_INPUT_REPORT_BYTES */
-+    0x81, 0x02,       /*  Input (Data, Var, Abs), Usage */
-+    0x09, 0x21,       /*  Usage (Output Report Data), FIDO_USAGE_DATA_OUT */
-+    0x15, 0x00,       /*  Logical Minimum (0) */
-+    0x26, 0xFF, 0x00, /*  Logical Maximum (255) */
-+    0x75, 0x08,       /*  Report Size (8) */
-+    0x95, 0x40,       /*  Report Count (64), HID_OUTPUT_REPORT_BYTES */
-+    0x91, 0x02,       /*  Output (Data, Var, Abs), Usage */
-+    0xC0              /* End Collection */
-+};
-+
-+}  // namespace
-+
-+struct HidServiceFido::ConnectParams {
-+  ConnectParams(scoped_refptr<HidDeviceInfo> device_info,
-+                bool allow_protected_reports,
-+                bool allow_fido_reports,
-+                ConnectCallback callback)
-+      : device_info(std::move(device_info)),
-+        allow_protected_reports(allow_protected_reports),
-+        allow_fido_reports(allow_fido_reports),
-+        callback(std::move(callback)),
-+	task_runner(base::SequencedTaskRunner::GetCurrentDefault()),
-+        blocking_task_runner(
-+            base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)) {}
-+  ~ConnectParams() {}
-+
-+  scoped_refptr<HidDeviceInfo> device_info;
-+  bool allow_protected_reports;
-+  bool allow_fido_reports;
-+  ConnectCallback callback;
-+  scoped_refptr<base::SequencedTaskRunner> task_runner;
-+  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner;
-+  base::ScopedFD fd;
-+};
-+
-+class HidServiceFido::BlockingTaskRunnerHelper : public UdevWatcher::Observer {
-+ public:
-+  BlockingTaskRunnerHelper(base::WeakPtr<HidServiceFido> service)
-+      : service_(std::move(service)),
-+        task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
-+    DETACH_FROM_SEQUENCE(sequence_checker_);
-+  }
-+
-+  BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete;
-+  BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete;
-+
-+  ~BlockingTaskRunnerHelper() override {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+  }
-+
-+  void Start() {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+
-+    void *library = dlopen("libudev.so", RTLD_NOW | RTLD_LOCAL);
-+    if (library) {
-+      dlclose(library);
-+      watcher_ = UdevWatcher::StartWatching(this);
-+      watcher_->EnumerateExistingDevices();
-+    } else {
-+      HID_LOG(ERROR) << "No udev available, failling back to single enumeration";
-+      WalkFidoDevices(nullptr);
-+    }
-+
-+    task_runner_->PostTask(
-+        FROM_HERE,
-+        base::BindOnce(&HidServiceFido::FirstEnumerationComplete, service_));
-+  }
-+
-+ private:
-+  void WalkFidoDevices(const char *name) {
-+    fido_dev_info_t *devlist = NULL;
-+    fido_dev_t *dev = NULL;
-+    size_t devlist_len = 0, i;
-+    const char *path;
-+    int r;
-+    const int MAX_FIDO_DEVICES = 256;
-+
-+    if ((devlist = fido_dev_info_new(MAX_FIDO_DEVICES)) == NULL) {
-+      HID_LOG(ERROR) << "fido_dev_info_new failed";
-+      goto out;
-+    }
-+    if ((r = fido_dev_info_manifest(devlist, MAX_FIDO_DEVICES, &devlist_len)) !=
-+        FIDO_OK) {
-+      HID_LOG(ERROR) << "fido_dev_info_manifest: " << fido_strerr(r);
-+      goto out;
-+    }
-+
-+    HID_LOG(EVENT) << "fido_dev_info_manifest found " << devlist_len
-+                   << " device(s)";
-+
-+    for (i = 0; i < devlist_len; i++) {
-+      const fido_dev_info_t *di = fido_dev_info_ptr(devlist, i);
-+
-+      if (di == NULL) {
-+        HID_LOG(ERROR) << "fido_dev_info_ptr " << i << " failed";
-+        continue;
-+      }
-+
-+      if ((path = fido_dev_info_path(di)) == NULL) {
-+        HID_LOG(ERROR) << "fido_dev_info_path " << i << " failed";
-+        continue;
-+      }
-+
-+      if (name != nullptr && !strcmp(path, name)) {
-+        HID_LOG(EVENT) << "hotplug device " << i << ": " << path;
-+        OnFidoDeviceAdded(di);
-+        break;
-+      }
-+
-+      HID_LOG(EVENT) << "trying device " << i << ": " << path;
-+      if ((dev = fido_dev_new()) == NULL) {
-+        HID_LOG(ERROR) << "fido_dev_new failed";
-+        continue;
-+      }
-+
-+      if ((r = fido_dev_open(dev, path)) != FIDO_OK) {
-+        HID_LOG(ERROR) << "fido_dev_open failed " << path;
-+        fido_dev_free(&dev);
-+        continue;
-+      }
-+
-+      fido_dev_close(dev);
-+      fido_dev_free(&dev);
-+
-+      OnFidoDeviceAdded(di);
-+    }
-+  out:
-+    if (devlist != NULL)
-+      fido_dev_info_free(&devlist, MAX_FIDO_DEVICES);
-+  }
-+
-+  void OnFidoDeviceAdded(const fido_dev_info_t *di) {
-+    auto null_as_empty = [](const char *r) -> std::string {
-+      return (r != nullptr) ? r : "";
-+    };
-+    std::string device_node(null_as_empty(fido_dev_info_path(di)));  
-+    std::vector<uint8_t> report_descriptor(
-+        kU2fReportDesc, kU2fReportDesc + sizeof(kU2fReportDesc));
-+
-+    auto device_info = base::MakeRefCounted<HidDeviceInfo>(
-+        device_node, /*physical_device_id*/"", fido_dev_info_vendor(di),
-+        fido_dev_info_product(di), null_as_empty(fido_dev_info_product_string(di)),
-+        null_as_empty(fido_dev_info_manufacturer_string(di)),
-+	device::mojom::HidBusType::kHIDBusTypeUSB, report_descriptor,
-+        device_node);
-+
-+    task_runner_->PostTask(
-+        FROM_HERE,
-+        base::BindOnce(&HidServiceFido::AddDevice, service_, device_info));
-+  }
-+
-+  // UdevWatcher::Observer
-+  void OnDeviceAdded(ScopedUdevDevicePtr device) override {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    base::ScopedBlockingCall scoped_blocking_call(
-+        FROM_HERE, base::BlockingType::MAY_BLOCK);
-+
-+    const char* subsystem = udev_device_get_subsystem(device.get());
-+    if (!subsystem || strcmp(subsystem, "fido") != 0)
-+      return;
-+
-+    const char* device_path = udev_device_get_syspath(device.get());
-+    if (!device_path)
-+      return;
-+
-+    WalkFidoDevices(device_path);
-+  }
-+
-+  void OnDeviceRemoved(ScopedUdevDevicePtr device) override {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    base::ScopedBlockingCall scoped_blocking_call(
-+        FROM_HERE, base::BlockingType::MAY_BLOCK);
-+
-+    const char* device_path = udev_device_get_syspath(device.get());
-+    if (device_path) {
-+      task_runner_->PostTask(
-+          FROM_HERE, base::BindOnce(&HidServiceFido::RemoveDevice, service_,
-+                                    std::string(device_path)));
-+    }
-+  }
-+
-+  void OnDeviceChanged(ScopedUdevDevicePtr) override {}
-+
-+  SEQUENCE_CHECKER(sequence_checker_);
-+  std::unique_ptr<UdevWatcher> watcher_;
-+
-+  // This weak pointer is only valid when checked on this task runner.
-+  base::WeakPtr<HidServiceFido> service_;
-+  scoped_refptr<base::SequencedTaskRunner> task_runner_;
-+};
-+
-+HidServiceFido::HidServiceFido()
-+    : blocking_task_runner_(
-+          base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)),
-+      helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner_)) {
-+  // We need to properly initialize |blocking_task_helper_| here because we need
-+  // |weak_factory_| to be created first.
-+  helper_.reset(new BlockingTaskRunnerHelper(weak_factory_.GetWeakPtr()));
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Start,
-+                                base::Unretained(helper_.get())));
-+}
-+
-+HidServiceFido::~HidServiceFido() = default;
-+
-+base::WeakPtr<HidService> HidServiceFido::GetWeakPtr() {
-+  return weak_factory_.GetWeakPtr();
-+}
-+
-+void HidServiceFido::Connect(const std::string& device_guid,
-+                              bool allow_protected_reports,
-+                              bool allow_fido_reports,
-+                              ConnectCallback callback) {
-+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+
-+  const auto& map_entry = devices().find(device_guid);
-+  if (map_entry == devices().end()) {
-+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
-+        FROM_HERE, base::BindOnce(std::move(callback), nullptr));
-+    return;
-+  }
-+  scoped_refptr<HidDeviceInfo> device_info = map_entry->second;
-+
-+  auto params =
-+      std::make_unique<ConnectParams>(device_info, allow_protected_reports,
-+                                      allow_fido_reports, std::move(callback));
-+  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner =
-+      params->blocking_task_runner;
-+  blocking_task_runner->PostTask(
-+      FROM_HERE, base::BindOnce(&HidServiceFido::OpenOnBlockingThread,
-+                                std::move(params)));
-+}
-+
-+// static
-+void HidServiceFido::OpenOnBlockingThread(
-+    std::unique_ptr<ConnectParams> params) {
-+  base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-+                                                base::BlockingType::MAY_BLOCK);
-+  scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner;
-+
-+  base::FilePath device_path(params->device_info->device_node());
-+  base::File device_file;
-+  int flags =
-+      base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE;
-+  device_file.Initialize(device_path, flags);
-+  if (!device_file.IsValid()) {
-+    base::File::Error file_error = device_file.error_details();
-+
-+    if (file_error == base::File::FILE_ERROR_ACCESS_DENIED) {
-+      HID_LOG(EVENT)
-+          << "Access denied opening device read-write, trying read-only.";
-+      flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
-+      device_file.Initialize(device_path, flags);
-+    }
-+  }
-+  if (!device_file.IsValid()) {
-+    HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node()
-+                   << "': "
-+                   << base::File::ErrorToString(device_file.error_details());
-+    task_runner->PostTask(FROM_HERE,
-+                          base::BindOnce(std::move(params->callback), nullptr));
-+    return;
-+  }
-+  if (!terrible_ping_kludge(device_file.GetPlatformFile(), params->device_info->device_node())) {
-+    HID_LOG(EVENT) << "Failed to ping " << params->device_info->device_node();
-+    task_runner->PostTask(FROM_HERE, base::BindOnce(std::move(params->callback), nullptr));
-+    return;
-+  }
-+  params->fd.reset(device_file.TakePlatformFile());
-+
-+  task_runner->PostTask(FROM_HERE, base::BindOnce(&HidServiceFido::FinishOpen,
-+                                                  std::move(params)));
-+}
-+
-+// static
-+void HidServiceFido::FinishOpen(std::unique_ptr<ConnectParams> params) {
-+  DCHECK(params->fd.is_valid());
-+
-+  if (!base::SetNonBlocking(params->fd.get())) {
-+    HID_PLOG(DEBUG) << "Failed to set the non-blocking flag on the device fd";
-+    std::move(params->callback).Run(nullptr);
-+    return;
-+  }
-+
-+  std::move(params->callback)
-+      .Run(base::MakeRefCounted<HidConnectionFido>(
-+          std::move(params->device_info), std::move(params->fd),
-+          std::move(params->blocking_task_runner),
-+          params->allow_protected_reports, params->allow_fido_reports));
-+}
-+
-+}  // namespace device
diff --git a/chromium-next/patches/patch-services_device_hid_hid__service__fido.h b/chromium-next/patches/patch-services_device_hid_hid__service__fido.h
deleted file mode 100644
index 08a78889d9..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__service__fido.h
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_service_fido.h.orig	2025-05-08 12:01:57.803484139 +0000
-+++ services/device/hid/hid_service_fido.h
-@@ -0,0 +1,65 @@
-+// Copyright 2014 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SERVICES_DEVICE_HID_HID_SERVICE_LINUX_H_
-+#define SERVICES_DEVICE_HID_HID_SERVICE_LINUX_H_
-+
-+#include <memory>
-+
-+#include "base/compiler_specific.h"
-+#include "base/files/scoped_file.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/task/sequenced_task_runner.h"
-+#include "build/build_config.h"
-+#include "build/chromeos_buildflags.h"
-+#include "services/device/hid/hid_device_info.h"
-+#include "services/device/hid/hid_service.h"
-+
-+namespace device {
-+
-+class HidServiceFido : public HidService {
-+ public:
-+  HidServiceFido();
-+  HidServiceFido(HidServiceFido&) = delete;
-+  HidServiceFido& operator=(HidServiceFido&) = delete;
-+  ~HidServiceFido() override;
-+
-+  // HidService:
-+  void Connect(const std::string& device_id,
-+               bool allow_protected_reports,
-+               bool allow_fido_reports,
-+               ConnectCallback callback) override;
-+  base::WeakPtr<HidService> GetWeakPtr() override;
-+
-+ private:
-+  struct ConnectParams;
-+  class BlockingTaskRunnerHelper;
-+
-+// These functions implement the process of locating, requesting access to and
-+// opening a device. Because this operation crosses multiple threads these
-+// functions are static and the necessary parameters are passed as a single
-+// struct.
-+#if BUILDFLAG(IS_CHROMEOS_ASH)
-+  static void OnPathOpenComplete(std::unique_ptr<ConnectParams> params,
-+                                 base::ScopedFD fd);
-+  static void OnPathOpenError(const std::string& device_path,
-+                              ConnectCallback callback,
-+                              const std::string& error_name,
-+                              const std::string& error_message);
-+#else
-+  static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params);
-+#endif
-+  static void FinishOpen(std::unique_ptr<ConnectParams> params);
-+
-+  const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
-+
-+  // |helper_| lives on the sequence |blocking_task_runner_| posts to and holds
-+  // a weak reference back to the service that owns it.
-+  std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_;
-+  base::WeakPtrFactory<HidServiceFido> weak_factory_{this};
-+};
-+
-+}  // namespace device
-+
-+#endif  // SERVICES_DEVICE_HID_HID_SERVICE_LINUX_H_
diff --git a/chromium-next/patches/patch-services_device_hid_hid__service__freebsd.cc b/chromium-next/patches/patch-services_device_hid_hid__service__freebsd.cc
deleted file mode 100644
index d6ed898995..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__service__freebsd.cc
+++ /dev/null
@@ -1,404 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_service_freebsd.cc.orig	2025-05-08 12:01:57.803625652 +0000
-+++ services/device/hid/hid_service_freebsd.cc
-@@ -0,0 +1,395 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "services/device/hid/hid_service_freebsd.h"
-+
-+#include <dev/usb/usb_ioctl.h>
-+#include <stdint.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+
-+#include <set>
-+#include <string>
-+#include <vector>
-+
-+#include "base/files/file_descriptor_watcher_posix.h"
-+#include "base/files/file_enumerator.h"
-+#include "base/files/file_util.h"
-+#include "base/files/file.h"
-+#include "base/location.h"
-+#include "base/logging.h"
-+#include "base/posix/eintr_wrapper.h"
-+#include "base/stl_util.h"
-+#include "base/strings/pattern.h"
-+#include "base/strings/stringprintf.h"
-+#include "base/strings/sys_string_conversions.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/string_split.h"
-+#include "base/task/single_thread_task_runner.h"
-+#include "base/task/thread_pool.h"
-+#include "base/threading/scoped_blocking_call.h"
-+#include "base/threading/thread_restrictions.h"
-+#include "components/device_event_log/device_event_log.h"
-+#include "services/device/hid/hid_connection_freebsd.h"
-+
-+const int kMaxPermissionChecks = 5;
-+
-+namespace device {
-+
-+struct HidServiceFreeBSD::ConnectParams {
-+  ConnectParams(scoped_refptr<HidDeviceInfo> device_info,
-+                bool allow_protected_reports,
-+		bool allow_fido_reports,
-+                ConnectCallback callback)
-+      : device_info(std::move(device_info)),
-+	allow_protected_reports(allow_protected_reports),
-+	allow_fido_reports(allow_fido_reports),
-+        callback(std::move(callback)),
-+	task_runner(base::SequencedTaskRunner::GetCurrentDefault()),
-+        blocking_task_runner(
-+            base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)) {}
-+  ~ConnectParams() {}
-+
-+  scoped_refptr<HidDeviceInfo> device_info;
-+  bool allow_protected_reports;
-+  bool allow_fido_reports;
-+  ConnectCallback callback;
-+  scoped_refptr<base::SequencedTaskRunner> task_runner;
-+  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner;
-+  base::ScopedFD fd;
-+};
-+
-+class HidServiceFreeBSD::BlockingTaskRunnerHelper {
-+ public:
-+  BlockingTaskRunnerHelper(base::WeakPtr<HidServiceFreeBSD> service)
-+      : service_(std::move(service)),
-+	task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
-+    DETACH_FROM_SEQUENCE(sequence_checker_);
-+
-+    timer_.reset(new base::RepeatingTimer());
-+    devd_buffer_ = new net::IOBufferWithSize(1024);
-+  }
-+
-+  BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete;
-+  BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete;
-+
-+  ~BlockingTaskRunnerHelper() {
-+  }
-+
-+  void Start() {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+
-+    const base::FilePath kDevRoot("/dev");
-+    const std::string kUHIDPattern("/dev/uhid*");
-+
-+    base::FileEnumerator enumerator(kDevRoot, false, base::FileEnumerator::FILES);
-+    do {
-+      const base::FilePath next_device_path(enumerator.Next());
-+      const std::string next_device = next_device_path.value();
-+      if (next_device.empty())
-+        break;
-+
-+      if (base::MatchPattern(next_device, kUHIDPattern))
-+        OnDeviceAdded(next_device.substr(5));
-+    } while (true);
-+
-+    SetupDevdMonitor();
-+
-+    task_runner_->PostTask(
-+        FROM_HERE,
-+        base::BindOnce(&HidServiceFreeBSD::FirstEnumerationComplete, service_));
-+  }
-+
-+  bool HaveReadWritePermissions(std::string device_id) {
-+    std::string device_node = "/dev/" + device_id;
-+    base::AssertBlockingAllowed();
-+
-+    base::FilePath device_path(device_node);
-+    base::File device_file;
-+    int flags =
-+        base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE;
-+    device_file.Initialize(device_path, flags);
-+    if (!device_file.IsValid())
-+      return false;
-+
-+    return true;
-+  }
-+
-+  void OnDeviceAdded(std::string device_id) {
-+    base::ScopedBlockingCall scoped_blocking_call(
-+        FROM_HERE, base::BlockingType::MAY_BLOCK);
-+    std::string device_node = "/dev/" + device_id;
-+    uint16_t vendor_id = 0xffff;
-+    uint16_t product_id = 0xffff;
-+    std::string product_name = "";
-+    std::string serial_number = "";
-+
-+    std::vector<uint8_t> report_descriptor;
-+
-+    base::AssertBlockingAllowed();
-+
-+    base::FilePath device_path(device_node);
-+    base::File device_file;
-+    int flags =
-+        base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE;
-+    device_file.Initialize(device_path, flags);
-+    if (!device_file.IsValid()) {
-+      HID_LOG(ERROR) << "Failed to open '" << device_node
-+                     << "': "
-+                     << base::File::ErrorToString(device_file.error_details());
-+      return;
-+    }
-+
-+    base::ScopedFD fd;
-+    fd.reset(device_file.TakePlatformFile());
-+
-+    struct usb_gen_descriptor ugd;
-+    ugd.ugd_data = NULL;
-+    ugd.ugd_maxlen = 0xffff;
-+    int result = HANDLE_EINTR(
-+        ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd));
-+
-+    if (result < 0) {
-+      HID_LOG(ERROR) << "Failed to get report descriptor size";
-+      return;
-+    }
-+
-+    report_descriptor.resize(ugd.ugd_actlen);
-+
-+    ugd.ugd_data = report_descriptor.data();
-+    ugd.ugd_maxlen = ugd.ugd_actlen;
-+    result = HANDLE_EINTR(
-+        ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd));
-+
-+    if (result < 0) {
-+      HID_LOG(ERROR) << "Failed to get report descriptor";
-+      return;
-+    }
-+
-+    scoped_refptr<HidDeviceInfo> device_info(new HidDeviceInfo(
-+        device_id,
-+        /*physical_device_id*/"",
-+	vendor_id,
-+	product_id,
-+	product_name,
-+	serial_number,
-+        device::mojom::HidBusType::kHIDBusTypeUSB,
-+        report_descriptor,
-+	device_node));
-+
-+    task_runner_->PostTask(FROM_HERE, base::BindOnce(&HidServiceFreeBSD::AddDevice,
-+                                                 service_, device_info));
-+  }
-+
-+  void OnDeviceRemoved(std::string device_id) {
-+    base::ScopedBlockingCall scoped_blocking_call(
-+        FROM_HERE, base::BlockingType::MAY_BLOCK);
-+    task_runner_->PostTask(
-+        FROM_HERE, base::BindOnce(&HidServiceFreeBSD::RemoveDevice, service_,
-+                                  device_id));
-+  }
-+
-+ private:
-+
-+  void CheckPendingPermissionChange() {
-+    base::AssertBlockingAllowed();
-+    std::map<std::string, int>::iterator it;
-+    for (it = permissions_checks_attempts_.begin(); it != permissions_checks_attempts_.end();) {
-+      std::string device_name = it->first;
-+      bool keep = true;
-+      if (HaveReadWritePermissions(device_name)) {
-+        OnDeviceAdded(device_name);
-+        keep = false;
-+      }
-+      else if (it->second-- <= 0) {
-+        HID_LOG(ERROR) << "Still don't have write permissions to '" << device_name
-+                       << "' after " << kMaxPermissionChecks << " attempts";
-+        keep = false;
-+      }
-+
-+      if (keep)
-+        ++it;
-+      else
-+        permissions_checks_attempts_.erase(it++);
-+    }
-+
-+    if (permissions_checks_attempts_.empty())
-+      timer_->Stop();
-+  }
-+
-+  void SetupDevdMonitor() {
-+    base::AssertBlockingAllowed();
-+
-+    int devd_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
-+    if (devd_fd < 0)
-+      return;
-+
-+    struct sockaddr_un sa;
-+
-+    sa.sun_family = AF_UNIX;
-+    strlcpy(sa.sun_path, "@VARBASE@/run/devd.seqpacket.pipe", sizeof(sa.sun_path));
-+    if (connect(devd_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
-+      close(devd_fd);
-+      return;
-+    } 
-+
-+    devd_fd_.reset(devd_fd);
-+    file_watcher_ = base::FileDescriptorWatcher::WatchReadable(
-+        devd_fd_.get(), base::BindRepeating(&BlockingTaskRunnerHelper::OnDevdMessageCanBeRead,
-+                                            base::Unretained(this)));
-+  }
-+
-+  void OnDevdMessageCanBeRead() {
-+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    ssize_t bytes_read = HANDLE_EINTR(recv(devd_fd_.get(), devd_buffer_->data(),
-+                                      devd_buffer_->size() - 1, MSG_WAITALL));
-+    if (bytes_read < 0) {
-+      if (errno != EAGAIN) {
-+        HID_LOG(ERROR) << "Read failed";
-+        file_watcher_.reset();
-+      }
-+      return;
-+    }
-+
-+    devd_buffer_->data()[bytes_read] = 0;
-+    char *data = devd_buffer_->data();
-+    // It may take some time for devd to change permissions
-+    // on /dev/uhidX node. So do not fail immediately if
-+    // open fail. Retry each second for kMaxPermissionChecks
-+    // times before giving up entirely
-+    if (base::StartsWith(data, "+uhid", base::CompareCase::SENSITIVE)) {
-+      std::vector<std::string> parts = base::SplitString(
-+        data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-+      if (!parts.empty()) {
-+        std::string device_name = parts[0].substr(1); // skip '+'
-+        if (HaveReadWritePermissions(device_name))
-+          OnDeviceAdded(parts[0].substr(1));
-+        else {
-+          // Do not re-add to checks
-+          if (permissions_checks_attempts_.find(device_name) == permissions_checks_attempts_.end()) {
-+            permissions_checks_attempts_.insert(std::pair<std::string, int>(device_name, kMaxPermissionChecks));
-+            timer_->Start(FROM_HERE, base::Seconds(1),
-+                          this, &BlockingTaskRunnerHelper::CheckPendingPermissionChange);
-+          }
-+        }
-+      }
-+    }
-+
-+    if (base::StartsWith(data, "-uhid", base::CompareCase::SENSITIVE)) {
-+      std::vector<std::string> parts = base::SplitString(
-+        data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-+      if (!parts.empty()) {
-+        std::string device_name = parts[0].substr(1); // skip '-'
-+        auto it = permissions_checks_attempts_.find(device_name);
-+        if (it != permissions_checks_attempts_.end()) {
-+          permissions_checks_attempts_.erase(it);
-+          if (permissions_checks_attempts_.empty())
-+            timer_->Stop();
-+        }
-+        OnDeviceRemoved(parts[0].substr(1));
-+      }
-+    }
-+  }
-+
-+  SEQUENCE_CHECKER(sequence_checker_);
-+
-+  // This weak pointer is only valid when checked on this task runner.
-+  base::WeakPtr<HidServiceFreeBSD> service_;
-+  scoped_refptr<base::SequencedTaskRunner> task_runner_;
-+  std::unique_ptr<base::FileDescriptorWatcher::Controller> file_watcher_;
-+  std::unique_ptr<base::RepeatingTimer> timer_;
-+  base::ScopedFD devd_fd_;
-+  scoped_refptr<net::IOBufferWithSize> devd_buffer_;
-+  std::map<std::string, int> permissions_checks_attempts_;
-+};
-+
-+HidServiceFreeBSD::HidServiceFreeBSD()
-+    : blocking_task_runner_(
-+          base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)),
-+      helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner_)) {
-+  helper_.reset(new BlockingTaskRunnerHelper(weak_factory_.GetWeakPtr()));
-+  blocking_task_runner_->PostTask(
-+      FROM_HERE,
-+      base::BindOnce(&BlockingTaskRunnerHelper::Start, base::Unretained(helper_.get())));
-+}
-+
-+HidServiceFreeBSD::~HidServiceFreeBSD() {
-+  blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release());
-+}
-+
-+base::WeakPtr<HidService> HidServiceFreeBSD::GetWeakPtr() {
-+  return weak_factory_.GetWeakPtr();
-+}
-+
-+// static
-+void HidServiceFreeBSD::OpenOnBlockingThread(
-+    std::unique_ptr<ConnectParams> params) {
-+  base::ScopedBlockingCall scoped_blocking_call(
-+      FROM_HERE, base::BlockingType::MAY_BLOCK);
-+  scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner;
-+
-+  base::FilePath device_path(params->device_info->device_node());
-+  base::File device_file;
-+  int flags =
-+      base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE;
-+  device_file.Initialize(device_path, flags);
-+  if (!device_file.IsValid()) {
-+    HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node()
-+                   << "': "
-+                   << base::File::ErrorToString(device_file.error_details());
-+    task_runner->PostTask(FROM_HERE,
-+		          base::BindOnce(std::move(params->callback), nullptr));
-+    return;
-+  }
-+  params->fd.reset(device_file.TakePlatformFile());
-+  task_runner->PostTask(FROM_HERE, base::BindOnce(&HidServiceFreeBSD::FinishOpen,
-+			                          std::move(params)));
-+}
-+
-+void HidServiceFreeBSD::Connect(const std::string& device_guid,
-+                                bool allow_protected_reports,
-+				bool allow_fido_reports,
-+                                ConnectCallback callback) {
-+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+
-+  const auto& map_entry = devices().find(device_guid);
-+  if (map_entry == devices().end()) {
-+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
-+        FROM_HERE, base::BindOnce(std::move(callback), nullptr));
-+    return;
-+  }
-+
-+  scoped_refptr<HidDeviceInfo> device_info = map_entry->second;
-+
-+  auto params = std::make_unique<ConnectParams>(device_info,
-+                                                allow_protected_reports,
-+						allow_fido_reports,
-+						std::move(callback));
-+  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner =
-+      params->blocking_task_runner;
-+
-+  blocking_task_runner->PostTask(
-+      FROM_HERE, base::BindOnce(&HidServiceFreeBSD::OpenOnBlockingThread,
-+                                std::move(params)));
-+}
-+
-+// static
-+void HidServiceFreeBSD::FinishOpen(std::unique_ptr<ConnectParams> params) {
-+  DCHECK(params->fd.is_valid());
-+
-+  if (!base::SetNonBlocking(params->fd.get())) {
-+    HID_PLOG(ERROR) << "Failed to set the non-blocking flag on the device fd";
-+    std::move(params->callback).Run(nullptr);
-+  }
-+
-+  std::move(params->callback).Run(base::MakeRefCounted<HidConnectionFreeBSD>(
-+    std::move(params->device_info),
-+    std::move(params->fd),
-+    std::move(params->blocking_task_runner),
-+    params->allow_protected_reports,
-+    params->allow_fido_reports
-+  ));
-+}
-+
-+}  // namespace device
diff --git a/chromium-next/patches/patch-services_device_hid_hid__service__freebsd.h b/chromium-next/patches/patch-services_device_hid_hid__service__freebsd.h
deleted file mode 100644
index c07d5629ba..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__service__freebsd.h
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_service_freebsd.h.orig	2025-05-08 12:01:57.803789187 +0000
-+++ services/device/hid/hid_service_freebsd.h
-@@ -0,0 +1,49 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef DEVICE_HID_HID_SERVICE_FREEBSD_H_
-+#define DEVICE_HID_HID_SERVICE_FREEBSD_H_
-+
-+#include <string>
-+
-+#include "base/memory/ref_counted.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/timer/timer.h"
-+#include "services/device/hid/hid_service.h"
-+#include "net/base/io_buffer.h"
-+
-+namespace device {
-+
-+class HidServiceFreeBSD : public HidService {
-+ public:
-+  HidServiceFreeBSD();
-+
-+  HidServiceFreeBSD(const HidServiceFreeBSD&) = delete;
-+  HidServiceFreeBSD& operator=(const HidServiceFreeBSD&) = delete;
-+
-+  ~HidServiceFreeBSD() override;
-+
-+  void Connect(const std::string& device_guid,
-+               bool allow_protected_reports,
-+	       bool allow_fido_reports,
-+               ConnectCallback connect) override;
-+  base::WeakPtr<HidService> GetWeakPtr() override;
-+
-+ private:
-+  struct ConnectParams;
-+  class BlockingTaskRunnerHelper;
-+
-+  static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params);
-+  static void FinishOpen(std::unique_ptr<ConnectParams> params);
-+
-+  const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
-+  // |helper_| lives on the sequence |blocking_task_runner_| posts to and holds
-+  // a weak reference back to the service that owns it.
-+  std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_;
-+  base::WeakPtrFactory<HidServiceFreeBSD> weak_factory_{this};
-+};
-+
-+}  // namespace device
-+
-+#endif  // DEVICE_HID_HID_SERVICE_FREEBSD_H_
diff --git a/chromium-next/patches/patch-services_device_hid_hid__service__netbsd.cc b/chromium-next/patches/patch-services_device_hid_hid__service__netbsd.cc
deleted file mode 100644
index db1cfc20c6..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__service__netbsd.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_service_netbsd.cc.orig	2025-05-08 12:01:57.803926431 +0000
-+++ services/device/hid/hid_service_netbsd.cc
-@@ -0,0 +1,27 @@
-+// Copyright 2022 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "services/device/hid/hid_service_netbsd.h"
-+
-+#include "base/notreached.h"
-+#include "services/device/hid/hid_connection.h"
-+
-+namespace device {
-+
-+HidServiceNetBSD::HidServiceNetBSD() = default;
-+HidServiceNetBSD::~HidServiceNetBSD() = default;
-+
-+void HidServiceNetBSD::Connect(const std::string& device_id,
-+                                bool allow_protected_reports,
-+                                bool allow_fido_reports,
-+                                ConnectCallback callback) {
-+  NOTIMPLEMENTED_LOG_ONCE();
-+  std::move(callback).Run(nullptr);
-+}
-+
-+base::WeakPtr<HidService> HidServiceNetBSD::GetWeakPtr() {
-+  return weak_factory_.GetWeakPtr();
-+}
-+
-+}  // namespace device
diff --git a/chromium-next/patches/patch-services_device_hid_hid__service__netbsd.h b/chromium-next/patches/patch-services_device_hid_hid__service__netbsd.h
deleted file mode 100644
index d2db01d60e..0000000000
--- a/chromium-next/patches/patch-services_device_hid_hid__service__netbsd.h
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/hid/hid_service_netbsd.h.orig	2025-05-08 12:01:57.804059488 +0000
-+++ services/device/hid/hid_service_netbsd.h
-@@ -0,0 +1,33 @@
-+// Copyright 2022 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SERVICES_DEVICE_HID_HID_SERVICE_NETBSD_H_
-+#define SERVICES_DEVICE_HID_HID_SERVICE_NETBSD_H_
-+
-+#include "services/device/hid/hid_service.h"
-+
-+namespace device {
-+
-+class HidServiceNetBSD : public HidService {
-+ public:
-+  HidServiceNetBSD();
-+  ~HidServiceNetBSD() override;
-+
-+  HidServiceNetBSD(const HidServiceNetBSD&) = delete;
-+  HidServiceNetBSD& operator=(const HidServiceNetBSD&) = delete;
-+
-+ private:
-+  // HidService implementation.
-+  void Connect(const std::string& device_id,
-+               bool allow_protected_reports,
-+               bool allow_fido_reports,
-+               ConnectCallback callback) override;
-+  base::WeakPtr<HidService> GetWeakPtr() override;
-+
-+  base::WeakPtrFactory<HidServiceNetBSD> weak_factory_{this};
-+};
-+
-+}  // namespace device
-+
-+#endif  // SERVICES_DEVICE_HID_HID_SERVICE_NETBSD_H_
diff --git a/chromium-next/patches/patch-services_device_public_cpp_device__features.cc b/chromium-next/patches/patch-services_device_public_cpp_device__features.cc
deleted file mode 100644
index cdaa04fc39..0000000000
--- a/chromium-next/patches/patch-services_device_public_cpp_device__features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/public/cpp/device_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/public/cpp/device_features.cc
-@@ -135,7 +135,7 @@ bool IsOsLevelGeolocationPermissionSuppo
- 
- // Controls whether Chrome will try to automatically detach kernel drivers when
- // a USB interface is busy.
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kAutomaticUsbDetach,
-              "AutomaticUsbDetach",
-              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-services_device_public_cpp_device__features.h b/chromium-next/patches/patch-services_device_public_cpp_device__features.h
deleted file mode 100644
index 6bb2b336de..0000000000
--- a/chromium-next/patches/patch-services_device_public_cpp_device__features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/public/cpp/device_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/public/cpp/device_features.h
-@@ -53,7 +53,7 @@ extern const DEVICE_FEATURES_EXPORT
- 
- DEVICE_FEATURES_EXPORT bool IsOsLevelGeolocationPermissionSupportEnabled();
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- DEVICE_FEATURES_EXPORT BASE_DECLARE_FEATURE(kAutomaticUsbDetach);
- #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-services_device_public_cpp_generic__sensor_sensor__reading.h b/chromium-next/patches/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
deleted file mode 100644
index 96be1d57f6..0000000000
--- a/chromium-next/patches/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/public/cpp/generic_sensor/sensor_reading.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/public/cpp/generic_sensor/sensor_reading.h
-@@ -8,6 +8,8 @@
- #include <stddef.h>
- #include <stdint.h>
- 
-+#include <cstdint>
-+
- #include <type_traits>
- 
- namespace device {
diff --git a/chromium-next/patches/patch-services_device_public_mojom_BUILD.gn b/chromium-next/patches/patch-services_device_public_mojom_BUILD.gn
deleted file mode 100644
index 5068c72939..0000000000
--- a/chromium-next/patches/patch-services_device_public_mojom_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/public/mojom/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/public/mojom/BUILD.gn
-@@ -96,7 +96,7 @@ mojom("device_service") {
-   enable_js_fuzzing = false
- 
-   enabled_features = []
--  if ((is_linux || is_chromeos) && use_udev) {
-+  if ((is_linux || is_chromeos) && !is_bsd && use_udev) {
-     enabled_features += [ "enable_input_device_manager" ]
-   }
- 
diff --git a/chromium-next/patches/patch-services_device_serial_BUILD.gn b/chromium-next/patches/patch-services_device_serial_BUILD.gn
deleted file mode 100644
index 56f18ec0c1..0000000000
--- a/chromium-next/patches/patch-services_device_serial_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/serial/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/serial/BUILD.gn
-@@ -4,7 +4,7 @@
- 
- import("//build/config/features.gni")
- 
--if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac || is_android) {
-+if (is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac || is_android) {
-   config("platform_support") {
-     visibility = [ ":serial" ]
-     if (is_win) {
diff --git a/chromium-next/patches/patch-services_device_serial_serial__device__enumerator.cc b/chromium-next/patches/patch-services_device_serial_serial__device__enumerator.cc
deleted file mode 100644
index d81508a699..0000000000
--- a/chromium-next/patches/patch-services_device_serial_serial__device__enumerator.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/serial/serial_device_enumerator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/serial/serial_device_enumerator.cc
-@@ -13,7 +13,7 @@
- #include "build/build_config.h"
- #include "components/device_event_log/device_event_log.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "services/device/serial/serial_device_enumerator_linux.h"
- #elif BUILDFLAG(IS_MAC)
- #include "services/device/serial/serial_device_enumerator_mac.h"
-@@ -28,7 +28,7 @@ namespace device {
- // static
- std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create(
-     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return SerialDeviceEnumeratorLinux::Create();
- #elif BUILDFLAG(IS_MAC)
-   return std::make_unique<SerialDeviceEnumeratorMac>();
diff --git a/chromium-next/patches/patch-services_device_serial_serial__io__handler__posix.cc b/chromium-next/patches/patch-services_device_serial_serial__io__handler__posix.cc
deleted file mode 100644
index 77f45a0d9f..0000000000
--- a/chromium-next/patches/patch-services_device_serial_serial__io__handler__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/serial/serial_io_handler_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/serial/serial_io_handler_posix.cc
-@@ -73,7 +73,7 @@ bool BitrateToSpeedConstant(int bitrate,
-     BITRATE_TO_SPEED_CASE(9600)
-     BITRATE_TO_SPEED_CASE(19200)
-     BITRATE_TO_SPEED_CASE(38400)
--#if !BUILDFLAG(IS_MAC)
-+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
-     BITRATE_TO_SPEED_CASE(57600)
-     BITRATE_TO_SPEED_CASE(115200)
-     BITRATE_TO_SPEED_CASE(230400)
diff --git a/chromium-next/patches/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/chromium-next/patches/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
deleted file mode 100644
index 00b6684354..0000000000
--- a/chromium-next/patches/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
-@@ -131,9 +131,12 @@ class TimeZoneMonitorLinuxImpl
-     // false positives are harmless, assuming the false positive rate is
-     // reasonable.
-     const auto kFilesToWatch = std::to_array<const char*>({
--        "/etc/localtime",
-+#if BUILDFLAG(IS_BSD)
-+        "@PKG_SYSCONFBASE@/localtime",
-+#else
-         "/etc/timezone",
-         "/etc/TZ",
-+#endif
-     });
-     for (size_t index = 0; index < std::size(kFilesToWatch); ++index) {
-       file_path_watchers_.push_back(std::make_unique<base::FilePathWatcher>());
diff --git a/chromium-next/patches/patch-services_device_usb_BUILD.gn b/chromium-next/patches/patch-services_device_usb_BUILD.gn
deleted file mode 100644
index 3aa5456f13..0000000000
--- a/chromium-next/patches/patch-services_device_usb_BUILD.gn
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/usb/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/usb/BUILD.gn
-@@ -90,7 +90,7 @@ static_library("usb") {
-     deps += [ "//third_party/re2" ]
-   }
- 
--  if (is_mac) {
-+  if (is_mac || is_openbsd) {
-     # These sources and deps are required for libusb.
-     # TODO(crbug.com/40136337) Remove these sources.
-     sources += [
-@@ -113,6 +113,13 @@ static_library("usb") {
-     deps += [ "//third_party/libusb" ]
-   }
- 
-+  if (is_freebsd || is_netbsd) {
-+    sources += [
-+      "usb_service_fake.cc",
-+      "usb_service_fake.h",
-+    ]
-+  }
-+
-   if (is_linux || is_chromeos) {
-     sources += [
-       "usb_device_linux.cc",
-@@ -134,7 +141,7 @@ static_library("usb") {
-     deps += [ "//device/udev_linux" ]
-   }
- 
--  if (is_android || is_chromeos || is_linux) {
-+  if (is_android || is_chromeos || is_linux && !is_bsd) {
-     sources += [
-       "usb_device_handle_usbfs.cc",
-       "usb_device_handle_usbfs.h",
diff --git a/chromium-next/patches/patch-services_device_usb_usb__device__handle__usbfs.cc b/chromium-next/patches/patch-services_device_usb_usb__device__handle__usbfs.cc
deleted file mode 100644
index 43855a93de..0000000000
--- a/chromium-next/patches/patch-services_device_usb_usb__device__handle__usbfs.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/usb/usb_device_handle_usbfs.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/usb/usb_device_handle_usbfs.cc
-@@ -39,7 +39,7 @@
- #include "chromeos/dbus/permission_broker/permission_broker_client.h"
- #endif
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "services/device/public/cpp/device_features.h"
- #include "services/device/usb/usb_interface_detach_allowlist.h"
- #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-@@ -271,7 +271,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskR
-   return true;
- }
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::DetachInterface(
-     int interface_number,
-     const CombinedInterfaceInfo& interface_info) {
-@@ -599,7 +599,7 @@ void UsbDeviceHandleUsbfs::ClaimInterfac
-     return;
-   }
- #endif
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
-     const mojom::UsbConfigurationInfo* config =
-         device_->GetActiveConfiguration();
-@@ -945,7 +945,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterf
-     return;
-   }
- #endif
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
-     helper_.AsyncCall(&BlockingTaskRunnerHelper::ReattachInterface)
-         .WithArgs(interface_number)
diff --git a/chromium-next/patches/patch-services_device_usb_usb__device__handle__usbfs.h b/chromium-next/patches/patch-services_device_usb_usb__device__handle__usbfs.h
deleted file mode 100644
index ee9b9e824f..0000000000
--- a/chromium-next/patches/patch-services_device_usb_usb__device__handle__usbfs.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/usb/usb_device_handle_usbfs.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/usb/usb_device_handle_usbfs.h
-@@ -19,7 +19,7 @@
- #include "base/threading/sequence_bound.h"
- #include "services/device/usb/usb_device_handle.h"
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/containers/flat_set.h"
- #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
- 
-@@ -215,7 +215,7 @@ class UsbDeviceHandleUsbfs::BlockingTask
-   bool ClearHalt(uint8_t endpoint_address);
-   void DiscardUrb(Transfer* transfer);
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Detach the interface from a kernel driver before ClaimInterface
-   virtual bool DetachInterface(int interface_number,
-                                const CombinedInterfaceInfo& interfaceInfo);
-@@ -228,7 +228,7 @@ class UsbDeviceHandleUsbfs::BlockingTask
-   // Called when |fd_| is writable without blocking.
-   void OnFileCanWriteWithoutBlocking();
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Called from |DetachInterface|.
-   std::string GetKernelDriver(int interface_number) const;
- #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-@@ -240,7 +240,7 @@ class UsbDeviceHandleUsbfs::BlockingTask
-   std::unique_ptr<base::FileDescriptorWatcher::Controller> watch_controller_;
-   SEQUENCE_CHECKER(sequence_checker_);
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // All interfaces that have been detached from kernel drivers
-   base::flat_set<int> detached_interfaces_;
- #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-services_device_usb_usb__service.cc b/chromium-next/patches/patch-services_device_usb_usb__service.cc
deleted file mode 100644
index adef7e9815..0000000000
--- a/chromium-next/patches/patch-services_device_usb_usb__service.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/usb/usb_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/device/usb/usb_service.cc
-@@ -21,12 +21,16 @@
- 
- #if BUILDFLAG(IS_ANDROID)
- #include "services/device/usb/usb_service_android.h"
--#elif defined(USE_UDEV)
-+#elif defined(USE_UDEV) && !BUILDFLAG(IS_BSD)
- #include "services/device/usb/usb_service_linux.h"
- #elif BUILDFLAG(IS_MAC)
- #include "services/device/usb/usb_service_impl.h"
- #elif BUILDFLAG(IS_WIN)
- #include "services/device/usb/usb_service_win.h"
-+#elif BUILDFLAG(IS_OPENBSD)
-+#include "services/device/usb/usb_service_impl.h"
-+#elif BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
-+#include "services/device/usb/usb_service_fake.h"
- #endif
- 
- namespace device {
-@@ -49,12 +53,14 @@ constexpr base::TaskTraits UsbService::k
- std::unique_ptr<UsbService> UsbService::Create() {
- #if BUILDFLAG(IS_ANDROID)
-   return base::WrapUnique(new UsbServiceAndroid());
--#elif defined(USE_UDEV)
-+#elif defined(USE_UDEV) && !BUILDFLAG(IS_BSD)
-   return base::WrapUnique(new UsbServiceLinux());
- #elif BUILDFLAG(IS_WIN)
-   return base::WrapUnique(new UsbServiceWin());
- #elif BUILDFLAG(IS_MAC)
-   return base::WrapUnique(new UsbServiceImpl());
-+#elif BUILDFLAG(IS_BSD)
-+  return base::WrapUnique(new UsbServiceImpl());
- #else
-   return nullptr;
- #endif
diff --git a/chromium-next/patches/patch-services_device_usb_usb__service__fake.cc b/chromium-next/patches/patch-services_device_usb_usb__service__fake.cc
deleted file mode 100644
index ca322d19d1..0000000000
--- a/chromium-next/patches/patch-services_device_usb_usb__service__fake.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/usb/usb_service_fake.cc.orig	2025-05-08 12:01:57.805774080 +0000
-+++ services/device/usb/usb_service_fake.cc
-@@ -0,0 +1,49 @@
-+// Copyright 2014 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "services/device/usb/usb_service_fake.h"
-+
-+#include <stdint.h>
-+
-+#include <list>
-+#include <memory>
-+#include <set>
-+#include <utility>
-+
-+#include "base/barrier_closure.h"
-+#include "base/containers/contains.h"
-+#include "base/location.h"
-+#include "base/memory/ref_counted_memory.h"
-+#include "base/memory/weak_ptr.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "base/task/sequenced_task_runner.h"
-+#include "base/task/single_thread_task_runner.h"
-+#include "base/task/thread_pool.h"
-+#include "base/threading/scoped_blocking_call.h"
-+#include "build/build_config.h"
-+#include "components/device_event_log/device_event_log.h"
-+#include "services/device/usb/usb_device_handle.h"
-+#include "services/device/usb/usb_error.h"
-+#include "services/device/usb/webusb_descriptors.h"
-+
-+namespace device {
-+
-+UsbServiceImpl::UsbServiceImpl()
-+    : task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) {
-+  NOTIMPLEMENTED();
-+}
-+
-+UsbServiceImpl::~UsbServiceImpl() {
-+  NOTIMPLEMENTED();
-+  NotifyWillDestroyUsbService();
-+}
-+
-+void UsbServiceImpl::GetDevices(GetDevicesCallback callback) {
-+  NOTIMPLEMENTED();
-+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+  UsbService::GetDevices(std::move(callback));
-+}
-+
-+}  // namespace device
diff --git a/chromium-next/patches/patch-services_device_usb_usb__service__fake.h b/chromium-next/patches/patch-services_device_usb_usb__service__fake.h
deleted file mode 100644
index 3183951b80..0000000000
--- a/chromium-next/patches/patch-services_device_usb_usb__service__fake.h
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/device/usb/usb_service_fake.h.orig	2025-05-08 12:01:57.805907437 +0000
-+++ services/device/usb/usb_service_fake.h
-@@ -0,0 +1,48 @@
-+// Copyright 2015 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SERVICES_DEVICE_USB_USB_SERVICE_IMPL_H_
-+#define SERVICES_DEVICE_USB_USB_SERVICE_IMPL_H_
-+
-+#include "services/device/usb/usb_service.h"
-+
-+#include <stddef.h>
-+
-+#include <map>
-+#include <set>
-+#include <string>
-+#include <vector>
-+
-+#include "base/containers/queue.h"
-+#include "base/memory/weak_ptr.h"
-+#include "build/build_config.h"
-+#include "services/device/usb/usb_context.h"
-+#include "services/device/usb/usb_device_impl.h"
-+#include "third_party/abseil-cpp/absl/types/optional.h"
-+
-+namespace device {
-+
-+class UsbDeviceImpl;
-+
-+class UsbServiceImpl final : public UsbService {
-+ public:
-+  UsbServiceImpl();
-+
-+  UsbServiceImpl(const UsbServiceImpl&) = delete;
-+  UsbServiceImpl& operator=(const UsbServiceImpl&) = delete;
-+
-+  ~UsbServiceImpl() override;
-+
-+ private:
-+  // device::UsbService implementation
-+  void GetDevices(GetDevicesCallback callback) override;
-+
-+  void OnUsbContext(scoped_refptr<UsbContext> context);
-+
-+  scoped_refptr<base::SequencedTaskRunner> task_runner_;
-+};
-+
-+}  // namespace device
-+
-+#endif  // SERVICES_DEVICE_USB_USB_SERVICE_IMPL_H_
diff --git a/chromium-next/patches/patch-services_network_BUILD.gn b/chromium-next/patches/patch-services_network_BUILD.gn
deleted file mode 100644
index 0dac6b97f8..0000000000
--- a/chromium-next/patches/patch-services_network_BUILD.gn
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/BUILD.gn
-@@ -400,7 +400,6 @@ if (is_linux || is_chromeos) {
-     ]
-     deps = [
-       "//base:base",
--      "//sandbox/linux:sandbox_services",
-       "//sandbox/policy:policy",
-     ]
-     configs += [ "//build/config/compiler:wexit_time_destructors" ]
diff --git a/chromium-next/patches/patch-services_network_network__context.cc b/chromium-next/patches/patch-services_network_network__context.cc
deleted file mode 100644
index 05ed9cd9c7..0000000000
--- a/chromium-next/patches/patch-services_network_network__context.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/network_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/network_context.cc
-@@ -607,7 +607,7 @@ NetworkContext::NetworkContextHttpAuthPr
- NetworkContext::NetworkContextHttpAuthPreferences::
-     ~NetworkContextHttpAuthPreferences() = default;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
-     const {
-   if (network_service_) {
-@@ -2557,7 +2557,7 @@ void NetworkContext::OnHttpAuthDynamicPa
-       http_auth_dynamic_network_service_params->android_negotiate_account_type);
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   http_auth_merged_preferences_.set_allow_gssapi_library_load(
-       http_auth_dynamic_network_service_params->allow_gssapi_library_load);
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-services_network_network__context.h b/chromium-next/patches/patch-services_network_network__context.h
deleted file mode 100644
index f6f0007974..0000000000
--- a/chromium-next/patches/patch-services_network_network__context.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/network_context.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/network_context.h
-@@ -715,7 +715,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
-    public:
-     explicit NetworkContextHttpAuthPreferences(NetworkService* network_service);
-     ~NetworkContextHttpAuthPreferences() override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     bool AllowGssapiLibraryLoad() const override;
- #endif  // BUILDFLAG(IS_LINUX)
-    private:
diff --git a/chromium-next/patches/patch-services_network_network__sandbox__hook__linux.cc b/chromium-next/patches/patch-services_network_network__sandbox__hook__linux.cc
deleted file mode 100644
index c570d72ea3..0000000000
--- a/chromium-next/patches/patch-services_network_network__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/network_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/network_sandbox_hook_linux.cc
-@@ -15,11 +15,14 @@
- #include "sandbox/linux/syscall_broker/broker_file_permission.h"
- #include "sandbox/policy/features.h"
- 
-+#if !BUILDFLAG(IS_BSD)
- using sandbox::syscall_broker::BrokerFilePermission;
- using sandbox::syscall_broker::MakeBrokerCommandSet;
-+#endif
- 
- namespace network {
- 
-+#if !BUILDFLAG(IS_BSD)
- sandbox::syscall_broker::BrokerCommandSet GetNetworkBrokerCommandSet() {
-   return MakeBrokerCommandSet({
-       sandbox::syscall_broker::COMMAND_ACCESS,
-@@ -103,9 +106,11 @@ void LoadNetworkLibraries() {
-   }
- }
- #endif  // BUILDFLAG(IS_CHROMEOS)
-+#endif
- 
- bool NetworkPreSandboxHook(std::vector<std::string> network_context_parent_dirs,
-                            sandbox::policy::SandboxLinux::Options options) {
-+#if !BUILDFLAG(IS_BSD)
- #if BUILDFLAG(IS_CHROMEOS)
-   LoadNetworkLibraries();
- #endif
-@@ -118,6 +123,7 @@ bool NetworkPreSandboxHook(std::vector<s
-       GetNetworkBrokerCommandSet(),
-       GetNetworkFilePermissions(std::move(network_context_parent_dirs)),
-       options);
-+#endif
- 
-   return true;
- }
diff --git a/chromium-next/patches/patch-services_network_network__sandbox__hook__linux.h b/chromium-next/patches/patch-services_network_network__sandbox__hook__linux.h
deleted file mode 100644
index 898d99d0ec..0000000000
--- a/chromium-next/patches/patch-services_network_network__sandbox__hook__linux.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/network_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/network_sandbox_hook_linux.h
-@@ -6,7 +6,11 @@
- #define SERVICES_NETWORK_NETWORK_SANDBOX_HOOK_LINUX_H_
- 
- #include "base/component_export.h"
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace network {
- 
diff --git a/chromium-next/patches/patch-services_network_network__service.cc b/chromium-next/patches/patch-services_network_network__service.cc
deleted file mode 100644
index 04b207a90c..0000000000
--- a/chromium-next/patches/patch-services_network_network__service.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/network_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/network_service.cc
-@@ -103,11 +103,11 @@
- #include "third_party/boringssl/src/include/openssl/cpu.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS)
- #include "components/os_crypt/sync/key_storage_config_linux.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "services/network/network_change_notifier_passive_factory.h"
- #endif
- 
-@@ -1016,7 +1016,7 @@ void NetworkService::SetExplicitlyAllowe
-   net::SetExplicitlyAllowedPorts(ports);
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void NetworkService::SetGssapiLibraryLoadObserver(
-     mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
-         gssapi_library_load_observer) {
-@@ -1116,7 +1116,7 @@ NetworkService::CreateHttpAuthHandlerFac
-   );
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void NetworkService::OnBeforeGssapiLibraryLoad() {
-   if (gssapi_library_load_observer_.is_bound()) {
-     gssapi_library_load_observer_->OnBeforeGssapiLibraryLoad();
diff --git a/chromium-next/patches/patch-services_network_network__service.h b/chromium-next/patches/patch-services_network_network__service.h
deleted file mode 100644
index f79f6cfcb5..0000000000
--- a/chromium-next/patches/patch-services_network_network__service.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/network_service.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/network_service.h
-@@ -250,7 +250,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
-       const std::vector<ContentSettingPatternSource>& settings) override;
- 
-   void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void SetGssapiLibraryLoadObserver(
-       mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
-           gssapi_library_load_observer) override;
-@@ -291,7 +291,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
-   std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory(
-       NetworkContext* network_context);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // This is called just before a GSSAPI library may be loaded.
-   void OnBeforeGssapiLibraryLoad();
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -547,7 +547,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
-   // leaking stale listeners between tests.
-   std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   mojo::Remote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer_;
- #endif  // BUILDFLAG(IS_LINUX)
- 
diff --git a/chromium-next/patches/patch-services_network_public_cpp_BUILD.gn b/chromium-next/patches/patch-services_network_public_cpp_BUILD.gn
deleted file mode 100644
index b307f0f568..0000000000
--- a/chromium-next/patches/patch-services_network_public_cpp_BUILD.gn
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/public/cpp/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/public/cpp/BUILD.gn
-@@ -621,7 +621,7 @@ component("cpp_base") {
-     sources += [ "transferable_directory_fuchsia.cc" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux && !is_bsd) {
-     sources += [
-       "network_interface_change_listener_mojom_traits.cc",
-       "network_interface_change_listener_mojom_traits.h",
-@@ -742,7 +742,7 @@ source_set("tests") {
-     "x_frame_options_parser_unittest.cc",
-   ]
- 
--  if (is_linux) {
-+  if ((is_linux) && !is_bsd) {
-     sources += [ "network_interface_change_listener_mojom_traits_unittest.cc" ]
-   }
- 
diff --git a/chromium-next/patches/patch-services_network_public_cpp_features.cc b/chromium-next/patches/patch-services_network_public_cpp_features.cc
deleted file mode 100644
index 0e526ed8ba..0000000000
--- a/chromium-next/patches/patch-services_network_public_cpp_features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/public/cpp/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/public/cpp/features.cc
-@@ -125,7 +125,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
- BASE_FEATURE(kDnsOverHttpsUpgrade,
-              "DnsOverHttpsUpgrade",
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium-next/patches/patch-services_network_public_mojom_BUILD.gn b/chromium-next/patches/patch-services_network_public_mojom_BUILD.gn
deleted file mode 100644
index cbd0ddd94c..0000000000
--- a/chromium-next/patches/patch-services_network_public_mojom_BUILD.gn
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/public/mojom/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/public/mojom/BUILD.gn
-@@ -674,11 +674,11 @@ mojom("url_loader_base") {
-   }
- 
-   enabled_features = []
--  if (is_android || is_chromeos || is_linux) {
-+  if (!is_bsd && (is_android || is_chromeos || is_linux)) {
-     enabled_features += [ "network_change_notifier_in_browser" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux && !is_bsd) {
-     # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does
-     # not include lacros.
-     enabled_features += [ "use_network_interface_change_listener" ]
-@@ -1765,7 +1765,7 @@ mojom("mojom") {
-     }
-   }
- 
--  if (is_linux) {
-+  if (is_linux && !is_bsd) {
-     # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does
-     # not include lacros.
-     enabled_features += [ "use_network_interface_change_listener" ]
diff --git a/chromium-next/patches/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h b/chromium-next/patches/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
deleted file mode 100644
index cd54c762cd..0000000000
--- a/chromium-next/patches/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/network/shared_dictionary/shared_dictionary_writer_in_memory.h
-@@ -9,6 +9,8 @@
- #include <string>
- #include <vector>
- 
-+#include <vector>
-+
- #include "base/component_export.h"
- #include "base/functional/callback.h"
- #include "crypto/secure_hash.h"
diff --git a/chromium-next/patches/patch-services_on__device__model_on__device__model__service.h b/chromium-next/patches/patch-services_on__device__model_on__device__model__service.h
deleted file mode 100644
index 6d3cf8d06b..0000000000
--- a/chromium-next/patches/patch-services_on__device__model_on__device__model__service.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/on_device_model/on_device_model_service.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/on_device_model/on_device_model_service.h
-@@ -31,6 +31,10 @@ class OnDeviceModelInternalImpl;
- class TsHolder;
- }
- 
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#endif
-+
- namespace on_device_model {
- 
- class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelService
-@@ -44,7 +48,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) 
-   // Must be called in the service's process after the run loop finished.
-   [[nodiscard]] static bool Shutdown();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static void AddSandboxLinuxOptions(
-       sandbox::policy::SandboxLinux::Options& options);
- #endif
diff --git a/chromium-next/patches/patch-services_on__device__model_pre__sandbox__init.cc b/chromium-next/patches/patch-services_on__device__model_pre__sandbox__init.cc
deleted file mode 100644
index 8c1711d913..0000000000
--- a/chromium-next/patches/patch-services_on__device__model_pre__sandbox__init.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/on_device_model/pre_sandbox_init.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/on_device_model/pre_sandbox_init.cc
-@@ -14,7 +14,7 @@
- #include "services/on_device_model/ml/chrome_ml.h"  // nogncheck
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "gpu/config/gpu_info_collector.h"                    // nogncheck
- #include "third_party/dawn/include/dawn/dawn_proc.h"          // nogncheck
- #include "third_party/dawn/include/dawn/native/DawnNative.h"  // nogncheck
-@@ -25,7 +25,7 @@ namespace on_device_model {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- constexpr uint32_t kVendorIdAMD = 0x1002;
- constexpr uint32_t kVendorIdIntel = 0x8086;
- constexpr uint32_t kVendorIdNVIDIA = 0x10DE;
-@@ -74,7 +74,7 @@ bool OnDeviceModelService::PreSandboxIni
-   }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Warm any relevant drivers before attempting to bring up the sandbox. For
-   // good measure we initialize a device instance for any adapter with an
-   // appropriate backend on top of any integrated or discrete GPU.
-@@ -102,7 +102,7 @@ bool OnDeviceModelService::PreSandboxIni
-   return true;
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- void OnDeviceModelService::AddSandboxLinuxOptions(
-     sandbox::policy::SandboxLinux::Options& options) {
diff --git a/chromium-next/patches/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/chromium-next/patches/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
deleted file mode 100644
index 279515236b..0000000000
--- a/chromium-next/patches/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
-@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(con
-                                      uint32_t shared_resident_kb) {
-   DCHECK(os_dump.platform_private_footprint);
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes;
-   uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes;
-   return (rss_anon_bytes + vm_swap_bytes) / 1024;
-@@ -83,7 +83,7 @@ memory_instrumentation::mojom::OSMemDump
-   os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable;
-   os_dump->private_footprint_kb =
-       CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   os_dump->private_footprint_swap_kb =
-       internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
-   os_dump->mappings_count = internal_os_dump.mappings_count;
-@@ -222,7 +222,7 @@ void QueuedRequestDispatcher::SetUpAndDi
- 
- // On most platforms each process can dump data about their own process
- // so ask each process to do so Linux is special see below.
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-     request->pending_responses.insert({client_info.pid, ResponseType::kOSDump});
-     client->RequestOSMemoryDump(request->memory_map_option(),
-                                 {base::kNullProcessId},
-@@ -237,7 +237,7 @@ void QueuedRequestDispatcher::SetUpAndDi
- 
- // In some cases, OS stats can only be dumped from a privileged process to
- // get around to sandboxing/selinux restrictions (see crbug.com/461788).
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   std::vector<base::ProcessId> pids;
-   mojom::ClientProcess* browser_client = nullptr;
-   base::ProcessId browser_client_pid = base::kNullProcessId;
-@@ -283,7 +283,7 @@ void QueuedRequestDispatcher::SetUpAndDi
-     const OsCallback& os_callback) {
- // On Linux, OS stats can only be dumped from a privileged process to
- // get around to sandboxing/selinux restrictions (see crbug.com/461788).
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   mojom::ClientProcess* browser_client = nullptr;
-   base::ProcessId browser_client_pid = 0;
-   for (const auto& client_info : clients) {
-@@ -333,7 +333,7 @@ QueuedRequestDispatcher::FinalizeVmRegio
-     // each client process provides 1 OS dump, % the case where the client is
-     // disconnected mid dump.
-     OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     for (auto& kv : extra_os_dumps) {
-       auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first;
-       DCHECK(results.find(pid) == results.end());
-@@ -394,7 +394,7 @@ void QueuedRequestDispatcher::Finalize(Q
-     // crash). In the latter case (OS_LINUX) we expect the full map to come
-     // from the browser process response.
-     OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     for (const auto& kv : extra_os_dumps) {
-       auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first;
-       DCHECK_EQ(pid_to_os_dump[pid], nullptr);
diff --git a/chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
deleted file mode 100644
index 56637b1714..0000000000
--- a/chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn
-@@ -27,10 +27,14 @@ component("memory_instrumentation") {
-     sources += [ "os_metrics_win.cc" ]
-   }
- 
--  if (is_android || is_linux || is_chromeos) {
-+  if ((is_android || is_linux || is_chromeos) && !is_bsd) {
-     sources += [ "os_metrics_linux.cc" ]
-   }
- 
-+  if (is_bsd) {
-+    sources += [ "os_metrics_bsd.cc" ]
-+  }
-+
-   if (is_fuchsia) {
-     sources += [ "os_metrics_fuchsia.cc" ]
-   }
diff --git a/chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
deleted file mode 100644
index c89cb692c0..0000000000
--- a/chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h
-@@ -57,7 +57,7 @@ class COMPONENT_EXPORT(
-   static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(
-       base::ProcessHandle);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   static void SetProcSmapsForTesting(FILE*);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
-         // BUILDFLAG(IS_ANDROID)
-@@ -79,7 +79,7 @@ class COMPONENT_EXPORT(
-   GetMemoryInfo(base::ProcessHandle handle);
- #endif  // !BUILDFLAG(IS_APPLE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   // Provides information on the dump state of resident pages. These values are
-   // written to logs. New enum values can be added, but existing enums must
-   // never be renumbered or deleted and reused.
diff --git a/chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc b/chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
deleted file mode 100644
index e54473ab34..0000000000
--- a/chromium-next/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig	2025-05-08 12:01:57.808722109 +0000
-+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc
-@@ -0,0 +1,66 @@
-+// Copyright 2022 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h"
-+
-+#include "base/memory/page_size.h"
-+#include "base/process/process.h"
-+#include "base/process/process_handle.h"
-+
-+#include <sys/sysctl.h>
-+
-+#include <vector>
-+
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
-+#define vm_rssize info.p_vm_rssize
-+#elif BUILDFLAG(IS_FREEBSD)
-+#include <sys/user.h>
-+#define vm_rssize info.ki_rssize
-+#endif
-+
-+namespace memory_instrumentation {
-+
-+// static
-+bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
-+                                 mojom::RawOSMemDump* dump) {
-+  base::Process process = pid == base::kNullProcessId
-+                              ? base::Process::Current()
-+                              : base::Process::Open(pid);
-+  const size_t kPageSize = base::GetPageSize();
-+#if BUILDFLAG(IS_NETBSD)
-+  struct kinfo_proc2 info;
-+  size_t length = sizeof(struct kinfo_proc2);
-+#else
-+  struct kinfo_proc info;
-+  size_t length = sizeof(struct kinfo_proc);
-+#endif
-+#if BUILDFLAG(IS_OPENBSD)
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process.Handle(),
-+                static_cast<int>(length), 1 };
-+#elif BUILDFLAG(IS_FREEBSD)
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process.Handle() };
-+#elif BUILDFLAG(IS_NETBSD)
-+  int mib[] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, process.Handle(),
-+                sizeof(struct kinfo_proc2), 1 };
-+#endif
-+
-+  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
-+    return false;
-+
-+  dump->resident_set_kb = (vm_rssize * kPageSize) / 1024;
-+  dump->platform_private_footprint->rss_anon_bytes =
-+      vm_rssize * kPageSize;
-+  dump->platform_private_footprint->vm_swap_bytes = 0;
-+
-+  return true;
-+}
-+
-+// static
-+std::vector<mojom::VmRegionPtr> OSMetrics::GetProcessMemoryMaps(
-+    base::ProcessId) {
-+  NOTIMPLEMENTED();
-+  return std::vector<mojom::VmRegionPtr>();
-+}
-+
-+}  // namespace memory_instrumentation
diff --git a/chromium-next/patches/patch-services_screen__ai_public_cpp_utilities.cc b/chromium-next/patches/patch-services_screen__ai_public_cpp_utilities.cc
deleted file mode 100644
index 57b19e6f85..0000000000
--- a/chromium-next/patches/patch-services_screen__ai_public_cpp_utilities.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/screen_ai/public/cpp/utilities.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/screen_ai/public/cpp/utilities.cc
-@@ -18,7 +18,7 @@ namespace screen_ai {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- constexpr char kBinaryPathSwitch[] = "screen-ai-binary";
- #endif
- 
-@@ -39,7 +39,7 @@ constexpr char kScreenAIDlcRootPath[] =
- #endif
- 
- #if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] =
-     FILE_PATH_LITERAL("third_party/screen-ai/linux/resources");
- #elif BUILDFLAG(IS_MAC)
-@@ -128,7 +128,7 @@ base::FilePath GetComponentBinaryPathFor
- 
- const char* GetBinaryPathSwitch() {
-   // This is only used on Linux and ChromeOS.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return kBinaryPathSwitch;
- #else
-   return nullptr;
diff --git a/chromium-next/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/chromium-next/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
deleted file mode 100644
index b8d9c45c57..0000000000
--- a/chromium-next/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
-@@ -58,6 +58,7 @@ bool ScreenAIPreSandboxHook(base::FilePa
-     }
-   }
- 
-+#if !BUILDFLAG(IS_BSD)
-   auto* instance = sandbox::policy::SandboxLinux::GetInstance();
- 
-   std::vector<BrokerFilePermission> permissions{
-@@ -79,6 +80,7 @@ bool ScreenAIPreSandboxHook(base::FilePa
-                             sandbox::syscall_broker::COMMAND_OPEN}),
-       permissions, options);
-   instance->EngageNamespaceSandboxIfPossible();
-+#endif
- 
-   return true;
- }
diff --git a/chromium-next/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/chromium-next/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
deleted file mode 100644
index 3200a02aac..0000000000
--- a/chromium-next/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h
-@@ -6,7 +6,13 @@
- #define SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_
- 
- #include "base/files/file_path.h"
-+#include "build/build_config.h"
-+
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace screen_ai {
- 
diff --git a/chromium-next/patches/patch-services_service__manager_BUILD.gn b/chromium-next/patches/patch-services_service__manager_BUILD.gn
deleted file mode 100644
index 4d4ce8fceb..0000000000
--- a/chromium-next/patches/patch-services_service__manager_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/service_manager/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/service_manager/BUILD.gn
-@@ -65,7 +65,7 @@ source_set("service_manager") {
-     ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     deps += [ "//sandbox/linux:sandbox_services" ]
-   }
- }
diff --git a/chromium-next/patches/patch-services_service__manager_public_cpp_service__executable_BUILD.gn b/chromium-next/patches/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
deleted file mode 100644
index cc03ba5486..0000000000
--- a/chromium-next/patches/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/service_manager/public/cpp/service_executable/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/service_manager/public/cpp/service_executable/BUILD.gn
-@@ -22,7 +22,7 @@ source_set("support") {
-     "//services/service_manager/public/mojom",
-   ]
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     deps += [
-       "//sandbox/linux:sandbox",
-       "//sandbox/linux:sandbox_services",
diff --git a/chromium-next/patches/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/chromium-next/patches/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
deleted file mode 100644
index 9731521f64..0000000000
--- a/chromium-next/patches/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc
-@@ -38,7 +38,7 @@
- #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h"
- #include "third_party/perfetto/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h"
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
- #include "base/profiler/thread_delegate_posix.h"
- #define INITIALIZE_THREAD_DELEGATE_POSIX 1
- #else  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE)
diff --git a/chromium-next/patches/patch-services_tracing_public_cpp_system__metrics__sampler.cc b/chromium-next/patches/patch-services_tracing_public_cpp_system__metrics__sampler.cc
deleted file mode 100644
index f889aaa271..0000000000
--- a/chromium-next/patches/patch-services_tracing_public_cpp_system__metrics__sampler.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/tracing/public/cpp/system_metrics_sampler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/tracing/public/cpp/system_metrics_sampler.cc
-@@ -176,8 +176,8 @@ void SystemMetricsSampler::ProcessSample
-     TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"),
-                   "PhysicalMemoryFootprint",
-                   memory_info->physical_footprint_bytes);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)) && defined(notyet)
-     TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"), "VmSwapMemory",
-                   memory_info->vm_swap_bytes);
-     TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"), "RssAnonMemory",
diff --git a/chromium-next/patches/patch-services_video__capture_public_mojom_video__capture__service.mojom b/chromium-next/patches/patch-services_video__capture_public_mojom_video__capture__service.mojom
deleted file mode 100644
index 0d238c8efd..0000000000
--- a/chromium-next/patches/patch-services_video__capture_public_mojom_video__capture__service.mojom
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/video_capture/public/mojom/video_capture_service.mojom.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/video_capture/public/mojom/video_capture_service.mojom
-@@ -25,10 +25,10 @@ interface AcceleratorFactory {
-       pending_receiver<chromeos_camera.mojom.MjpegDecodeAccelerator> jda);
- };
- 
--[EnableIf=is_fuchsia]
-+[EnableIf=is_openbsd]
- const sandbox.mojom.Sandbox kVideoCaptureSandbox
-   = sandbox.mojom.Sandbox.kVideoCapture;
--[EnableIfNot=is_fuchsia]
-+[EnableIfNot=is_openbsd]
- const sandbox.mojom.Sandbox kVideoCaptureSandbox
-   = sandbox.mojom.Sandbox.kNoSandbox;
- 
diff --git a/chromium-next/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.cc b/chromium-next/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
deleted file mode 100644
index af6d5654cb..0000000000
--- a/chromium-next/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/video_effects/video_effects_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/video_effects/video_effects_sandbox_hook_linux.cc
-@@ -6,7 +6,13 @@
- 
- #include <dlfcn.h>
- 
-+#include "build/build_config.h"
-+
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- #include "services/on_device_model/ml/chrome_ml_holder.h"
- 
- namespace video_effects {
-@@ -29,8 +35,10 @@ bool VideoEffectsPreSandboxHook(
-     DVLOG(1) << "Successfully opened Chrome ML shared library.";
-   }
- 
-+#if !BUILDFLAG(IS_BSD)
-   auto* instance = sandbox::policy::SandboxLinux::GetInstance();
-   instance->EngageNamespaceSandboxIfPossible();
-+#endif
-   return true;
- }
- 
diff --git a/chromium-next/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.h b/chromium-next/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.h
deleted file mode 100644
index 8b1349d208..0000000000
--- a/chromium-next/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/video_effects/video_effects_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/video_effects/video_effects_sandbox_hook_linux.h
-@@ -5,7 +5,13 @@
- #ifndef SERVICES_VIDEO_EFFECTS_VIDEO_EFFECTS_SANDBOX_HOOK_LINUX_H_
- #define SERVICES_VIDEO_EFFECTS_VIDEO_EFFECTS_SANDBOX_HOOK_LINUX_H_
- 
-+#include "build/build_config.h"
-+
-+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/sandbox.h"
-+#else
- #include "sandbox/policy/linux/sandbox_linux.h"
-+#endif
- 
- namespace video_effects {
- 
diff --git a/chromium-next/patches/patch-services_viz_public_mojom_BUILD.gn b/chromium-next/patches/patch-services_viz_public_mojom_BUILD.gn
deleted file mode 100644
index e7e17431c5..0000000000
--- a/chromium-next/patches/patch-services_viz_public_mojom_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/viz/public/mojom/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ services/viz/public/mojom/BUILD.gn
-@@ -56,7 +56,7 @@ mojom("mojom") {
- 
-   # Used in thread.mojom
-   enabled_features = []
--  if (is_fuchsia || is_apple) {
-+  if (is_fuchsia || is_apple || is_bsd) {
-     enabled_features += [ "thread_id_is_64_bit" ]
-   } else {
-     enabled_features += [ "thread_id_is_32_bit" ]
diff --git a/chromium-next/patches/patch-skia_ext_SkMemory__new__handler.cpp b/chromium-next/patches/patch-skia_ext_SkMemory__new__handler.cpp
deleted file mode 100644
index 6c60175153..0000000000
--- a/chromium-next/patches/patch-skia_ext_SkMemory__new__handler.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- skia/ext/SkMemory_new_handler.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ skia/ext/SkMemory_new_handler.cpp
-@@ -24,7 +24,7 @@
- #include <windows.h>
- #elif BUILDFLAG(IS_APPLE)
- #include <malloc/malloc.h>
--#else
-+#elif !BUILDFLAG(IS_BSD)
- #include <malloc.h>
- #endif
- 
-@@ -110,7 +110,7 @@ static void* malloc_nothrow(size_t size,
-   // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
-   // doesn't work as intended everywhere.
-   void* result;
--#if BUILDFLAG(IS_IOS)
-+#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
-   result = malloc(size);
- #else
-   // It's the responsibility of the caller to check the return value.
diff --git a/chromium-next/patches/patch-skia_ext_font__utils.cc b/chromium-next/patches/patch-skia_ext_font__utils.cc
deleted file mode 100644
index 2c31b9500b..0000000000
--- a/chromium-next/patches/patch-skia_ext_font__utils.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- skia/ext/font_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ skia/ext/font_utils.cc
-@@ -21,7 +21,7 @@
- #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h"
- #endif
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "third_party/skia/include/ports/SkFontConfigInterface.h"
- #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h"
- #include "third_party/skia/include/ports/SkFontScanner_Fontations.h"
-@@ -67,7 +67,7 @@ static sk_sp<SkFontMgr> fontmgr_factory(
-   }
- #elif BUILDFLAG(IS_APPLE)
-   return SkFontMgr_New_CoreText(nullptr);
--#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
-   if (base::FeatureList::IsEnabled(skia::kFontationsLinuxSystemFonts)) {
-     return fci ? SkFontMgr_New_FCI(std::move(fci),
diff --git a/chromium-next/patches/patch-skia_ext_skcolorspace__trfn.cc b/chromium-next/patches/patch-skia_ext_skcolorspace__trfn.cc
deleted file mode 100644
index e66bdc3a7e..0000000000
--- a/chromium-next/patches/patch-skia_ext_skcolorspace__trfn.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- skia/ext/skcolorspace_trfn.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ skia/ext/skcolorspace_trfn.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include <cmath>
-+
- #include "skia/ext/skcolorspace_trfn.h"
- 
- #include <array>
diff --git a/chromium-next/patches/patch-third__party_abseil-cpp_absl_base_config.h b/chromium-next/patches/patch-third__party_abseil-cpp_absl_base_config.h
deleted file mode 100644
index 1cd087230e..0000000000
--- a/chromium-next/patches/patch-third__party_abseil-cpp_absl_base_config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/abseil-cpp/absl/base/config.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/abseil-cpp/absl/base/config.h
-@@ -409,7 +409,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES
- #ifdef ABSL_HAVE_SCHED_YIELD
- #error ABSL_HAVE_SCHED_YIELD cannot be directly set
- #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \
--    defined(__VXWORKS__)
-+    defined(__VXWORKS__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
-+    defined(__NetBSD__)
- #define ABSL_HAVE_SCHED_YIELD 1
- #endif
- 
-@@ -424,7 +425,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES
- // platforms.
- #ifdef ABSL_HAVE_SEMAPHORE_H
- #error ABSL_HAVE_SEMAPHORE_H cannot be directly set
--#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__)
-+#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__) || \
-+    defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
- #define ABSL_HAVE_SEMAPHORE_H 1
- #endif
- 
diff --git a/chromium-next/patches/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc b/chromium-next/patches/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc
deleted file mode 100644
index 4cb9a19ce6..0000000000
--- a/chromium-next/patches/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/abseil-cpp/absl/base/internal/raw_logging.cc
-@@ -44,7 +44,7 @@
- #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
-     defined(__hexagon__) || defined(__Fuchsia__) ||                     \
-     defined(__native_client__) || defined(__OpenBSD__) ||               \
--    defined(__EMSCRIPTEN__) || defined(__ASYLO__)
-+    defined(__EMSCRIPTEN__) || defined(__ASYLO__) || defined(__NetBSD__)
- 
- #include <unistd.h>
- 
diff --git a/chromium-next/patches/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/chromium-next/patches/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
deleted file mode 100644
index 90a21f7cbf..0000000000
--- a/chromium-next/patches/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc
-@@ -30,7 +30,7 @@
- #include <sys/syscall.h>
- #endif
- 
--#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
- #include <sys/sysctl.h>
- #endif
- 
-@@ -198,6 +198,7 @@ static double GetNominalCPUFrequency() {
- 
- #else
- 
-+#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
- // Helper function for reading a long from a file. Returns true if successful
- // and the memory location pointed to by value is set to the value read.
- static bool ReadLongFromFile(const char *file, long *value) {
-@@ -230,6 +231,7 @@ static bool ReadLongFromFile(const char 
-   }
-   return ret;
- }
-+#endif
- 
- #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY)
- 
-@@ -329,9 +331,11 @@ static double GetNominalCPUFrequency() {
-   // a new mode (turbo mode). Essentially, those frequencies cannot
-   // always be relied upon. The same reasons apply to /proc/cpuinfo as
-   // well.
-+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) // pledge violation
-   if (ReadLongFromFile("/sys/devices/system/cpu/cpu0/tsc_freq_khz", &freq)) {
-     return freq * 1e3;  // Value is kHz.
-   }
-+#endif
- 
- #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY)
-   // On these platforms, the TSC frequency is the nominal CPU
-@@ -350,10 +354,12 @@ static double GetNominalCPUFrequency() {
-   // If CPU scaling is in effect, we want to use the *maximum*
-   // frequency, not whatever CPU speed some random processor happens
-   // to be using now.
-+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) // pledge violation
-   if (ReadLongFromFile("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq",
-                        &freq)) {
-     return freq * 1e3;  // Value is kHz.
-   }
-+#endif
- 
-   return 1.0;
- #endif  // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
-@@ -465,6 +471,12 @@ pid_t GetTID() {
-   return reinterpret_cast<pid_t>(thread);
- }
- 
-+#elif defined(__OpenBSD__)
-+
-+pid_t GetTID() {
-+  return getthrid();
-+}
-+
- #elif defined(__Fuchsia__)
- 
- pid_t GetTID() {
diff --git a/chromium-next/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/chromium-next/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
deleted file mode 100644
index b14712b7e7..0000000000
--- a/chromium-next/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
-@@ -35,7 +35,8 @@
- #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
-     !defined(__native_client__) && !defined(__asmjs__) &&             \
-     !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) &&   \
--    !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__XTENSA__)
-+    !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__XTENSA__) && \
-+    !defined(__FreeBSD__) && !defined(__NetBSD__)
- #define ABSL_HAVE_ELF_MEM_IMAGE 1
- #endif
- 
diff --git a/chromium-next/patches/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc b/chromium-next/patches/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc
deleted file mode 100644
index f5938f7dd1..0000000000
--- a/chromium-next/patches/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc
-@@ -19,7 +19,8 @@
- #endif
- 
- #if defined(HAS_STRPTIME) && HAS_STRPTIME
--#if !defined(_XOPEN_SOURCE) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
-+#if !defined(_XOPEN_SOURCE) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && \
-+    !defined(__NetBSD__)
- #define _XOPEN_SOURCE 500  // Exposes definitions for SUSv2 (UNIX 98).
- #endif
- #endif
diff --git a/chromium-next/patches/patch-third__party_afl_src_afl-fuzz.c b/chromium-next/patches/patch-third__party_afl_src_afl-fuzz.c
deleted file mode 100644
index 9a70ba2686..0000000000
--- a/chromium-next/patches/patch-third__party_afl_src_afl-fuzz.c
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/afl/src/afl-fuzz.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/afl/src/afl-fuzz.c
-@@ -58,7 +58,8 @@
- #include <sys/ioctl.h>
- #include <sys/file.h>
- 
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__) || \
-+    defined (__NetBSD__)
- #  include <sys/sysctl.h>
- #endif /* __APPLE__ || __FreeBSD__ || __OpenBSD__ */
- 
-@@ -3531,7 +3532,8 @@ static double get_runnable_processes(voi
- 
-   static double res;
- 
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__) || \
-+    defined (__NetBSD__)
- 
-   /* I don't see any portable sysctl or so that would quickly give us the
-      number of runnable processes; the 1-minute load average can be a
-@@ -7347,7 +7349,8 @@ static void get_core_count(void) {
- 
-   u32 cur_runnable = 0;
- 
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__) || \
-+    defined (__NetBSD__)
- 
-   size_t s = sizeof(cpu_core_count);
- 
-@@ -7392,7 +7395,8 @@ static void get_core_count(void) {
- 
-     cur_runnable = (u32)get_runnable_processes();
- 
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__) || \
-+    defined (__NetBSD__)
- 
-     /* Add ourselves, since the 1-minute average doesn't include that yet. */
- 
diff --git a/chromium-next/patches/patch-third__party_angle_BUILD.gn b/chromium-next/patches/patch-third__party_angle_BUILD.gn
deleted file mode 100644
index 510226f3d0..0000000000
--- a/chromium-next/patches/patch-third__party_angle_BUILD.gn
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/BUILD.gn
-@@ -355,7 +355,6 @@ config("extra_warnings") {
-       "-Wtautological-type-limit-compare",
-       "-Wundefined-reinterpret-cast",
-       "-Wunneeded-internal-declaration",
--      "-Wunused-but-set-variable",
-       "-Wsuggest-destructor-override",
-       "-Wsuggest-override",
- 
-@@ -532,7 +531,7 @@ template("angle_common_lib") {
-       all_dependent_configs = [ ":angle_disable_pool_alloc" ]
-     }
- 
--    if (is_linux || is_chromeos) {
-+    if ((is_linux || is_chromeos) && !is_bsd) {
-       libs = [ "dl" ]
-     }
- 
-@@ -687,6 +686,9 @@ angle_static_library("angle_gpu_info_uti
-         "Xi",
-         "Xext",
-       ]
-+      if (is_bsd) {
-+        libs += [ "GL" ]
-+      }
-     }
- 
-     if (angle_use_wayland && angle_has_build) {
diff --git a/chromium-next/patches/patch-third__party_angle_src_common_platform.h b/chromium-next/patches/patch-third__party_angle_src_common_platform.h
deleted file mode 100644
index 8e40b8edbf..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_common_platform.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/common/platform.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/common/platform.h
-@@ -23,8 +23,19 @@
- #elif defined(__linux__) || defined(EMSCRIPTEN)
- #    define ANGLE_PLATFORM_LINUX 1
- #    define ANGLE_PLATFORM_POSIX 1
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ||              \
--    defined(__DragonFly__) || defined(__sun) || defined(__GLIBC__) || defined(__GNU__) || \
-+#elif defined(__OpenBSD__)
-+#    define ANGLE_PLATFORM_OPENBSD 1
-+#    define ANGLE_PLATFORM_POSIX 1
-+#    define ANGLE_PLATFORM_BSD 1
-+#elif defined(__NetBSD__)
-+#    define ANGLE_PLATFORM_NETBSD 1
-+#    define ANGLE_PLATFORM_POSIX 1
-+#    define ANGLE_PLATFORM_BSD 1
-+#elif defined(__FreeBSD__)
-+#    define ANGLE_PLATFORM_FREEBSD 1
-+#    define ANGLE_PLATFORM_POSIX 1
-+#    define ANGLE_PLATFORM_BSD 1
-+#elif defined(__DragonFly__) || defined(__sun) || defined(__GLIBC__) || defined(__GNU__) || \
-     defined(__QNX__) || defined(__Fuchsia__) || defined(__HAIKU__)
- #    define ANGLE_PLATFORM_POSIX 1
- #else
diff --git a/chromium-next/patches/patch-third__party_angle_src_common_platform__helpers.h b/chromium-next/patches/patch-third__party_angle_src_common_platform__helpers.h
deleted file mode 100644
index ed27dc35d9..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_common_platform__helpers.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/common/platform_helpers.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/common/platform_helpers.h
-@@ -62,7 +62,7 @@ inline constexpr bool IsIOS()
- 
- inline constexpr bool IsLinux()
- {
--#if defined(ANGLE_PLATFORM_LINUX)
-+#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
-     return true;
- #else
-     return false;
diff --git a/chromium-next/patches/patch-third__party_angle_src_common_system__utils.cpp b/chromium-next/patches/patch-third__party_angle_src_common_system__utils.cpp
deleted file mode 100644
index 76613997f5..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_common_system__utils.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/common/system_utils.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/common/system_utils.cpp
-@@ -25,7 +25,7 @@ namespace angle
- {
- std::string GetExecutableName()
- {
--#if defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 21
-+#if (defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 21) || defined(ANGLE_PLATFORM_BSD)
-     // Support for "getprogname" function in bionic was introduced in L (API level 21)
-     const char *executableName = getprogname();
-     return (executableName) ? std::string(executableName) : "ANGLE";
diff --git a/chromium-next/patches/patch-third__party_angle_src_common_system__utils__linux.cpp b/chromium-next/patches/patch-third__party_angle_src_common_system__utils__linux.cpp
deleted file mode 100644
index ebe402326b..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_common_system__utils__linux.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/common/system_utils_linux.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/common/system_utils_linux.cpp
-@@ -15,10 +15,17 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#if ANGLE_PLATFORM_OPENBSD
-+#include <pthread_np.h>
-+#elif ANGLE_PLATFORM_NETBSD
-+#include <pthread.h>
-+#endif
-+
- #include <array>
- 
- namespace angle
- {
-+#if ANGLE_PLATFORM_LINUX
- std::string GetExecutablePath()
- {
-     // We cannot use lstat to get the size of /proc/self/exe as it always returns 0
-@@ -34,6 +41,7 @@ std::string GetExecutablePath()
-     path[result] = '\0';
-     return path;
- }
-+#endif
- 
- std::string GetExecutableDirectory()
- {
-@@ -59,6 +67,12 @@ void SetCurrentThreadName(const char *na
-     // There's a 15-character (16 including '\0') limit.  If the name is too big (and ERANGE is
-     // returned), name will be ignored.
-     ASSERT(strlen(name) < 16);
-+#if ANGLE_PLATFORM_OPENBSD
-+    pthread_set_name_np(pthread_self(), name);
-+#elif ANGLE_PLATFORM_NETBSD
-+    pthread_setname_np(pthread_self(), "%s", (void *)name);
-+#else
-     pthread_setname_np(pthread_self(), name);
-+#endif
- }
- }  // namespace angle
diff --git a/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h b/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
deleted file mode 100644
index 4c7284237a..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h
-@@ -15,6 +15,13 @@
- namespace angle
- {
- 
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+bool CollectMesaCardInfo(std::vector<GPUDeviceInfo> *devices);                
-+#if defined(__FreeBSD__)
-+bool GetPCIDevicesFreeBSD(std::vector<GPUDeviceInfo> *devices);
-+#endif
-+#endif
-+
- // Defined in SystemInfo_libpci when GPU_INFO_USE_LIBPCI is defined.
- bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices);
- // Defined in SystemInfo_x11 when GPU_INFO_USE_X11 is defined.
diff --git a/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp b/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
deleted file mode 100644
index 75ae3e11f5..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp
-@@ -12,6 +12,11 @@
- #include <pci/pci.h>
- #include <unistd.h>
- 
-+#if defined(__FreeBSD__)
-+#include <fcntl.h>
-+#include <sys/pciio.h>
-+#endif
-+
- #include "common/angleutils.h"
- #include "common/debug.h"
- 
-@@ -86,6 +91,75 @@ struct LibPCI : private angle::NonCopyab
- 
- }  // anonymous namespace
- 
-+#if defined(__FreeBSD__)
-+// Adds an entry per PCI GPU found and fills the device and vendor ID.
-+bool GetPCIDevicesFreeBSD(std::vector<GPUDeviceInfo> *devices)
-+{
-+    int fd;
-+    struct pci_conf_io conf;
-+    struct pci_conf *matches;
-+    uint32_t offset = 0;
-+
-+    fd = open("/dev/pci", O_RDONLY);
-+    if (fd < 0)
-+        return false;
-+
-+    matches = new struct pci_conf[32];
-+    conf.generation = 0;
-+    do {
-+        conf.pat_buf_len = 0;
-+        conf.num_patterns = 0;
-+        conf.patterns = NULL;
-+        conf.match_buf_len = 32 * sizeof(struct pci_conf);
-+        conf.num_matches = 32;
-+        conf.matches = matches;
-+        conf.offset = offset;
-+        conf.status = PCI_GETCONF_ERROR;
-+        if (ioctl(fd, PCIOCGETCONF, &conf) < 0) {
-+            if (errno == ENODEV)
-+                break;
-+        }
-+        /* PCI_GETCONF_LIST_CHANGED would require us to start over. */
-+        if (conf.status == PCI_GETCONF_ERROR || conf.status == PCI_GETCONF_LIST_CHANGED) {
-+            break;
-+        }
-+
-+        for (unsigned int i = 0; i < conf.num_matches; i++) {
-+            uint16_t device_class = (matches[i].pc_class << 8) |  matches[i].pc_subclass;
-+
-+            // Skip non-GPU devices
-+            switch (device_class)
-+            {
-+                case PCI_CLASS_DISPLAY_VGA:
-+                case PCI_CLASS_DISPLAY_XGA:
-+                case PCI_CLASS_DISPLAY_3D:
-+                    break;
-+                default:
-+                    continue;
-+            }
-+
-+            // Skip unknown devices
-+            if (matches[i].pc_vendor == 0 || matches[i].pc_device == 0) {
-+                continue;
-+            }
-+
-+            GPUDeviceInfo info;
-+            info.vendorId = matches[i].pc_vendor;
-+            info.deviceId = matches[i].pc_device;
-+
-+            devices->push_back(info);
-+        }
-+        offset += conf.num_matches;
-+    } while (conf.status == PCI_GETCONF_MORE_DEVS);
-+
-+    delete[] matches;
-+
-+    close(fd);
-+
-+    return true;
-+}
-+#endif
-+
- // Adds an entry per PCI GPU found and fills the device and vendor ID.
- bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices)
- {
diff --git a/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp b/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
deleted file mode 100644
index 10e5815ca6..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp
-@@ -71,6 +71,24 @@ bool GetPCIDevicesWithLibPCI(std::vector
- 
- bool GetSystemInfo(SystemInfo *info)
- {
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+    if (!CollectMesaCardInfo(&(info->gpus)))
-+    {
-+#if defined(__FreeBSD__)
-+        if (!GetPCIDevicesFreeBSD(&(info->gpus)))
-+        {
-+#endif
-+#if defined(ANGLE_USE_VULKAN_SYSTEM_INFO)
-+            // Try vulkan backend to get GPU info
-+            return GetSystemInfoVulkan(info);
-+#else
-+            return false;
-+#endif
-+#if defined(__FreeBSD__)
-+        }
-+#endif
-+    }
-+#else
-     if (!GetPCIDevicesWithLibPCI(&(info->gpus)))
-     {
- #if defined(ANGLE_USE_VULKAN_SYSTEM_INFO)
-@@ -85,6 +103,7 @@ bool GetSystemInfo(SystemInfo *info)
-     {
-         return false;
-     }
-+#endif
- 
-     GetDualGPUInfo(info);
- 
diff --git a/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp b/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
deleted file mode 100644
index d66bf6211e..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp
-@@ -8,6 +8,10 @@
- 
- #include "gpu_info_util/SystemInfo_internal.h"
- 
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#include <GL/glx.h>
-+#include <GL/glxext.h>
-+#endif
- #include <X11/Xlib.h>
- 
- #include "common/debug.h"
-@@ -18,9 +22,47 @@
- #    error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11
- #endif
- 
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#define GLX_RENDERER_VENDOR_ID_MESA	0x8183
-+#define GLX_RENDERER_DEVICE_ID_MESA	0x8184
-+#endif
-+
- namespace angle
- {
- 
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+bool CollectMesaCardInfo(std::vector<GPUDeviceInfo> *devices)
-+{
-+    unsigned int vid[3], did[3];
-+
-+    Display *display = XOpenDisplay(NULL);
-+    if (!display) {
-+        return false;
-+    }
-+
-+    PFNGLXQUERYRENDERERINTEGERMESAPROC queryInteger =
-+        (PFNGLXQUERYRENDERERINTEGERMESAPROC) glXGetProcAddressARB((const GLubyte *)
-+        "glXQueryRendererIntegerMESA");
-+
-+    if (!queryInteger)
-+        return false;
-+
-+    bool vendor_ret =
-+        queryInteger(display, 0, 0, GLX_RENDERER_VENDOR_ID_MESA, vid);
-+    bool device_ret =
-+        queryInteger(display, 0, 0, GLX_RENDERER_DEVICE_ID_MESA, did);
-+
-+    if (vendor_ret && device_ret) {
-+        GPUDeviceInfo info;
-+        info.vendorId = vid[0];
-+        info.deviceId = did[0];
-+        devices->push_back(info);
-+    }
-+
-+    return true;
-+}
-+#endif
-+
- bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version)
- {
-     *version = "";
diff --git a/chromium-next/patches/patch-third__party_angle_src_libANGLE_Display.cpp b/chromium-next/patches/patch-third__party_angle_src_libANGLE_Display.cpp
deleted file mode 100644
index f4f642f29a..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_libANGLE_Display.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/libANGLE/Display.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/libANGLE/Display.cpp
-@@ -58,7 +58,7 @@
- #        include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
- #    elif ANGLE_ENABLE_CGL
- #        include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
--#    elif defined(ANGLE_PLATFORM_LINUX)
-+#    elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
- #        include "libANGLE/renderer/gl/egl/DisplayEGL.h"
- #        if defined(ANGLE_USE_X11)
- #            include "libANGLE/renderer/gl/glx/DisplayGLX_api.h"
-@@ -422,7 +422,7 @@ rx::DisplayImpl *CreateDisplayFromAttrib
-             impl = new rx::DisplayCGL(state);
-             break;
- 
--#    elif defined(ANGLE_PLATFORM_LINUX)
-+#    elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
- #        if defined(ANGLE_USE_GBM)
-             if (platformType == 0)
-             {
-@@ -468,7 +468,7 @@ rx::DisplayImpl *CreateDisplayFromAttrib
- #if defined(ANGLE_ENABLE_OPENGL)
- #    if defined(ANGLE_PLATFORM_WINDOWS)
-             impl = new rx::DisplayWGL(state);
--#    elif defined(ANGLE_PLATFORM_LINUX)
-+#    elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
- #        if defined(ANGLE_USE_GBM)
-             if (platformType == 0)
-             {
-@@ -519,7 +519,7 @@ rx::DisplayImpl *CreateDisplayFromAttrib
-                 impl = rx::CreateVulkanWin32Display(state);
-             }
-             break;
--#    elif defined(ANGLE_PLATFORM_LINUX)
-+#    elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
- #        if defined(ANGLE_USE_GBM)
-             if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
-             {
-@@ -2133,7 +2133,7 @@ static ClientExtensions GenerateClientEx
-     extensions.platformWaylandEXT = true;
- #endif
- 
--#if defined(ANGLE_PLATFORM_LINUX) && (defined(ANGLE_ENABLE_OPENGL) || defined(ANGLE_ENABLE_VULKAN))
-+#if (defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)) && (defined(ANGLE_ENABLE_OPENGL) || defined(ANGLE_ENABLE_VULKAN))
-     extensions.platformSurfacelessMESA = true;
- #endif
- 
-@@ -2180,7 +2180,7 @@ static ClientExtensions GenerateClientEx
-     extensions.x11Visual = true;
- #endif
- 
--#if defined(ANGLE_PLATFORM_LINUX)
-+#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
-     extensions.platformANGLEDeviceTypeEGLANGLE = true;
- #endif
- 
diff --git a/chromium-next/patches/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp b/chromium-next/patches/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
deleted file mode 100644
index e6050fac4f..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
-@@ -144,10 +144,10 @@ bool FunctionsGLX::initialize(Display *x
-     // which a GLXWindow was ever created.
-     if (!sLibHandle)
-     {
--        sLibHandle = dlopen("libGL.so.1", RTLD_NOW);
-+        sLibHandle = dlopen("libGL.so", RTLD_NOW);
-         if (!sLibHandle)
-         {
--            *errorString = std::string("Could not dlopen libGL.so.1: ") + dlerror();
-+            *errorString = std::string("Could not dlopen libGL.so: ") + dlerror();
-             return false;
-         }
-     }
diff --git a/chromium-next/patches/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/chromium-next/patches/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
deleted file mode 100644
index 3d26e939df..0000000000
--- a/chromium-next/patches/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
-@@ -23,7 +23,7 @@ bool IsVulkanWin32DisplayAvailable();
- DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state);
- #endif  // defined(ANGLE_PLATFORM_WINDOWS)
- 
--#if defined(ANGLE_PLATFORM_LINUX)
-+#if defined(ANGLE_PLATFORM_POSIX)
- bool IsVulkanWaylandDisplayAvailable();
- DisplayImpl *CreateVulkanWaylandDisplay(const egl::DisplayState &state);
- 
diff --git a/chromium-next/patches/patch-third__party_angle_util_BUILD.gn b/chromium-next/patches/patch-third__party_angle_util_BUILD.gn
deleted file mode 100644
index 2ca89a9dd0..0000000000
--- a/chromium-next/patches/patch-third__party_angle_util_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/util/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/angle/util/BUILD.gn
-@@ -332,7 +332,7 @@ foreach(is_shared_library,
-     ]
-     libs = []
- 
--    if (is_linux || is_chromeos) {
-+    if ((is_linux || is_chromeos) && !is_bsd) {
-       libs += [
-         "rt",
-         "dl",
diff --git a/chromium-next/patches/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/chromium-next/patches/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
deleted file mode 100644
index 3244368b14..0000000000
--- a/chromium-next/patches/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc
-@@ -77,7 +77,7 @@ bool StructTraits<blink::mojom::Renderer
- 
-   out->send_subresource_notification = data.send_subresource_notification();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (!data.ReadSystemFontFamilyName(&out->system_font_family_name))
-     return false;
- #endif
diff --git a/chromium-next/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/chromium-next/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
deleted file mode 100644
index d955c8c43c..0000000000
--- a/chromium-next/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h
-@@ -65,7 +65,7 @@ struct BLINK_COMMON_EXPORT RendererPrefe
-   UserAgentOverride user_agent_override;
-   std::string accept_languages;
-   bool send_subresource_notification{false};
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   std::string system_font_family_name;
- #endif
- #if BUILDFLAG(IS_WIN)
diff --git a/chromium-next/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/chromium-next/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
deleted file mode 100644
index 6f3f03fcba..0000000000
--- a/chromium-next/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h
-@@ -180,7 +180,7 @@ struct BLINK_COMMON_EXPORT
-     return data.send_subresource_notification;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static const std::string& system_font_family_name(
-       const ::blink::RendererPreferences& data) {
-     return data.system_font_family_name;
diff --git a/chromium-next/patches/patch-third__party_blink_public_platform_platform.h b/chromium-next/patches/patch-third__party_blink_public_platform_platform.h
deleted file mode 100644
index 94680857bd..0000000000
--- a/chromium-next/patches/patch-third__party_blink_public_platform_platform.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/public/platform/platform.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/public/platform/platform.h
-@@ -372,7 +372,7 @@ class BLINK_PLATFORM_EXPORT Platform {
-     return nullptr;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // This is called after the thread is created, so the embedder
-   // can initiate an IPC to change its thread type (on Linux we can't
-   // increase the nice value, so we need to ask the browser process). This
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/chromium-next/patches/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
deleted file mode 100644
index f88abb4d29..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
-@@ -30,7 +30,7 @@ def init(root_src_dir, enable_style_form
- 
-     # Determine //buildtools/<platform>/ directory
-     new_path_platform_suffix = ""
--    if sys.platform.startswith("linux"):
-+    if sys.platform.startswith(("linux","openbsd","freebsd","netbsd")):
-         platform = "linux64"
-         exe_suffix = ""
-     elif sys.platform.startswith("darwin"):
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_build_scripts_gperf.py b/chromium-next/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
deleted file mode 100644
index 09ae94ab7b..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/build/scripts/gperf.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/build/scripts/gperf.py
-@@ -28,24 +28,6 @@ def generate_gperf(gperf_path, gperf_inp
-             stdout=subprocess.PIPE,
-             universal_newlines=True)
-         gperf_output = gperf.communicate(gperf_input)[0]
--        # Massage gperf output to be more palatable for modern compilers.
--        # TODO(thakis): Upstream these to gperf so we don't need massaging.
--        # `register` is deprecated in C++11 and removed in C++17, so remove
--        # it from gperf's output.
--        # https://savannah.gnu.org/bugs/index.php?53028
--        gperf_output = re.sub(r'\bregister ', '', gperf_output)
--        # -Wimplicit-fallthrough needs an explicit fallthrough statement,
--        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
--        # https://savannah.gnu.org/bugs/index.php?53029
--        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
--                                            '  [[fallthrough]];')
--        # -Wpointer-to-int-cast warns about casting pointers to smaller ints
--        # Replace {(int)(long)&(foo), bar} with
--        # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
--        gperf_output = re.sub(
--            r'\(int\)\(long\)(.*?),',
--            r'static_cast<int>(reinterpret_cast<uintptr_t>(\1)),',
--            gperf_output)
-         script = 'third_party/blink/renderer/build/scripts/gperf.py'
-         return '// Generated by %s\n' % script + gperf_output
-     except OSError:
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py b/chromium-next/patches/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
deleted file mode 100644
index 5eba45c246..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/build/scripts/run_with_pythonpath.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/build/scripts/run_with_pythonpath.py
-@@ -22,6 +22,7 @@ def main():
-         existing_pp = (
-             os.pathsep + env['PYTHONPATH']) if 'PYTHONPATH' in env else ''
-         env['PYTHONPATH'] = os.pathsep.join(python_paths) + existing_pp
-+    env['LD_LIBRARY_PATH'] = "@WRKSRC@/out/Release"
-     sys.exit(subprocess.call([sys.executable] + args, env=env))
- 
- 
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_controller_blink__initializer.cc b/chromium-next/patches/patch-third__party_blink_renderer_controller_blink__initializer.cc
deleted file mode 100644
index 007c4c4214..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/controller/blink_initializer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -82,12 +82,12 @@
- #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "third_party/blink/renderer/controller/memory_usage_monitor_posix.h"
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
- #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
- #endif
-@@ -256,7 +256,7 @@ void BlinkInitializer::RegisterInterface
-       main_thread_task_runner);
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
-       ConvertToBaseRepeatingCallback(
-           CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -304,7 +304,7 @@ void BlinkInitializer::RegisterMemoryWat
-   MemorySaverController::Initialize();
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // Start reporting the highest private memory footprint after the first
-   // navigation.
-   HighestPmfReporter::Initialize(main_thread_task_runner);
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/chromium-next/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
deleted file mode 100644
index d3e766b52d..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc
-@@ -133,15 +133,17 @@ void MemoryUsageMonitorPosix::ResetFileD
- 
- void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file,
-                                            base::File status_file) {
-+#if !BUILDFLAG(IS_BSD)
-   DCHECK(statm_file.IsValid());
-   DCHECK(status_file.IsValid());
-   DCHECK_EQ(-1, statm_fd_.get());
-   DCHECK_EQ(-1, status_fd_.get());
-   statm_fd_.reset(statm_file.TakePlatformFile());
-   status_fd_.reset(status_file.TakePlatformFile());
-+#endif
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- void MemoryUsageMonitorPosix::Bind(
-     mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver) {
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/chromium-next/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
deleted file mode 100644
index 07ec0e16bb..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/controller/memory_usage_monitor_posix.h
-@@ -13,7 +13,7 @@
- #include "third_party/blink/renderer/controller/controller_export.h"
- #include "third_party/blink/renderer/controller/memory_usage_monitor.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "third_party/blink/public/mojom/memory_usage_monitor_linux.mojom-blink.h"
- #endif
- 
-@@ -22,7 +22,7 @@ namespace blink {
- // MemoryUsageMonitor implementation for Android and Linux.
- class CONTROLLER_EXPORT MemoryUsageMonitorPosix
-     : public MemoryUsageMonitor
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     ,
-       public mojom::blink::MemoryUsageMonitorLinux
- #endif
-@@ -30,7 +30,7 @@ class CONTROLLER_EXPORT MemoryUsageMonit
-  public:
-   MemoryUsageMonitorPosix() = default;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static void Bind(
-       mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver);
- #endif
-@@ -48,7 +48,7 @@ class CONTROLLER_EXPORT MemoryUsageMonit
-                                               uint64_t* vm_size,
-                                               uint64_t* vm_hwm_size);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // mojom::MemoryUsageMonitorLinux implementations:
-   void SetProcFiles(base::File statm_file, base::File status_file) override;
- #endif
-@@ -66,7 +66,7 @@ class CONTROLLER_EXPORT MemoryUsageMonit
-   base::ScopedFD statm_fd_;
-   base::ScopedFD status_fd_;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   mojo::Receiver<mojom::blink::MemoryUsageMonitorLinux> receiver_{this};
- #endif
- };
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
deleted file mode 100644
index 83c6677ca7..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/editing/editing_behavior.cc
-@@ -304,7 +304,7 @@ bool EditingBehavior::ShouldInsertCharac
-   // unexpected behaviour
-   if (ch < ' ')
-     return false;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // According to XKB map no keyboard combinations with ctrl key are mapped to
-   // printable characters, however we need the filter as the DomKey/text could
-   // contain printable characters.
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
deleted file mode 100644
index 5c8353ed41..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/execution_context/navigator_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/execution_context/navigator_base.cc
-@@ -31,7 +31,7 @@ String GetReducedNavigatorPlatform() {
-   return "Win32";
- #elif BUILDFLAG(IS_FUCHSIA)
-   return "";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return "Linux x86_64";
- #elif BUILDFLAG(IS_IOS)
-   return "iPhone";
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
deleted file mode 100644
index 07a1d20de7..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDela
- #if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN)
- SkFontHinting RendererPreferencesToSkiaHinting(
-     const blink::RendererPreferences& prefs) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!prefs.should_antialias_text) {
-     // When anti-aliasing is off, GTK maps all non-zero hinting settings to
-     // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3421,7 +3421,7 @@ void WebViewImpl::UpdateFontRenderingFro
-       gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE);
-   WebFontRenderStyle::SetSubpixelPositioning(
-       renderer_preferences_.use_subpixel_positioning);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!renderer_preferences_.system_font_family_name.empty()) {
-     WebFontRenderStyle::SetSystemFontFamily(blink::WebString::FromUTF8(
-         renderer_preferences_.system_font_family_name));
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
deleted file mode 100644
index 8c9aad9a2d..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6471,7 +6471,7 @@ TEST_F(WebFrameTest, DISABLED_PositionFo
- }
- 
- #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
- // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable.
- // TODO(crbug.com/1317375): Build these tests on all platforms.
- #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \
-@@ -6880,7 +6880,7 @@ TEST_F(CompositedSelectionBoundsTest, La
- TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) {
-   RunTest("composited_selection_bounds_large_selection_noscroll.html");
- }
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #if !BUILDFLAG(IS_ANDROID)
- TEST_F(CompositedSelectionBoundsTest, Input) {
-   web_view_helper_.GetWebView()->GetSettings()->SetDefaultFontSize(16);
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
deleted file mode 100644
index 8d6c039cf9..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -51,7 +51,7 @@ constexpr base::TimeDelta kEncodeRowSlac
- 
- /* The value is based on user statistics on Nov 2017. */
- #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--     BUILDFLAG(IS_WIN))
-+     BUILDFLAG(IS_WIN)) || BUILDFLAG(IS_BSD)
- const double kIdleTaskStartTimeoutDelayMs = 1000.0;
- #else
- const double kIdleTaskStartTimeoutDelayMs = 4000.0;  // For ChromeOS, Mobile
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
deleted file mode 100644
index c28a4a5530..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
-@@ -192,7 +192,7 @@ InspectorMemoryAgent::GetSamplingProfile
- 
- Vector<String> InspectorMemoryAgent::Symbolize(
-     const std::vector<const void*>& addresses) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // TODO(alph): Move symbolization to the client.
-   Vector<const void*> addresses_to_symbolize;
-   for (const void* address : addresses) {
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_layout_layout__view.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_layout_layout__view.cc
deleted file mode 100644
index 5df71bf004..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/layout/layout_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/layout/layout_view.cc
-@@ -74,7 +74,7 @@
- #include "ui/display/screen_info.h"
- #include "ui/gfx/geometry/quad_f.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "third_party/blink/renderer/platform/fonts/font_cache.h"
- #endif
- 
-@@ -785,7 +785,7 @@ void LayoutView::LayoutRoot() {
-     intrinsic_logical_widths_ = LogicalWidth();
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // The font code in FontPlatformData does not have a direct connection to the
-   // document, the frame or anything from which we could retrieve the device
-   // scale factor. After using zoom for DSF, the GraphicsContext does only ever
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
deleted file mode 100644
index bae575ab44..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/loader/mixed_content_checker.cc
-@@ -485,7 +485,7 @@ bool MixedContentChecker::ShouldBlockFet
-   switch (context_type) {
-     case mojom::blink::MixedContentContextType::kOptionallyBlockable:
- 
--#if (BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)) && \
-+#if (BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \
-     BUILDFLAG(ENABLE_CAST_RECEIVER)
-       // Fuchsia WebEngine can be configured to allow loading Mixed Content from
-       // an insecure IP address. This is a workaround to revert Fuchsia Cast
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
deleted file mode 100644
index 4b3afbb1a9..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
-@@ -573,7 +573,7 @@ bool OriginTrialContext::CanEnableTrialF
-   }
- 
-   if (trial_name == "TranslationAPI") {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     return base::FeatureList::IsEnabled(features::kTranslationAPI);
- #else
-     return false;
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_page_context__menu__controller.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
deleted file mode 100644
index 45b0e15f1f..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/page/context_menu_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/page/context_menu_controller.cc
-@@ -641,7 +641,7 @@ bool ContextMenuController::ShowContextM
-     if (potential_image_node != nullptr &&
-         IsA<HTMLCanvasElement>(potential_image_node)) {
-       data.media_type = mojom::blink::ContextMenuDataMediaType::kCanvas;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       // TODO(crbug.com/40902474): Support reading from the WebGPU front buffer
-       // on Linux and remove the below code, which results in "Copy Image" and
-       // "Save Image To" being grayed out in the context menu.
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_paint_paint__layer.cc
deleted file mode 100644
index 2ebb84d00d..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_paint_paint__layer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -124,7 +124,7 @@ namespace blink {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- struct SameSizeAsPaintLayer : GarbageCollected<PaintLayer>, DisplayItemClient {
-   // The bit fields may fit into the machine word of DisplayItemClient which
-   // has only 8-bit data.
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
deleted file mode 100644
index 98617ae71f..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
-@@ -146,7 +146,7 @@ bool ScrollbarThemeAura::SupportsDragSna
- // Disable snapback on desktop Linux to better integrate with the desktop
- // behavior. Typically, Linux apps do not implement scrollbar snapback (this
- // is true for at least GTK and QT apps).
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return false;
- #else
-   return true;
-@@ -423,7 +423,7 @@ ScrollbarPart ScrollbarThemeAura::PartsT
- 
- bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,
-                                              const WebMouseEvent& event) const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (event.button == WebPointerProperties::Button::kMiddle)
-     return true;
- #endif
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/chromium-next/patches/patch-third__party_blink_renderer_core_xml_xslt__processor.h
deleted file mode 100644
index ea927364c1..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_xml_xslt__processor.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/xml/xslt_processor.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/xml/xslt_processor.h
-@@ -77,7 +77,11 @@ class XSLTProcessor final : public Scrip
- 
-   void reset();
- 
-+#if (LIBXML_VERSION >= 21200)
-   static void ParseErrorFunc(void* user_data, const xmlError*);
-+#else
-+  static void ParseErrorFunc(void* user_data, xmlError*);
-+#endif
-   static void GenericErrorFunc(void* user_data, const char* msg, ...);
- 
-   // Only for libXSLT callbacks
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/chromium-next/patches/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
deleted file mode 100644
index 1a556fb466..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-@@ -68,7 +68,11 @@ void XSLTProcessor::GenericErrorFunc(voi
-   // It would be nice to do something with this error message.
- }
- 
-+#if (LIBXML_VERSION >= 21200)
- void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
-+#else
-+void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
-+#endif
-   FrameConsole* console = static_cast<FrameConsole*>(user_data);
-   if (!console)
-     return;
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/chromium-next/patches/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
deleted file mode 100644
index 35a8dd5f28..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/modules/media/audio/audio_device_factory.cc
-@@ -33,7 +33,7 @@ namespace {
- // Set when the default factory is overridden.
- AudioDeviceFactory* g_factory_override = nullptr;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Due to driver deadlock issues on Windows (http://crbug/422522) there is a
- // chance device authorization response is never received from the browser side.
- // In this case we will time out, to avoid renderer hang forever waiting for
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/chromium-next/patches/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
deleted file mode 100644
index 0c3c95f48e..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
-@@ -857,7 +857,7 @@ TEST_F(AudioRendererMixerManagerTest, Mi
-             mixer->get_output_params_for_testing().sample_rate());
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // Use 10 ms buffer (441 frames per buffer).
-   EXPECT_EQ(output_sample_rate / 100,
-             mixer->get_output_params_for_testing().frames_per_buffer());
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc b/chromium-next/patches/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
deleted file mode 100644
index c5aa71ad36..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc
-@@ -542,6 +542,7 @@ void RTCDataChannel::send(Blob* data, Ex
-   pending_messages_.push_back(message);
- }
- 
-+#undef close
- void RTCDataChannel::close() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   if (state_ == webrtc::DataChannelInterface::kClosing ||
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/chromium-next/patches/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
deleted file mode 100644
index 16f6a621d4..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
-@@ -304,7 +304,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED
-   SetupRenderer(kDefaultOutputDeviceId);
-   renderer_proxy_->Start();
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   static const int kExpectedBufferSize = kHardwareSampleRate / 100;
- #elif BUILDFLAG(IS_ANDROID)
-   static const int kExpectedBufferSize = 2 * kHardwareSampleRate / 100;
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/chromium-next/patches/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
deleted file mode 100644
index 0896803c00..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
-@@ -465,7 +465,7 @@ class AudioWorkletThreadPriorityTest
- 
-     // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL
-     // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     if (expected_priority == base::ThreadPriorityForTest::kRealtimeAudio ||
-         expected_priority == base::ThreadPriorityForTest::kDisplay) {
-       EXPECT_EQ(actual_priority, base::ThreadPriorityForTest::kNormal);
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/chromium-next/patches/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
deleted file mode 100644
index 29f05b2b4b..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6338,7 +6338,7 @@ void WebGLRenderingContextBase::TexImage
-   constexpr bool kAllowZeroCopyImages = true;
- #endif
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(crbug.com/1175907): Only TexImage2D seems to work with the GPU path on
-   // Android M -- appears to work fine on R, but to avoid regressions in <video>
-   // limit to TexImage2D only for now. Fails conformance test on Nexus 5X:
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc b/chromium-next/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
deleted file mode 100644
index e852f7c843..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc
-@@ -207,7 +207,7 @@ bool GPUCanvasContext::PaintRenderingRes
- 
-   scoped_refptr<WebGPUMailboxTexture> front_buffer_texture;
-   if (source_buffer == kFrontBuffer) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // By returning false here the canvas will show up as black in the scenarios
-     // that copy the front buffer, such as printing.
-     // TODO(crbug.com/40902474): Support concurrent SharedImage reads via Dawn
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/chromium-next/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
deleted file mode 100644
index ce5e4a54d8..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -812,7 +812,7 @@ bool GPUQueue::CopyFromCanvasSourceImage
- // on linux platform.
- // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES
- // backend is failing for unknown reasons.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool forceReadback = true;
- #elif BUILDFLAG(IS_ANDROID)
-   // TODO(crbug.com/dawn/1969): Some Android devices don't fail to copy from
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_BUILD.gn b/chromium-next/patches/patch-third__party_blink_renderer_platform_BUILD.gn
deleted file mode 100644
index ed12df94fa..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -2046,7 +2046,7 @@ static_library("test_support") {
-   ]
- 
-   # fuzzed_data_provider may not work with a custom toolchain.
--  if (custom_toolchain == "" && is_clang) {
-+  if ((custom_toolchain == "" && is_clang) && !is_bsd) {
-     sources += [
-       "testing/fuzzed_data_provider.cc",
-       "testing/fuzzed_data_provider.h",
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
deleted file mode 100644
index 8e2efb95bd..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/fonts/font_cache.cc
-@@ -82,7 +82,7 @@ extern const char kNotoColorEmojiCompat[
- 
- SkFontMgr* FontCache::static_font_manager_ = nullptr;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- float FontCache::device_scale_factor_ = 1.0;
- #endif
- 
-@@ -133,7 +133,7 @@ const FontPlatformData* FontCache::Syste
-     const FontDescription& font_description) {
-   const AtomicString& family = FontCache::SystemFontFamily();
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
--    BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
-   if (family.empty() || family == font_family_names::kSystemUi)
-     return nullptr;
- #else
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.h
deleted file mode 100644
index f27fb77098..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/fonts/font_cache.h
-@@ -55,7 +55,7 @@
- #include "third_party/skia/include/core/SkFontMgr.h"
- #include "third_party/skia/include/core/SkRefCnt.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "ui/gfx/font_fallback_linux.h"
- #endif
- 
-@@ -167,7 +167,7 @@ class PLATFORM_EXPORT FontCache final {
- 
-   static void MaybePreloadSystemFonts();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // These are needed for calling QueryRenderStyleForStrike, since
-   // gfx::GetFontRenderParams makes distinctions based on DSF.
-   static float DeviceScaleFactor() { return device_scale_factor_; }
-@@ -243,7 +243,7 @@ class PLATFORM_EXPORT FontCache final {
-       const char* locale_family_name);
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static bool GetFontForCharacter(UChar32,
-                                   const char* preferred_locale,
-                                   gfx::FallbackFontData*);
-@@ -316,7 +316,7 @@ class PLATFORM_EXPORT FontCache final {
-                                    const FontFaceCreationParams&,
-                                    std::string& name);
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static AtomicString GetFamilyNameForCharacter(SkFontMgr*,
-                                                 UChar32,
-                                                 const FontDescription&,
-@@ -353,7 +353,7 @@ class PLATFORM_EXPORT FontCache final {
-   bool is_test_font_mgr_ = false;
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static float device_scale_factor_;
- #endif
- 
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__description.cc
deleted file mode 100644
index e1eb43ebc0..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__description.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/fonts/font_description.cc
-@@ -41,7 +41,7 @@
- #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
- #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "third_party/blink/renderer/platform/fonts/font_cache.h"
- #endif
- 
-@@ -280,7 +280,7 @@ FontCacheKey FontDescription::CacheKey(
-       static_cast<unsigned>(fields_.orientation_) << 1 |            // bit 2-3
-       static_cast<unsigned>(fields_.subpixel_text_position_);       // bit 1
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   float device_scale_factor_for_key = FontCache::DeviceScaleFactor();
- #else
-   float device_scale_factor_for_key = 1.0f;
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
deleted file mode 100644
index 1e1d26eac2..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/fonts/font_metrics.cc
-@@ -39,7 +39,7 @@
- namespace blink {
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // This is the largest VDMX table which we'll try to load and parse.
- static const size_t kMaxVDMXTableSize = 1024 * 1024;  // 1 MB
- #endif
-@@ -67,7 +67,7 @@ void FontMetrics::AscentDescentWithHacks
-   bool is_vdmx_valid = false;
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // Manually digging up VDMX metrics is only applicable when bytecode hinting
-   // using FreeType.  With DirectWrite or CoreText, no bytecode hinting is ever
-   // done.  This code should be pushed into FreeType (hinted font metrics).
-@@ -111,7 +111,7 @@ void FontMetrics::AscentDescentWithHacks
-     descent = SkScalarRoundToScalar(metrics.fDescent);
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     // When subpixel positioning is enabled, if the descent is rounded down,
-     // the descent part of the glyph may be truncated when displayed in a
-     // 'overflow: hidden' container.  To avoid that, borrow 1 unit from the
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
deleted file mode 100644
index e0adfcb5bf..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc
-@@ -9,7 +9,7 @@
- #if BUILDFLAG(IS_ANDROID)
- #include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h"
- #include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h"
- #elif BUILDFLAG(IS_WIN)
- #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h"
-@@ -24,7 +24,7 @@ std::unique_ptr<FontUniqueNameLookup>
- FontUniqueNameLookup::GetPlatformUniqueNameLookup() {
- #if BUILDFLAG(IS_ANDROID)
-   return std::make_unique<FontUniqueNameLookupAndroid>();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return std::make_unique<FontUniqueNameLookupLinux>();
- #elif BUILDFLAG(IS_WIN)
-   return std::make_unique<FontUniqueNameLookupWin>();
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
deleted file mode 100644
index bec906e512..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
-@@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkStri
-   return AtomicString::FromUTF8(std::string_view(str.begin(), str.end()));
- }
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // This function is called on android or when we are emulating android fonts on
- // linux and the embedder has overriden the default fontManager with
- // WebFontRendering::setSkiaFontMgr.
-@@ -246,7 +246,7 @@ const FontPlatformData* FontCache::Creat
-   std::string name;
- 
-   sk_sp<SkTypeface> typeface;
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool noto_color_emoji_from_gmscore = false;
- #if BUILDFLAG(IS_ANDROID)
-   // Use the unique local matching pathway for fetching Noto Color Emoji Compat
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
deleted file mode 100644
index bae3787465..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
-@@ -71,8 +71,12 @@ void BeginFrameProvider::CreateComposito
- 
-   // Once we are using RAF, this thread is driving user interactive display
-   // updates. Update priority accordingly.
-+  // pledge(2)
-+  // stop this baloney
-+#if !defined(OS_OPENBSD)
-   base::PlatformThread::SetCurrentThreadType(
-       base::ThreadType::kDisplayCritical);
-+#endif
- 
-   mojo::Remote<mojom::blink::EmbeddedFrameSinkProvider> provider;
-   Platform::Current()->GetBrowserInterfaceBroker()->GetInterface(
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
deleted file mode 100644
index 706396b061..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc
-@@ -47,7 +47,7 @@ scoped_refptr<StaticBitmapImage> MakeAcc
- 
-   const auto paint_image = source->PaintImageForCurrentFrame();
-   const auto image_info = paint_image.GetSkImageInfo();
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(b/330865436): On Linux, CanvasResourceProvider doesn't always check
-   // for SCANOUT support correctly on X11 and it's never supported in
-   // practice. Therefore, don't include it until this flow is reworked.
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
deleted file mode 100644
index 861a21e1c2..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -421,7 +421,7 @@ void VideoFrameSubmitter::OnBeginFrame(
-     auto& details = timing_details.find(frame_token)->value;
-     auto& feedback = details.presentation_feedback;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // TODO: On Linux failure flag is unreliable, and perfectly rendered frames
-     // are reported as failures all the time.
-     bool presentation_failure = false;
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
deleted file mode 100644
index ac6038c7c1..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc
-@@ -14,7 +14,9 @@
- 
- namespace blink {
- 
-+#if !BUILDFLAG(IS_BSD)
- const char kPartitionAllocDumpName[] = "partition_alloc";
-+#endif
- 
- PartitionAllocMemoryDumpProvider* PartitionAllocMemoryDumpProvider::Instance() {
-   DEFINE_STATIC_LOCAL(PartitionAllocMemoryDumpProvider, instance, ());
-@@ -24,6 +26,7 @@ PartitionAllocMemoryDumpProvider* Partit
- bool PartitionAllocMemoryDumpProvider::OnMemoryDump(
-     const base::trace_event::MemoryDumpArgs& args,
-     base::trace_event::ProcessMemoryDump* memory_dump) {
-+#if !BUILDFLAG(IS_BSD)
-   using base::trace_event::MemoryDumpLevelOfDetail;
- 
-   MemoryDumpLevelOfDetail level_of_detail = args.level_of_detail;
-@@ -49,6 +52,7 @@ bool PartitionAllocMemoryDumpProvider::O
-       "size", "bytes", partition_stats_dumper.total_active_bytes());
-   memory_dump->AddOwnershipEdge(allocated_objects_dump->guid(),
-                                 partitions_dump->guid());
-+#endif
- 
-   return true;
- }
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
deleted file mode 100644
index e60df2434e..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc
-@@ -324,12 +324,12 @@ SupportedFormats GetSupportedFormatsInte
-       supported_formats.profiles.push_back(profile.profile);
-       supported_formats.sdp_formats.push_back(std::move(*format));
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(IS_WIN)
-       const bool kShouldAddH264Cbp =
-           base::FeatureList::IsEnabled(kMediaFoundationH264CbpEncoding) &&
-           profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       const bool kShouldAddH264Cbp =
-           profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE;
- #endif
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/chromium-next/patches/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
deleted file mode 100644
index db494f6f88..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -434,7 +434,7 @@
-       name: "AppTitle",
-       status: "experimental",
-       origin_trial_feature_name: "AppTitle",
--      origin_trial_os: ["win", "mac", "linux", "chromeos"],
-+      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd", "netbsd"],
-       base_feature: "WebAppEnableAppTitle",
-     },
-     {
-@@ -1698,7 +1698,7 @@
-       name: "DocumentIsolationPolicy",
-       status: "experimental",
-       origin_trial_feature_name: "DocumentIsolationPolicy",
--      origin_trial_os: ["win", "mac", "linux", "chromeos"],
-+      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd", "netbsd"],
-       base_feature: "none",
-     },
-     {
-@@ -1943,7 +1943,7 @@
-       base_feature: "none",
-       public: true,
-       origin_trial_feature_name: "FedCmMultipleIdentityProviders",
--      origin_trial_os: ["win", "mac", "linux", "chromeos"],
-+      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd", "netbsd"],
-       origin_trial_allows_third_party: true,
-     },
-     {
-@@ -3331,7 +3331,7 @@
-       // Tracking bug for the implementation: https://crbug.com/1462930
-       name: "PermissionElement",
-       origin_trial_feature_name: "PermissionElement",
--      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "android"],
-+      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "android", "openbsd", "freebsd", "netbsd"],
-       status: "experimental",
-       public: true,
-       base_feature_status: "enabled",
-@@ -3475,7 +3475,7 @@
-     {
-       name: "PrivateNetworkAccessPermissionPrompt",
-       origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt",
--      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
-+      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd", "netbsd"],
-       status: "stable",
-       public: true,
-       base_feature: "none",
-@@ -4636,7 +4636,7 @@
-       name: "UnrestrictedSharedArrayBuffer",
-       base_feature: "none",
-       origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
--      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
-+      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd", "netbsd"],
-     },
-     // Enables using policy-controlled feature "usb-unrestricted" to allow
-     // isolated context to access protected USB interface classes and to
-@@ -4811,7 +4811,7 @@
-     {
-       name: "WebAppScopeExtensions",
-       origin_trial_feature_name: "WebAppScopeExtensions",
--      origin_trial_os: ["win", "mac", "linux", "chromeos"],
-+      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd", "netbsd"],
-       status: "experimental",
-       base_feature: "none",
-     },
-@@ -5086,7 +5086,7 @@
-     {
-       name: "WebIdentityDigitalCredentials",
-       origin_trial_feature_name: "WebIdentityDigitalCredentials",
--      origin_trial_os: ["android", "win", "mac", "linux", "chromeos"],
-+      origin_trial_os: ["android", "win", "mac", "linux", "chromeos", "openbsd", "freebsd", "netbsd"],
-       origin_trial_allows_third_party: true,
-       implied_by: ["WebIdentityDigitalCredentialsCreation"],
-       public: true,
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
deleted file mode 100644
index d679d9eee4..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/scheduler/common/thread.cc
-@@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThrea
-             "Compositor");
-       }));
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_OPENBSD)
-   compositor_thread->GetTaskRunner()->PostTaskAndReplyWithResult(
-       FROM_HERE, base::BindOnce(&base::PlatformThread::CurrentId),
-       base::BindOnce([](base::PlatformThreadId compositor_thread_id) {
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
deleted file mode 100644
index 8436e125f6..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc
-@@ -27,7 +27,7 @@ BlinkCategorizedWorkerPoolDelegate& Blin
- 
- void BlinkCategorizedWorkerPoolDelegate::NotifyThreadWillRun(
-     base::PlatformThreadId tid) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   scoped_refptr<base::TaskRunner> task_runner =
-       Thread::MainThread()->GetTaskRunner(MainThreadTaskRunnerRestricted());
-   task_runner->PostTask(FROM_HERE, base::BindOnce(
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_container__annotations.h b/chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
deleted file mode 100644
index 11365c8808..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/wtf/container_annotations.h
-@@ -11,7 +11,7 @@
- // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86
- // once the crashes there have been fixed: http://crbug.com/461406
- #if defined(ADDRESS_SANITIZER) &&                      \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
-     defined(ARCH_CPU_X86_64)
- 
- // Annotations require buffers to begin on an 8-byte boundary. See
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_math__extras.h b/chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_math__extras.h
deleted file mode 100644
index 214a174aa7..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_math__extras.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/wtf/math_extras.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/wtf/math_extras.h
-@@ -128,6 +128,10 @@ constexpr float Grad2turn(float g) {
-   return g * (1.0f / 400.0f);
- }
- 
-+#if defined(OS_FREEBSD)
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Winvalid-constexpr"
-+#endif
- constexpr double RoundHalfTowardsPositiveInfinity(double value) {
-   return std::floor(value + 0.5);
- }
-@@ -135,6 +139,9 @@ constexpr double RoundHalfTowardsPositiv
- constexpr float RoundHalfTowardsPositiveInfinity(float value) {
-   return std::floor(value + 0.5f);
- }
-+#if defined(OS_FREEBSD)
-+#pragma clang diagnostic pop
-+#endif
- 
- // ClampTo() is implemented by templated helper classes (to allow for partial
- // template specialization) as well as several helper functions.
diff --git a/chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
deleted file mode 100644
index dd74625cf7..0000000000
--- a/chromium-next/patches/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -23,6 +23,13 @@
- extern "C" void* __libc_stack_end;  // NOLINT
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#include <sys/signal.h>
-+#if !BUILDFLAG(IS_NETBSD)
-+#include <pthread_np.h>
-+#endif
-+#endif
-+
- namespace WTF {
- 
- size_t GetUnderestimatedStackSize() {
-@@ -35,7 +42,8 @@ size_t GetUnderestimatedStackSize() {
- // correctly for the main thread.
- 
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_NETBSD)
-   // pthread_getattr_np() can fail if the thread is not invoked by
-   // pthread_create() (e.g., the main thread of blink_unittests).
-   // If so, a conservative size estimate is returned.
-@@ -56,7 +64,7 @@ size_t GetUnderestimatedStackSize() {
-     pthread_attr_destroy(&attr);
-     return size;
-   }
--#if BUILDFLAG(IS_FREEBSD)
-+#if BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
-   pthread_attr_destroy(&attr);
- #endif
- 
-@@ -67,6 +75,8 @@ size_t GetUnderestimatedStackSize() {
-   //    low as 512k.
-   //
-   return 512 * 1024;
-+#elif BUILDFLAG(IS_OPENBSD)
-+  return 512 * 1024;
- #elif BUILDFLAG(IS_APPLE)
-   // pthread_get_stacksize_np() returns too low a value for the main thread on
-   // OSX 10.9,
-@@ -103,7 +113,7 @@ size_t GetUnderestimatedStackSize() {
- 
- void* GetStackStart() {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_NETBSD)
-   pthread_attr_t attr;
-   int error;
- #if BUILDFLAG(IS_FREEBSD)
-@@ -120,7 +130,7 @@ void* GetStackStart() {
-     pthread_attr_destroy(&attr);
-     return reinterpret_cast<uint8_t*>(base) + size;
-   }
--#if BUILDFLAG(IS_FREEBSD)
-+#if BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
-   pthread_attr_destroy(&attr);
- #endif
- #if defined(__GLIBC__)
-@@ -152,6 +162,13 @@ void* GetStackStart() {
-   ::GetCurrentThreadStackLimits(&lowLimit, &highLimit);
-   return reinterpret_cast<void*>(highLimit);
- #endif
-+#elif BUILDFLAG(IS_OPENBSD)
-+  stack_t ss;
-+  void *base;
-+  int error = pthread_stackseg_np(pthread_self(), &ss);
-+  CHECK(!error);
-+  base = (void*)((size_t) ss.ss_sp - ss.ss_size);
-+  return reinterpret_cast<uint8_t*>(base) + ss.ss_size;
- #else
- #error Unsupported getStackStart on this platform.
- #endif
diff --git a/chromium-next/patches/patch-third__party_brotli_common_platform.h b/chromium-next/patches/patch-third__party_brotli_common_platform.h
deleted file mode 100644
index d56c46714b..0000000000
--- a/chromium-next/patches/patch-third__party_brotli_common_platform.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/brotli/common/platform.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/brotli/common/platform.h
-@@ -28,7 +28,7 @@
- #include <brotli/port.h>
- #include <brotli/types.h>
- 
--#if defined(OS_LINUX) || defined(OS_CYGWIN) || defined(__EMSCRIPTEN__)
-+#if defined(OS_LINUX) || defined(OS_CYGWIN) || defined(__EMSCRIPTEN__) || defined(OS_BSD)
- #include <endian.h>
- #elif defined(OS_FREEBSD)
- #include <machine/endian.h>
diff --git a/chromium-next/patches/patch-third__party_cpuinfo_cpuinfo.gni b/chromium-next/patches/patch-third__party_cpuinfo_cpuinfo.gni
deleted file mode 100644
index ac4e39da6f..0000000000
--- a/chromium-next/patches/patch-third__party_cpuinfo_cpuinfo.gni
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/cpuinfo/cpuinfo.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/cpuinfo/cpuinfo.gni
-@@ -8,7 +8,7 @@ use_cpuinfo =
-     current_cpu != "s390" && current_cpu != "s390x" &&
-     current_cpu != "riscv64" &&
-     # cpuinfo is not supported on fuchsia.
--    !is_fuchsia &&
-+    !is_fuchsia && !is_bsd &&
-     # There's a few arm architectures that are not supported by cpuinfo,
-     # especially amongst ChromeOS devices.
-     # See //third_party/cpuinfo/src/src/arm/linux/cp.h.
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/chromium-next/patches/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
deleted file mode 100644
index e3b360ba42..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni
-@@ -61,7 +61,7 @@ if (crashpad_is_in_chromium) {
-   crashpad_is_ios = is_ios
-   crashpad_is_apple = is_apple
-   crashpad_is_win = is_win
--  crashpad_is_linux = is_linux || is_chromeos
-+  crashpad_is_linux = (is_linux || is_chromeos) && !is_bsd
-   crashpad_is_android = is_android
-   crashpad_is_fuchsia = is_fuchsia
- 
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_client_BUILD.gn b/chromium-next/patches/patch-third__party_crashpad_crashpad_client_BUILD.gn
deleted file mode 100644
index c946be07db..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_client_BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/client/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/client/BUILD.gn
-@@ -134,6 +134,13 @@ static_library("common") {
-   if (crashpad_is_win) {
-     sources += [ "crash_report_database_win.cc" ]
-   }
-+
-+  if (crashpad_is_posix) {
-+    sources += [
-+      "crashpad_client_posix.cc",
-+    ]
-+  }
-+
-   if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) {
-     sources += [
-       "crash_report_database_generic.cc",
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc b/chromium-next/patches/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
deleted file mode 100644
index fbee12c35e..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig	2025-05-08 12:01:57.832282915 +0000
-+++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc
-@@ -0,0 +1,40 @@
-+// Copyright 2017 The Crashpad Authors. All rights reserved.
-+//
-+// Licensed under the Apache License, Version 2.0 (the "License");
-+// you may not use this file except in compliance with the License.
-+// You may obtain a copy of the License at
-+//
-+//     http://www.apache.org/licenses/LICENSE-2.0
-+//
-+// Unless required by applicable law or agreed to in writing, software
-+// distributed under the License is distributed on an "AS IS" BASIS,
-+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+// See the License for the specific language governing permissions and
-+// limitations under the License.
-+
-+#include "client/crashpad_client.h"
-+
-+#include "base/logging.h"
-+#include "base/notreached.h"
-+
-+namespace crashpad {
-+
-+CrashpadClient::CrashpadClient() {}
-+
-+CrashpadClient::~CrashpadClient() {}
-+
-+bool CrashpadClient::StartHandler(
-+    const base::FilePath& handler,
-+    const base::FilePath& database,
-+    const base::FilePath& metrics_dir,
-+    const std::string& url,
-+    const std::map<std::string, std::string>& annotations,
-+    const std::vector<std::string>& arguments,
-+    bool restartable,
-+    bool asynchronous_start,   
-+    const std::vector<base::FilePath>& attachments) {
-+  NOTREACHED();  // TODO(scottmg): https://crashpad.chromium.org/bug/196
-+  return false;
-+}
-+
-+}  // namespace crashpad
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc b/chromium-next/patches/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
deleted file mode 100644
index 1b7ad068b4..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-@@ -159,6 +159,12 @@ std::string MinidumpMiscInfoDebugBuildSt
-   static constexpr char kOS[] = "win";
- #elif BUILDFLAG(IS_FUCHSIA)
-   static constexpr char kOS[] = "fuchsia";
-+#elif defined(OS_OPENBSD)
-+  static constexpr char kOS[] = "openbsd";
-+#elif defined(OS_FREEBSD)
-+  static constexpr char kOS[] = "freebsd";
-+#elif defined(OS_NETBSD)
-+  static constexpr char kOS[] = "netbsd";
- #else
- #error define kOS for this operating system
- #endif
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_address__types.h b/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_address__types.h
deleted file mode 100644
index 1354258c8a..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_address__types.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/util/misc/address_types.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/util/misc/address_types.h
-@@ -25,7 +25,7 @@
- #include <mach/mach_types.h>
- #elif BUILDFLAG(IS_WIN)
- #include "util/win/address_types.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "util/linux/address_types.h"
- #elif BUILDFLAG(IS_FUCHSIA)
- #include <zircon/types.h>
-@@ -55,7 +55,7 @@ using VMSize = mach_vm_size_t;
- using VMAddress = WinVMAddress;
- using VMSize = WinVMSize;
- 
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- 
- using VMAddress = LinuxVMAddress;
- using VMSize = LinuxVMSize;
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_capture__context.h b/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
deleted file mode 100644
index f1f1932cb8..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/util/misc/capture_context.h
-@@ -21,7 +21,8 @@
- #include <mach/mach.h>
- #elif BUILDFLAG(IS_WIN)
- #include <windows.h>
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
-+      BUILDFLAG(IS_FREEBSD) || BUILDFLAG(IS_NETBSD)
- #include <ucontext.h>
- #endif  // BUILDFLAG(IS_APPLE)
- 
-@@ -35,7 +36,8 @@ using NativeCPUContext = arm_unified_thr
- #endif
- #elif BUILDFLAG(IS_WIN)
- using NativeCPUContext = CONTEXT;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
-+      BUILDFLAG(IS_BSD)
- using NativeCPUContext = ucontext_t;
- #endif  // BUILDFLAG(IS_APPLE)
- 
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_metrics.cc b/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
deleted file mode 100644
index ba38276789..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/util/misc/metrics.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/util/misc/metrics.cc
-@@ -25,7 +25,7 @@
- #define METRICS_OS_NAME "Win"
- #elif BUILDFLAG(IS_ANDROID)
- #define METRICS_OS_NAME "Android"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #define METRICS_OS_NAME "Linux"
- #elif BUILDFLAG(IS_FUCHSIA)
- #define METRICS_OS_NAME "Fuchsia"
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_uuid.cc b/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
deleted file mode 100644
index 9c5f96fbbd..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/util/misc/uuid.cc
-@@ -110,7 +110,7 @@ bool UUID::InitializeWithNew() {
-   InitializeFromBytes(uuid);
-   return true;
- #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // Linux, Android, and Fuchsia do not provide a UUID generator in a
-   // widely-available system library. On Linux and Android, uuid_generate()
-   // from libuuid is not available everywhere.
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc b/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
deleted file mode 100644
index 94ec9054fa..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/util/posix/close_multiple.cc
-@@ -73,7 +73,7 @@ void CloseNowOrOnExec(int fd, bool ebadf
- // This is an advantage over looping over all possible file descriptors, because
- // no attempt needs to be made to close file descriptors that are not open.
- bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) {
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   static constexpr char kFDDir[] = "/dev/fd";
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-   static constexpr char kFDDir[] = "/proc/self/fd";
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc b/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
deleted file mode 100644
index 2d9a70d95b..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc
-@@ -25,7 +25,7 @@ void DropPrivileges() {
-   gid_t gid = getgid();
-   uid_t uid = getuid();
- 
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and
-   // setregid(), setreuid() and setregid() alone should be sufficient to drop
-   // privileges. The standard specifies that the saved ID should be set to the
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_signals.cc
deleted file mode 100644
index 2ba5cc714a..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_signals.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/util/posix/signals.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/util/posix/signals.cc
-@@ -51,7 +51,7 @@ constexpr int kCrashSignals[] = {
- #if defined(SIGEMT)
-     SIGEMT,
- #endif  // defined(SIGEMT)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     SIGXCPU,
-     SIGXFSZ,
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -91,7 +91,7 @@ constexpr int kTerminateSignals[] = {
-     SIGXCPU,
-     SIGXFSZ,
- #endif  // BUILDFLAG(IS_APPLE)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     SIGIO,
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- };
-@@ -251,8 +251,12 @@ bool Signals::WillSignalReraiseAutonomou
-          // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c
-          // psignal_internal().
-          (code > 0 &&
-+#if defined(SI_ASYNCIO)
-           code != SI_ASYNCIO &&
-+#endif
-+#if defined(SI_MESGQ)
-           code != SI_MESGQ &&
-+#endif
-           code != SI_QUEUE &&
-           code != SI_TIMER &&
-           code != SI_USER &&
diff --git a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
deleted file mode 100644
index 6be2dfa6e9..0000000000
--- a/chromium-next/patches/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc
-@@ -68,7 +68,7 @@ constexpr const char* kSignalNames[] = {
-     "INFO",
-     "USR1",
-     "USR2",
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #if defined(ARCH_CPU_MIPS_FAMILY)
-     "HUP",
-     "INT",
-@@ -139,7 +139,7 @@ constexpr const char* kSignalNames[] = {
- #endif  // defined(ARCH_CPU_MIPS_FAMILY)
- #endif
- };
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- // NSIG is 64 to account for real-time signals.
- static_assert(std::size(kSignalNames) == 32, "kSignalNames length");
- #else
diff --git a/chromium-next/patches/patch-third__party_crc32c_BUILD.gn b/chromium-next/patches/patch-third__party_crc32c_BUILD.gn
deleted file mode 100644
index fd04df162e..0000000000
--- a/chromium-next/patches/patch-third__party_crc32c_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/crc32c/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/crc32c/BUILD.gn
-@@ -46,7 +46,7 @@ config("crc32c_config") {
-   }
- 
-   # Android added <sys/auxv.h> in API level 18.
--  if (is_linux || is_chromeos || is_android) {
-+  if (is_linux || is_chromeos || is_android && !is_bsd) {
-     defines += [
-       "HAVE_STRONG_GETAUXVAL=1",
-       "HAVE_WEAK_GETAUXVAL=1",
diff --git a/chromium-next/patches/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/chromium-next/patches/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
deleted file mode 100644
index 4184ebead7..0000000000
--- a/chromium-next/patches/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/dawn/include/dawn/native/VulkanBackend.h
-@@ -83,7 +83,8 @@ struct ExternalImageExportInfoVk : Exter
- };
- 
- // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome
--#if defined(__linux__) || defined(__Fuchsia__)
-+#if defined(__linux__) || defined(__Fuchsia__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
-+    defined(__NetBSD__)
- 
- // Common properties of external images represented by FDs. On successful import the file
- // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be
diff --git a/chromium-next/patches/patch-third__party_dawn_src_dawn_common_Platform.h b/chromium-next/patches/patch-third__party_dawn_src_dawn_common_Platform.h
deleted file mode 100644
index 0876c2b429..0000000000
--- a/chromium-next/patches/patch-third__party_dawn_src_dawn_common_Platform.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/dawn/src/dawn/common/Platform.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/dawn/src/dawn/common/Platform.h
-@@ -60,6 +60,11 @@
- #error "Unsupported Windows platform."
- #endif
- 
-+#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#define DAWN_PLATFORM_IS_LINUX 1
-+#define DAWN_PLATFORM_IS_BSD 1
-+#define DAWN_PLATFORM_IS_POSIX 1
-+
- #elif defined(__linux__)
- #define DAWN_PLATFORM_IS_LINUX 1
- #define DAWN_PLATFORM_IS_POSIX 1
diff --git a/chromium-next/patches/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/chromium-next/patches/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
deleted file mode 100644
index 94c26f9e64..0000000000
--- a/chromium-next/patches/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp
-@@ -57,7 +57,7 @@ constexpr char kSwiftshaderLibName[] = "
- #endif
- 
- #if DAWN_PLATFORM_IS(LINUX)
--#if DAWN_PLATFORM_IS(ANDROID)
-+#if DAWN_PLATFORM_IS(ANDROID) || DAWN_PLATFORM_IS(BSD)
- constexpr char kVulkanLibName[] = "libvulkan.so";
- #else
- constexpr char kVulkanLibName[] = "libvulkan.so.1";
diff --git a/chromium-next/patches/patch-third__party_ffmpeg_BUILD.gn b/chromium-next/patches/patch-third__party_ffmpeg_BUILD.gn
deleted file mode 100644
index 864fae25e0..0000000000
--- a/chromium-next/patches/patch-third__party_ffmpeg_BUILD.gn
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/ffmpeg/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/ffmpeg/BUILD.gn
-@@ -350,7 +350,6 @@ target(link_target_type, "ffmpeg_interna
-       libs += [
-         "m",
-         "z",
--        "rt",
-       ]
-     }
-     if (is_component_ffmpeg) {
diff --git a/chromium-next/patches/patch-third__party_ffmpeg_libavcodec_x86_cabac.h b/chromium-next/patches/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
deleted file mode 100644
index eb362dd7b1..0000000000
--- a/chromium-next/patches/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/ffmpeg/libavcodec/x86/cabac.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/ffmpeg/libavcodec/x86/cabac.h
-@@ -31,7 +31,8 @@
- 
- #if   (defined(__i386) && defined(__clang__) && (__clang_major__<2 || (__clang_major__==2 && __clang_minor__<10)))\
-    || (                  !defined(__clang__) && defined(__llvm__) && __GNUC__==4 && __GNUC_MINOR__==2 && __GNUC_PATCHLEVEL__<=1)\
--   || (defined(__INTEL_COMPILER) && defined(_MSC_VER))
-+   || (defined(__INTEL_COMPILER) && defined(_MSC_VER)) \
-+   || ((defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386))
- #       define BROKEN_COMPILER 1
- #else
- #       define BROKEN_COMPILER 0
diff --git a/chromium-next/patches/patch-third__party_ffmpeg_libavutil_cpu.c b/chromium-next/patches/patch-third__party_ffmpeg_libavutil_cpu.c
deleted file mode 100644
index bc70ac1550..0000000000
--- a/chromium-next/patches/patch-third__party_ffmpeg_libavutil_cpu.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/ffmpeg/libavutil/cpu.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/ffmpeg/libavutil/cpu.c
-@@ -38,10 +38,7 @@
- #if HAVE_GETPROCESSAFFINITYMASK || HAVE_WINRT
- #include <windows.h>
- #endif
--#if HAVE_SYSCTL
--#if HAVE_SYS_PARAM_H
--#include <sys/param.h>
--#endif
-+#if HAVE_SYSCTL && !defined(__OpenBSD__)
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
diff --git a/chromium-next/patches/patch-third__party_ffmpeg_libavutil_mem.c b/chromium-next/patches/patch-third__party_ffmpeg_libavutil_mem.c
deleted file mode 100644
index ee4ad6532b..0000000000
--- a/chromium-next/patches/patch-third__party_ffmpeg_libavutil_mem.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/ffmpeg/libavutil/mem.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/ffmpeg/libavutil/mem.c
-@@ -33,9 +33,6 @@
- #include <stdlib.h>
- #include <stdatomic.h>
- #include <string.h>
--#if HAVE_MALLOC_H
--#include <malloc.h>
--#endif
- 
- #include "attributes.h"
- #include "avassert.h"
diff --git a/chromium-next/patches/patch-third__party_ffmpeg_libavutil_random__seed.c b/chromium-next/patches/patch-third__party_ffmpeg_libavutil_random__seed.c
deleted file mode 100644
index 4cdd53fce1..0000000000
--- a/chromium-next/patches/patch-third__party_ffmpeg_libavutil_random__seed.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/ffmpeg/libavutil/random_seed.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/ffmpeg/libavutil/random_seed.c
-@@ -20,6 +20,10 @@
- 
- #include "config.h"
- 
-+#if defined(__NetBSD__)
-+#define _NETBSD_SOURCE 1
-+#endif
-+
- #if HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-@@ -35,6 +39,11 @@
- #elif CONFIG_OPENSSL
- #include <openssl/rand.h>
- #endif
-+#if HAVE_ARC4RANDOM_BUF
-+#undef __BSD_VISIBLE
-+#define __BSD_VISIBLE 1
-+#include <stdlib.h>
-+#endif
- #include <fcntl.h>
- #include <math.h>
- #include <time.h>
diff --git a/chromium-next/patches/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm b/chromium-next/patches/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
deleted file mode 100644
index 863a6f89c1..0000000000
--- a/chromium-next/patches/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/ffmpeg/libavutil/x86/x86inc.asm
-@@ -46,6 +46,12 @@
-     %endif
- %endif
- 
-+%if ARCH_X86_64
-+    %define _CET_ENDBR endbr64
-+%else
-+    %define _CET_ENDBR
-+%endif
-+
- %define WIN64  0
- %define UNIX64 0
- %if ARCH_X86_64
-@@ -861,6 +867,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, 
-     %endif
-     align function_align
-     %2:
-+    _CET_ENDBR
-     RESET_MM_PERMUTATION        ; needed for x86-64, also makes disassembly somewhat nicer
-     %xdefine rstk rsp           ; copy of the original stack pointer, used when greater alignment than the known stack alignment is required
-     %assign stack_offset 0      ; stack pointer offset relative to the return address
diff --git a/chromium-next/patches/patch-third__party_fontconfig_include_config.h b/chromium-next/patches/patch-third__party_fontconfig_include_config.h
deleted file mode 100644
index cdc43f9d5c..0000000000
--- a/chromium-next/patches/patch-third__party_fontconfig_include_config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/fontconfig/include/config.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/fontconfig/include/config.h
-@@ -13,7 +13,7 @@
- 
- #define FC_CACHEDIR "/var/cache/fontconfig"
- 
--#define FC_DEFAULT_FONTS "\t<dir>/usr/share/fonts</dir>\n\t<dir>/usr/local/share/fonts</dir>\n"
-+#define FC_DEFAULT_FONTS "\t<dir>/usr/X11R6/lib/X11/fonts</dir>"
- 
- #define FC_FONTPATH ""
- 
-@@ -66,7 +66,7 @@
- 
- #define HAVE_MMAP 1
- 
--#define HAVE_POSIX_FADVISE 1
-+#define HAVE_POSIX_FADVISE 0
- 
- #define HAVE_PTHREAD 1
- 
-@@ -74,10 +74,13 @@
- 
- #define HAVE_RANDOM 1
- 
--#define HAVE_RANDOM_R 1
-+/* #undef HAVE_RANDOM_R */
- 
- #define HAVE_RAND_R 1
- 
-+/* Define to 1 if you have the `arc4_random' function. */
-+#define HAVE_ARC4RANDOM 1
-+
- #define HAVE_READLINK 1
- 
- #define HAVE_STDATOMIC_PRIMITIVES 1
-@@ -92,11 +95,11 @@
- 
- #define HAVE_SYS_PARAM_H 1
- 
--#define HAVE_SYS_STATFS_H 1
-+/* #undef HAVE_SYS_STATFS_H */
- 
- #define HAVE_SYS_STATVFS_H 1
- 
--#define HAVE_SYS_VFS_H 1
-+/* #undef HAVE_SYS_VFS_H */
- 
- #define HAVE_UNISTD_H 1
- 
diff --git a/chromium-next/patches/patch-third__party_fontconfig_src_src_fccompat.c b/chromium-next/patches/patch-third__party_fontconfig_src_src_fccompat.c
deleted file mode 100644
index 3a23cf1d3f..0000000000
--- a/chromium-next/patches/patch-third__party_fontconfig_src_src_fccompat.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/fontconfig/src/src/fccompat.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/fontconfig/src/src/fccompat.c
-@@ -184,7 +184,9 @@ FcRandom(void)
- {
-     int32_t result;
- 
--#if HAVE_RANDOM_R
-+#if HAVE_ARC4RANDOM
-+    result = arc4random() & 0x7fffffff;
-+#elif HAVE_RANDOM_R
-     static struct random_data fcrandbuf;
-     static char statebuf[256];
-     static FcBool initialized = FcFalse;
diff --git a/chromium-next/patches/patch-third__party_ipcz_src_BUILD.gn b/chromium-next/patches/patch-third__party_ipcz_src_BUILD.gn
deleted file mode 100644
index 31dd211fe2..0000000000
--- a/chromium-next/patches/patch-third__party_ipcz_src_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/ipcz/src/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/ipcz/src/BUILD.gn
-@@ -7,7 +7,7 @@ import("//build_overrides/ipcz.gni")
- import("//testing/libfuzzer/fuzzer_test.gni")
- import("//testing/test.gni")
- 
--enable_multiprocess_tests = is_linux
-+enable_multiprocess_tests = is_linux && !is_bsd
- 
- buildflag_header("test_buildflags") {
-   header = "test_buildflags.h"
diff --git a/chromium-next/patches/patch-third__party_ipcz_src_reference__drivers_random.cc b/chromium-next/patches/patch-third__party_ipcz_src_reference__drivers_random.cc
deleted file mode 100644
index 81e808ef01..0000000000
--- a/chromium-next/patches/patch-third__party_ipcz_src_reference__drivers_random.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/ipcz/src/reference_drivers/random.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/ipcz/src/reference_drivers/random.cc
-@@ -55,7 +55,7 @@ decltype(&ProcessPrng) GetProcessPrng() 
- }
- #endif
- 
--#if defined(OS_POSIX) && !BUILDFLAG(IS_MAC)
-+#if defined(OS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
- void RandomBytesFromDevUrandom(absl::Span<uint8_t> destination) {
-   static int urandom_fd = [] {
-     for (;;) {
-@@ -99,7 +99,7 @@ void RandomBytes(absl::Span<uint8_t> des
-       return;
-     }
-   }
--#elif BUILDFLAG(IS_MAC)
-+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   const bool ok = getentropy(destination.data(), destination.size()) == 0;
-   ABSL_ASSERT(ok);
- #elif BUILDFLAG(IS_IOS)
diff --git a/chromium-next/patches/patch-third__party_ipcz_src_standalone_base_logging.cc b/chromium-next/patches/patch-third__party_ipcz_src_standalone_base_logging.cc
deleted file mode 100644
index 5a4a95d62a..0000000000
--- a/chromium-next/patches/patch-third__party_ipcz_src_standalone_base_logging.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/ipcz/src/standalone/base/logging.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/ipcz/src/standalone/base/logging.cc
-@@ -55,6 +55,9 @@ LogMessage::LogMessage(const char* file,
- #elif BUILDFLAG(IS_ANDROID)
-   stream_ << getpid() << ":" << gettid() << ":";
-   const char* trimmed_file = strrchr(file, '/') + 1;
-+#elif BUILDFLAG(IS_BSD)
-+  stream_ << getpid() << ":" << pthread_self() << ":";
-+  const char* trimmed_file = strrchr(file, '/') + 1;
- #elif BUILDFLAG(IS_WIN)
-   const char* trimmed_file = file;
-   stream_ << (::GetCurrentProcessId()) << ":" << ::GetCurrentThreadId() << ":";
diff --git a/chromium-next/patches/patch-third__party_leveldatabase_env__chromium.cc b/chromium-next/patches/patch-third__party_leveldatabase_env__chromium.cc
deleted file mode 100644
index 8386195e26..0000000000
--- a/chromium-next/patches/patch-third__party_leveldatabase_env__chromium.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/leveldatabase/env_chromium.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/leveldatabase/env_chromium.cc
-@@ -329,7 +329,8 @@ ChromiumWritableFile::ChromiumWritableFi
- 
- Status ChromiumWritableFile::SyncParent() {
-   TRACE_EVENT0("leveldb", "SyncParent");
--#if defined(OS_POSIX) || defined(OS_FUCHSIA)
-+// pledge violation (directory passed as fd)
-+#if (defined(OS_POSIX) || defined(OS_FUCHSIA)) && !defined(OS_OPENBSD)
-   FilePath path = FilePath::FromUTF8Unsafe(parent_dir_);
-   FileErrorOr<base::File> result = filesystem_->OpenFile(
-       path, base::File::FLAG_OPEN | base::File::FLAG_READ);
diff --git a/chromium-next/patches/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/chromium-next/patches/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
deleted file mode 100644
index 95b9a399d3..0000000000
--- a/chromium-next/patches/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c
-@@ -127,10 +127,46 @@ static int arm_get_cpu_caps(void) {
-   return flags;
- }
- 
--#elif defined(__linux__)  // end defined(AOM_USE_ANDROID_CPU_FEATURES)
-+#elif defined(__OpenBSD__)
-+#include <sys/sysctl.h>
-+#include <machine/cpu.h>
-+#include <machine/armreg.h>
-+
-+static int arm_get_cpu_caps(void) {
-+  int flags = 0;
-+  int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
-+  uint64_t cpu_id = 0;
-+  size_t len = sizeof(cpu_id);
-+
-+  flags |= HAS_NEON;  // Neon is mandatory in Armv8.0-A.
-+
-+  if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0)
-+    return flags;
-+
-+  if (ID_AA64ISAR0_CRC32(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
-+    flags |= HAS_ARM_CRC32;
-+
-+  return flags;
-+}
-+
-+#elif defined(__linux__) || defined(__FreeBSD__)  // end defined(AOM_USE_ANDROID_CPU_FEATURES)
- 
- #include <sys/auxv.h>
- 
-+#if defined(__FreeBSD__)
-+static unsigned long getauxval(unsigned long type)
-+{
-+    /* Only AT_HWCAP* return unsigned long */
-+    if (type != AT_HWCAP && type != AT_HWCAP2) {
-+        return 0;
-+    }
-+
-+    unsigned long ret = 0;
-+    elf_aux_info(type, &ret, sizeof(ret));
-+    return ret;
-+}
-+#endif
-+
- // Define hwcap values ourselves: building with an old auxv header where these
- // hwcap values are not defined should not prevent features from being enabled.
- #define AOM_AARCH64_HWCAP_CRC32 (1 << 7)
diff --git a/chromium-next/patches/patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h b/chromium-next/patches/patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h
deleted file mode 100644
index 3856e7b571..0000000000
--- a/chromium-next/patches/patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libc++/src/include/__locale_dir/locale_base_api.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libc++/src/include/__locale_dir/locale_base_api.h
-@@ -113,7 +113,7 @@
- 
- #if defined(__APPLE__)
- #  include <__locale_dir/support/apple.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
- #  include <__locale_dir/support/freebsd.h>
- #elif defined(_LIBCPP_MSVCRT_LIKE)
- #  include <__locale_dir/support/windows.h>
diff --git a/chromium-next/patches/patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h b/chromium-next/patches/patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h
deleted file mode 100644
index 62170a4754..0000000000
--- a/chromium-next/patches/patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libc++/src/include/__locale_dir/support/bsd_like.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libc++/src/include/__locale_dir/support/bsd_like.h
-@@ -24,7 +24,11 @@
- #  include <wctype.h>
- #endif
- 
-+#if defined(__NetBSD__)
-+#include <locale.h>
-+#else
- #include <xlocale.h>
-+#endif
- 
- #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
- #  pragma GCC system_header
diff --git a/chromium-next/patches/patch-third__party_libc++_src_src_chrono.cpp b/chromium-next/patches/patch-third__party_libc++_src_src_chrono.cpp
deleted file mode 100644
index f73876ac48..0000000000
--- a/chromium-next/patches/patch-third__party_libc++_src_src_chrono.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libc++/src/src/chrono.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libc++/src/src/chrono.cpp
-@@ -38,7 +38,7 @@
- // OpenBSD and GPU do not have a fully conformant suite of POSIX timers, but
- // it does have clock_gettime and CLOCK_MONOTONIC which is all we need.
- #if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || defined(__AMDGPU__) ||                      \
--    defined(__NVPTX__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0)
-+    defined(__NVPTX__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__FreeBSD__) || defined(__NetBSD__)
- #  define _LIBCPP_HAS_CLOCK_GETTIME
- #endif
- 
diff --git a/chromium-next/patches/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp b/chromium-next/patches/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
deleted file mode 100644
index 3b3e7618d1..0000000000
--- a/chromium-next/patches/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libc++/src/src/filesystem/filesystem_clock.cpp
-@@ -35,7 +35,7 @@
- #endif
- 
- #if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__AMDGPU__) || defined(__NVPTX__) ||                        \
--    (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0)
-+    (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
- #  define _LIBCPP_HAS_CLOCK_GETTIME
- #endif
- 
diff --git a/chromium-next/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h b/chromium-next/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
deleted file mode 100644
index 844b62b0dc..0000000000
--- a/chromium-next/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libc++abi/src/src/cxa_guard_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libc++abi/src/src/cxa_guard_impl.h
-@@ -425,6 +425,17 @@ void PlatformFutexWake(int* addr) {
-   __tsan_release(addr);
-   futex(reinterpret_cast<volatile uint32_t*>(addr), WAKE, INT_MAX, NULL, NULL);
- }
-+/*#elif defined(__NetBSD__)
-+void PlatformFutexWait(int* addr, int expect) {
-+  constexpr int WAIT = 0;
-+  syscall(SYS___futex, addr, WAIT, expect, NULL, NULL, 0, 0);
-+  __tsan_acquire(addr);
-+}
-+void PlatformFutexWake(int* addr) {
-+  constexpr int WAKE = 1;
-+  __tsan_release(addr);
-+  syscall(SYS___futex, addr, WAKE, INT_MAX, NULL, NULL, 0, 0);
-+}*/
- #elif defined(SYS_futex)
- void PlatformFutexWait(int* addr, int expect) {
-   constexpr int WAIT = 0;
diff --git a/chromium-next/patches/patch-third__party_libdrm_src_xf86drmMode.c b/chromium-next/patches/patch-third__party_libdrm_src_xf86drmMode.c
deleted file mode 100644
index d32a46c1df..0000000000
--- a/chromium-next/patches/patch-third__party_libdrm_src_xf86drmMode.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libdrm/src/xf86drmMode.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libdrm/src/xf86drmMode.c
-@@ -976,7 +976,7 @@ drm_public int drmCheckModesettingSuppor
- 	}
- #elif defined(__DragonFly__)
- 	return 0;
--#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- 	int	fd;
- 	struct drm_mode_card_res res;
- 	drmModeResPtr r = 0;
-@@ -1129,7 +1129,11 @@ drm_public int drmModePageFlipTarget(int
- 
- drm_public int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id,
- 		    uint32_t fb_id, uint32_t flags,
-+#if defined(__NetBSD__)
-+			uint32_t crtc_x, uint32_t crtc_y,
-+#else
- 		    int32_t crtc_x, int32_t crtc_y,
-+#endif
- 		    uint32_t crtc_w, uint32_t crtc_h,
- 		    uint32_t src_x, uint32_t src_y,
- 		    uint32_t src_w, uint32_t src_h)
diff --git a/chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
deleted file mode 100644
index fbf2c6c836..0000000000
--- a/chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h
-@@ -22,7 +22,8 @@
- #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
- // C++11 Lock implementation based on std::mutex.
- #include "phonenumbers/base/memory/singleton_stdmutex.h"
--#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)
-+#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
-+    defined(__NetBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)
- #include "phonenumbers/base/memory/singleton_posix.h"
- #elif defined(WIN32)
- #include "phonenumbers/base/memory/singleton_win32.h"
diff --git a/chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
deleted file mode 100644
index 7fbeb64966..0000000000
--- a/chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h
-@@ -22,7 +22,8 @@
- #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
- // C++11 Lock implementation based on std::mutex.
- #include "phonenumbers/base/synchronization/lock_stdmutex.h"
--#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)
-+#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
-+  defined(__NetBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)
- #include "phonenumbers/base/synchronization/lock_posix.h"
- #elif defined(WIN32)
- #include "phonenumbers/base/synchronization/lock_win32.h"
diff --git a/chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
deleted file mode 100644
index 4a49450347..0000000000
--- a/chromium-next/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h
-@@ -22,8 +22,8 @@
- // Note that I18N_PHONENUMBERS_NO_THREAD_SAFETY must be defined only to let the
- // user of the library know that it can't be used in a thread-safe manner when
- // it is not depending on Boost.
--#if !defined(__linux__) && !defined(__APPLE__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \
--    !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) && \
-+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \
-+    !defined(__NetBSD__) && !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) && \
- 	!((__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)) && \
- 	!defined(WIN32)
- #error Building without Boost, please provide \
-@@ -33,7 +33,8 @@
- #endif
- 
- #if !defined(NDEBUG) && !defined(I18N_PHONENUMBERS_USE_BOOST) && \
--    (defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD))
-+    (defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
-+    defined(__NetBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD))
- 
- #include <pthread.h>
- 
diff --git a/chromium-next/patches/patch-third__party_libsync_src_include_sync_sync.h b/chromium-next/patches/patch-third__party_libsync_src_include_sync_sync.h
deleted file mode 100644
index 920fbe5606..0000000000
--- a/chromium-next/patches/patch-third__party_libsync_src_include_sync_sync.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libsync/src/include/sync/sync.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libsync/src/include/sync/sync.h
-@@ -22,7 +22,9 @@
- #include <sys/cdefs.h>
- #include <stdint.h>
- 
-+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- #include <linux/types.h>
-+#endif
- 
- __BEGIN_DECLS
- 
diff --git a/chromium-next/patches/patch-third__party_libsync_src_sync.c b/chromium-next/patches/patch-third__party_libsync_src_sync.c
deleted file mode 100644
index be5e204601..0000000000
--- a/chromium-next/patches/patch-third__party_libsync_src_sync.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libsync/src/sync.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libsync/src/sync.c
-@@ -17,8 +17,8 @@
-  */
- 
- #include <fcntl.h>
--#include <malloc.h>
- #include <stdint.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <errno.h>
- #include <poll.h>
-@@ -29,6 +29,12 @@
- 
- #include <sync/sync.h>
- 
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+typedef __uint8_t __u8;
-+typedef __uint32_t __u32;
-+typedef __int32_t __s32;
-+#define ETIME ETIMEDOUT
-+#endif
- 
- struct sw_sync_create_fence_data {
-   __u32 value;
diff --git a/chromium-next/patches/patch-third__party_libusb_BUILD.gn b/chromium-next/patches/patch-third__party_libusb_BUILD.gn
deleted file mode 100644
index 0e88814857..0000000000
--- a/chromium-next/patches/patch-third__party_libusb_BUILD.gn
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libusb/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libusb/BUILD.gn
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- 
- # libusb is only used by //services/device/usb on macOS.
--assert(is_mac)
-+assert(is_mac || is_bsd)
- 
- import("//build/config/chromeos/ui_mode.gni")
- import("//build/config/features.gni")
-@@ -103,7 +103,7 @@ static_library("libusb") {
-     ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [
-       "src/libusb/os/linux_usbfs.c",
-       "src/libusb/os/linux_usbfs.h",
-@@ -114,11 +114,21 @@ static_library("libusb") {
-     ]
-   }
- 
-+  if (is_openbsd) {
-+    sources += [
-+      "src/libusb/os/openbsd_usb.c",
-+    ]
-+    defines += [
-+      "OS_OPENBSD=1",
-+      "_GNU_SOURCE=1",
-+    ]
-+  }
-+
-   if (is_chromeos_ash) {
-     defines += [ "USBI_TIMERFD_AVAILABLE" ]
-   }
- 
--  if (use_udev) {
-+  if (use_udev && !is_bsd) {
-     sources += [ "src/libusb/os/linux_udev.cc" ]
-     defines += [
-       "HAVE_LIBUDEV=1",
-@@ -127,7 +137,7 @@ static_library("libusb") {
-     deps += [ "//build/linux/libudev" ]
-   }
- 
--  if ((is_linux || is_chromeos) && !use_udev) {
-+  if ((is_linux || is_chromeos) && !use_udev && !is_bsd) {
-     sources += [ "src/libusb/os/linux_netlink.c" ]
-     defines += [ "HAVE_LINUX_NETLINK_H" ]
-   }
diff --git a/chromium-next/patches/patch-third__party_libusb_src_libusb_core.c b/chromium-next/patches/patch-third__party_libusb_src_libusb_core.c
deleted file mode 100644
index 1bfcbccd92..0000000000
--- a/chromium-next/patches/patch-third__party_libusb_src_libusb_core.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libusb/src/libusb/core.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libusb/src/libusb/core.c
-@@ -448,7 +448,7 @@ libusb_free_device_list(list, 1);
-  * which grows when required. it can be freed once discovery has completed,
-  * eliminating the need for a list node in the libusb_device structure
-  * itself. */
--#define DISCOVERED_DEVICES_SIZE_STEP 8
-+#define DISCOVERED_DEVICES_SIZE_STEP 16
- 
- static struct discovered_devs *discovered_devs_alloc(void)
- {
diff --git a/chromium-next/patches/patch-third__party_libusb_src_libusb_os_threads__posix.c b/chromium-next/patches/patch-third__party_libusb_src_libusb_os_threads__posix.c
deleted file mode 100644
index 173dfa39b3..0000000000
--- a/chromium-next/patches/patch-third__party_libusb_src_libusb_os_threads__posix.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libusb/src/libusb/os/threads_posix.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libusb/src/libusb/os/threads_posix.c
-@@ -19,9 +19,11 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
--#if defined(__linux__) || defined(__OpenBSD__)
-+#if defined(__linux__)
- # include <unistd.h>
- # include <sys/syscall.h>
-+#elif defined(__OpenBSD__)
-+# include <unistd.h>
- #elif defined(__APPLE__)
- # include <mach/mach.h>
- #elif defined(__CYGWIN__)
-@@ -65,7 +67,7 @@ int usbi_get_tid(void)
- #elif defined(__OpenBSD__)
- 	/* The following only works with OpenBSD > 5.1 as it requires
- 	   real thread support. For 5.1 and earlier, -1 is returned. */
--	ret = syscall(SYS_getthrid);
-+	ret = getthrid();
- #elif defined(__APPLE__)
- 	ret = mach_thread_self();
- 	mach_port_deallocate(mach_task_self(), ret);
diff --git a/chromium-next/patches/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c b/chromium-next/patches/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
deleted file mode 100644
index 597c03f1ce..0000000000
--- a/chromium-next/patches/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c
-@@ -120,10 +120,24 @@ static int arm_get_cpu_caps(void) {
-   return flags;
- }
- 
--#elif defined(__linux__)  // end defined(VPX_USE_ANDROID_CPU_FEATURES)
-+#elif defined(__linux__) || defined(__FreeBSD__)  // end defined(VPX_USE_ANDROID_CPU_FEATURES)
- 
- #include <sys/auxv.h>
- 
-+#if defined(__FreeBSD__)
-+static unsigned long getauxval(unsigned long type)
-+{
-+    /* Only AT_HWCAP* return unsigned long */
-+    if (type != AT_HWCAP && type != AT_HWCAP2) {
-+        return 0;
-+    }
-+
-+    unsigned long ret = 0;
-+    elf_aux_info(type, &ret, sizeof(ret));
-+    return ret;
-+}
-+#endif
-+
- // Define hwcap values ourselves: building with an old auxv header where these
- // hwcap values are not defined should not prevent features from being enabled.
- #define VPX_AARCH64_HWCAP_ASIMDDP (1 << 20)
diff --git a/chromium-next/patches/patch-third__party_lzma__sdk_C_CpuArch.c b/chromium-next/patches/patch-third__party_lzma__sdk_C_CpuArch.c
deleted file mode 100644
index bd980ee387..0000000000
--- a/chromium-next/patches/patch-third__party_lzma__sdk_C_CpuArch.c
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/lzma_sdk/C/CpuArch.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/lzma_sdk/C/CpuArch.c
-@@ -854,6 +854,34 @@ BoolInt CPU_IsSupported_SHA1(void) { ret
- BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; }
- BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; }
- 
-+#elif defined(__OpenBSD__)
-+
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <machine/cpu.h>
-+#include <machine/armreg.h>
-+
-+BoolInt CPU_IsSupported_NEON() { return 1; }
-+
-+#define MY_HWCAP_CHECK_FUNC_2(name1, name2) \
-+  BoolInt CPU_IsSupported_ ## name1() { \
-+    int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; \
-+    size_t len = sizeof(uint64_t); \
-+    uint64_t cpu_id = 0; \
-+    if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) \
-+      return 0; \
-+    if (ID_AA64ISAR0_ ## name2(cpu_id) >= ID_AA64ISAR0_## name2 ##_BASE) \
-+      return 1; \
-+    return 0; \
-+  }
-+
-+#define MY_HWCAP_CHECK_FUNC(name) \
-+  MY_HWCAP_CHECK_FUNC_2(name, name)
-+
-+MY_HWCAP_CHECK_FUNC (CRC32)
-+MY_HWCAP_CHECK_FUNC (SHA1)
-+MY_HWCAP_CHECK_FUNC (SHA2)
-+MY_HWCAP_CHECK_FUNC (AES)
- 
- #else // __APPLE__
- 
diff --git a/chromium-next/patches/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc b/chromium-next/patches/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
deleted file mode 100644
index 28ef634861..0000000000
--- a/chromium-next/patches/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/material_color_utilities/src/cpp/palettes/tones.cc
-@@ -14,6 +14,8 @@
-  * limitations under the License.
-  */
- 
-+#include <cmath>
-+
- #include "cpp/palettes/tones.h"
- 
- #include <cmath>
diff --git a/chromium-next/patches/patch-third__party_nasm_BUILD.gn b/chromium-next/patches/patch-third__party_nasm_BUILD.gn
deleted file mode 100644
index 87ad020eb2..0000000000
--- a/chromium-next/patches/patch-third__party_nasm_BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/nasm/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/nasm/BUILD.gn
-@@ -63,6 +63,13 @@ config("nasm_config") {
- 
-   defines = [ "HAVE_CONFIG_H" ]
- 
-+  _string_h_lines =
-+        read_file("/usr/include/string.h", "list lines")
-+  _mempcpy = filter_include(_string_h_lines, [ "*mempcpy*" ])
-+  if (_mempcpy != []) {
-+    defines += [ "HAVE_MEMPCPY=1" ]
-+  }
-+
-   if (is_clang) {
-     cflags = [
-       # The inline functions in NASM's headers flag this.
diff --git a/chromium-next/patches/patch-third__party_nasm_config_config-linux.h b/chromium-next/patches/patch-third__party_nasm_config_config-linux.h
deleted file mode 100644
index f1e7b8aa13..0000000000
--- a/chromium-next/patches/patch-third__party_nasm_config_config-linux.h
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/nasm/config/config-linux.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/nasm/config/config-linux.h
-@@ -160,7 +160,7 @@
- 
- /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
-    don't. */
--#define HAVE_DECL_STRLCPY 0
-+#define HAVE_DECL_STRLCPY 1
- 
- /* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you
-    don't. */
-@@ -183,7 +183,7 @@
- #define HAVE_DECL_STRSEP 1
- 
- /* Define to 1 if you have the <endian.h> header file. */
--#define HAVE_ENDIAN_H 1
-+/* #undef HAVE_ENDIAN_H */
- 
- /* Define to 1 if you have the `faccessat' function. */
- #define HAVE_FACCESSAT 1
-@@ -327,16 +327,16 @@
- #define HAVE_ISASCII 1
- 
- /* Define to 1 if you have the `iscntrl' function. */
--/* #undef HAVE_ISCNTRL */
-+#define HAVE_ISCNTRL 1
- 
- /* Define to 1 if you have the <machine/endian.h> header file. */
--/* #undef HAVE_MACHINE_ENDIAN_H */
-+#define HAVE_MACHINE_ENDIAN_H 1
- 
- /* Define to 1 if you have the <memory.h> header file. */
- #define HAVE_MEMORY_H 1
- 
- /* Define to 1 if you have the `mempcpy' function. */
--#define HAVE_MEMPCPY 1
-+/* #undef HAVE_MEMPCPY */
- 
- /* Define to 1 if you have a working `mmap' system call. */
- #define HAVE_MMAP 1
-@@ -357,7 +357,7 @@
- #define HAVE_STDARG_H 1
- 
- /* Define to 1 if stdbool.h conforms to C99. */
--/* #undef HAVE_STDBOOL_H */
-+#define HAVE_STDBOOL_H 1
- 
- /* Define to 1 if your compiler supports C99 extern inline */
- #define HAVE_STDC_INLINE 1
-@@ -384,7 +384,7 @@
- #define HAVE_STRING_H 1
- 
- /* Define to 1 if you have the `strlcpy' function. */
--/* #undef HAVE_STRLCPY */
-+#define HAVE_STRLCPY 1
- 
- /* Define to 1 if you have the `strncasecmp' function. */
- #define HAVE_STRNCASECMP 1
-@@ -411,7 +411,7 @@
- #define HAVE_SYSCONF 1
- 
- /* Define to 1 if you have the <sys/endian.h> header file. */
--/* #undef HAVE_SYS_ENDIAN_H */
-+#define HAVE_SYS_ENDIAN_H 1
- 
- /* Define to 1 if you have the <sys/mman.h> header file. */
- #define HAVE_SYS_MMAN_H 1
-@@ -486,13 +486,13 @@
- /* #undef HAVE__STATI64 */
- 
- /* Define to 1 if you have the `__bswap_16' intrinsic function. */
--#define HAVE___BSWAP_16 1
-+/* #undef HAVE___BSWAP_16 */
- 
- /* Define to 1 if you have the `__bswap_32' intrinsic function. */
--#define HAVE___BSWAP_32 1
-+/* #undef HAVE___BSWAP_32 */
- 
- /* Define to 1 if you have the `__bswap_64' intrinsic function. */
--#define HAVE___BSWAP_64 1
-+/* #undef HAVE___BSWAP_64 */
- 
- /* Define to 1 if you have the `__builtin_bswap16' intrinsic function. */
- #define HAVE___BUILTIN_BSWAP16 1
-@@ -620,7 +620,7 @@
- /* Define to the equivalent of the C99 'restrict' keyword, or to
-    nothing if this is not supported.  Do not define if restrict is
-    supported directly.  */
--#define restrict __restrict
-+#define restrict __restrict__
- /* Work around a bug in Sun C++: it does not support _Restrict or
-    __restrict__, even though the corresponding Sun C compiler ends up with
-    "#define restrict _Restrict" or "#define restrict __restrict__" in the
-@@ -637,7 +637,7 @@
- /* Define if your snprintf function is not named snprintf. */
- /* #undef snprintf */
- 
--/* Define if your typeof operator is not named typeof. */
-+/* Define if your typeof operator is not named `typeof'. */
- #define typeof __typeof
- 
- /* Define to the type of an unsigned integer type wide enough to hold a
diff --git a/chromium-next/patches/patch-third__party_node_node.gni b/chromium-next/patches/patch-third__party_node_node.gni
deleted file mode 100644
index f959723149..0000000000
--- a/chromium-next/patches/patch-third__party_node_node.gni
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/node/node.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/node/node.gni
-@@ -22,7 +22,7 @@ template("node") {
- 
-     # When use_remoteexec=true, node actions may run on remote
-     # Linux worker. So it should include linux node binary in inputs.
--    if (is_linux || is_chromeos || use_remoteexec) {
-+    if ((is_linux || is_chromeos || use_remoteexec) && !is_bsd) {
-       inputs += [ "//third_party/node/linux/node-linux-x64/bin/node" ]
-     }
-     if (is_win && host_os == "win") {
-@@ -35,16 +35,5 @@ template("node") {
-         inputs += [ "//third_party/node/mac/node-darwin-x64/bin/node" ]
-       }
-     }
--
--    # Automatically add a dependency to ":check_version" to ensure NodeJS is
--    # always running the expected version, except when the ':check_version'
--    # target itself is running in which case it shouldn't depend on itself.
--    if (get_label_info(":" + target_name, "label_no_toolchain") !=
--        "//third_party/node:check_version") {
--      if (!defined(deps)) {
--        deps = []
--      }
--      deps += [ "//third_party/node:check_version" ]
--    }
-   }
- }
diff --git a/chromium-next/patches/patch-third__party_node_node.py b/chromium-next/patches/patch-third__party_node_node.py
deleted file mode 100644
index fdb8feadf2..0000000000
--- a/chromium-next/patches/patch-third__party_node_node.py
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/node/node.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/node/node.py
-@@ -20,6 +20,9 @@ def GetBinaryPath():
-   return os_path.join(os_path.dirname(__file__), *{
-     'Darwin': (darwin_path, darwin_name, 'bin', 'node'),
-     'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
-+    'OpenBSD': ('openbsd', 'node-openbsd', 'bin', 'node'),
-+    'FreeBSD': ('freebsd', 'node-freebsd', 'bin', 'node'),
-+    'NetBSD': ('netbsd', 'node-netbsd', 'bin', 'node'),
-     'Windows': ('win', 'node.exe'),
-   }[platform.system()])
- 
diff --git a/chromium-next/patches/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/chromium-next/patches/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
deleted file mode 100644
index a8b7b435af..0000000000
--- a/chromium-next/patches/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp
-@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies
-     {"ForteMT", "Forte"},
- };
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(OS_ASMJS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(OS_ASMJS) || BUILDFLAG(IS_BSD)
- const char kNarrowFamily[] = "LiberationSansNarrow";
- #elif BUILDFLAG(IS_ANDROID)
- const char kNarrowFamily[] = "RobotoCondensed";
diff --git a/chromium-next/patches/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/chromium-next/patches/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
deleted file mode 100644
index 9cafcd2213..0000000000
--- a/chromium-next/patches/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp
-@@ -20,7 +20,7 @@
- #include "core/fxge/fx_font.h"
- #include "core/fxge/systemfontinfo_iface.h"
- 
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD)
- #error "Included on the wrong platform"
- #endif
- 
-@@ -173,10 +173,9 @@ class CLinuxPlatform : public CFX_GEModu
-   std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override {
-     auto pInfo = std::make_unique<CFX_LinuxFontInfo>();
-     if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) {
--      pInfo->AddPath("/usr/share/fonts");
--      pInfo->AddPath("/usr/share/X11/fonts/Type1");
--      pInfo->AddPath("/usr/share/X11/fonts/TTF");
--      pInfo->AddPath("/usr/local/share/fonts");
-+      pInfo->AddPath("@X11BASE@/lib/X11/fonts/Type1");
-+      pInfo->AddPath("@X11BASE@/lib/X11/fonts/TTF");
-+      pInfo->AddPath("@PREFIX@/share/fonts");
-     }
-     return pInfo;
-   }
diff --git a/chromium-next/patches/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/chromium-next/patches/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
deleted file mode 100644
index a4022f374b..0000000000
--- a/chromium-next/patches/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/pdfium/fxjs/fx_date_helpers.cpp
-@@ -39,6 +39,11 @@ double GetLocalTZA() {
-     return 0;
-   time_t t = 0;
-   FXSYS_time(&t);
-+#ifdef __FreeBSD__
-+  struct tm lt;
-+  localtime_r(&t, &lt);
-+  return (double)(-(lt.tm_gmtoff * 1000));
-+#else
-   FXSYS_localtime(&t);
- #if BUILDFLAG(IS_WIN)
-   // In gcc 'timezone' is a global variable declared in time.h. In VC++, that
-@@ -47,6 +52,7 @@ double GetLocalTZA() {
-   _get_timezone(&timezone);
- #endif
-   return (double)(-(timezone * 1000));
-+#endif // __FreeBSD__
- }
- 
- int GetDaylightSavingTA(double d) {
diff --git a/chromium-next/patches/patch-third__party_pdfium_pdfium.gni b/chromium-next/patches/patch-third__party_pdfium_pdfium.gni
deleted file mode 100644
index 49eee11b59..0000000000
--- a/chromium-next/patches/patch-third__party_pdfium_pdfium.gni
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/pdfium/pdfium.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/pdfium/pdfium.gni
-@@ -42,7 +42,7 @@ declare_args() {
-   # PDFium will use PartitionAlloc partitions to separate strings, scalars,
-   # etc. from other allocations. However, the use of PartitionAlloc for new or
-   # malloc is controlled by args in build_overrides/partition_alloc.gni.
--  pdf_use_partition_alloc = pdf_use_partition_alloc_override
-+  pdf_use_partition_alloc = pdf_use_partition_alloc_override && use_partition_alloc_as_malloc
- 
-   # Build PDFium to use Skia (experimental) for all PDFium graphics.
-   # If enabled, coexists in build with AGG graphics and the default
diff --git a/chromium-next/patches/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp b/chromium-next/patches/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
deleted file mode 100644
index e35938197e..0000000000
--- a/chromium-next/patches/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp
-@@ -6,12 +6,16 @@
- 
- #include "xfa/fxfa/parser/cxfa_timezoneprovider.h"
- 
-+#include <stdint.h>
- #include <stdlib.h>
- #include <time.h>
- 
- #include "build/build_config.h"
- 
- static bool g_bProviderTimeZoneSet = false;
-+#if defined(OS_FREEBSD)
-+static long g_lTimeZoneOffset = 0;
-+#endif
- 
- #if BUILDFLAG(IS_WIN)
- #define TIMEZONE _timezone
-@@ -24,9 +28,21 @@ static bool g_bProviderTimeZoneSet = fal
- CXFA_TimeZoneProvider::CXFA_TimeZoneProvider() {
-   if (!g_bProviderTimeZoneSet) {
-     g_bProviderTimeZoneSet = true;
-+#if defined(OS_FREEBSD)
-+    time_t now = time(nullptr);
-+    struct tm tm = {};
-+
-+    localtime_r(&now, &tm);
-+    g_lTimeZoneOffset = tm.tm_gmtoff;
-+#else
-     TZSET();
-+#endif
-   }
-+#if defined(OS_FREEBSD)
-+  tz_minutes_ = static_cast<int8_t>((abs(g_lTimeZoneOffset) % 3600) / 60);
-+#else
-   tz_minutes_ = TIMEZONE / -60;
-+#endif
- }
- 
- CXFA_TimeZoneProvider::~CXFA_TimeZoneProvider() = default;
diff --git a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_build__config.h b/chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_build__config.h
deleted file mode 100644
index 55b0ec4fde..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_build__config.h
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/include/perfetto/base/build_config.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/include/perfetto/base/build_config.h
-@@ -27,6 +27,7 @@
- #if defined(__ANDROID__)
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
-@@ -41,6 +42,7 @@
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 1
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
-@@ -62,9 +64,10 @@
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE_TVOS() 0
- #endif
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 1
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 1
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
-@@ -78,6 +81,7 @@
- #elif defined(__QNXNTO__)
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
-@@ -91,6 +95,7 @@
- #elif defined(_WIN32)
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
-@@ -104,6 +109,7 @@
- #elif defined(__EMSCRIPTEN__)
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
-@@ -120,6 +126,7 @@
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
-@@ -130,6 +137,7 @@
- #elif defined(__native_client__)
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
diff --git a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
deleted file mode 100644
index d181016380..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/include/perfetto/base/thread_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/include/perfetto/base/thread_utils.h
-@@ -37,6 +37,7 @@ __declspec(dllimport) unsigned long __st
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <pthread.h>
- #else
- #include <pthread.h>
- #endif
-@@ -50,6 +51,11 @@ using PlatformThreadId = pid_t;
- inline PlatformThreadId GetThreadId() {
-   return gettid();
- }
-+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-+using PlatformThreadId = uint64_t;
-+inline PlatformThreadId GetThreadId() {
-+  return reinterpret_cast<uint64_t>(pthread_self());
-+}
- #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX)
- using PlatformThreadId = pid_t;
- inline PlatformThreadId GetThreadId() {
diff --git a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_time.h b/chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_time.h
deleted file mode 100644
index 30113bb5e3..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_base_time.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/include/perfetto/base/time.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/include/perfetto/base/time.h
-@@ -227,6 +227,9 @@ inline TimeNanos GetTimeInternalNs(clock
- // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
- // during suspend (when supported).
- inline TimeNanos GetBootTimeNs() {
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+  return GetTimeInternalNs(kWallTimeClockSource);
-+#else
-   // Determine if CLOCK_BOOTTIME is available on the first call.
-   static const clockid_t kBootTimeClockSource = [] {
-     struct timespec ts = {};
-@@ -234,6 +237,7 @@ inline TimeNanos GetBootTimeNs() {
-     return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource;
-   }();
-   return GetTimeInternalNs(kBootTimeClockSource);
-+#endif
- }
- 
- inline TimeNanos GetWallTimeNs() {
-@@ -241,7 +245,13 @@ inline TimeNanos GetWallTimeNs() {
- }
- 
- inline TimeNanos GetWallTimeRawNs() {
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
-+  return GetTimeInternalNs(CLOCK_MONOTONIC);
-+#elif defined(__FreeBSD__)
-+  return GetTimeInternalNs(CLOCK_MONOTONIC_FAST);
-+#else
-   return GetTimeInternalNs(CLOCK_MONOTONIC_RAW);
-+#endif
- }
- 
- inline TimeNanos GetThreadCPUTimeNs() {
diff --git a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h b/chromium-next/patches/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
deleted file mode 100644
index c4a2ffe1bc..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/include/perfetto/ext/base/event_fd.h
-@@ -58,6 +58,8 @@ class EventFd {
-   // On Mac and other non-Linux UNIX platforms a pipe-based fallback is used.
-   // The write end of the wakeup pipe.
-   ScopedFile write_fd_;
-+#else
-+  ScopedFile write_fd_;
- #endif
- };
- 
diff --git a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h b/chromium-next/patches/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
deleted file mode 100644
index f61e1b4240..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h
-@@ -41,9 +41,10 @@
- namespace perfetto {
- namespace base {
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
-+    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
- // Sets the "comm" of the calling thread to the first 15 chars of the given
- // string.
- inline bool MaybeSetThreadName(const std::string& name) {
diff --git a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h b/chromium-next/patches/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
deleted file mode 100644
index c2f4e950e6..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h
-@@ -249,7 +249,7 @@ class PERFETTO_EXPORT_COMPONENT LegacyTr
- // are different. E.g. on Mac size_t is considered a different type from
- // uint64_t even though it has the same size and signedness.
- // Below we add overloads for those types that are known to cause ambiguity.
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
-+#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || defined(__OpenBSD__)
-   explicit LegacyTraceId(size_t raw_id) : raw_id_(raw_id) {}
-   explicit LegacyTraceId(intptr_t raw_id)
-       : raw_id_(static_cast<uint64_t>(raw_id)) {}
diff --git a/chromium-next/patches/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto b/chromium-next/patches/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
deleted file mode 100644
index f9aad0d996..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto
-@@ -10,7 +10,7 @@ message V4l2QbufFtraceEvent {
-   optional uint32 field = 2;
-   optional uint32 flags = 3;
-   optional uint32 index = 4;
--  optional int32 minor = 5;
-+  optional int32 gminor = 5;
-   optional uint32 sequence = 6;
-   optional uint32 timecode_flags = 7;
-   optional uint32 timecode_frames = 8;
-@@ -30,7 +30,7 @@ message V4l2DqbufFtraceEvent {
-   optional uint32 field = 2;
-   optional uint32 flags = 3;
-   optional uint32 index = 4;
--  optional int32 minor = 5;
-+  optional int32 gminor = 5;
-   optional uint32 sequence = 6;
-   optional uint32 timecode_flags = 7;
-   optional uint32 timecode_frames = 8;
-@@ -48,7 +48,7 @@ message V4l2DqbufFtraceEvent {
- message Vb2V4l2BufQueueFtraceEvent {
-   optional uint32 field = 1;
-   optional uint32 flags = 2;
--  optional int32 minor = 3;
-+  optional int32 gminor = 3;
-   optional uint32 sequence = 4;
-   optional uint32 timecode_flags = 5;
-   optional uint32 timecode_frames = 6;
-@@ -65,7 +65,7 @@ message Vb2V4l2BufQueueFtraceEvent {
- message Vb2V4l2BufDoneFtraceEvent {
-   optional uint32 field = 1;
-   optional uint32 flags = 2;
--  optional int32 minor = 3;
-+  optional int32 gminor = 3;
-   optional uint32 sequence = 4;
-   optional uint32 timecode_flags = 5;
-   optional uint32 timecode_frames = 6;
-@@ -82,7 +82,7 @@ message Vb2V4l2BufDoneFtraceEvent {
- message Vb2V4l2QbufFtraceEvent {
-   optional uint32 field = 1;
-   optional uint32 flags = 2;
--  optional int32 minor = 3;
-+  optional int32 gminor = 3;
-   optional uint32 sequence = 4;
-   optional uint32 timecode_flags = 5;
-   optional uint32 timecode_frames = 6;
-@@ -99,7 +99,7 @@ message Vb2V4l2QbufFtraceEvent {
- message Vb2V4l2DqbufFtraceEvent {
-   optional uint32 field = 1;
-   optional uint32 flags = 2;
--  optional int32 minor = 3;
-+  optional int32 gminor = 3;
-   optional uint32 sequence = 4;
-   optional uint32 timecode_flags = 5;
-   optional uint32 timecode_frames = 6;
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_base_clock__snapshots.cc b/chromium-next/patches/patch-third__party_perfetto_src_base_clock__snapshots.cc
deleted file mode 100644
index f43dd298f9..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_base_clock__snapshots.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/base/clock_snapshots.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/base/clock_snapshots.cc
-@@ -27,6 +27,7 @@ ClockSnapshotVector CaptureClockSnapshot
- #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \
-     !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) &&   \
-     !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) &&  \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) &&  \
-     !PERFETTO_BUILDFLAG(PERFETTO_OS_QNX)
-   struct {
-     clockid_t id;
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_base_event__fd.cc b/chromium-next/patches/patch-third__party_perfetto_src_base_event__fd.cc
deleted file mode 100644
index 57cd46e073..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_base_event__fd.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/base/event_fd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/base/event_fd.cc
-@@ -24,7 +24,8 @@
- #include <synchapi.h>
- #elif PERFETTO_BUILDFLAG(PERFETTO_OS_QNX)
- #include <unistd.h>
--#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#elif (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
- #include <sys/eventfd.h>
- #include <unistd.h>
-@@ -59,7 +60,8 @@ void EventFd::Clear() {
-     PERFETTO_DFATAL("EventFd::Clear()");
- }
- 
--#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
-+#elif (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
- 
- EventFd::EventFd() {
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_base_periodic__task.cc b/chromium-next/patches/patch-third__party_perfetto_src_base_periodic__task.cc
deleted file mode 100644
index b3f7b5c8df..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_base_periodic__task.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/base/periodic_task.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/base/periodic_task.cc
-@@ -24,7 +24,7 @@
- #include "perfetto/base/time.h"
- #include "perfetto/ext/base/file_utils.h"
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19)
- #include <sys/timerfd.h>
- #endif
-@@ -44,7 +44,7 @@ uint32_t GetNextDelayMs(const TimeMillis
- }
- 
- ScopedPlatformHandle CreateTimerFd(const PeriodicTask::Args& args) {
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19)
-   ScopedPlatformHandle tfd(
-       timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK));
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_base_string__utils.cc b/chromium-next/patches/patch-third__party_perfetto_src_base_string__utils.cc
deleted file mode 100644
index e8935b2d68..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_base_string__utils.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/base/string_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/base/string_utils.cc
-@@ -39,7 +39,8 @@ namespace base {
- // Locale-independant as possible version of strtod.
- double StrToD(const char* nptr, char** endptr) {
- #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
-+    (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
-   static auto c_locale = newlocale(LC_ALL, "C", nullptr);
-   return strtod_l(nptr, endptr, c_locale);
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_base_subprocess__posix.cc b/chromium-next/patches/patch-third__party_perfetto_src_base_subprocess__posix.cc
deleted file mode 100644
index 408a32335b..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_base_subprocess__posix.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/base/subprocess_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/base/subprocess_posix.cc
-@@ -35,7 +35,8 @@
- #include <thread>
- #include <tuple>
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
- #include <sys/prctl.h>
- #endif
-@@ -64,7 +65,8 @@ struct ChildProcessArgs {
- // Don't add any dynamic allocation in this function. This will be invoked
- // under a fork(), potentially in a state where the allocator lock is held.
- void __attribute__((noreturn)) ChildProcess(ChildProcessArgs* args) {
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-   // In no case we want a child process to outlive its parent process. This is
-   // relevant for tests, so that a test failure/crash doesn't leave child
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_base_test_vm__test__utils.cc b/chromium-next/patches/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
deleted file mode 100644
index 933656f836..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/base/test/vm_test_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/base/test/vm_test_utils.cc
-@@ -91,7 +91,7 @@ bool IsMapped(void* start, size_t size) 
-   // Fuchsia doesn't yet support paging (b/119503290).
-   ignore_result(page_size);
-   return true;
--#elif PERFETTO_BUILDFLAG(PERFETTO_OS_NACL)
-+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) || PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-   // mincore isn't available on NaCL.
-   ignore_result(page_size);
-   return true;
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_base_thread__task__runner.cc b/chromium-next/patches/patch-third__party_perfetto_src_base_thread__task__runner.cc
deleted file mode 100644
index 936045030e..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_base_thread__task__runner.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/base/thread_task_runner.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/base/thread_task_runner.cc
-@@ -27,7 +27,8 @@
- #include "perfetto/ext/base/thread_utils.h"
- #include "perfetto/ext/base/unix_task_runner.h"
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
- #include <sys/prctl.h>
- #endif
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_base_unix__socket.cc b/chromium-next/patches/patch-third__party_perfetto_src_base_unix__socket.cc
deleted file mode 100644
index c8a481883d..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_base_unix__socket.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/base/unix_socket.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/base/unix_socket.cc
-@@ -45,7 +45,7 @@
- #include <unistd.h>
- #endif
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
-+#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/ucred.h>
- #endif
- 
-@@ -977,15 +977,27 @@ void UnixSocket::ReadPeerCredentialsPosi
-   int res = getpeereid(fd, &peer_uid_, nullptr);
-   PERFETTO_CHECK(res == 0);
-   // There is no pid when obtaining peer credentials for QNX
--#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-+  struct sockpeercred user_cred;
-+#else
-   struct ucred user_cred;
-+#endif
-   socklen_t len = sizeof(user_cred);
-   int fd = sock_raw_.fd();
-   int res = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &user_cred, &len);
-   PERFETTO_CHECK(res == 0);
-   peer_uid_ = user_cred.uid;
-   peer_pid_ = user_cred.pid;
-+#elif defined(__NetBSD__)
-+  struct unpcbid user_cred;
-+  socklen_t len = sizeof(user_cred);
-+  int fd = sock_raw_.fd();
-+  int res = getsockopt(fd, 0, LOCAL_PEEREID, &user_cred, &len);
-+  PERFETTO_CHECK(res == 0);
-+  peer_uid_ = user_cred.unp_euid;
-+  peer_pid_ = user_cred.unp_pid;
- #elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
-   struct xucred user_cred;
-   socklen_t len = sizeof(user_cred);
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_base_utils.cc b/chromium-next/patches/patch-third__party_perfetto_src_base_utils.cc
deleted file mode 100644
index 255b16a86f..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_base_utils.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/base/utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/base/utils.cc
-@@ -38,7 +38,8 @@
- #include <mach/vm_page_size.h>
- #endif
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
- #include <sys/prctl.h>
- 
-@@ -279,14 +280,22 @@ void Daemonize(std::function<int()> pare
- 
- std::string GetCurExecutablePath() {
-   std::string self_path;
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)
-+    PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-   char buf[PATH_MAX];
-   ssize_t size = readlink("/proc/self/exe", buf, sizeof(buf));
-   PERFETTO_CHECK(size != -1);
-   // readlink does not null terminate.
-   self_path = std::string(buf, static_cast<size_t>(size));
-+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-+  char *buf;
-+  const char *cpath = "@PREFIX@/lib/chromium/chrome";
-+  if ((buf = getenv("CHROME_EXE_PATH")) != NULL)
-+    self_path = std::string(buf);
-+  else
-+    self_path = std::string(cpath);
- #elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
-   uint32_t size = 0;
-   PERFETTO_CHECK(_NSGetExecutablePath(nullptr, &size));
-@@ -338,7 +347,8 @@ void AlignedFree(void* ptr) {
- }
- 
- bool IsSyncMemoryTaggingEnabled() {
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-   // Compute only once per lifetime of the process.
-   static bool cached_value = [] {
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc b/chromium-next/patches/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
deleted file mode 100644
index 276272f73e..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc
-@@ -62,7 +62,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
-     case FtraceEvent::kV4l2QbufFieldNumber: {
-       V4l2QbufFtraceEvent::Decoder pb_evt(bytes);
-       BufferEvent evt;
--      evt.device_minor = pb_evt.minor();
-+      evt.device_minor = pb_evt.gminor();
-       evt.index = pb_evt.index();
-       evt.type = pb_evt.type();
-       evt.bytesused = pb_evt.bytesused();
-@@ -103,7 +103,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
-     case FtraceEvent::kV4l2DqbufFieldNumber: {
-       V4l2DqbufFtraceEvent::Decoder pb_evt(bytes);
-       BufferEvent evt;
--      evt.device_minor = pb_evt.minor();
-+      evt.device_minor = pb_evt.gminor();
-       evt.index = pb_evt.index();
-       evt.type = pb_evt.type();
-       evt.bytesused = pb_evt.bytesused();
-@@ -149,7 +149,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
-     case FtraceEvent::kVb2V4l2BufQueueFieldNumber: {
-       Vb2V4l2BufQueueFtraceEvent::Decoder pb_evt(bytes);
-       BufferEvent evt;
--      evt.device_minor = pb_evt.minor();
-+      evt.device_minor = pb_evt.gminor();
-       evt.index = std::nullopt;
-       evt.type = std::nullopt;
-       evt.bytesused = std::nullopt;
-@@ -180,7 +180,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
-     case FtraceEvent::kVb2V4l2BufDoneFieldNumber: {
-       Vb2V4l2BufDoneFtraceEvent::Decoder pb_evt(bytes);
-       BufferEvent evt;
--      evt.device_minor = pb_evt.minor();
-+      evt.device_minor = pb_evt.gminor();
-       evt.index = std::nullopt;
-       evt.type = std::nullopt;
-       evt.bytesused = std::nullopt;
-@@ -211,7 +211,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
-     case FtraceEvent::kVb2V4l2QbufFieldNumber: {
-       Vb2V4l2QbufFtraceEvent::Decoder pb_evt(bytes);
-       BufferEvent evt;
--      evt.device_minor = pb_evt.minor();
-+      evt.device_minor = pb_evt.gminor();
-       evt.index = std::nullopt;
-       evt.type = std::nullopt;
-       evt.bytesused = std::nullopt;
-@@ -242,7 +242,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
-     case FtraceEvent::kVb2V4l2DqbufFieldNumber: {
-       Vb2V4l2DqbufFtraceEvent::Decoder pb_evt(bytes);
-       BufferEvent evt;
--      evt.device_minor = pb_evt.minor();
-+      evt.device_minor = pb_evt.gminor();
-       evt.index = std::nullopt;
-       evt.type = std::nullopt;
-       evt.bytesused = std::nullopt;
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_tracing_ipc_memfd.cc b/chromium-next/patches/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
deleted file mode 100644
index d9b7f9243a..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/tracing/ipc/memfd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/tracing/ipc/memfd.cc
-@@ -20,7 +20,8 @@
- 
- #define PERFETTO_MEMFD_ENABLED()             \
-   PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
--  PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX)
-+  (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
-+  !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD))
- 
- #if PERFETTO_MEMFD_ENABLED()
- 
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_tracing_platform__posix.cc b/chromium-next/patches/patch-third__party_perfetto_src_tracing_platform__posix.cc
deleted file mode 100644
index 74496c34e1..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_tracing_platform__posix.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/tracing/platform_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/tracing/platform_posix.cc
-@@ -110,12 +110,13 @@ std::unique_ptr<base::TaskRunner> Platfo
- }
- 
- std::string PlatformPosix::GetCurrentProcessName() {
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-   std::string cmdline;
-   base::ReadFile("/proc/self/cmdline", &cmdline);
-   return cmdline.substr(0, cmdline.find('\0'));
--#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
-+#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-   return std::string(getprogname());
- #else
-   return "unknown_producer";
diff --git a/chromium-next/patches/patch-third__party_perfetto_src_tracing_track.cc b/chromium-next/patches/patch-third__party_perfetto_src_tracing_track.cc
deleted file mode 100644
index 791b6721f2..0000000000
--- a/chromium-next/patches/patch-third__party_perfetto_src_tracing_track.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/perfetto/src/tracing/track.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/perfetto/src/tracing/track.cc
-@@ -60,8 +60,9 @@ protos::gen::TrackDescriptor ProcessTrac
-   auto desc = Track::Serialize();
-   auto pd = desc.mutable_process();
-   pd->set_pid(static_cast<int32_t>(pid));
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-   std::string cmdline;
-   if (base::ReadFile("/proc/self/cmdline", &cmdline)) {
-     // Since cmdline is a zero-terminated list of arguments, this ends up
-@@ -170,7 +171,7 @@ namespace internal {
- namespace {
- 
- uint64_t GetProcessStartTime() {
--#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
-+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
-   std::string stat;
-   if (!base::ReadFile("/proc/self/stat", &stat))
-     return 0u;
diff --git a/chromium-next/patches/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/chromium-next/patches/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
deleted file mode 100644
index 66eb2a7cc1..0000000000
--- a/chromium-next/patches/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h
-@@ -99,7 +99,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
- 
- #undef GOOGLE_PROTOBUF_PLATFORM_ERROR
- 
--#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE)
-+#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__)
- // Android ndk does not support the __thread keyword very well yet. Here
- // we use pthread_key_create()/pthread_getspecific()/... methods for
- // TLS support on android.
diff --git a/chromium-next/patches/patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h b/chromium-next/patches/patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h
deleted file mode 100644
index 2e9fd85e5e..0000000000
--- a/chromium-next/patches/patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/skia/src/gpu/ganesh/GrAutoLocaleSetter.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/skia/src/gpu/ganesh/GrAutoLocaleSetter.h
-@@ -27,7 +27,7 @@
- #define HAVE_XLOCALE 0
- #endif
- 
--#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION)
-+#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION) || defined(__NetBSD__)
- #define HAVE_LOCALE_T 0
- #else
- #define HAVE_LOCALE_T 1
diff --git a/chromium-next/patches/patch-third__party_skia_src_ports_SkMemory__malloc.cpp b/chromium-next/patches/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
deleted file mode 100644
index 11a8f052e5..0000000000
--- a/chromium-next/patches/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/skia/src/ports/SkMemory_malloc.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/skia/src/ports/SkMemory_malloc.cpp
-@@ -15,7 +15,8 @@
- 
- #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
- #include <malloc/malloc.h>
--#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
-+#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) && \
-+    !defined(__NetBSD__)
- #include <malloc.h>
- #elif defined(SK_BUILD_FOR_WIN)
- #include <malloc.h>
-@@ -126,7 +127,7 @@ size_t sk_malloc_size(void* addr, size_t
-     #elif defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 17
-         completeSize = malloc_usable_size(addr);
-         SkASSERT(completeSize >= size);
--    #elif defined(SK_BUILD_FOR_UNIX)
-+    #elif defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-         completeSize = malloc_usable_size(addr);
-         SkASSERT(completeSize >= size);
-     #elif defined(SK_BUILD_FOR_WIN)
diff --git a/chromium-next/patches/patch-third__party_skia_src_ports_SkOSFile__posix.cpp b/chromium-next/patches/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
deleted file mode 100644
index f2fded1582..0000000000
--- a/chromium-next/patches/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/skia/src/ports/SkOSFile_posix.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/skia/src/ports/SkOSFile_posix.cpp
-@@ -25,7 +25,7 @@
- #endif
- 
- void sk_fsync(FILE* f) {
--#if !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION)
-+#if !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION) && !defined(__OpenBSD__)
-     int fd = fileno(f);
-     fsync(fd);
- #endif
diff --git a/chromium-next/patches/patch-third__party_speech-dispatcher_libspeechd__version.h b/chromium-next/patches/patch-third__party_speech-dispatcher_libspeechd__version.h
deleted file mode 100644
index ab24be69f4..0000000000
--- a/chromium-next/patches/patch-third__party_speech-dispatcher_libspeechd__version.h
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/speech-dispatcher/libspeechd_version.h.orig	2025-05-08 12:01:57.846080414 +0000
-+++ third_party/speech-dispatcher/libspeechd_version.h
-@@ -0,0 +1,29 @@
-+/*
-+ * libspeechd_version.h - Shared library for easy access to Speech Dispatcher functions (header)
-+ *
-+ * Copyright (C) 2001, 2002, 2003, 2004 Brailcom, o.p.s.
-+ *
-+ * This is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU Lesser General Public License as published by
-+ * the Free Software Foundation; either version 2.1, or (at your option)
-+ * any later version.
-+ *
-+ * This software is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+ *
-+ * Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.4 2024/03/22 13:10:56 robert
-+ */
-+
-+#ifndef _LIBSPEECHD_VERSION_H
-+#define _LIBSPEECHD_VERSION_H
-+
-+#define LIBSPEECHD_MAJOR_VERSION 0
-+#define LIBSPEECHD_MINOR_VERSION 11
-+#define LIBSPEECHD_MICRO_VERSION 5
-+
-+#endif /* ifndef _LIBSPEECHD_VERSION_H */
diff --git a/chromium-next/patches/patch-third__party_speech-dispatcher_speechd__types.h b/chromium-next/patches/patch-third__party_speech-dispatcher_speechd__types.h
deleted file mode 100644
index f2f98c4cb0..0000000000
--- a/chromium-next/patches/patch-third__party_speech-dispatcher_speechd__types.h
+++ /dev/null
@@ -1,148 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/speech-dispatcher/speechd_types.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/speech-dispatcher/speechd_types.h
-@@ -119,4 +119,139 @@ typedef struct {
- 	SPDVoice voice;
- } SPDMsgSettings;
- 
-+/* TEMP_FAILURE_RETRY seems to be available only on Linux. For systems that
-+ * don't have this macro we provide our own version. This code was taken from
-+ * file "/usr/include/unistd.h" from Debian package "libc6-dev"
-+ * version 2.3.2.ds1-20. */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+	(__extension__ \
-+	 ({ long int __result; \
-+		do __result = (long int) (expression); \
-+		while (__result == -1L && errno == EINTR); \
-+		__result; }))
-+#endif
-+
-+#endif /* not ifndef SPEECHD_TYPES */
-+
-+/*
-+ * speechd_types.h - types for Speech Dispatcher
-+ *
-+ * Copyright (C) 2001, 2002, 2003 Brailcom, o.p.s.
-+ *
-+ * This is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU Lesser General Public License as published by
-+ * the Free Software Foundation; either version 2.1, or (at your option)
-+ * any later version.
-+ *
-+ * This software is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef SPEECHD_TYPES_H
-+#define SPEECHD_TYPES_H
-+
-+typedef enum {
-+	SPD_PUNCT_ALL = 0,
-+	SPD_PUNCT_NONE = 1,
-+	SPD_PUNCT_SOME = 2,
-+	SPD_PUNCT_MOST = 3
-+} SPDPunctuation;
-+
-+typedef enum {
-+	SPD_CAP_NONE = 0,
-+	SPD_CAP_SPELL = 1,
-+	SPD_CAP_ICON = 2
-+} SPDCapitalLetters;
-+
-+typedef enum {
-+	SPD_SPELL_OFF = 0,
-+	SPD_SPELL_ON = 1
-+} SPDSpelling;
-+
-+typedef enum {
-+	SPD_MALE1 = 1,
-+	SPD_MALE2 = 2,
-+	SPD_MALE3 = 3,
-+	SPD_FEMALE1 = 4,
-+	SPD_FEMALE2 = 5,
-+	SPD_FEMALE3 = 6,
-+	SPD_CHILD_MALE = 7,
-+	SPD_CHILD_FEMALE = 8,
-+	SPD_UNSPECIFIED = -1
-+} SPDVoiceType;
-+
-+typedef struct {
-+	char *name;		/* Name of the voice (id) */
-+	char *language;		/* 2/3-letter ISO language code,
-+				 * possibly followed by 2/3-letter ISO region code,
-+				 * e.g. en-US */
-+	char *variant;		/* a not-well defined string describing dialect etc. */
-+} SPDVoice;
-+
-+typedef enum {
-+	SPD_DATA_TEXT = 0,
-+	SPD_DATA_SSML = 1
-+} SPDDataMode;
-+
-+typedef enum {
-+	SPD_IMPORTANT = 1,
-+	SPD_MESSAGE = 2,
-+	SPD_TEXT = 3,
-+	SPD_NOTIFICATION = 4,
-+	SPD_PROGRESS = 5
-+} SPDPriority;
-+
-+typedef enum {
-+	SPD_BEGIN = 1,
-+	SPD_END = 2,
-+	SPD_INDEX_MARKS = 4,
-+	SPD_CANCEL = 8,
-+	SPD_PAUSE = 16,
-+	SPD_RESUME = 32,
-+
-+	SPD_ALL = 0x3f
-+} SPDNotification;
-+
-+typedef enum {
-+	SPD_EVENT_BEGIN,
-+	SPD_EVENT_END,
-+	SPD_EVENT_INDEX_MARK,
-+	SPD_EVENT_CANCEL,
-+	SPD_EVENT_PAUSE,
-+	SPD_EVENT_RESUME
-+} SPDNotificationType;
-+
-+typedef enum {
-+	SORT_BY_TIME = 0,
-+	SORT_BY_ALPHABET = 1
-+} ESort;
-+
-+typedef enum {
-+	SPD_MSGTYPE_TEXT = 0,
-+	SPD_MSGTYPE_SOUND_ICON = 1,
-+	SPD_MSGTYPE_CHAR = 2,
-+	SPD_MSGTYPE_KEY = 3,
-+	SPD_MSGTYPE_SPELL = 99
-+} SPDMessageType;
-+
-+typedef struct {
-+	signed int rate;
-+	signed int pitch;
-+	signed int pitch_range;
-+	signed int volume;
-+
-+	SPDPunctuation punctuation_mode;
-+	SPDSpelling spelling_mode;
-+	SPDCapitalLetters cap_let_recogn;
-+
-+	SPDVoiceType voice_type;
-+	SPDVoice voice;
-+} SPDMsgSettings;
-+
- #endif /* not ifndef SPEECHD_TYPES */
diff --git a/chromium-next/patches/patch-third__party_sqlite_BUILD.gn b/chromium-next/patches/patch-third__party_sqlite_BUILD.gn
deleted file mode 100644
index 0222e398a3..0000000000
--- a/chromium-next/patches/patch-third__party_sqlite_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/sqlite/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/sqlite/BUILD.gn
-@@ -155,7 +155,7 @@ config("sqlite_warnings") {
-       ]
-     }
-   }
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     cflags += [
-       # SQLite doesn't believe in compiler warnings, preferring testing.
-       # http://www.sqlite.org/faq.html#q17
diff --git a/chromium-next/patches/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c b/chromium-next/patches/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
deleted file mode 100644
index ab445f80f5..0000000000
--- a/chromium-next/patches/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -14486,7 +14486,7 @@ struct fts5_api {
- ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
- ** it.
- */
--#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
-+#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__FreeBSD__)
- #  define _XOPEN_SOURCE 600
- #endif
- 
-@@ -20975,6 +20975,9 @@ SQLITE_PRIVATE int sqlite3HeapNearlyFull
- ** The alloca() routine never returns NULL.  This will cause code paths
- ** that deal with sqlite3StackAlloc() failures to be unreachable.
- */
-+#if defined(__NetBSD__)
-+# undef SQLITE_USE_ALLOCA
-+#endif
- #ifdef SQLITE_USE_ALLOCA
- # define sqlite3StackAllocRaw(D,N)   alloca(N)
- # define sqlite3StackAllocRawNN(D,N) alloca(N)
diff --git a/chromium-next/patches/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/chromium-next/patches/patch-third__party_sqlite_src_amalgamation_sqlite3.c
deleted file mode 100644
index 956c19c701..0000000000
--- a/chromium-next/patches/patch-third__party_sqlite_src_amalgamation_sqlite3.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14486,7 +14486,7 @@ struct fts5_api {
- ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
- ** it.
- */
--#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
-+#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__FreeBSD__)
- #  define _XOPEN_SOURCE 600
- #endif
- 
-@@ -20962,6 +20962,9 @@ SQLITE_PRIVATE int sqlite3HeapNearlyFull
- ** The alloca() routine never returns NULL.  This will cause code paths
- ** that deal with sqlite3StackAlloc() failures to be unreachable.
- */
-+#if defined(__NetBSD__)
-+# undef SQLITE_USE_ALLOCA
-+#endif
- #ifdef SQLITE_USE_ALLOCA
- # define sqlite3StackAllocRaw(D,N)   alloca(N)
- # define sqlite3StackAllocRawNN(D,N) alloca(N)
-@@ -45387,6 +45390,11 @@ static int unixRandomness(sqlite3_vfs *N
-   memset(zBuf, 0, nBuf);
-   randomnessPid = osGetpid(0);
- #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
-+#if defined(__OpenBSD__)
-+  {
-+    arc4random_buf(zBuf, nBuf);
-+  }
-+#else
-   {
-     int fd, got;
-     fd = robust_open("/dev/urandom", O_RDONLY, 0);
-@@ -45403,6 +45411,7 @@ static int unixRandomness(sqlite3_vfs *N
-     }
-   }
- #endif
-+#endif
-   return nBuf;
- }
- 
diff --git a/chromium-next/patches/patch-third__party_swiftshader_src_Reactor_Debug.cpp b/chromium-next/patches/patch-third__party_swiftshader_src_Reactor_Debug.cpp
deleted file mode 100644
index e1772620a3..0000000000
--- a/chromium-next/patches/patch-third__party_swiftshader_src_Reactor_Debug.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/swiftshader/src/Reactor/Debug.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/swiftshader/src/Reactor/Debug.cpp
-@@ -46,7 +46,8 @@ namespace {
- 
- bool IsUnderDebugger()
- {
--#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__)
-+#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && \
-+	!defined(__NetBSD__)
- 	static bool checked = false;
- 	static bool res = false;
- 
diff --git a/chromium-next/patches/patch-third__party_swiftshader_src_System_Configurator.cpp b/chromium-next/patches/patch-third__party_swiftshader_src_System_Configurator.cpp
deleted file mode 100644
index 6047c3e4d4..0000000000
--- a/chromium-next/patches/patch-third__party_swiftshader_src_System_Configurator.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/swiftshader/src/System/Configurator.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/swiftshader/src/System/Configurator.cpp
-@@ -38,6 +38,9 @@ namespace sw {
- 
- Configurator::Configurator(const std::string &filePath)
- {
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+	return;
-+#endif
- 	std::fstream file(filePath, std::ios::in);
- 	if(file.fail())
- 	{
diff --git a/chromium-next/patches/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp b/chromium-next/patches/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
deleted file mode 100644
index ac9f2351fd..0000000000
--- a/chromium-next/patches/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/swiftshader/src/System/Linux/MemFd.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/swiftshader/src/System/Linux/MemFd.cpp
-@@ -25,6 +25,7 @@
- #	define MFD_CLOEXEC 0x0001U
- #endif
- 
-+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- #if __aarch64__
- #	define __NR_memfd_create 279
- #elif __arm__
-@@ -36,6 +37,7 @@
- #elif __x86_64__
- #	define __NR_memfd_create 319
- #endif /* __NR_memfd_create__ */
-+#endif
- 
- LinuxMemFd::~LinuxMemFd()
- {
-@@ -63,13 +65,17 @@ bool LinuxMemFd::allocate(const char *na
- {
- 	close();
- 
--#ifndef __NR_memfd_create
-+#if !defined(__NR_memfd_create) || defined(__OpenBSD__)
- 	TRACE("memfd_create() not supported on this system!");
- 	return false;
- #else
- 	// In the event of no system call this returns -1 with errno set
- 	// as ENOSYS.
-+#if defined(__FreeBSD__) ||  defined(__NetBSD__)
-+	fd_ = memfd_create(name, MFD_CLOEXEC);
-+#else
- 	fd_ = syscall(__NR_memfd_create, name, MFD_CLOEXEC);
-+#endif
- 	if(fd_ < 0)
- 	{
- 		TRACE("memfd_create() returned %d: %s", errno, strerror(errno));
diff --git a/chromium-next/patches/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp b/chromium-next/patches/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
deleted file mode 100644
index 3165447abf..0000000000
--- a/chromium-next/patches/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp
-@@ -49,13 +49,17 @@ public:
- 	{
- 		pthread_mutexattr_t mattr;
- 		pthread_mutexattr_init(&mattr);
-+#if 0
- 		pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
-+#endif
- 		pthread_mutex_init(&mutex, &mattr);
- 		pthread_mutexattr_destroy(&mattr);
- 
- 		pthread_condattr_t cattr;
- 		pthread_condattr_init(&cattr);
-+#if 0
- 		pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
-+#endif
- 		pthread_cond_init(&cond, &cattr);
- 		pthread_condattr_destroy(&cattr);
- 	}
diff --git a/chromium-next/patches/patch-third__party_swiftshader_src_WSI_libXCB.cpp b/chromium-next/patches/patch-third__party_swiftshader_src_WSI_libXCB.cpp
deleted file mode 100644
index 07df2b1cb2..0000000000
--- a/chromium-next/patches/patch-third__party_swiftshader_src_WSI_libXCB.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/swiftshader/src/WSI/libXCB.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/swiftshader/src/WSI/libXCB.cpp
-@@ -57,7 +57,7 @@ LibXcbExports *LibXCB::loadExports()
- 		}
- 		else
- 		{
--			libxcb = loadLibrary("libxcb.so.1");
-+			libxcb = loadLibrary("libxcb.so");
- 		}
- 
- 		if(getProcAddress(RTLD_DEFAULT, "xcb_shm_query_version"))  // Search the global scope for pre-loaded XCB library.
-@@ -66,7 +66,7 @@ LibXcbExports *LibXCB::loadExports()
- 		}
- 		else
- 		{
--			libshm = loadLibrary("libxcb-shm.so.0");
-+			libshm = loadLibrary("libxcb-shm.so");
- 		}
- 
- 		return LibXcbExports(libxcb, libshm);
diff --git a/chromium-next/patches/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h b/chromium-next/patches/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
deleted file mode 100644
index 0549efa1de..0000000000
--- a/chromium-next/patches/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
+++ /dev/null
@@ -1,180 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
-@@ -29,7 +29,7 @@
- 
- /* Define to 1 if you have the declaration of `arc4random', and to 0 if you
-    don't. */
--#define HAVE_DECL_ARC4RANDOM 0
-+#define HAVE_DECL_ARC4RANDOM 1
- 
- /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you
-    don't. */
-@@ -53,7 +53,7 @@
- #define HAVE_DLOPEN 1
- 
- /* Define if dladdr() is available on this platform. */
--/* #undef HAVE_DLADDR */
-+#define HAVE_DLADDR 1
- 
- /* Define to 1 if you have the <errno.h> header file. */
- #define HAVE_ERRNO_H 1
-@@ -92,7 +92,7 @@
- #define HAVE_ISATTY 1
- 
- /* Define to 1 if you have the `edit' library (-ledit). */
--/* #undef HAVE_LIBEDIT */
-+#define HAVE_LIBEDIT 1
- 
- /* Define to 1 if you have the `pfm' library (-lpfm). */
- /* #undef HAVE_LIBPFM */
-@@ -110,13 +110,13 @@
- /* #undef HAVE_PTHREAD_SETNAME_NP */
- 
- /* Define to 1 if you have the `z' library (-lz). */
--/* #undef HAVE_LIBZ */
-+#define HAVE_LIBZ 1
- 
- /* Define to 1 if you have the <link.h> header file. */
--#define HAVE_LINK_H 1
-+/* #undef HAVE_LINK_H */
- 
- /* Define to 1 if you have the `lseek64' function. */
--#define HAVE_LSEEK64 1
-+/* #undef HAVE_LSEEK64 */
- 
- /* Define to 1 if you have the <mach/mach.h> header file. */
- /* #undef HAVE_MACH_MACH_H */
-@@ -125,7 +125,7 @@
- /* #undef HAVE_MALLCTL */
- 
- /* Define to 1 if you have the `mallinfo' function. */
--#define HAVE_MALLINFO 1
-+/* #undef HAVE_MALLINFO */
- 
- /* Define to 1 if you have the <malloc/malloc.h> header file. */
- /* #undef HAVE_MALLOC_MALLOC_H */
-@@ -134,10 +134,10 @@
- /* #undef HAVE_MALLOC_ZONE_STATISTICS */
- 
- /* Define to 1 if you have the `posix_fallocate' function. */
--#define HAVE_POSIX_FALLOCATE 1
-+/* #undef HAVE_POSIX_FALLOCATE */
- 
- /* Define to 1 if you have the `posix_spawn' function. */
--/* #undef HAVE_POSIX_SPAWN */
-+#define HAVE_POSIX_SPAWN 1
- 
- /* Define to 1 if you have the `pread' function. */
- #define HAVE_PREAD 1
-@@ -161,10 +161,10 @@
- #define HAVE_SETENV 1
- 
- /* Define to 1 if you have the `sched_getaffinity' function. */
--#define HAVE_SCHED_GETAFFINITY 1
-+/* #undef HAVE_SCHED_GETAFFINITY */
- 
- /* Define to 1 if you have the `CPU_COUNT' macro. */
--#define HAVE_CPU_COUNT 1
-+/* #undef HAVE_CPU_COUNT */
- 
- /* Define to 1 if you have the `setrlimit' function. */
- #define HAVE_SETRLIMIT 1
-@@ -182,7 +182,7 @@
- #define HAVE_STRERROR_R 1
- 
- /* Define to 1 if you have the `sysconf' function. */
--#define HAVE_SYSCONF 1
-+/* #undef HAVE_SYSCONF */
- 
- /* Define to 1 if you have the <sys/ioctl.h> header file. */
- #define HAVE_SYS_IOCTL_H 1
-@@ -209,7 +209,7 @@
- #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
- 
- /* Define to 1 if you have the <sys/types.h> header file. */
--#define HAVE_SYS_TYPES_H 1
-+/* #undef HAVE_SYS_TYPES_H */
- 
- /* Define if the setupterm() function is supported this platform. */
- /* #undef HAVE_TERMINFO */
-@@ -218,16 +218,16 @@
- /* #undef HAVE_LIBXAR */
- 
- /* Define to 1 if you have the <termios.h> header file. */
--/* #undef HAVE_TERMIOS_H */
-+#define HAVE_TERMIOS_H 1
- 
- /* Define to 1 if you have the <unistd.h> header file. */
- #define HAVE_UNISTD_H 1
- 
- /* Define to 1 if you have the <valgrind/valgrind.h> header file. */
--/* #undef HAVE_VALGRIND_VALGRIND_H */
-+/* #define HAVE_VALGRIND_VALGRIND_H 1 */
- 
- /* Define to 1 if you have the <zlib.h> header file. */
--/* #undef HAVE_ZLIB_H */
-+#define HAVE_ZLIB_H 1
- 
- /* Have host's _alloca */
- /* #undef HAVE__ALLOCA */
-@@ -292,30 +292,8 @@
- /* Linker version detected at compile time. */
- /* #undef HOST_LINK_VERSION */
- 
--/* Target triple LLVM will generate code for by default */
--/* Doesn't use `cmakedefine` because it is allowed to be empty. */
--#if defined(__x86_64__)
--#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
--#elif defined(__i386__)
--#define LLVM_DEFAULT_TARGET_TRIPLE "i686-pc-linux-gnu"
--#elif defined(__arm__)
--#define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf"
--#elif defined(__aarch64__)
--#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu"
--#elif defined(__mips__)
--#define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu"
--#elif defined(__mips64)
--#define LLVM_DEFAULT_TARGET_TRIPLE "mips64el-linux-gnuabi64"
--#elif defined(__powerpc64__)
--#define LLVM_DEFAULT_TARGET_TRIPLE "powerpc64le-unknown-linux-gnu"
--#elif defined(__riscv) && __riscv_xlen == 64
--#define LLVM_DEFAULT_TARGET_TRIPLE "riscv64-unknown-linux-gnu"
--#else
--#error "unknown architecture"
--#endif
--
- /* Define if zlib compression is available */
--#define LLVM_ENABLE_ZLIB 0
-+/* #define LLVM_ENABLE_ZLIB 1 */
- 
- /* Define if overriding target triple is enabled */
- /* #undef LLVM_TARGET_TRIPLE_ENV */
-@@ -339,10 +317,10 @@
- #define PACKAGE_NAME "LLVM"
- 
- /* Define to the full name and version of this package. */
--#define PACKAGE_STRING "LLVM 10.0.0"
-+#define PACKAGE_STRING "LLVM 11.1.0"
- 
- /* Define to the version of this package. */
--#define PACKAGE_VERSION "10.0.0"
-+#define PACKAGE_VERSION "11.1.0"
- 
- /* Define to the vendor of this package. */
- /* #undef PACKAGE_VENDOR */
-@@ -362,9 +340,6 @@
- /* Whether GlobalISel rule coverage is being collected */
- #define LLVM_GISEL_COV_ENABLED 0
- 
--/* Define if we have z3 and want to build it */
--#define LLVM_WITH_Z3 1
--
- /* Define to the default GlobalISel coverage file prefix */
- /* #undef LLVM_GISEL_COV_PREFIX */
- 
diff --git a/chromium-next/patches/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h b/chromium-next/patches/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
deleted file mode 100644
index a10c9f24d5..0000000000
--- a/chromium-next/patches/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-@@ -5,8 +5,6 @@
- #include "llvm/Config/llvm-config.h"
- 
- /* For detecting __GLIBC__ usage */
--#include <features.h>
--
- /* Bug report URL. */
- #define BUG_REPORT_URL "http://llvm.org/bugs/";
- 
-@@ -27,7 +25,7 @@
- 
- /* Define to 1 if you have the declaration of `arc4random', and to 0 if you
-    don't. */
--#define HAVE_DECL_ARC4RANDOM 0
-+#define HAVE_DECL_ARC4RANDOM 1
- 
- /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you
-    don't. */
-@@ -124,7 +122,7 @@
- #define HAVE_LINK_H 1
- 
- /* Define to 1 if you have the `lseek64' function. */
--#define HAVE_LSEEK64 1
-+/* #define HAVE_LSEEK64 */
- 
- /* Define to 1 if you have the <mach/mach.h> header file. */
- /* #undef HAVE_MACH_MACH_H */
-@@ -133,7 +131,7 @@
- /* #undef HAVE_MALLCTL */
- 
- /* Define to 1 if you have the `mallinfo' function. */
--#define HAVE_MALLINFO 1
-+/* #define HAVE_MALLINFO */
- 
- /* Some projects using SwiftShader bypass cmake (eg Chromium via gn) */
- /* so we need to check glibc version for the new API to be safe */
-@@ -163,7 +161,7 @@
- /* #undef HAVE_NDIR_H */
- 
- /* Define to 1 if you have the `posix_fallocate' function. */
--#define HAVE_POSIX_FALLOCATE 1
-+/* #define HAVE_POSIX_FALLOCATE */
- 
- /* Define to 1 if you have the `posix_spawn' function. */
- #define HAVE_POSIX_SPAWN 1
diff --git a/chromium-next/patches/patch-third__party_swiftshader_third__party_marl_src_memory.cpp b/chromium-next/patches/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
deleted file mode 100644
index 492a6c42d0..0000000000
--- a/chromium-next/patches/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/swiftshader/third_party/marl/src/memory.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/swiftshader/third_party/marl/src/memory.cpp
-@@ -19,7 +19,8 @@
- 
- #include <cstring>
- 
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__EMSCRIPTEN__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__EMSCRIPTEN__) || defined(__OpenBSD__) || \
-+      defined(__NetBSD__)
- #include <sys/mman.h>
- #include <unistd.h>
- namespace {
diff --git a/chromium-next/patches/patch-third__party_swiftshader_third__party_marl_src_thread.cpp b/chromium-next/patches/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
deleted file mode 100644
index f09c75a06c..0000000000
--- a/chromium-next/patches/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/swiftshader/third_party/marl/src/thread.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/swiftshader/third_party/marl/src/thread.cpp
-@@ -46,6 +46,9 @@
- #include <unistd.h>
- #include <thread>
- #endif
-+#if defined(__NetBSD__)
-+#include <stdarg.h>
-+#endif
- 
- namespace {
- 
-@@ -444,7 +447,9 @@ void Thread::setName(const char* fmt, ..
-   pthread_setname_np(name);
- #elif defined(__FreeBSD__)
-   pthread_set_name_np(pthread_self(), name);
--#elif !defined(__Fuchsia__) && !defined(__EMSCRIPTEN__)
-+#elif defined(__NetBSD__)
-+  pthread_setname_np(pthread_self(), "%s", (void *)name);
-+#elif !defined(__Fuchsia__) && !defined(__EMSCRIPTEN__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
-   pthread_setname_np(pthread_self(), name);
- #endif
- 
diff --git a/chromium-next/patches/patch-third__party_test__fonts_fontconfig_BUILD.gn b/chromium-next/patches/patch-third__party_test__fonts_fontconfig_BUILD.gn
deleted file mode 100644
index d3f9ad76e1..0000000000
--- a/chromium-next/patches/patch-third__party_test__fonts_fontconfig_BUILD.gn
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/test_fonts/fontconfig/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/test_fonts/fontconfig/BUILD.gn
-@@ -26,7 +26,11 @@ if (is_linux || is_chromeos) {
- 
-   copy("fonts_conf") {
-     sources = [ "fonts.conf" ]
--    outputs = [ "$root_out_dir/etc/fonts/{{source_file_part}}" ]
-+    if (is_freebsd) {
-+      outputs = [ "$root_out_dir/usr/local/etc/fonts/{{source_file_part}}" ]
-+    } else {
-+      outputs = [ "$root_out_dir/etc/fonts/{{source_file_part}}" ]
-+    }
-   }
- 
-   if (current_toolchain == host_toolchain) {
-@@ -47,7 +51,11 @@ if (is_linux || is_chromeos) {
-         "//third_party/test_fonts",
-       ]
-       args = []
--      inputs = [ "$root_out_dir/etc/fonts/fonts.conf" ]
-+      if (is_freebsd) {
-+        inputs = [ "$root_out_dir/usr/local/etc/fonts/fonts.conf" ]
-+      } else {
-+        inputs = [ "$root_out_dir/etc/fonts/fonts.conf" ]
-+      }
-       outputs = [
-         "$root_out_dir/fontconfig_caches/fb5c91b2895aa445d23aebf7f9e2189c-le64.cache-9",
-         "$root_out_dir/fontconfig_caches/CACHEDIR.TAG",
diff --git a/chromium-next/patches/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc b/chromium-next/patches/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
deleted file mode 100644
index 941103b03a..0000000000
--- a/chromium-next/patches/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/test_fonts/fontconfig/fontconfig_util_linux.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include "build/build_config.h"
-+
- #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h"
- 
- #include <fontconfig/fontconfig.h>
-@@ -16,11 +18,15 @@
- namespace test_fonts {
- 
- std::string GetSysrootDir() {
-+#if BUILDFLAG(IS_BSD)
-+  return std::string(".");
-+#else
-   char buf[PATH_MAX + 1];
-   auto count = readlink("/proc/self/exe", buf, PATH_MAX);
-   assert(count > 0);
-   buf[count] = '\0';
-   return dirname(buf);
-+#endif
- }
- 
- void SetUpFontconfig() {
diff --git a/chromium-next/patches/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc b/chromium-next/patches/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
deleted file mode 100644
index 08a79e9268..0000000000
--- a/chromium-next/patches/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc
-@@ -28,7 +28,7 @@ int main() {
-   // fontconfig cache.
-   //     $ echo -n /test_fonts | md5sum
-   //     fb5c91b2895aa445d23aebf7f9e2189c  -
--  static const char kCacheKey[] = "fb5c91b2895aa445d23aebf7f9e2189c";
-+  static const char kCacheKey[] = "cd4b5bc7-6cfc-41dc-8982-f2db624179ba";
- 
-   // fontconfig writes the mtime of the test_fonts directory into the cache. It
-   // presumably checks this later to ensure that the cache is still up to date.
-@@ -56,7 +56,7 @@ int main() {
-   FcFini();
- 
-   // Check existence of intended fontconfig cache file.
--  auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-9";
-+  auto cache = fontconfig_caches + "/" + kCacheKey + "-x86_64.cache-" + FC_CACHE_VERSION;
-   bool cache_exists = access(cache.c_str(), F_OK) == 0;
-   return !cache_exists;
- }
diff --git a/chromium-next/patches/patch-third__party_tflite_features.gni b/chromium-next/patches/patch-third__party_tflite_features.gni
deleted file mode 100644
index 183de066c0..0000000000
--- a/chromium-next/patches/patch-third__party_tflite_features.gni
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/tflite/features.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/tflite/features.gni
-@@ -9,8 +9,8 @@ declare_args() {
-   # This enables building TFLite with XNNPACK. Currently only available for
-   # Linux, macOS and Windows arm64/x64/x86 targets and ChromeOS non-ARM targets.
-   build_tflite_with_xnnpack =
--      (is_win || is_mac || is_linux || (is_chromeos && overlay_include_cbx)) &&
--      (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86")
-+      ((is_win || is_mac || is_linux || (is_chromeos && overlay_include_cbx)) &&
-+      (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86")) && !is_bsd
- 
-   # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp.
-   build_tflite_with_ruy = true
diff --git a/chromium-next/patches/patch-third__party_unrar_src_crypt.cpp b/chromium-next/patches/patch-third__party_unrar_src_crypt.cpp
deleted file mode 100644
index 13daa9c871..0000000000
--- a/chromium-next/patches/patch-third__party_unrar_src_crypt.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/unrar/src/crypt.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/unrar/src/crypt.cpp
-@@ -116,6 +116,8 @@ void GetRnd(byte *RndBuf,size_t BufSize)
-     Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) != FALSE;
-     CryptReleaseContext(hProvider, 0);
-   }
-+#elif defined(__OpenBSD__)
-+  arc4random_buf(RndBuf, BufSize);
- #elif defined(_UNIX)
-   FILE *rndf = fopen("/dev/urandom", "r");
-   if (rndf!=NULL)
diff --git a/chromium-next/patches/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h b/chromium-next/patches/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
deleted file mode 100644
index b8329e9598..0000000000
--- a/chromium-next/patches/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
-@@ -2971,7 +2971,7 @@ static void* vma_aligned_alloc(size_t al
- 
-     return memalign(alignment, size);
- }
--#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))
-+#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
- #include <cstdlib>
- 
- #if defined(__APPLE__)
diff --git a/chromium-next/patches/patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp b/chromium-next/patches/patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp
deleted file mode 100644
index f559aaf2c6..0000000000
--- a/chromium-next/patches/patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/vulkan-validation-layers/src/layers/vulkan/generated/vk_function_pointers.cpp.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/vulkan-validation-layers/src/layers/vulkan/generated/vk_function_pointers.cpp
-@@ -53,7 +53,8 @@ static void *get_proc_address(dl_handle 
-     assert(name);
-     return (void *)GetProcAddress(library, name);
- }
--#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || defined(__GNU__)
-+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNX__) || \
-+         defined(__GNU__) ||  defined(__NetBSD__)
- 
- #include <dlfcn.h>
- 
diff --git a/chromium-next/patches/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/chromium-next/patches/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
deleted file mode 100644
index d294c0a2f7..0000000000
--- a/chromium-next/patches/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-@@ -2760,7 +2760,7 @@ void* vma_aligned_alloc(size_t alignment
- 
-     return memalign(alignment, size);
- }
--#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))
-+#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__)
- #include <cstdlib>
- 
- #if defined(__APPLE__)
diff --git a/chromium-next/patches/patch-third__party_wayland_BUILD.gn b/chromium-next/patches/patch-third__party_wayland_BUILD.gn
deleted file mode 100644
index 67ce3dbde8..0000000000
--- a/chromium-next/patches/patch-third__party_wayland_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/wayland/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/wayland/BUILD.gn
-@@ -24,6 +24,11 @@ if (!use_system_libwayland) {
-       "src/src",
-     ]
- 
-+    if (is_bsd) {
-+      include_dirs += [ "/usr/local/include/libepoll-shim" ]
-+      libs = [ "epoll-shim" ]
-+    }   
-+
-     # Client/Server headers are automatically generated. Though, we still need
-     # to pass the path where these headers are located.
-     include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ]
diff --git a/chromium-next/patches/patch-third__party_wayland_include_config.h b/chromium-next/patches/patch-third__party_wayland_include_config.h
deleted file mode 100644
index 0e9337560f..0000000000
--- a/chromium-next/patches/patch-third__party_wayland_include_config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/wayland/include/config.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/wayland/include/config.h
-@@ -9,7 +9,14 @@
- 
- #define HAVE_BROKEN_MSG_CMSG_CLOEXEC 0
- 
-+#if defined(__FreeBSD__)
-+#include <osreldate.h>
-+#if defined(__FreeBSD_version) && __FreeBSD_version < 1300048
-+#undef HAVE_MEMFD_CREATE
-+#else
- #define HAVE_MEMFD_CREATE
-+#endif
-+#endif
- 
- #define HAVE_MKOSTEMP
- 
-@@ -25,7 +32,11 @@
- 
- #undef HAVE_SYS_PROCCTL_H
- 
-+#if defined(__FreeBSD__)
-+#define HAVE_SYS_UCRED_H
-+#else
- #undef HAVE_SYS_UCRED_H
-+#endif
- 
- #define HAVE_XUCRED_CR_PID 0
- 
diff --git a/chromium-next/patches/patch-third__party_webrtc_BUILD.gn b/chromium-next/patches/patch-third__party_webrtc_BUILD.gn
deleted file mode 100644
index 0e081a1545..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_BUILD.gn
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/BUILD.gn
-@@ -219,6 +219,9 @@ config("common_inherited_config") {
-   if (is_linux || is_chromeos) {
-     defines += [ "WEBRTC_LINUX" ]
-   }
-+  if (is_bsd) {
-+    defines += [ "WEBRTC_BSD" ]
-+  }
-   if (is_mac) {
-     defines += [ "WEBRTC_MAC" ]
-   }
diff --git a/chromium-next/patches/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/chromium-next/patches/patch-third__party_webrtc_modules_audio__device_BUILD.gn
deleted file mode 100644
index 2c286d76fa..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_modules_audio__device_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/modules/audio_device/BUILD.gn
-@@ -330,7 +330,7 @@ rtc_library("audio_device_impl") {
-     if (rtc_use_dummy_audio_file_devices) {
-       defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
-     } else {
--      if (is_linux || is_chromeos) {
-+      if ((is_linux || is_chromeos) && !is_bsd) {
-         sources += [
-           "linux/alsasymboltable_linux.cc",
-           "linux/alsasymboltable_linux.h",
diff --git a/chromium-next/patches/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/chromium-next/patches/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
deleted file mode 100644
index 4c1e98345e..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
-@@ -11,7 +11,9 @@
- #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
- 
- #include <EGL/eglext.h>
-+#if !defined(WEBRTC_BSD)
- #include <asm/ioctl.h>
-+#endif
- #include <dlfcn.h>
- #include <fcntl.h>
- #include <libdrm/drm_fourcc.h>
diff --git a/chromium-next/patches/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/chromium-next/patches/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
deleted file mode 100644
index b1746607ad..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
-@@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache
- void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) {
-   Visual* default_visual = attributes.visual;
-   int default_depth = attributes.depth;
-+#if defined(__OpenBSD__)
-+// pledge(2)
-+  RTC_LOG(LS_WARNING) << "Unable to use shmget(2) while using pledge(2). "
-+                         "Performance may be degraded.";
-+  return;
-+#endif
- 
-   int major, minor;
-   Bool have_pixmaps;
diff --git a/chromium-next/patches/patch-third__party_webrtc_rtc__base_byte__order.h b/chromium-next/patches/patch-third__party_webrtc_rtc__base_byte__order.h
deleted file mode 100644
index 6123aef27d..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_rtc__base_byte__order.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/rtc_base/byte_order.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/rtc_base/byte_order.h
-@@ -90,6 +90,8 @@
- #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined.
- #endif  // defined(WEBRTC_ARCH_LITTLE_ENDIAN)
- 
-+#elif defined(WEBRTC_BSD)
-+#include <sys/endian.h>
- #elif defined(WEBRTC_POSIX)
- #include <endian.h>
- #else
diff --git a/chromium-next/patches/patch-third__party_webrtc_rtc__base_ip__address.cc b/chromium-next/patches/patch-third__party_webrtc_rtc__base_ip__address.cc
deleted file mode 100644
index a15d5b168c..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_rtc__base_ip__address.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/rtc_base/ip_address.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/rtc_base/ip_address.cc
-@@ -14,7 +14,8 @@
- #include <cstring>
- #include <string>
- #if defined(WEBRTC_POSIX)
--#ifdef OPENBSD
-+#if defined(WEBRTC_BSD)
-+#include <sys/types.h>
- #include <netinet/in_systm.h>
- #endif
- #ifndef __native_client__
diff --git a/chromium-next/patches/patch-third__party_webrtc_rtc__base_net__test__helpers.cc b/chromium-next/patches/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
deleted file mode 100644
index e57e3093c5..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/rtc_base/net_test_helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/rtc_base/net_test_helpers.cc
-@@ -21,6 +21,7 @@
- #endif
- #if defined(WEBRTC_POSIX) && !defined(__native_client__)
- #include <arpa/inet.h>
-+#include <sys/socket.h>
- #if defined(WEBRTC_ANDROID)
- #include "rtc_base/ifaddrs_android.h"
- #else
diff --git a/chromium-next/patches/patch-third__party_webrtc_rtc__base_network.cc b/chromium-next/patches/patch-third__party_webrtc_rtc__base_network.cc
deleted file mode 100644
index 74eb8ca46a..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_rtc__base_network.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/rtc_base/network.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/rtc_base/network.cc
-@@ -314,7 +314,12 @@ webrtc::AdapterType GetAdapterTypeFromNa
-   }
- #endif
- 
-+#if defined(WEBRTC_BSD)
-+  // Treat all other network interface names as ethernet on BSD
-+  return webrtc::ADAPTER_TYPE_ETHERNET;
-+#else
-   return webrtc::ADAPTER_TYPE_UNKNOWN;
-+#endif
- }
- 
- NetworkManager::EnumerationPermission NetworkManager::enumeration_permission()
diff --git a/chromium-next/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/chromium-next/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
deleted file mode 100644
index 6454fbacb4..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/rtc_base/physical_socket_server.cc
-@@ -55,7 +55,7 @@
- #include "rtc_base/time_utils.h"
- #include "system_wrappers/include/field_trial.h"
- 
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- #include <linux/sockios.h>
- #endif
- 
-@@ -75,7 +75,7 @@ typedef void* SockOptArg;
- 
- #endif  // WEBRTC_POSIX
- 
--#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
-+#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) && !defined(WEBRTC_BSD)
- 
- int64_t GetSocketRecvTimestamp(int socket) {
-   struct timeval tv_ioctl;
-@@ -331,7 +331,7 @@ int PhysicalSocket::GetOption(Option opt
-     return -1;
-   }
-   if (opt == OPT_DONTFRAGMENT) {
--#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
-     *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
- #endif
-   } else if (opt == OPT_DSCP) {
-@@ -360,7 +360,7 @@ int PhysicalSocket::SetOption(Option opt
-   if (TranslateOption(opt, &slevel, &sopt) == -1)
-     return -1;
-   if (opt == OPT_DONTFRAGMENT) {
--#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
-     value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
- #endif
-   } else if (opt == OPT_DSCP) {
-@@ -391,7 +391,7 @@ int PhysicalSocket::SetOption(Option opt
- int PhysicalSocket::Send(const void* pv, size_t cb) {
-   int sent = DoSend(
-       s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
--#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
-       // Suppress SIGPIPE. Without this, attempting to send on a socket whose
-       // other end is closed will result in a SIGPIPE signal being raised to
-       // our process, which by default will terminate the process, which we
-@@ -420,7 +420,7 @@ int PhysicalSocket::SendTo(const void* b
-   size_t len = addr.ToSockAddrStorage(&saddr);
-   int sent =
-       DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
--#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
-                // Suppress SIGPIPE. See above for explanation.
-                MSG_NOSIGNAL,
- #else
-@@ -698,7 +698,7 @@ int PhysicalSocket::TranslateOption(Opti
-       *slevel = IPPROTO_IP;
-       *sopt = IP_DONTFRAGMENT;
-       break;
--#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__)
-+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__)
-       RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
-       return -1;
- #elif defined(WEBRTC_POSIX)
-@@ -747,7 +747,7 @@ int PhysicalSocket::TranslateOption(Opti
-       return -1;
- #endif
-     case OPT_RECV_ECN:
--#if defined(WEBRTC_POSIX)
-+#if defined(WEBRTC_POSIX) && defined(IP_RECVTOS) 
-       if (family_ == AF_INET6) {
-         *slevel = IPPROTO_IPV6;
-         *sopt = IPV6_RECVTCLASS;
-@@ -767,10 +767,19 @@ int PhysicalSocket::TranslateOption(Opti
-       *sopt = SO_KEEPALIVE;
-       break;
-     case OPT_TCP_KEEPCNT:
-+#if !defined(TCP_KEEPCNT)
-+      RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPCNT not supported.";
-+      return -1;
-+#else
-       *slevel = IPPROTO_TCP;
-       *sopt = TCP_KEEPCNT;
-       break;
-+#endif
-     case OPT_TCP_KEEPIDLE:
-+#if !defined(TCP_KEEPALIVE)
-+      RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPALIVE not supported.";
-+      return -1;
-+#else
-       *slevel = IPPROTO_TCP;
- #if !defined(WEBRTC_MAC)
-       *sopt = TCP_KEEPIDLE;
-@@ -778,12 +787,18 @@ int PhysicalSocket::TranslateOption(Opti
-       *sopt = TCP_KEEPALIVE;
- #endif
-       break;
-+#endif
-     case OPT_TCP_KEEPINTVL:
-+#if !defined(TCP_KEEPALIVE)
-+      RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPINTVL not supported.";
-+      return -1;
-+#else
-       *slevel = IPPROTO_TCP;
-       *sopt = TCP_KEEPINTVL;
-       break;
-+#endif
-     case OPT_TCP_USER_TIMEOUT:
--#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
-+#if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && defined(TCP_USER_TIMEOUT)
-       *slevel = IPPROTO_TCP;
-       *sopt = TCP_USER_TIMEOUT;
-       break;
diff --git a/chromium-next/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/chromium-next/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.h
deleted file mode 100644
index cadb7bf085..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/rtc_base/physical_socket_server.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/rtc_base/physical_socket_server.h
-@@ -18,7 +18,7 @@
- #include "rtc_base/third_party/sigslot/sigslot.h"
- 
- #if defined(WEBRTC_POSIX)
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- // On Linux, use epoll.
- #include <sys/epoll.h>
- 
diff --git a/chromium-next/patches/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/chromium-next/patches/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
deleted file mode 100644
index d60ee42d41..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/rtc_base/platform_thread_types.cc
-@@ -11,7 +11,9 @@
- #include "rtc_base/platform_thread_types.h"
- 
- #if defined(WEBRTC_LINUX)
-+#if !defined(WEBRTC_BSD)
- #include <sys/prctl.h>
-+#endif
- #include <sys/syscall.h>
- #endif
- 
-@@ -44,6 +46,8 @@ PlatformThreadId CurrentThreadId() {
-   return gettid();
- #elif defined(WEBRTC_FUCHSIA)
-   return zx_thread_self();
-+#elif defined(WEBRTC_BSD)
-+  return reinterpret_cast<uint64_t>(pthread_self());
- #elif defined(WEBRTC_LINUX)
-   return syscall(__NR_gettid);
- #elif defined(__EMSCRIPTEN__)
-@@ -74,6 +78,7 @@ bool IsThreadRefEqual(const PlatformThre
- }
- 
- void SetCurrentThreadName(const char* name) {
-+#if !defined(WEBRTC_BSD)
- #if defined(WEBRTC_WIN)
-   // The SetThreadDescription API works even if no debugger is attached.
-   // The names set with this API also show up in ETW traces. Very handy.
-@@ -121,6 +126,7 @@ void SetCurrentThreadName(const char* na
-                                               name, strlen(name));
-   RTC_DCHECK_EQ(status, ZX_OK);
- #endif
-+#endif
- }
- 
- }  // namespace rtc
diff --git a/chromium-next/patches/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h b/chromium-next/patches/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
deleted file mode 100644
index 1e5f81b00c..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h
-@@ -178,6 +178,10 @@ class multi_threaded_local {
- #endif  // _SIGSLOT_HAS_WIN32_THREADS
- 
- #ifdef _SIGSLOT_HAS_POSIX_THREADS
-+#if defined(OS_FREEBSD)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
-+#endif
- // The multi threading policies only get compiled in if they are enabled.
- class multi_threaded_global {
-  public:
-@@ -201,6 +205,9 @@ class multi_threaded_local {
-  private:
-   pthread_mutex_t m_mutex;
- };
-+#if defined(OS_FREEBSD)
-+#pragma GCC diagnostic pop
-+#endif
- #endif  // _SIGSLOT_HAS_POSIX_THREADS
- 
- template <class mt_policy>
diff --git a/chromium-next/patches/patch-third__party_webrtc_system__wrappers_BUILD.gn b/chromium-next/patches/patch-third__party_webrtc_system__wrappers_BUILD.gn
deleted file mode 100644
index 4a09ec0e5e..0000000000
--- a/chromium-next/patches/patch-third__party_webrtc_system__wrappers_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/system_wrappers/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/webrtc/system_wrappers/BUILD.gn
-@@ -62,8 +62,6 @@ rtc_library("system_wrappers") {
-     if (!build_with_chromium) {
-       sources += [ "source/cpu_features_linux.cc" ]
-     }
--
--    libs += [ "rt" ]
-   }
- 
-   if (is_win) {
diff --git a/chromium-next/patches/patch-third__party_widevine_cdm_widevine.gni b/chromium-next/patches/patch-third__party_widevine_cdm_widevine.gni
deleted file mode 100644
index 87bdb415d0..0000000000
--- a/chromium-next/patches/patch-third__party_widevine_cdm_widevine.gni
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/widevine/cdm/widevine.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/widevine/cdm/widevine.gni
-@@ -28,6 +28,9 @@ library_widevine_cdm_available =
-     (is_chromeos &&
-      (target_cpu == "x64" || target_cpu == "arm" || target_cpu == "arm64")) ||
-     (target_os == "linux" && target_cpu == "x64") ||
-+    (target_os == "openbsd" && target_cpu == "x64") ||
-+    (target_os == "freebsd" && target_cpu == "x64") ||
-+    (target_os == "netbsd" && target_cpu == "x64") ||
-     (target_os == "mac" && (target_cpu == "x64" || target_cpu == "arm64")) ||
-     (target_os == "win" &&
-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64"))
diff --git a/chromium-next/patches/patch-third__party_zlib_BUILD.gn b/chromium-next/patches/patch-third__party_zlib_BUILD.gn
deleted file mode 100644
index 462b9a2eba..0000000000
--- a/chromium-next/patches/patch-third__party_zlib_BUILD.gn
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/zlib/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/zlib/BUILD.gn
-@@ -128,7 +128,7 @@ if (use_arm_neon_optimizations) {
-     defines = [ "CRC32_ARMV8_CRC32" ]
-     if (is_android) {
-       defines += [ "ARMV8_OS_ANDROID" ]
--    } else if (is_linux || is_chromeos) {
-+    } else if ((is_linux || is_chromeos) && !is_bsd) {
-       defines += [ "ARMV8_OS_LINUX" ]
-     } else if (is_mac) {
-       defines += [ "ARMV8_OS_MACOS" ]
-@@ -138,6 +138,10 @@ if (use_arm_neon_optimizations) {
-       defines += [ "ARMV8_OS_FUCHSIA" ]
-     } else if (is_win) {
-       defines += [ "ARMV8_OS_WINDOWS" ]
-+    } else if (is_openbsd) {
-+      defines += [ "ARMV8_OS_OPENBSD" ]
-+    } else if (is_freebsd) {
-+      defines += [ "ARMV8_OS_FREEBSD" ]
-     } else {
-       assert(false, "Unsupported ARM OS")
-     }
-@@ -413,7 +417,7 @@ static_library("minizip") {
-     ]
-   }
- 
--  if (is_apple || is_android || is_nacl) {
-+  if (is_apple || is_android || is_nacl || is_bsd) {
-     # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We
-     # use fopen, ftell, and fseek instead on these systems.
-     defines = [ "USE_FILE32API" ]
diff --git a/chromium-next/patches/patch-third__party_zlib_cpu__features.c b/chromium-next/patches/patch-third__party_zlib_cpu__features.c
deleted file mode 100644
index 29eddffe6e..0000000000
--- a/chromium-next/patches/patch-third__party_zlib_cpu__features.c
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/zlib/cpu_features.c.orig	2025-05-05 19:21:24.000000000 +0000
-+++ third_party/zlib/cpu_features.c
-@@ -39,7 +39,8 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmu
- #ifndef CPU_NO_SIMD
- 
- #if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || \
--    defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS)
-+    defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \
-+    defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD)
- #include <pthread.h>
- #endif
- 
-@@ -56,6 +57,10 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmu
- #include <windows.h>
- #elif defined(ARMV8_OS_IOS)
- #include <sys/sysctl.h>
-+#elif defined(ARMV8_OS_OPENBSD)
-+#include <sys/sysctl.h>
-+#include <machine/cpu.h>
-+#include <machine/armreg.h>
- #elif !defined(_MSC_VER)
- #include <pthread.h>
- #else
-@@ -69,7 +74,8 @@ static void _cpu_check_features(void);
- #if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || \
-     defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || \
-     defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \
--    defined(RISCV_RVV)
-+    defined(RISCV_RVV) || defined(ARMV8_OS_OPENBSD) || \
-+    defined(ARMV8_OS_FREEBSD)
- #if !defined(ARMV8_OS_MACOS)
- // _cpu_check_features() doesn't need to do anything on mac/arm since all
- // features are known at build time, so don't call it.
-@@ -122,6 +128,17 @@ static void _cpu_check_features(void)
-     unsigned long features = getauxval(AT_HWCAP2);
-     arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
-     arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
-+#elif defined(ARMV8_OS_OPENBSD)
-+    int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
-+    uint64_t cpu_id = 0;
-+    size_t len = sizeof(cpu_id);
-+    if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0)
-+        return;
-+    if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL)
-+        arm_cpu_enable_pmull = 1;
-+
-+    if (ID_AA64ISAR0_CRC32(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
-+        arm_cpu_enable_crc32 = 1;
- #elif defined(ARMV8_OS_FUCHSIA)
-     uint32_t features;
-     zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features);
diff --git a/chromium-next/patches/patch-tools_code__cache__generator_BUILD.gn b/chromium-next/patches/patch-tools_code__cache__generator_BUILD.gn
deleted file mode 100644
index e110f287bc..0000000000
--- a/chromium-next/patches/patch-tools_code__cache__generator_BUILD.gn
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/code_cache_generator/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/code_cache_generator/BUILD.gn
-@@ -15,8 +15,34 @@ if (is_android) {
-   import("//build/config/android/rules.gni")
- }
- 
--executable("code_cache_generator") {
-+group("code_cache_generator") {
-+    deps = [ ":code_cache_generator_executable" ]
-+    if (target_os == "netbsd") {
-+      deps+= [ ":run_paxctl_code_cache_generator" ]
-+    }
-+}
-+
-+action("run_paxctl_code_cache_generator") {
-+  deps = [ ":code_cache_generator_executable" ]
-+
-+  script = "//v8/tools/run-paxctl.py"
-+  stamp = "$target_gen_dir/paxctl_stamp"
-+  outputs = [ stamp ]
-+
-+  sources = []
-+  data = []
-+
-+  args = [
-+    rebase_path(stamp, root_build_dir),
-+    "/usr/sbin/paxctl", "+m",
-+    "./" + rebase_path(get_label_info(":code_cache_generator_executable", "root_out_dir") + "/code_cache_generator",
-+    root_build_dir),
-+  ]
-+}
-+
-+executable("code_cache_generator_executable") {
-   sources = [ "code_cache_generator.cc" ]
-+  output_name = "code_cache_generator"
- 
-   deps = [
-     "//gin:gin",
-@@ -25,6 +51,7 @@ executable("code_cache_generator") {
-     "//tools/v8_context_snapshot:buildflags",
-     "//v8",
-   ]
-+
-   data_deps = []
-   data = []
- 
diff --git a/chromium-next/patches/patch-tools_generate__shim__headers_generate__shim__headers.py b/chromium-next/patches/patch-tools_generate__shim__headers_generate__shim__headers.py
deleted file mode 100644
index ccaadcf7d0..0000000000
--- a/chromium-next/patches/patch-tools_generate__shim__headers_generate__shim__headers.py
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/generate_shim_headers/generate_shim_headers.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/generate_shim_headers/generate_shim_headers.py
-@@ -18,7 +18,7 @@ import sys
- 
- 
- SHIM_TEMPLATE = """
--#if defined(OFFICIAL_BUILD)
-+#if defined(GOOGLE_CHROME_BUILD)
- #error shim headers must not be used in official builds!
- #endif
- """
-@@ -65,6 +65,9 @@ def GeneratorMain(argv):
-       if options.outputs:
-         yield os.path.join(target_directory, header_filename)
-       if options.generate:
-+        source_file = os.path.join(root, header_filename)
-+        if os.path.exists(source_file):
-+          os.unlink(source_file)
-         header_path = os.path.join(target_directory, header_filename)
-         header_dir = os.path.dirname(header_path)
-         if not os.path.exists(header_dir):
diff --git a/chromium-next/patches/patch-tools_generate__stubs_rules.gni b/chromium-next/patches/patch-tools_generate__stubs_rules.gni
deleted file mode 100644
index 45b57f010c..0000000000
--- a/chromium-next/patches/patch-tools_generate__stubs_rules.gni
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/generate_stubs/rules.gni.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/generate_stubs/rules.gni
-@@ -110,7 +110,6 @@ template("generate_stubs") {
-       "${target_gen_dir}/${invoker.output_name}.cc",
-       "${target_gen_dir}/${invoker.output_name}.h",
-     ]
--    libs = [ "dl" ]
-     include_dirs = [ target_gen_dir ]
-     if (defined(invoker.configs)) {
-       configs += invoker.configs
diff --git a/chromium-next/patches/patch-tools_gn_build_build__linux.ninja.template b/chromium-next/patches/patch-tools_gn_build_build__linux.ninja.template
deleted file mode 100644
index 75d13a2c27..0000000000
--- a/chromium-next/patches/patch-tools_gn_build_build__linux.ninja.template
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/gn/build/build_linux.ninja.template.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/gn/build/build_linux.ninja.template
-@@ -5,7 +5,7 @@ rule cxx
-   deps = gcc
- 
- rule alink_thin
--  command = $ar rcsT $out $in
-+  command = $ar rcs $out $in
-   description = AR $out
- 
- rule link
diff --git a/chromium-next/patches/patch-tools_gn_build_gen.py b/chromium-next/patches/patch-tools_gn_build_gen.py
deleted file mode 100644
index eb8cfabfa2..0000000000
--- a/chromium-next/patches/patch-tools_gn_build_gen.py
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/gn/build/gen.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/gn/build/gen.py
-@@ -94,6 +94,12 @@ class Platform(object):
-   def is_solaris(self):
-     return self._platform == 'solaris'
- 
-+  def is_openbsd(self):
-+    return self._platform == 'openbsd'
-+
-+  def is_freebsd(self):
-+    return self._platform == 'freebsd'
-+
-   def is_posix(self):
-     return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity']
- 
-@@ -304,7 +310,7 @@ def WriteGenericNinja(path, static_libra
-       'linux': 'build_linux.ninja.template',
-       'freebsd': 'build_linux.ninja.template',
-       'aix': 'build_aix.ninja.template',
--      'openbsd': 'build_openbsd.ninja.template',
-+      'openbsd': 'build_linux.ninja.template',
-       'haiku': 'build_haiku.ninja.template',
-       'solaris': 'build_linux.ninja.template',
-       'netbsd': 'build_linux.ninja.template',
-@@ -543,6 +549,9 @@ def WriteGNNinja(path, platform, host, o
-     if platform.is_posix() and not platform.is_haiku():
-       ldflags.append('-pthread')
- 
-+    if platform.is_openbsd():
-+      libs.append('-lkvm')
-+
-     if platform.is_mingw() or platform.is_msys():
-       cflags.extend(['-DUNICODE',
-                      '-DNOMINMAX',
diff --git a/chromium-next/patches/patch-tools_gn_src_base_files_file__posix.cc b/chromium-next/patches/patch-tools_gn_src_base_files_file__posix.cc
deleted file mode 100644
index 672c609b4d..0000000000
--- a/chromium-next/patches/patch-tools_gn_src_base_files_file__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/gn/src/base/files/file_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/gn/src/base/files/file_posix.cc
-@@ -359,7 +359,7 @@ void File::DoInitialize(const FilePath& 
- bool File::Flush() {
-   DCHECK(IsValid());
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   return !HANDLE_EINTR(fdatasync(file_.get()));
- #else
-   return !HANDLE_EINTR(fsync(file_.get()));
diff --git a/chromium-next/patches/patch-tools_gn_src_gn_version.h b/chromium-next/patches/patch-tools_gn_src_gn_version.h
deleted file mode 100644
index 64c5018a5c..0000000000
--- a/chromium-next/patches/patch-tools_gn_src_gn_version.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/gn/src/gn/version.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/gn/src/gn/version.h
-@@ -22,9 +22,9 @@ class Version {
- 
-   static std::optional<Version> FromString(std::string s);
- 
--  int major() const { return major_; }
--  int minor() const { return minor_; }
--  int patch() const { return patch_; }
-+  int gmajor() const { return major_; }
-+  int gminor() const { return minor_; }
-+  int gpatch() const { return patch_; }
- 
-   bool operator==(const Version& other) const;
-   bool operator<(const Version& other) const;
diff --git a/chromium-next/patches/patch-tools_gn_src_util_exe__path.cc b/chromium-next/patches/patch-tools_gn_src_util_exe__path.cc
deleted file mode 100644
index f93fd9851f..0000000000
--- a/chromium-next/patches/patch-tools_gn_src_util_exe__path.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/gn/src/util/exe_path.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/gn/src/util/exe_path.cc
-@@ -15,7 +15,7 @@
- #include <windows.h>
- 
- #include "base/win/win_util.h"
--#elif defined(OS_FREEBSD) || defined(OS_NETBSD)
-+#elif defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(OS_OPENBSD)
- #include <limits.h>
- #include <sys/sysctl.h>
- #include <sys/types.h>
-@@ -26,6 +26,10 @@
- #include <stdlib.h>
- #endif
- 
-+#if defined(OS_OPENBSD)
-+#include <kvm.h>
-+#endif
-+
- #if defined(OS_MACOSX)
- 
- base::FilePath GetExePath() {
-@@ -104,6 +108,67 @@ base::FilePath GetExePath() {
-   return base::FilePath(raw);
- }
- 
-+#elif defined(OS_OPENBSD)
-+
-+base::FilePath GetExePath() {
-+  struct kinfo_file *files;
-+  kvm_t *kd = NULL;
-+  char errbuf[_POSIX2_LINE_MAX];
-+  char **retvalargs;
-+#define MAXTOKENS 2
-+  char *tokens[MAXTOKENS];
-+  static char retval[PATH_MAX];
-+  int cnt;
-+  size_t len;
-+  struct stat sb;
-+  pid_t cpid = getpid();
-+
-+  int mib[] = { CTL_KERN, KERN_PROC_ARGS, cpid, KERN_PROC_ARGV };
-+
-+  if (sysctl(mib, 4, NULL, &len, NULL, 0) != -1) {
-+    retvalargs = static_cast<char**>(malloc(len));
-+    if (!retvalargs)
-+      goto out;
-+
-+    if (sysctl(mib, 4, retvalargs, &len, NULL, 0) < 0)
-+      goto out;
-+
-+    char *cr = strdup(retvalargs[0]);
-+    free(retvalargs);
-+
-+    *tokens = strtok(cr, ":");
-+    if (tokens[0] == NULL)
-+      goto out;
-+
-+    if (realpath(tokens[0], retval) == NULL)
-+      goto out;
-+
-+    if (stat(retval, &sb) < 0)
-+      goto out;
-+
-+    if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL)
-+      goto out;
-+
-+    if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, cpid,
-+                              sizeof(struct kinfo_file), &cnt)) == NULL) {
-+      kvm_close(kd); 
-+      goto out;
-+    }
-+
-+    for (int i = 0; i < cnt; i++) {
-+      if (files[i].fd_fd == KERN_FILE_TEXT &&
-+          files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) &&
-+          files[i].va_fileid == sb.st_ino) {
-+        kvm_close(kd);
-+        return base::FilePath(retval);
-+      }
-+    }
-+  }
-+
-+out:
-+  return base::FilePath();
-+}
-+
- #elif defined(OS_ZOS)
- 
- base::FilePath GetExePath() {
diff --git a/chromium-next/patches/patch-tools_grit_grit_node_base.py b/chromium-next/patches/patch-tools_grit_grit_node_base.py
deleted file mode 100644
index 8dcccc2dda..0000000000
--- a/chromium-next/patches/patch-tools_grit_grit_node_base.py
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/grit/grit/node/base.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/grit/grit/node/base.py
-@@ -496,7 +496,8 @@ class Node:
-         value = defs
- 
-       elif name == 'is_linux':
--        value = target_platform == 'linux'
-+        value = (target_platform == 'linux'
-+                 or 'bsd' in target_platform)
-       elif name == 'is_chromeos':
-         value = target_platform == 'chromeos'
-       elif name == 'is_macosx':
diff --git a/chromium-next/patches/patch-tools_json__schema__compiler_cpp__bundle__generator.py b/chromium-next/patches/patch-tools_json__schema__compiler_cpp__bundle__generator.py
deleted file mode 100644
index ba86fb5bba..0000000000
--- a/chromium-next/patches/patch-tools_json__schema__compiler_cpp__bundle__generator.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/json_schema_compiler/cpp_bundle_generator.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/json_schema_compiler/cpp_bundle_generator.py
-@@ -140,7 +140,7 @@ class CppBundleGenerator(object):
-       elif platform == Platforms.FUCHSIA:
-         ifdefs.append('BUILDFLAG(IS_FUCHSIA)')
-       elif platform == Platforms.LINUX:
--        ifdefs.append('BUILDFLAG(IS_LINUX)')
-+        ifdefs.append('BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)')
-       elif platform == Platforms.MAC:
-         ifdefs.append('BUILDFLAG(IS_MAC)')
-       elif platform == Platforms.WIN:
diff --git a/chromium-next/patches/patch-tools_json__schema__compiler_feature__compiler.py b/chromium-next/patches/patch-tools_json__schema__compiler_feature__compiler.py
deleted file mode 100644
index 83247ad4fa..0000000000
--- a/chromium-next/patches/patch-tools_json__schema__compiler_feature__compiler.py
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/json_schema_compiler/feature_compiler.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/json_schema_compiler/feature_compiler.py
-@@ -289,6 +289,9 @@ FEATURE_GRAMMAR = ({
-                 'linux': 'Feature::LINUX_PLATFORM',
-                 'mac': 'Feature::MACOSX_PLATFORM',
-                 'win': 'Feature::WIN_PLATFORM',
-+                'openbsd': 'Feature::LINUX_PLATFORM',
-+                'freebsd': 'Feature::LINUX_PLATFORM',
-+                'netbsd': 'Feature::LINUX_PLATFORM',
-             }
-         }
-     },
diff --git a/chromium-next/patches/patch-tools_memory_partition__allocator_inspect__utils.h b/chromium-next/patches/patch-tools_memory_partition__allocator_inspect__utils.h
deleted file mode 100644
index d25b351085..0000000000
--- a/chromium-next/patches/patch-tools_memory_partition__allocator_inspect__utils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/memory/partition_allocator/inspect_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/memory/partition_allocator/inspect_utils.h
-@@ -61,7 +61,7 @@ class RemoteProcessMemoryReader {
-   const pid_t pid_;
-   bool is_valid_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::ScopedFD mem_fd_;
- #elif BUILDFLAG(IS_MAC)
-   task_t task_;
diff --git a/chromium-next/patches/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/chromium-next/patches/patch-tools_perf_chrome__telemetry__build_BUILD.gn
deleted file mode 100644
index c0554ae646..0000000000
--- a/chromium-next/patches/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -56,7 +56,7 @@ group("telemetry_chrome_test") {
-     data_deps += [ "//chrome:reorder_imports" ]
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     data_deps += [ "//third_party/breakpad:dump_syms" ]
- 
-     # CrOS currently has issues with the locally compiled version of
-@@ -210,7 +210,7 @@ group("telemetry_chrome_test_without_chr
-   ]
- 
-   # Cr-Fuchsia doesn't support breakpad.
--  if (!is_win && !is_fuchsia) {
-+  if (!is_win && !is_fuchsia && !is_bsd) {
-     data_deps += [
-       # This is defined for Windows, but is unused by Telemetry on
-       # Windows, and including it can have issues when cross-compiling
diff --git a/chromium-next/patches/patch-tools_protoc__wrapper_protoc__wrapper.py b/chromium-next/patches/patch-tools_protoc__wrapper_protoc__wrapper.py
deleted file mode 100644
index 6a3c1fa758..0000000000
--- a/chromium-next/patches/patch-tools_protoc__wrapper_protoc__wrapper.py
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/protoc_wrapper/protoc_wrapper.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/protoc_wrapper/protoc_wrapper.py
-@@ -183,15 +183,19 @@ def main(argv):
-     if not options.exclude_imports:
-       protoc_cmd += ["--include_imports"]
- 
-+  nenv = os.environ.copy()
-+#  nenv["PATH"] = "${WRKOBJDIR}/bin:" + nenv["PATH"]
-+  nenv["LD_LIBRARY_PATH"] = "@WRKSRC@/out/Release"
-+
-   dependency_file_data = None
-   if options.descriptor_set_out and options.descriptor_set_dependency_file:
-     protoc_cmd += ['--dependency_out', options.descriptor_set_dependency_file]
--    ret = subprocess.call(protoc_cmd)
-+    ret = subprocess.call(protoc_cmd, env=nenv)
- 
-     with open(options.descriptor_set_dependency_file, 'rb') as f:
-       dependency_file_data = f.read().decode('utf-8')
- 
--  ret = subprocess.call(protoc_cmd)
-+  ret = subprocess.call(protoc_cmd, env=nenv)
-   if ret != 0:
-     if ret <= -100:
-       # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to
diff --git a/chromium-next/patches/patch-tools_v8__context__snapshot_BUILD.gn b/chromium-next/patches/patch-tools_v8__context__snapshot_BUILD.gn
deleted file mode 100644
index ad556327a5..0000000000
--- a/chromium-next/patches/patch-tools_v8__context__snapshot_BUILD.gn
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/v8_context_snapshot/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/v8_context_snapshot/BUILD.gn
-@@ -36,6 +36,24 @@ buildflag_header("buildflags") {
-   ]
- }
- 
-+action("run_paxctl_v8_context_snapshot_generator") {
-+  deps = [ ":v8_context_snapshot_generator($v8_snapshot_toolchain)" ]
-+
-+  script = "//v8/tools/run-paxctl.py"
-+  stamp = "$target_gen_dir/paxctl_stamp"
-+  outputs = [ stamp ]
-+
-+  sources = []
-+  data = []
-+
-+  args = [
-+    rebase_path(stamp, root_build_dir),
-+    "/usr/sbin/paxctl", "+m",
-+    "./" + rebase_path(get_label_info(":v8_context_snapshot_generator", "root_out_dir") + "/v8_context_snapshot_generator",
-+    root_build_dir),
-+  ]
-+}
-+
- if (use_v8_context_snapshot) {
-   action("generate_v8_context_snapshot") {
-     script = "//build/gn_run_binary.py"
-@@ -63,6 +81,9 @@ if (use_v8_context_snapshot) {
-       ":v8_context_snapshot_generator($v8_snapshot_toolchain)",
-       "//v8:run_mksnapshot_default",
-     ]
-+      if (target_os == "netbsd") {
-+        deps += [ ":run_paxctl_v8_context_snapshot_generator" ]
-+      }
- 
-     # TODO(sky): figure out why this doesn't work on android cross compile.
-     # In the case of compiling for the snapshot `shlib_extension` is ".so"
diff --git a/chromium-next/patches/patch-tools_variations_fieldtrial__to__struct.py b/chromium-next/patches/patch-tools_variations_fieldtrial__to__struct.py
deleted file mode 100644
index 113679c8ab..0000000000
--- a/chromium-next/patches/patch-tools_variations_fieldtrial__to__struct.py
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- tools/variations/fieldtrial_to_struct.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ tools/variations/fieldtrial_to_struct.py
-@@ -41,6 +41,9 @@ _platforms = [
-     'linux',
-     'mac',
-     'windows',
-+    'openbsd',
-+    'freebsd',
-+    'netbsd',
- ]
- 
- _form_factors = [
diff --git a/chromium-next/patches/patch-ui_accessibility_accessibility__features.cc b/chromium-next/patches/patch-ui_accessibility_accessibility__features.cc
deleted file mode 100644
index 2f74016209..0000000000
--- a/chromium-next/patches/patch-ui_accessibility_accessibility__features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/accessibility/accessibility_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/accessibility/accessibility_features.cc
-@@ -472,7 +472,7 @@ bool IsBlockRootWindowAccessibleNameChan
- }
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kWasmTtsComponentUpdaterEnabled,
-              "WasmTtsComponentUpdaterEnabled",
-              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium-next/patches/patch-ui_accessibility_accessibility__features.h b/chromium-next/patches/patch-ui_accessibility_accessibility__features.h
deleted file mode 100644
index 05ddedd85c..0000000000
--- a/chromium-next/patches/patch-ui_accessibility_accessibility__features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/accessibility/accessibility_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/accessibility/accessibility_features.h
-@@ -324,7 +324,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlo
- AX_BASE_EXPORT bool IsBlockRootWindowAccessibleNameChangeEventEnabled();
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Enable the component updater to download the wasm tts engine component.
- AX_BASE_EXPORT BASE_DECLARE_FEATURE(kWasmTtsComponentUpdaterEnabled);
- AX_BASE_EXPORT bool IsWasmTtsComponentUpdaterEnabled();
diff --git a/chromium-next/patches/patch-ui_accessibility_ax__node.cc b/chromium-next/patches/patch-ui_accessibility_ax__node.cc
deleted file mode 100644
index 99303208e0..0000000000
--- a/chromium-next/patches/patch-ui_accessibility_ax__node.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/accessibility/ax_node.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/accessibility/ax_node.cc
-@@ -1553,7 +1553,7 @@ AXNode::GetExtraMacNodes() const {
-   return &table_info->extra_mac_nodes;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- AXNode* AXNode::GetExtraAnnouncementNode(
-     ax::mojom::AriaNotificationPriority priority_property) const {
-   if (!tree_->extra_announcement_nodes()) {
-@@ -1581,7 +1581,7 @@ bool AXNode::IsGenerated() const {
-       GetRole() == ax::mojom::Role::kColumn ||
-       GetRole() == ax::mojom::Role::kTableHeaderContainer;
-   DCHECK_EQ(is_generated_node, is_extra_mac_node_role);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   //  On Linux, generated nodes are always children of the root.
-   if (GetParent() && GetParent()->GetManager()) {
-     DCHECK(GetParent()->GetManager()->IsRoot());
diff --git a/chromium-next/patches/patch-ui_accessibility_ax__node.h b/chromium-next/patches/patch-ui_accessibility_ax__node.h
deleted file mode 100644
index be590bf52e..0000000000
--- a/chromium-next/patches/patch-ui_accessibility_ax__node.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/accessibility/ax_node.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/accessibility/ax_node.h
-@@ -587,7 +587,7 @@ class AX_EXPORT AXNode final {
-   const std::vector<raw_ptr<AXNode, VectorExperimental>>* GetExtraMacNodes()
-       const;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   AXNode* GetExtraAnnouncementNode(
-       ax::mojom::AriaNotificationPriority priority_property) const;
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-ui_accessibility_ax__tree.cc b/chromium-next/patches/patch-ui_accessibility_ax__tree.cc
deleted file mode 100644
index 00c0a220c6..0000000000
--- a/chromium-next/patches/patch-ui_accessibility_ax__tree.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/accessibility/ax_tree.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/accessibility/ax_tree.cc
-@@ -824,7 +824,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged
-   return old_node_is_ignored != new_node_is_ignored;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- ExtraAnnouncementNodes::ExtraAnnouncementNodes(AXNode* root) {
-   assertive_node_ = CreateNode("assertive", root);
-   polite_node_ = CreateNode("polite", root);
-@@ -917,7 +917,7 @@ AXNode* AXTree::GetFromId(AXNodeID id) c
- 
- void AXTree::Destroy() {
-   base::ElapsedThreadTimer timer;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ClearExtraAnnouncementNodes();
- #endif  // BUILDFLAG(IS_LINUX)
- 
-@@ -2104,7 +2104,7 @@ void AXTree::NotifyNodeAttributesWillCha
-                     new_data);
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void AXTree::ClearExtraAnnouncementNodes() {
-   if (!extra_announcement_nodes_) {
-     return;
-@@ -2493,7 +2493,7 @@ bool AXTree::CreateNewChildVector(
-     AXTreeUpdateState* update_state) {
-   DCHECK(GetTreeUpdateInProgressState());
-   bool success = true;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // If the root node has children added, clear the extra announcement nodes,
-   // which should always have their indices as the last two children of the root
-   // node. They will be recreated if needed, and given the correct indices.
diff --git a/chromium-next/patches/patch-ui_accessibility_ax__tree.h b/chromium-next/patches/patch-ui_accessibility_ax__tree.h
deleted file mode 100644
index 8f672244f8..0000000000
--- a/chromium-next/patches/patch-ui_accessibility_ax__tree.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/accessibility/ax_tree.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/accessibility/ax_tree.h
-@@ -62,7 +62,7 @@ enum class AXTreeUnserializeError {
- };
- // LINT.ThenChange(/tools/metrics/histograms/metadata/accessibility/enums.xml:AccessibilityTreeUnserializeError)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // To support AriaNotify on older versions of ATK, we need to use the ATK
- // signal "Text::text-insert". This signal requires a node that is a
- // text type, and it needs to have aria-live properties set in order for
-@@ -287,7 +287,7 @@ class AX_EXPORT AXTree {
- 
-   void NotifyChildTreeConnectionChanged(AXNode* node, AXTree* child_tree);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void ClearExtraAnnouncementNodes();
-   void CreateExtraAnnouncementNodes();
-   ExtraAnnouncementNodes* extra_announcement_nodes() const {
-@@ -544,7 +544,7 @@ class AX_EXPORT AXTree {
- 
-   std::unique_ptr<AXEvent> event_data_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<ExtraAnnouncementNodes> extra_announcement_nodes_ = nullptr;
- #endif  // BUILDFLAG(IS_LINUX)
- };
diff --git a/chromium-next/patches/patch-ui_aura_client_drag__drop__client.h b/chromium-next/patches/patch-ui_aura_client_drag__drop__client.h
deleted file mode 100644
index fcb5063dd5..0000000000
--- a/chromium-next/patches/patch-ui_aura_client_drag__drop__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/aura/client/drag_drop_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/aura/client/drag_drop_client.h
-@@ -44,7 +44,7 @@ class AURA_EXPORT DragDropClient {
-       int allowed_operations,
-       ui::mojom::DragEventSource source) = 0;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Updates the drag image. An empty |image| may be used to hide a previously
-   // set non-empty drag image, and a non-empty |image| shows the drag image
-   // again if it was previously hidden.
diff --git a/chromium-next/patches/patch-ui_aura_screen__ozone.cc b/chromium-next/patches/patch-ui_aura_screen__ozone.cc
deleted file mode 100644
index 6276d06ca8..0000000000
--- a/chromium-next/patches/patch-ui_aura_screen__ozone.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/aura/screen_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/aura/screen_ozone.cc
-@@ -107,7 +107,7 @@ display::Display ScreenOzone::GetPrimary
-   return platform_screen_->GetPrimaryDisplay();
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- ScreenOzone::ScreenSaverSuspenderOzone::ScreenSaverSuspenderOzone(
-     std::unique_ptr<ui::PlatformScreen::PlatformScreenSaverSuspender> suspender)
-     : suspender_(std::move(suspender)) {}
diff --git a/chromium-next/patches/patch-ui_aura_screen__ozone.h b/chromium-next/patches/patch-ui_aura_screen__ozone.h
deleted file mode 100644
index 4128838dfd..0000000000
--- a/chromium-next/patches/patch-ui_aura_screen__ozone.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/aura/screen_ozone.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/aura/screen_ozone.h
-@@ -44,7 +44,7 @@ class AURA_EXPORT ScreenOzone : public d
-   display::Display GetDisplayMatching(
-       const gfx::Rect& match_rect) const override;
-   display::Display GetPrimaryDisplay() const override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver()
-       override;
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -68,7 +68,7 @@ class AURA_EXPORT ScreenOzone : public d
-   ui::PlatformScreen* platform_screen() { return platform_screen_.get(); }
- 
-  private:
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   class ScreenSaverSuspenderOzone
-       : public display::Screen::ScreenSaverSuspender {
-    public:
diff --git a/chromium-next/patches/patch-ui_base_accelerators_accelerator.cc b/chromium-next/patches/patch-ui_base_accelerators_accelerator.cc
deleted file mode 100644
index 1b163020ac..0000000000
--- a/chromium-next/patches/patch-ui_base_accelerators_accelerator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/accelerators/accelerator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/accelerators/accelerator.cc
-@@ -336,7 +336,7 @@ std::u16string Accelerator::ApplyLongFor
-     result = ApplyModifierToAcceleratorString(result, IDS_APP_SEARCH_KEY);
- #elif BUILDFLAG(IS_WIN)
-     result = ApplyModifierToAcceleratorString(result, IDS_APP_WINDOWS_KEY);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     result = ApplyModifierToAcceleratorString(result, IDS_APP_SUPER_KEY);
- #else
-     NOTREACHED();
diff --git a/chromium-next/patches/patch-ui_base_accelerators_command.cc b/chromium-next/patches/patch-ui_base_accelerators_command.cc
deleted file mode 100644
index 7383453aa7..0000000000
--- a/chromium-next/patches/patch-ui_base_accelerators_command.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/accelerators/command.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/accelerators/command.cc
-@@ -81,7 +81,7 @@ std::string Command::CommandPlatform() {
-   return ui::kKeybindingPlatformMac;
- #elif BUILDFLAG(IS_CHROMEOS)
-   return ui::kKeybindingPlatformChromeOs;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return ui::kKeybindingPlatformLinux;
- #elif BUILDFLAG(IS_FUCHSIA)
-   // TODO(crbug.com/40220501): Change this once we decide what string should be
diff --git a/chromium-next/patches/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc b/chromium-next/patches/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc
deleted file mode 100644
index 6d3093c82e..0000000000
--- a/chromium-next/patches/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc
-@@ -12,7 +12,7 @@
- #include "ui/base/accelerators/accelerator.h"
- #include "ui/ozone/public/ozone_platform.h"
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS)
- #include "base/feature_list.h"
- #include "ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_linux.h"
- #endif
-@@ -20,7 +20,7 @@
- using content::BrowserThread;
- 
- namespace {
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS)
- BASE_FEATURE(kGlobalShortcutsPortal,
-              "GlobalShortcutsPortal",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -38,7 +38,7 @@ GlobalAcceleratorListener* GlobalAcceler
-     return instance->get();
-   }
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS)
-   if (base::FeatureList::IsEnabled(kGlobalShortcutsPortal)) {
-     static GlobalAcceleratorListenerLinux* const linux_instance =
-         new GlobalAcceleratorListenerLinux(nullptr);
diff --git a/chromium-next/patches/patch-ui_base_clipboard_clipboard__constants.cc b/chromium-next/patches/patch-ui_base_clipboard_clipboard__constants.cc
deleted file mode 100644
index bffe1f0f75..0000000000
--- a/chromium-next/patches/patch-ui_base_clipboard_clipboard__constants.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/clipboard/clipboard_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/clipboard/clipboard_constants.cc
-@@ -25,7 +25,7 @@ const char kMimeTypeOctetStream[] = "app
- // Used for window dragging on some platforms.
- const char kMimeTypeWindowDrag[] = "chromium/x-window-drag";
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- const char kMimeTypeLinuxUtf8String[] = "UTF8_STRING";
- const char kMimeTypeLinuxString[] = "STRING";
- const char kMimeTypeLinuxText[] = "TEXT";
-@@ -33,7 +33,7 @@ const char kMimeTypeLinuxText[] = "TEXT"
-         // BUILDFLAG(IS_FUCHSIA)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- const char kMimeTypeSourceUrl[] = "chromium/x-source-url";
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
-         // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
diff --git a/chromium-next/patches/patch-ui_base_clipboard_clipboard__constants.h b/chromium-next/patches/patch-ui_base_clipboard_clipboard__constants.h
deleted file mode 100644
index b4a87bdbaa..0000000000
--- a/chromium-next/patches/patch-ui_base_clipboard_clipboard__constants.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/clipboard/clipboard_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/clipboard/clipboard_constants.h
-@@ -41,7 +41,7 @@ extern const char kMimeTypeWindowDrag[];
- 
- // ----- LINUX & CHROMEOS & FUCHSIA MIME TYPES -----
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
- extern const char kMimeTypeLinuxUtf8String[];
- COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
-@@ -53,7 +53,7 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES
-         // BUILDFLAG(IS_FUCHSIA)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- extern const char kMimeTypeSourceUrl[];
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
-         // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
diff --git a/chromium-next/patches/patch-ui_base_clipboard_clipboard__non__backed.cc b/chromium-next/patches/patch-ui_base_clipboard_clipboard__non__backed.cc
deleted file mode 100644
index ced43b6b03..0000000000
--- a/chromium-next/patches/patch-ui_base_clipboard_clipboard__non__backed.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/clipboard/clipboard_non_backed.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/clipboard/clipboard_non_backed.cc
-@@ -461,7 +461,7 @@ ClipboardNonBacked::ClipboardNonBacked()
-   // so create internal clipboards for platform supported clipboard buffers.
-   constexpr ClipboardBuffer kClipboardBuffers[] = {
-     ClipboardBuffer::kCopyPaste,
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     ClipboardBuffer::kSelection,
- #endif
- #if BUILDFLAG(IS_MAC)
diff --git a/chromium-next/patches/patch-ui_base_cursor_cursor__factory.cc b/chromium-next/patches/patch-ui_base_cursor_cursor__factory.cc
deleted file mode 100644
index 005cc634aa..0000000000
--- a/chromium-next/patches/patch-ui_base_cursor_cursor__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/cursor/cursor_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/cursor/cursor_factory.cc
-@@ -96,7 +96,7 @@ void CursorFactory::ObserveThemeChanges(
-   NOTIMPLEMENTED();
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
- // Returns a cursor name compatible with either X11 or the FreeDesktop.org
- // cursor spec ([1] and [2]), followed by fallbacks that can work as
diff --git a/chromium-next/patches/patch-ui_base_cursor_cursor__factory.h b/chromium-next/patches/patch-ui_base_cursor_cursor__factory.h
deleted file mode 100644
index 953c62718a..0000000000
--- a/chromium-next/patches/patch-ui_base_cursor_cursor__factory.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/cursor/cursor_factory.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/cursor/cursor_factory.h
-@@ -93,7 +93,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) C
-   base::ObserverList<CursorFactoryObserver>::Unchecked observers_;
- };
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(UI_BASE_CURSOR)
- std::vector<std::string> CursorNamesFromType(mojom::CursorType type);
- #endif
diff --git a/chromium-next/patches/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/chromium-next/patches/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
deleted file mode 100644
index 224cd30ffb..0000000000
--- a/chromium-next/patches/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/dragdrop/os_exchange_data_provider_factory.cc
-@@ -7,7 +7,7 @@
- #include "base/notreached.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- #include "ui/base/dragdrop/os_exchange_data_provider_factory_ozone.h"
- #include "ui/base/dragdrop/os_exchange_data_provider_non_backed.h"
- #elif BUILDFLAG(IS_APPLE)
-@@ -21,7 +21,7 @@ namespace ui {
- // static
- std::unique_ptr<OSExchangeDataProvider>
- OSExchangeDataProviderFactory::CreateProvider() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // The instance can be nullptr in tests that do not instantiate the platform,
-   // or on platforms that do not implement specific drag'n'drop.  For them,
-   // falling back to the Aura provider should be fine.
diff --git a/chromium-next/patches/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/chromium-next/patches/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
deleted file mode 100644
index 584b324ff4..0000000000
--- a/chromium-next/patches/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc
-@@ -101,7 +101,7 @@ void OSExchangeDataProviderNonBacked::Se
- 
- std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString()
-     const {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (HasFile()) {
-     // Various Linux file managers both pass a list of file:// URIs and set the
-     // string representation to the URI. We explicitly don't want to return use
diff --git a/chromium-next/patches/patch-ui_base_ime_dummy__text__input__client.cc b/chromium-next/patches/patch-ui_base_ime_dummy__text__input__client.cc
deleted file mode 100644
index c4b325bf31..0000000000
--- a/chromium-next/patches/patch-ui_base_ime_dummy__text__input__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ime/dummy_text_input_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ime/dummy_text_input_client.cc
-@@ -175,7 +175,7 @@ bool DummyTextInputClient::ShouldDoLearn
-   return false;
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- bool DummyTextInputClient::SetCompositionFromExistingText(
-     const gfx::Range& range,
-     const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
diff --git a/chromium-next/patches/patch-ui_base_ime_dummy__text__input__client.h b/chromium-next/patches/patch-ui_base_ime_dummy__text__input__client.h
deleted file mode 100644
index 722fd2699c..0000000000
--- a/chromium-next/patches/patch-ui_base_ime_dummy__text__input__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ime/dummy_text_input_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ime/dummy_text_input_client.h
-@@ -73,7 +73,7 @@ class DummyTextInputClient : public Text
-   ukm::SourceId GetClientSourceForMetrics() const override;
-   bool ShouldDoLearning() override;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool SetCompositionFromExistingText(
-       const gfx::Range& range,
-       const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override;
diff --git a/chromium-next/patches/patch-ui_base_ime_fake__text__input__client.cc b/chromium-next/patches/patch-ui_base_ime_fake__text__input__client.cc
deleted file mode 100644
index c797b3f884..0000000000
--- a/chromium-next/patches/patch-ui_base_ime_fake__text__input__client.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ime/fake_text_input_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ime/fake_text_input_client.cc
-@@ -227,7 +227,7 @@ bool FakeTextInputClient::ShouldDoLearni
-   return should_do_learning_;
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- bool FakeTextInputClient::SetCompositionFromExistingText(
-     const gfx::Range& range,
-     const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
diff --git a/chromium-next/patches/patch-ui_base_ime_fake__text__input__client.h b/chromium-next/patches/patch-ui_base_ime_fake__text__input__client.h
deleted file mode 100644
index 064f51a639..0000000000
--- a/chromium-next/patches/patch-ui_base_ime_fake__text__input__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ime/fake_text_input_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ime/fake_text_input_client.h
-@@ -107,7 +107,7 @@ class FakeTextInputClient : public TextI
-   void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override;
-   ukm::SourceId GetClientSourceForMetrics() const override;
-   bool ShouldDoLearning() override;
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool SetCompositionFromExistingText(
-       const gfx::Range& range,
-       const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override;
diff --git a/chromium-next/patches/patch-ui_base_ime_init_input__method__initializer.cc b/chromium-next/patches/patch-ui_base_ime_init_input__method__initializer.cc
deleted file mode 100644
index ec7d1eb7cb..0000000000
--- a/chromium-next/patches/patch-ui_base_ime_init_input__method__initializer.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ime/init/input_method_initializer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ime/init/input_method_initializer.cc
-@@ -9,7 +9,7 @@
- #include "base/trace_event/trace_event.h"
- #include "build/build_config.h"
- 
--#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
- #include "ui/base/ime/linux/fake_input_method_context.h"
- #include "ui/base/ime/linux/linux_input_method_context_factory.h"
- #elif BUILDFLAG(IS_WIN)
-@@ -33,7 +33,7 @@ void ShutdownInputMethod() {
- }
- 
- void InitializeInputMethodForTesting() {
--#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-   GetInputMethodContextFactoryForTest() =
-       base::BindRepeating([](LinuxInputMethodContextDelegate* delegate)
-                               -> std::unique_ptr<LinuxInputMethodContext> {
-@@ -45,7 +45,7 @@ void InitializeInputMethodForTesting() {
- }
- 
- void ShutdownInputMethodForTesting() {
--#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
-   // The function owns the factory (as a static variable that's returned by
-   // reference), so setting this to an empty factory will free the old one.
-   GetInputMethodContextFactoryForTest() = LinuxInputMethodContextFactory();
diff --git a/chromium-next/patches/patch-ui_base_ime_linux_linux__input__method__context__factory.cc b/chromium-next/patches/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
deleted file mode 100644
index 56a6a541e3..0000000000
--- a/chromium-next/patches/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ime/linux/linux_input_method_context_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ime/linux/linux_input_method_context_factory.cc
-@@ -9,7 +9,7 @@
- #include "build/build_config.h"
- #include "ui/base/ime/linux/fake_input_method_context.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #include "ui/linux/linux_ui_delegate.h"
- #endif
-@@ -32,7 +32,7 @@ std::unique_ptr<LinuxInputMethodContext>
-   if (auto factory = GetInputMethodContextFactoryForTest())
-     return factory.Run(delegate);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Give the toolkit a chance to create the context.
-   if (auto* linux_ui = LinuxUi::instance()) {
-     if (auto context = linux_ui->CreateInputMethodContext(delegate))
diff --git a/chromium-next/patches/patch-ui_base_ime_text__input__client.h b/chromium-next/patches/patch-ui_base_ime_text__input__client.h
deleted file mode 100644
index c31de2ec8e..0000000000
--- a/chromium-next/patches/patch-ui_base_ime_text__input__client.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ime/text_input_client.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ime/text_input_client.h
-@@ -337,7 +337,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) Text
-   // fields that are considered 'private' (e.g. in incognito tabs).
-   virtual bool ShouldDoLearning() = 0;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Start composition over a given UTF-16 code range from existing text. This
-   // should only be used for composition scenario when IME wants to start
-   // composition on existing text. Returns whether the operation was successful.
diff --git a/chromium-next/patches/patch-ui_base_resource_resource__bundle.cc b/chromium-next/patches/patch-ui_base_resource_resource__bundle.cc
deleted file mode 100644
index cac0648e7d..0000000000
--- a/chromium-next/patches/patch-ui_base_resource_resource__bundle.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/resource/resource_bundle.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/resource/resource_bundle.cc
-@@ -929,7 +929,7 @@ void ResourceBundle::ReloadFonts() {
- }
- 
- ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return max_scale_factor_;
- #else
-   return GetMaxSupportedResourceScaleFactor();
diff --git a/chromium-next/patches/patch-ui_base_test_skia__gold__pixel__diff.cc b/chromium-next/patches/patch-ui_base_test_skia__gold__pixel__diff.cc
deleted file mode 100644
index 4ff9228dbf..0000000000
--- a/chromium-next/patches/patch-ui_base_test_skia__gold__pixel__diff.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/test/skia_gold_pixel_diff.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/test/skia_gold_pixel_diff.cc
-@@ -117,7 +117,7 @@ const char* GetPlatformName() {
-   return "windows";
- #elif BUILDFLAG(IS_APPLE)
-   return "macOS";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "linux";
- #elif BUILDFLAG(IS_CHROMEOS)
-   return "ash";
diff --git a/chromium-next/patches/patch-ui_base_test_ui__controls.h b/chromium-next/patches/patch-ui_base_test_ui__controls.h
deleted file mode 100644
index 6891890b93..0000000000
--- a/chromium-next/patches/patch-ui_base_test_ui__controls.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/test/ui_controls.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/test/ui_controls.h
-@@ -191,7 +191,7 @@ bool SendTouchEventsNotifyWhenDone(int a
-                                    base::OnceClosure task);
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Forces the platform implementation to use screen coordinates, even if they're
- // not really available, the next time that ui_controls::SendMouseMove() or
- // ui_controls::SendMouseMoveNotifyWhenDone() is called, or some other method
diff --git a/chromium-next/patches/patch-ui_base_ui__base__features.cc b/chromium-next/patches/patch-ui_base_ui__base__features.cc
deleted file mode 100644
index ecf49bddab..0000000000
--- a/chromium-next/patches/patch-ui_base_ui__base__features.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ui_base_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ui_base_features.cc
-@@ -119,7 +119,7 @@ BASE_FEATURE(kWaylandLinuxDrmSyncobj,
- // Controls whether support for Wayland's per-surface scaling is enabled.
- BASE_FEATURE(kWaylandPerSurfaceScale,
-              "WaylandPerSurfaceScale",
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -143,7 +143,7 @@ BASE_FEATURE(kWaylandSessionManagement,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_OZONE)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // If this feature is enabled, users not specify --ozone-platform-hint switch
- // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220.
- COMPONENT_EXPORT(UI_BASE_FEATURES)
-@@ -225,7 +225,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists
- // native apps on Windows.
- BASE_FEATURE(kExperimentalFlingAnimation,
-              "ExperimentalFlingAnimation",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -301,7 +301,7 @@ bool IsForcedColorsEnabled() {
- BASE_FEATURE(kEyeDropper,
-              "EyeDropper",
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium-next/patches/patch-ui_base_ui__base__features.h b/chromium-next/patches/patch-ui_base_ui__base__features.h
deleted file mode 100644
index a0bc3e6aa4..0000000000
--- a/chromium-next/patches/patch-ui_base_ui__base__features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ui_base_features.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ui_base_features.h
-@@ -126,7 +126,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
- BASE_DECLARE_FEATURE(kWaylandSessionManagement);
- #endif  // BUILDFLAG(IS_OZONE)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(UI_BASE_FEATURES)
- BASE_DECLARE_FEATURE(kOverrideDefaultOzonePlatformHintToAuto);
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium-next/patches/patch-ui_base_ui__base__switches.cc b/chromium-next/patches/patch-ui_base_ui__base__switches.cc
deleted file mode 100644
index 3628ac5059..0000000000
--- a/chromium-next/patches/patch-ui_base_ui__base__switches.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ui_base_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ui_base_switches.cc
-@@ -24,13 +24,13 @@ const char kDisableModalAnimations[] = "
- const char kShowMacOverlayBorders[] = "show-mac-overlay-borders";
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Specifies system font family name. Improves determenism when rendering
- // pages in headless mode.
- const char kSystemFontFamily[] = "system-font-family";
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Specify the toolkit used to construct the Linux GUI.
- const char kUiToolkitFlag[] = "ui-toolkit";
- // Disables GTK IME integration.
diff --git a/chromium-next/patches/patch-ui_base_ui__base__switches.h b/chromium-next/patches/patch-ui_base_ui__base__switches.h
deleted file mode 100644
index e4bc8a36aa..0000000000
--- a/chromium-next/patches/patch-ui_base_ui__base__switches.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/ui_base_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/ui_base_switches.h
-@@ -22,11 +22,11 @@ COMPONENT_EXPORT(UI_BASE) extern const c
- COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOverlayBorders[];
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(UI_BASE) extern const char kSystemFontFamily[];
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(UI_BASE) extern const char kUiToolkitFlag[];
- COMPONENT_EXPORT(UI_BASE) extern const char kDisableGtkIme[];
- #endif
diff --git a/chromium-next/patches/patch-ui_base_webui_web__ui__util.cc b/chromium-next/patches/patch-ui_base_webui_web__ui__util.cc
deleted file mode 100644
index c6da283b4d..0000000000
--- a/chromium-next/patches/patch-ui_base_webui_web__ui__util.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/webui/web_ui_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/webui/web_ui_util.cc
-@@ -46,7 +46,7 @@ namespace {
- constexpr float kMaxScaleFactor = 1000.0f;
- 
- std::string GetFontFamilyMd() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "Roboto, " + GetFontFamily();
- #else
-   return GetFontFamily();
-@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::str
- std::string GetFontFamily() {
-   std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::string font_name = ui::ResourceBundle::GetSharedInstance()
-                               .GetFont(ui::ResourceBundle::BaseFont)
-                               .GetFontName();
diff --git a/chromium-next/patches/patch-ui_base_x_x11__cursor__factory.cc b/chromium-next/patches/patch-ui_base_x_x11__cursor__factory.cc
deleted file mode 100644
index 1f53732e8e..0000000000
--- a/chromium-next/patches/patch-ui_base_x_x11__cursor__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/x/x11_cursor_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/x/x11_cursor_factory.cc
-@@ -13,7 +13,7 @@
- #include "ui/gfx/geometry/point.h"
- #include "ui/gfx/x/connection.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
-@@ -70,7 +70,7 @@ scoped_refptr<PlatformCursor> X11CursorF
- }
- 
- void X11CursorFactory::ObserveThemeChanges() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* linux_ui = LinuxUi::instance();
-   DCHECK(linux_ui);
-   cursor_theme_observation_.Observe(linux_ui);
diff --git a/chromium-next/patches/patch-ui_base_x_x11__cursor__factory.h b/chromium-next/patches/patch-ui_base_x_x11__cursor__factory.h
deleted file mode 100644
index 2cc6e885c4..0000000000
--- a/chromium-next/patches/patch-ui_base_x_x11__cursor__factory.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/x/x11_cursor_factory.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/x/x11_cursor_factory.h
-@@ -20,7 +20,7 @@ namespace ui {
- class X11Cursor;
- class XCursorLoader;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- class LinuxUi;
- #endif
- 
-@@ -62,7 +62,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11Cur
-   // initializing `cursor_loader_` will modify `default_cursors_`.
-   std::unique_ptr<XCursorLoader> cursor_loader_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::ScopedObservation<LinuxUi, CursorThemeManagerObserver>
-       cursor_theme_observation_{this};
- #endif
diff --git a/chromium-next/patches/patch-ui_base_x_x11__cursor__loader.cc b/chromium-next/patches/patch-ui_base_x_x11__cursor__loader.cc
deleted file mode 100644
index 6bf0bf3211..0000000000
--- a/chromium-next/patches/patch-ui_base_x_x11__cursor__loader.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/x/x11_cursor_loader.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/x/x11_cursor_loader.cc
-@@ -42,7 +42,7 @@
- #include "ui/gfx/x/connection.h"
- #include "ui/gfx/x/xproto.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
-@@ -87,7 +87,11 @@ std::string CursorPathFromLibXcursor() {
-     void operator()(void* ptr) const { dlclose(ptr); }
-   };
- 
-+#if BUILDFLAG(IS_BSD)
-+  std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so", RTLD_LAZY));
-+#else
-   std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so.1", RTLD_LAZY));
-+#endif
-   if (!lib)
-     return "";
- 
-@@ -232,7 +236,7 @@ scoped_refptr<base::RefCountedMemory> Re
-     const std::string& rm_xcursor_theme) {
-   constexpr const char kDefaultTheme[] = "default";
-   std::string themes[] = {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // The toolkit theme has the highest priority.
-     LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName()
-                         : std::string(),
-@@ -422,7 +426,7 @@ uint32_t XCursorLoader::GetPreferredCurs
-     return size;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Let the toolkit have the next say.
-   auto* linux_ui = LinuxUi::instance();
-   size = linux_ui ? linux_ui->GetCursorThemeSize() : 0;
diff --git a/chromium-next/patches/patch-ui_base_x_x11__display__manager.cc b/chromium-next/patches/patch-ui_base_x_x11__display__manager.cc
deleted file mode 100644
index c3d3ca57bd..0000000000
--- a/chromium-next/patches/patch-ui_base_x_x11__display__manager.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/x/x11_display_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/x/x11_display_manager.cc
-@@ -16,7 +16,7 @@
- #include "ui/gfx/x/randr.h"
- #include "ui/gfx/x/xproto.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
-@@ -92,7 +92,7 @@ void XDisplayManager::FetchDisplayList()
-           ? display::Display::GetForcedDeviceScaleFactor()
-           : 1.0f};
-   const auto* display_config = &empty_display_config;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (const auto* linux_ui = ui::LinuxUi::instance()) {
-     display_config = &linux_ui->display_config();
-   }
diff --git a/chromium-next/patches/patch-ui_base_x_x11__shm__image__pool.cc b/chromium-next/patches/patch-ui_base_x_x11__shm__image__pool.cc
deleted file mode 100644
index ab87d433c7..0000000000
--- a/chromium-next/patches/patch-ui_base_x_x11__shm__image__pool.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/base/x/x11_shm_image_pool.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/base/x/x11_shm_image_pool.cc
-@@ -16,6 +16,7 @@
- #include "base/functional/callback.h"
- #include "base/location.h"
- #include "base/strings/string_util.h"
-+#include "base/system/sys_info.h"
- #include "build/build_config.h"
- #include "net/base/url_util.h"
- #include "ui/events/platform/platform_event_dispatcher.h"
-@@ -44,10 +45,14 @@ constexpr float kShmResizeShrinkThreshol
-     1.0f / (kShmResizeThreshold * kShmResizeThreshold);
- 
- std::size_t MaxShmSegmentSizeImpl() {
-+#if BUILDFLAG(IS_BSD)
-+  return base::SysInfo::MaxSharedMemorySize();
-+#else
-   struct shminfo info;
-   if (shmctl(0, IPC_INFO, reinterpret_cast<struct shmid_ds*>(&info)) == -1)
-     return 0;
-   return info.shmmax;
-+#endif
- }
- 
- std::size_t MaxShmSegmentSize() {
-@@ -56,14 +61,19 @@ std::size_t MaxShmSegmentSize() {
- }
- 
- #if !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_BSD)
- bool IsRemoteHost(const std::string& name) {
-   if (name.empty())
-     return false;
- 
-   return !net::HostStringIsLocalhost(name);
- }
-+#endif
- 
- bool ShouldUseMitShm(x11::Connection* connection) {
-+#if BUILDFLAG(IS_BSD)
-+  return false;
-+#else
-   // MIT-SHM may be available on remote connetions, but it will be unusable.  Do
-   // a best-effort check to see if the host is remote to disable the SHM
-   // codepath.  It may be possible in contrived cases for there to be a
-@@ -92,6 +102,7 @@ bool ShouldUseMitShm(x11::Connection* co
-     return false;
- 
-   return true;
-+#endif
- }
- #endif  // !BUILDFLAG(IS_CHROMEOS)
- 
-@@ -182,7 +193,7 @@ bool XShmImagePool::Resize(const gfx::Si
-         shmctl(state.shmid, IPC_RMID, nullptr);
-         return false;
-       }
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // On Linux, a shmid can still be attached after IPC_RMID if otherwise
-       // kept alive.  Detach before XShmAttach to prevent a memory leak in case
-       // the process dies.
-@@ -201,7 +212,7 @@ bool XShmImagePool::Resize(const gfx::Si
-         return false;
-       state.shmseg = shmseg;
-       state.shmem_attached_to_server = true;
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-       // The Linux-specific shmctl behavior above may not be portable, so we're
-       // forced to do IPC_RMID after the server has attached to the segment.
-       shmctl(state.shmid, IPC_RMID, nullptr);
diff --git a/chromium-next/patches/patch-ui_color_color__id.h b/chromium-next/patches/patch-ui_color_color__id.h
deleted file mode 100644
index aeb3821d90..0000000000
--- a/chromium-next/patches/patch-ui_color_color__id.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/color/color_id.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/color/color_id.h
-@@ -624,7 +624,7 @@
-   E_CPONLY(kColorCrosSysPositive) \
-   E_CPONLY(kColorCrosSysComplementVariant) \
-   E_CPONLY(kColorCrosSysInputFieldOnBase)
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define PLATFORM_SPECIFIC_COLOR_IDS \
-   E_CPONLY(kColorNativeButtonBorder)\
-   E_CPONLY(kColorNativeHeaderButtonBorderActive) \
diff --git a/chromium-next/patches/patch-ui_color_color__provider__utils.cc b/chromium-next/patches/patch-ui_color_color__provider__utils.cc
deleted file mode 100644
index 517122c24d..0000000000
--- a/chromium-next/patches/patch-ui_color_color__provider__utils.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/color/color_provider_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/color/color_provider_utils.cc
-@@ -191,7 +191,7 @@ std::string_view SystemThemeName(ui::Sys
-   switch (system_theme) {
-     case ui::SystemTheme::kDefault:
-       return "kDefault";
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case ui::SystemTheme::kGtk:
-       return "kGtk";
-     case ui::SystemTheme::kQt:
diff --git a/chromium-next/patches/patch-ui_color_system__theme.h b/chromium-next/patches/patch-ui_color_system__theme.h
deleted file mode 100644
index a6341c82ba..0000000000
--- a/chromium-next/patches/patch-ui_color_system__theme.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/color/system_theme.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/color/system_theme.h
-@@ -15,7 +15,7 @@ namespace ui {
- enum class SystemTheme {
-   // Classic theme, used in the default or users' chosen theme.
-   kDefault = 0,
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   kGtk = 1,
-   kQt = 2,
-   kMaxValue = kQt,
diff --git a/chromium-next/patches/patch-ui_compositor_compositor.cc b/chromium-next/patches/patch-ui_compositor_compositor.cc
deleted file mode 100644
index 78f20c6913..0000000000
--- a/chromium-next/patches/patch-ui_compositor_compositor.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/compositor/compositor.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/compositor/compositor.cc
-@@ -952,7 +952,7 @@ void Compositor::OnResume() {
-     obs.ResetIfActive();
- }
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
- void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) {
-   observer_list_.Notify(
-       &CompositorObserver::OnCompositingCompleteSwapWithNewSize, this, size);
diff --git a/chromium-next/patches/patch-ui_compositor_compositor.h b/chromium-next/patches/patch-ui_compositor_compositor.h
deleted file mode 100644
index 9c7976b37e..0000000000
--- a/chromium-next/patches/patch-ui_compositor_compositor.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/compositor/compositor.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/compositor/compositor.h
-@@ -463,7 +463,7 @@ class COMPOSITOR_EXPORT Compositor : pub
-   // base::PowerSuspendObserver:
-   void OnResume() override;
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   void OnCompleteSwapWithNewSize(const gfx::Size& size);
- #endif  // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
- 
diff --git a/chromium-next/patches/patch-ui_compositor_compositor__observer.h b/chromium-next/patches/patch-ui_compositor_compositor__observer.h
deleted file mode 100644
index d5154f61c1..0000000000
--- a/chromium-next/patches/patch-ui_compositor_compositor__observer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/compositor/compositor_observer.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/compositor/compositor_observer.h
-@@ -56,7 +56,7 @@ class COMPOSITOR_EXPORT CompositorObserv
-   // Called when a child of the compositor is resizing.
-   virtual void OnCompositingChildResizing(Compositor* compositor) {}
- 
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
-   // Called when a swap with new size is completed.
-   virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor,
-                                                     const gfx::Size& size) {}
diff --git a/chromium-next/patches/patch-ui_display_screen.cc b/chromium-next/patches/patch-ui_display_screen.cc
deleted file mode 100644
index e8b08af3de..0000000000
--- a/chromium-next/patches/patch-ui_display_screen.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/display/screen.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/display/screen.cc
-@@ -86,7 +86,7 @@ void Screen::SetDisplayForNewWindows(int
-   display_id_for_new_windows_ = display_id;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default;
- 
- std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() {
diff --git a/chromium-next/patches/patch-ui_display_screen.h b/chromium-next/patches/patch-ui_display_screen.h
deleted file mode 100644
index d5b8230214..0000000000
--- a/chromium-next/patches/patch-ui_display_screen.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/display/screen.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/display/screen.h
-@@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen {
-   // (both of which may or may not be `nearest_id`).
-   display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Object which suspends the platform-specific screensaver for the duration of
-   // its existence.
-   class ScreenSaverSuspender {
-@@ -246,7 +246,7 @@ class DISPLAY_EXPORT Screen {
-   int64_t display_id_for_new_windows_;
-   int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   uint32_t screen_saver_suspension_count_ = 0;
- #endif  // BUILDFLAG(IS_LINUX)
- };
diff --git a/chromium-next/patches/patch-ui_events_devices_x11_device__data__manager__x11.cc b/chromium-next/patches/patch-ui_events_devices_x11_device__data__manager__x11.cc
deleted file mode 100644
index 9256a23f4e..0000000000
--- a/chromium-next/patches/patch-ui_events_devices_x11_device__data__manager__x11.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/events/devices/x11/device_data_manager_x11.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/events/devices/x11/device_data_manager_x11.cc
-@@ -849,6 +849,7 @@ void DeviceDataManagerX11::SetDisabledKe
- }
- 
- void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) {
-+  NOTIMPLEMENTED();
-   blocked_devices_.set(static_cast<uint32_t>(deviceid), true);
-   // TODO(rsadam@): Support blocking touchscreen devices.
-   std::vector<KeyboardDevice> keyboards = GetKeyboardDevices();
diff --git a/chromium-next/patches/patch-ui_events_event.cc b/chromium-next/patches/patch-ui_events_event.cc
deleted file mode 100644
index f89e3ce4b4..0000000000
--- a/chromium-next/patches/patch-ui_events_event.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/events/event.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/events/event.cc
-@@ -373,7 +373,7 @@ std::string LocatedEvent::ToString() con
- MouseEvent::MouseEvent(const PlatformEvent& native_event)
-     : LocatedEvent(native_event),
-       changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)),
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       movement_(GetMouseMovementFromNative(native_event)),
- #endif
-       pointer_details_(GetMousePointerDetailsFromNative(native_event)) {
-@@ -629,7 +629,7 @@ std::unique_ptr<Event> MouseWheelEvent::
-   return std::make_unique<MouseWheelEvent>(*this);
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on
- // Linux.
- // static
-@@ -889,7 +889,7 @@ void KeyEvent::InitializeNative() {
-   if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent()))
-     SetFlags(flags() | EF_IS_REPEAT);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   NormalizeFlags();
- #elif BUILDFLAG(IS_WIN)
-   // Only Windows has native character events.
diff --git a/chromium-next/patches/patch-ui_events_event__switches.cc b/chromium-next/patches/patch-ui_events_event__switches.cc
deleted file mode 100644
index 695bbb4f52..0000000000
--- a/chromium-next/patches/patch-ui_events_event__switches.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/events/event_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/events/event_switches.cc
-@@ -21,7 +21,7 @@ const char kCompensateForUnstablePinchZo
- // value is a floating point number that is interpreted as a distance in pixels.
- const char kTouchSlopDistance[] = "touch-slop-distance";
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Tells chrome to interpret events from these devices as touch events. Only
- // available with XInput 2 (i.e. X server 1.8 or above). The id's of the
- // devices can be retrieved from 'xinput list'.
diff --git a/chromium-next/patches/patch-ui_events_event__switches.h b/chromium-next/patches/patch-ui_events_event__switches.h
deleted file mode 100644
index d33be45920..0000000000
--- a/chromium-next/patches/patch-ui_events_event__switches.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/events/event_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/events/event_switches.h
-@@ -13,7 +13,7 @@ namespace switches {
- EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[];
- EVENTS_BASE_EXPORT extern const char kTouchSlopDistance[];
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- EVENTS_BASE_EXPORT extern const char kTouchDevices[];
- EVENTS_BASE_EXPORT extern const char kPenDevices[];
- #endif
diff --git a/chromium-next/patches/patch-ui_events_keycodes_dom_keycode__converter.cc b/chromium-next/patches/patch-ui_events_keycodes_dom_keycode__converter.cc
deleted file mode 100644
index 65ce267ec6..0000000000
--- a/chromium-next/patches/patch-ui_events_keycodes_dom_keycode__converter.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/events/keycodes/dom/keycode_converter.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/events/keycodes/dom/keycode_converter.cc
-@@ -18,7 +18,7 @@
- #include "ui/events/keycodes/dom/dom_code.h"
- #include "ui/events/keycodes/dom/dom_key.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)
- #include <linux/input.h>
- #endif
- 
-@@ -31,7 +31,7 @@ namespace {
- #if BUILDFLAG(IS_WIN)
- #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \
-   { usb, win, code }
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \
-   { usb, xkb, code }
- #elif BUILDFLAG(IS_APPLE)
-@@ -70,7 +70,7 @@ struct DomKeyMapEntry {
- #undef DOM_KEY_UNI
- #undef DOM_KEY_MAP_DECLARATION_END
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)
- 
- // The offset between XKB Keycode and evdev code.
- constexpr int kXkbKeycodeOffset = 8;
-@@ -191,7 +191,7 @@ int KeycodeConverter::DomCodeToNativeKey
-   return UsbKeycodeToNativeKeycode(static_cast<uint32_t>(code));
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)
- // static
- DomCode KeycodeConverter::XkbKeycodeToDomCode(uint32_t xkb_keycode) {
-   // Currently XKB keycode is the native keycode.
diff --git a/chromium-next/patches/patch-ui_events_keycodes_dom_keycode__converter.h b/chromium-next/patches/patch-ui_events_keycodes_dom_keycode__converter.h
deleted file mode 100644
index 3eba13c288..0000000000
--- a/chromium-next/patches/patch-ui_events_keycodes_dom_keycode__converter.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/events/keycodes/dom/keycode_converter.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/events/keycodes/dom/keycode_converter.h
-@@ -64,7 +64,7 @@ class KeycodeConverter {
-   // Convert a DomCode into a native keycode.
-   static int DomCodeToNativeKeycode(DomCode code);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)
-   // Convert a XKB keycode into a DomCode.
-   static DomCode XkbKeycodeToDomCode(uint32_t xkb_keycode);
- 
diff --git a/chromium-next/patches/patch-ui_gfx_BUILD.gn b/chromium-next/patches/patch-ui_gfx_BUILD.gn
deleted file mode 100644
index 1bec8050fd..0000000000
--- a/chromium-next/patches/patch-ui_gfx_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/BUILD.gn
-@@ -661,7 +661,7 @@ source_set("memory_buffer_sources") {
-     deps += [ "//build/config/linux/libdrm" ]
-   }
- 
--  if (is_linux || is_chromeos || is_android) {
-+  if ((is_linux || is_chromeos || is_android) && !is_bsd) {
-     deps += [ "//third_party/libsync" ]
-   }
- 
diff --git a/chromium-next/patches/patch-ui_gfx_canvas__skia.cc b/chromium-next/patches/patch-ui_gfx_canvas__skia.cc
deleted file mode 100644
index 31caeafdd0..0000000000
--- a/chromium-next/patches/patch-ui_gfx_canvas__skia.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/canvas_skia.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/canvas_skia.cc
-@@ -219,7 +219,7 @@ void Canvas::DrawStringRectWithFlags(std
-     Range range = StripAcceleratorChars(flags, &adjusted_text);
-     bool elide_text = ((flags & NO_ELLIPSIS) == 0);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // On Linux, eliding really means fading the end of the string. But only
-     // for LTR text. RTL text is still elided (on the left) with "...".
-     if (elide_text) {
diff --git a/chromium-next/patches/patch-ui_gfx_font__fallback__linux.cc b/chromium-next/patches/patch-ui_gfx_font__fallback__linux.cc
deleted file mode 100644
index 501c3a8ff4..0000000000
--- a/chromium-next/patches/patch-ui_gfx_font__fallback__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/font_fallback_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/font_fallback_linux.cc
-@@ -32,6 +32,8 @@
- #include "ui/gfx/linux/fontconfig_util.h"
- #include "ui/gfx/platform_font.h"
- 
-+#include <unistd.h>
-+
- namespace gfx {
- 
- namespace {
diff --git a/chromium-next/patches/patch-ui_gfx_font__render__params.h b/chromium-next/patches/patch-ui_gfx_font__render__params.h
deleted file mode 100644
index a48b630098..0000000000
--- a/chromium-next/patches/patch-ui_gfx_font__render__params.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/font_render_params.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/font_render_params.h
-@@ -115,7 +115,7 @@ COMPONENT_EXPORT(GFX)
- FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
-                                      std::string* family_out);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are
- // changing Fontconfig's configuration.
- COMPONENT_EXPORT(GFX) void ClearFontRenderParamsCacheForTest();
-@@ -125,7 +125,7 @@ COMPONENT_EXPORT(GFX) void ClearFontRend
- COMPONENT_EXPORT(GFX) float GetFontRenderParamsDeviceScaleFactor();
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // Sets the device scale factor for FontRenderParams to decide
- // if it should enable subpixel positioning.
- COMPONENT_EXPORT(GFX)
diff --git a/chromium-next/patches/patch-ui_gfx_font__render__params__linux.cc b/chromium-next/patches/patch-ui_gfx_font__render__params__linux.cc
deleted file mode 100644
index 50c0c60b64..0000000000
--- a/chromium-next/patches/patch-ui_gfx_font__render__params__linux.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/font_render_params_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/font_render_params_linux.cc
-@@ -24,7 +24,7 @@
- #include "ui/gfx/linux/fontconfig_util.h"
- #include "ui/gfx/switches.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
-@@ -222,7 +222,7 @@ FontRenderParams GetFontRenderParams(con
- 
-   // Start with the delegate's settings, but let Fontconfig have the final say.
-   FontRenderParams params;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (auto* linux_ui = ui::LinuxUi::instance()) {
-     params = linux_ui->GetDefaultFontRenderParams();
-   }
diff --git a/chromium-next/patches/patch-ui_gfx_font__util.cc b/chromium-next/patches/patch-ui_gfx_font__util.cc
deleted file mode 100644
index 746f5ce02d..0000000000
--- a/chromium-next/patches/patch-ui_gfx_font__util.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/font_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/font_util.cc
-@@ -6,7 +6,7 @@
- 
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <fontconfig/fontconfig.h>
- #include "ui/gfx/linux/fontconfig_util.h"
- #endif
-@@ -24,7 +24,7 @@ void InitializeFonts() {
-   // background (resources have not yet been granted to cast) since it prevents
-   // the long delay the user would have seen on first rendering.
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Early initialize FontConfig.
-   InitializeGlobalFontConfigAsync();
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium-next/patches/patch-ui_gfx_gpu__memory__buffer.cc b/chromium-next/patches/patch-ui_gfx_gpu__memory__buffer.cc
deleted file mode 100644
index be2de597ef..0000000000
--- a/chromium-next/patches/patch-ui_gfx_gpu__memory__buffer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/gpu_memory_buffer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/gpu_memory_buffer.cc
-@@ -108,7 +108,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHan
-   handle.id = id;
-   handle.offset = offset;
-   handle.stride = stride;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle);
- #elif BUILDFLAG(IS_APPLE)
-   handle.io_surface = io_surface;
diff --git a/chromium-next/patches/patch-ui_gfx_gpu__memory__buffer.h b/chromium-next/patches/patch-ui_gfx_gpu__memory__buffer.h
deleted file mode 100644
index 04b332875d..0000000000
--- a/chromium-next/patches/patch-ui_gfx_gpu__memory__buffer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/gpu_memory_buffer.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/gpu_memory_buffer.h
-@@ -17,7 +17,7 @@
- #include "ui/gfx/generic_shared_memory_id.h"
- #include "ui/gfx/geometry/rect.h"
- 
--#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "ui/gfx/native_pixmap_handle.h"
- #elif BUILDFLAG(IS_APPLE)
- #include "ui/gfx/mac/io_surface.h"
-@@ -47,7 +47,7 @@ enum GpuMemoryBufferType {
- #if BUILDFLAG(IS_APPLE)
-   IO_SURFACE_BUFFER,
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   NATIVE_PIXMAP,
- #endif
- #if BUILDFLAG(IS_WIN)
-@@ -212,7 +212,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBu
- 
-   uint32_t offset = 0;
-   uint32_t stride = 0;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   NativePixmapHandle native_pixmap_handle;
- #elif BUILDFLAG(IS_APPLE)
-   ScopedIOSurface io_surface;
diff --git a/chromium-next/patches/patch-ui_gfx_linux_dmabuf__uapi.h b/chromium-next/patches/patch-ui_gfx_linux_dmabuf__uapi.h
deleted file mode 100644
index b68eb0ee50..0000000000
--- a/chromium-next/patches/patch-ui_gfx_linux_dmabuf__uapi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/linux/dmabuf_uapi.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/linux/dmabuf_uapi.h
-@@ -5,12 +5,11 @@
- #ifndef UI_GFX_LINUX_DMABUF_UAPI_H_
- #define UI_GFX_LINUX_DMABUF_UAPI_H_
- 
--#include <linux/version.h>
-+#include <sys/types.h>
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
--#include <linux/dma-buf.h>
--#else
--#include <linux/types.h>
-+typedef int32_t  __s32;
-+typedef uint32_t __u32;
-+typedef uint64_t __u64;
- 
- struct dma_buf_sync {
-   __u64 flags;
-@@ -26,9 +25,7 @@ constexpr __u64 DMA_BUF_SYNC_END = 1 << 
- constexpr char DMA_BUF_BASE = 'b';
- constexpr unsigned long DMA_BUF_IOCTL_SYNC =
-     _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync);
--#endif
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
- struct dma_buf_export_sync_file {
-   __u32 flags;
-   __s32 fd;
-@@ -43,6 +40,5 @@ constexpr unsigned long DMA_BUF_IOCTL_EX
-     _IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file);
- constexpr unsigned long DMA_BUF_IOCTL_IMPORT_SYNC_FILE =
-     _IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file);
--#endif
- 
- #endif  // UI_GFX_LINUX_DMABUF_UAPI_H_
diff --git a/chromium-next/patches/patch-ui_gfx_linux_gbm__wrapper.cc b/chromium-next/patches/patch-ui_gfx_linux_gbm__wrapper.cc
deleted file mode 100644
index ad41c907ba..0000000000
--- a/chromium-next/patches/patch-ui_gfx_linux_gbm__wrapper.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/linux/gbm_wrapper.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/linux/gbm_wrapper.cc
-@@ -318,7 +318,7 @@ class Device final : public ui::GbmDevic
-     // of 1x1 BOs which are destroyed before creating the final BO creation used
-     // to instantiate the returned GbmBuffer.
-     gfx::Size size_for_verification =
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-         gfx::Size(1, 1);
- #else
-         requested_size;
diff --git a/chromium-next/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/chromium-next/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
deleted file mode 100644
index a836929813..0000000000
--- a/chromium-next/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/mojom/native_handle_types_mojom_traits.cc
-@@ -14,7 +14,7 @@
- #include "ui/gfx/mac/io_surface.h"
- #endif  // BUILDFLAG(IS_APPLE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
- #include "ui/gfx/native_pixmap_handle.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
- 
-@@ -80,11 +80,11 @@ bool StructTraits<gfx::mojom::AHardwareB
- }
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
- mojo::PlatformHandle StructTraits<
-     gfx::mojom::NativePixmapPlaneDataView,
-     gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return mojo::PlatformHandle(std::move(plane.fd));
- #elif BUILDFLAG(IS_FUCHSIA)
-   return mojo::PlatformHandle(std::move(plane.vmo));
-@@ -100,7 +100,7 @@ bool StructTraits<
-   out->size = data.size();
- 
-   mojo::PlatformHandle handle = data.TakeBufferHandle();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (!handle.is_fd())
-     return false;
-   out->fd = handle.TakeFD();
-@@ -126,7 +126,7 @@ bool StructTraits<
-     gfx::mojom::NativePixmapHandleDataView,
-     gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data,
-                                    gfx::NativePixmapHandle* out) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   out->modifier = data.modifier();
-   out->supports_zero_copy_webgpu_import =
-       data.supports_zero_copy_webgpu_import();
-@@ -187,7 +187,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandl
-     case gfx::IO_SURFACE_BUFFER:
-       return Tag::kMachPort;
- #endif  // BUILDFLAG(IS_APPLE)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
-     case gfx::NATIVE_PIXMAP:
-       return Tag::kNativePixmapHandle;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-@@ -251,7 +251,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBu
-       }
-       return true;
- #endif  // BUILDFLAG(IS_APPLE)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
-     case Tag::kNativePixmapHandle:
-       handle->type = gfx::NATIVE_PIXMAP;
-       return data.ReadNativePixmapHandle(&handle->native_pixmap_handle);
diff --git a/chromium-next/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/chromium-next/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
deleted file mode 100644
index 0c1b128ed6..0000000000
--- a/chromium-next/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/mojom/native_handle_types_mojom_traits.h
-@@ -18,7 +18,7 @@
- #include "ui/gfx/gpu_memory_buffer.h"
- #include "ui/gfx/mojom/native_handle_types.mojom-shared.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
- #include "ui/gfx/native_pixmap_handle.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
- 
-@@ -46,7 +46,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDL
- };
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
- template <>
- struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS)
-     StructTraits<gfx::mojom::NativePixmapPlaneDataView,
-@@ -74,13 +74,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDL
-     return pixmap_handle.planes;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) {
-     return pixmap_handle.modifier;
-   }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static bool supports_zero_copy_webgpu_import(
-       const gfx::NativePixmapHandle& pixmap_handle) {
-     return pixmap_handle.supports_zero_copy_webgpu_import;
-@@ -159,7 +159,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDL
-   static PlatformHandle mach_port(gfx::GpuMemoryBufferHandle& handle);
- #endif  // BUILDFLAG(IS_APPLE)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
-   static gfx::NativePixmapHandle& native_pixmap_handle(
-       gfx::GpuMemoryBufferHandle& handle) {
-     return handle.native_pixmap_handle;
diff --git a/chromium-next/patches/patch-ui_gfx_native__pixmap__handle.cc b/chromium-next/patches/patch-ui_gfx_native__pixmap__handle.cc
deleted file mode 100644
index 9c800cd392..0000000000
--- a/chromium-next/patches/patch-ui_gfx_native__pixmap__handle.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/native_pixmap_handle.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/native_pixmap_handle.cc
-@@ -11,7 +11,7 @@
- #include "ui/gfx/buffer_format_util.h"
- #include "ui/gfx/geometry/size.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <drm_fourcc.h>
- #include <unistd.h>
- 
-@@ -23,9 +23,13 @@
- #include "base/fuchsia/fuchsia_logging.h"
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+#include <unistd.h>
-+#endif
-+
- namespace gfx {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID,
-               "gfx::NativePixmapHandle::kNoModifier should be an alias for"
-               "DRM_FORMAT_MOD_INVALID");
-@@ -36,7 +40,7 @@ NativePixmapPlane::NativePixmapPlane() :
- NativePixmapPlane::NativePixmapPlane(int stride,
-                                      int offset,
-                                      uint64_t size
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-                                      ,
-                                      base::ScopedFD fd
- #elif BUILDFLAG(IS_FUCHSIA)
-@@ -47,7 +51,7 @@ NativePixmapPlane::NativePixmapPlane(int
-     : stride(stride),
-       offset(offset),
-       size(size)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       ,
-       fd(std::move(fd))
- #elif BUILDFLAG(IS_FUCHSIA)
-@@ -75,7 +79,7 @@ NativePixmapHandle& NativePixmapHandle::
- NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
-   NativePixmapHandle clone;
-   for (auto& plane : handle.planes) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     DCHECK(plane.fd.is_valid());
-     // Combining the HANDLE_EINTR and ScopedFD's constructor causes the compiler
-     // to emit some very strange assembly that tends to cause FD ownership
-@@ -113,7 +117,7 @@ NativePixmapHandle CloneHandleForIPC(con
- #endif
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   clone.modifier = handle.modifier;
-   clone.supports_zero_copy_webgpu_import =
-       handle.supports_zero_copy_webgpu_import;
diff --git a/chromium-next/patches/patch-ui_gfx_native__pixmap__handle.h b/chromium-next/patches/patch-ui_gfx_native__pixmap__handle.h
deleted file mode 100644
index 3b7935407d..0000000000
--- a/chromium-next/patches/patch-ui_gfx_native__pixmap__handle.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/native_pixmap_handle.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/native_pixmap_handle.h
-@@ -14,7 +14,7 @@
- #include "build/build_config.h"
- #include "ui/gfx/buffer_types.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/files/scoped_file.h"
- #endif
- 
-@@ -34,7 +34,7 @@ struct COMPONENT_EXPORT(GFX) NativePixma
-   NativePixmapPlane(int stride,
-                     int offset,
-                     uint64_t size
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-                     ,
-                     base::ScopedFD fd
- #elif BUILDFLAG(IS_FUCHSIA)
-@@ -55,7 +55,7 @@ struct COMPONENT_EXPORT(GFX) NativePixma
-   // This is necessary to map the buffers.
-   uint64_t size;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // File descriptor for the underlying memory object (usually dmabuf).
-   base::ScopedFD fd;
- #elif BUILDFLAG(IS_FUCHSIA)
-@@ -78,7 +78,7 @@ struct COMPONENT_EXPORT(GFX) NativePixma
- 
-   std::vector<NativePixmapPlane> planes;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // The modifier is retrieved from GBM library and passed to EGL driver.
-   // Generally it's platform specific, and we don't need to modify it in
-   // Chromium code. Also one per plane per entry.
diff --git a/chromium-next/patches/patch-ui_gfx_native__widget__types.h b/chromium-next/patches/patch-ui_gfx_native__widget__types.h
deleted file mode 100644
index 4b9d572d4f..0000000000
--- a/chromium-next/patches/patch-ui_gfx_native__widget__types.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/native_widget_types.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/native_widget_types.h
-@@ -104,7 +104,7 @@ class ViewAndroid;
- #endif
- class SkBitmap;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern "C" {
- struct _AtkObject;
- using AtkObject = struct _AtkObject;
-@@ -194,7 +194,7 @@ using NativeViewAccessible = id;
- #else
- using NativeViewAccessible = struct objc_object*;
- #endif
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Linux doesn't have a native font type.
- using NativeViewAccessible = AtkObject*;
- #else
diff --git a/chromium-next/patches/patch-ui_gfx_platform__font__skia.cc b/chromium-next/patches/patch-ui_gfx_platform__font__skia.cc
deleted file mode 100644
index bb934b1587..0000000000
--- a/chromium-next/patches/patch-ui_gfx_platform__font__skia.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/platform_font_skia.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/platform_font_skia.cc
-@@ -29,7 +29,7 @@
- #include "ui/gfx/system_fonts_win.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
-@@ -167,7 +167,7 @@ void PlatformFontSkia::EnsuresDefaultFon
-   weight = system_font.GetWeight();
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On Linux, LinuxUi is used to query the native toolkit (e.g.
-   // GTK) for the default UI font.
-   if (auto* linux_ui = ui::LinuxUi::instance()) {
diff --git a/chromium-next/patches/patch-ui_gfx_render__text__api__fuzzer.cc b/chromium-next/patches/patch-ui_gfx_render__text__api__fuzzer.cc
deleted file mode 100644
index bebb875043..0000000000
--- a/chromium-next/patches/patch-ui_gfx_render__text__api__fuzzer.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/render_text_api_fuzzer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/render_text_api_fuzzer.cc
-@@ -19,7 +19,7 @@
- #include "ui/gfx/font_util.h"
- #include "ui/gfx/render_text.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h"
- #endif
- 
-@@ -46,7 +46,7 @@ struct Environment {
- 
-     CHECK(base::i18n::InitializeICU());
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     test_fonts::SetUpFontconfig();
- #endif
-     gfx::InitializeFonts();
diff --git a/chromium-next/patches/patch-ui_gfx_render__text__fuzzer.cc b/chromium-next/patches/patch-ui_gfx_render__text__fuzzer.cc
deleted file mode 100644
index 049adb6597..0000000000
--- a/chromium-next/patches/patch-ui_gfx_render__text__fuzzer.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/render_text_fuzzer.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/render_text_fuzzer.cc
-@@ -17,7 +17,7 @@
- #include "ui/gfx/canvas.h"
- #include "ui/gfx/font_util.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h"
- #endif
- 
-@@ -40,7 +40,7 @@ struct Environment {
- 
-     CHECK(base::i18n::InitializeICU());
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     test_fonts::SetUpFontconfig();
- #endif
-     gfx::InitializeFonts();
diff --git a/chromium-next/patches/patch-ui_gfx_switches.cc b/chromium-next/patches/patch-ui_gfx_switches.cc
deleted file mode 100644
index 143ff3158d..0000000000
--- a/chromium-next/patches/patch-ui_gfx_switches.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/switches.cc
-@@ -32,7 +32,7 @@ const char kForcePrefersNoReducedMotion[
- // Run in headless mode, i.e., without a UI or display server dependencies.
- const char kHeadless[] = "headless";
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Which X11 display to connect to. Emulates the GTK+ "--display=" command line
- // argument. In use only with Ozone/X11.
- const char kX11Display[] = "display";
diff --git a/chromium-next/patches/patch-ui_gfx_switches.h b/chromium-next/patches/patch-ui_gfx_switches.h
deleted file mode 100644
index 1a81131e72..0000000000
--- a/chromium-next/patches/patch-ui_gfx_switches.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/switches.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/switches.h
-@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kF
- GFX_SWITCHES_EXPORT extern const char kForcePrefersNoReducedMotion[];
- GFX_SWITCHES_EXPORT extern const char kHeadless[];
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- GFX_SWITCHES_EXPORT extern const char kX11Display[];
- GFX_SWITCHES_EXPORT extern const char kNoXshm[];
- #endif
diff --git a/chromium-next/patches/patch-ui_gfx_x_atom__cache.cc b/chromium-next/patches/patch-ui_gfx_x_atom__cache.cc
deleted file mode 100644
index 3e2c0324df..0000000000
--- a/chromium-next/patches/patch-ui_gfx_x_atom__cache.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/x/atom_cache.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/x/atom_cache.cc
-@@ -157,6 +157,7 @@ constexpr auto kAtomsToCache = std::to_a
-     "application/octet-stream",
-     "application/vnd.chromium.test",
-     "chromium/filename",
-+    "chromium/from-privileged",
-     "chromium/x-bookmark-entries",
-     "chromium/x-browser-actions",
-     "chromium/x-file-system-files",
diff --git a/chromium-next/patches/patch-ui_gfx_x_generated__protos_dri3.cc b/chromium-next/patches/patch-ui_gfx_x_generated__protos_dri3.cc
deleted file mode 100644
index e18b80a9e8..0000000000
--- a/chromium-next/patches/patch-ui_gfx_x_generated__protos_dri3.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/x/generated_protos/dri3.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/x/generated_protos/dri3.cc
-@@ -27,6 +27,8 @@
- #include <xcb/xcb.h>
- #include <xcb/xcbext.h>
- 
-+#include <unistd.h>
-+
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
- #include "ui/gfx/x/connection.h"
diff --git a/chromium-next/patches/patch-ui_gfx_x_generated__protos_shm.cc b/chromium-next/patches/patch-ui_gfx_x_generated__protos_shm.cc
deleted file mode 100644
index fa9c7a6f2f..0000000000
--- a/chromium-next/patches/patch-ui_gfx_x_generated__protos_shm.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/x/generated_protos/shm.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/x/generated_protos/shm.cc
-@@ -27,6 +27,8 @@
- #include <xcb/xcb.h>
- #include <xcb/xcbext.h>
- 
-+#include <unistd.h>
-+
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
- #include "ui/gfx/x/connection.h"
diff --git a/chromium-next/patches/patch-ui_gfx_x_xlib__support.cc b/chromium-next/patches/patch-ui_gfx_x_xlib__support.cc
deleted file mode 100644
index 16ad18e2dd..0000000000
--- a/chromium-next/patches/patch-ui_gfx_x_xlib__support.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/x/xlib_support.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gfx/x/xlib_support.cc
-@@ -39,10 +39,18 @@ void InitXlib() {
-     return;
-   }
- 
-+#if BUILDFLAG(IS_BSD)
-+  CHECK(xlib_loader->Load("libX11.so"));
-+#else
-   CHECK(xlib_loader->Load("libX11.so.6"));
-+#endif
- 
-   auto* xlib_xcb_loader = GetXlibXcbLoader();
-+#if BUILDFLAG(IS_BSD)
-+  CHECK(xlib_xcb_loader->Load("libX11-xcb.so"));
-+#else
-   CHECK(xlib_xcb_loader->Load("libX11-xcb.so.1"));
-+#endif
- 
-   CHECK(xlib_loader->XInitThreads());
- 
diff --git a/chromium-next/patches/patch-ui_gl_BUILD.gn b/chromium-next/patches/patch-ui_gl_BUILD.gn
deleted file mode 100644
index ce941b81cb..0000000000
--- a/chromium-next/patches/patch-ui_gl_BUILD.gn
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gl/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gl/BUILD.gn
-@@ -174,7 +174,6 @@ component("gl") {
-   public_deps = [
-     ":gl_enums",
-     "//base",
--    "//third_party/mesa_headers",
-     "//ui/events/platform",
-     "//ui/gfx",
-     "//ui/gfx/geometry",
-@@ -328,7 +327,6 @@ component("gl") {
-     data_deps += [
-       "//third_party/angle:libEGL",
-       "//third_party/angle:libGLESv2",
--      "//third_party/mesa_headers",
-     ]
-     if (enable_swiftshader) {
-       data_deps += [
-@@ -554,7 +552,6 @@ test("gl_unittests") {
- 
-   data_deps = [
-     "//testing/buildbot/filters:gl_unittests_filters",
--    "//third_party/mesa_headers",
-   ]
- 
-   if (is_win) {
diff --git a/chromium-next/patches/patch-ui_gl_gl__context.cc b/chromium-next/patches/patch-ui_gl_gl__context.cc
deleted file mode 100644
index 860bb0b5b3..0000000000
--- a/chromium-next/patches/patch-ui_gl_gl__context.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gl/gl_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gl/gl_context.cc
-@@ -516,7 +516,7 @@ bool GLContext::MakeVirtuallyCurrent(
-   DCHECK(virtual_context->IsCurrent(surface));
- 
-   if (switched_real_contexts || virtual_context != current_virtual_context_) {
--#if DCHECK_IS_ON()
-+#if DCHECK_IS_ON() && !BUILDFLAG(IS_BSD)
-     GLenum error = glGetError();
-     // Accepting a context loss error here enables using debug mode to work on
-     // context loss handling in virtual context mode.
diff --git a/chromium-next/patches/patch-ui_gl_gl__fence.cc b/chromium-next/patches/patch-ui_gl_gl__fence.cc
deleted file mode 100644
index a96608ee03..0000000000
--- a/chromium-next/patches/patch-ui_gl_gl__fence.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gl/gl_fence.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gl/gl_fence.cc
-@@ -17,7 +17,7 @@
- #include "ui/gl/gl_surface_egl.h"
- #include "ui/gl/gl_version_info.h"
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC
- #include "ui/gl/gl_fence_android_native_fence_sync.h"
- #endif
diff --git a/chromium-next/patches/patch-ui_gl_gl__implementation.cc b/chromium-next/patches/patch-ui_gl_gl__implementation.cc
deleted file mode 100644
index d0673894de..0000000000
--- a/chromium-next/patches/patch-ui_gl_gl__implementation.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gl/gl_implementation.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gl/gl_implementation.cc
-@@ -286,7 +286,7 @@ GetRequestedGLImplementationFromCommandL
-     const base::CommandLine* command_line) {
-   bool overrideUseSoftwareGL =
-       command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests);
--#if BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
-   if (std::getenv("RUNNING_UNDER_RR")) {
-     // https://rr-project.org/ is a Linux-only record-and-replay debugger that
diff --git a/chromium-next/patches/patch-ui_gl_gl__switches.cc b/chromium-next/patches/patch-ui_gl_gl__switches.cc
deleted file mode 100644
index c077e0a23b..0000000000
--- a/chromium-next/patches/patch-ui_gl_gl__switches.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gl/gl_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gl/gl_switches.cc
-@@ -13,7 +13,7 @@
- #include "base/android/build_info.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include <vulkan/vulkan_core.h>
- #include "third_party/angle/src/gpu_info_util/SystemInfo.h"  // nogncheck
- #endif
-@@ -319,7 +319,7 @@ bool IsDefaultANGLEVulkan() {
-     return false;
-   }
- #endif  // BUILDFLAG(IS_ANDROID)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   angle::SystemInfo system_info;
-   {
-     GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan");
-@@ -372,7 +372,7 @@ bool IsDefaultANGLEVulkan() {
-   }
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // AMDVLK driver is buggy, so disable Vulkan with AMDVLK for now.
-   // crbug.com/1340081
-   if (active_gpu.driverId == VK_DRIVER_ID_AMD_OPEN_SOURCE)
diff --git a/chromium-next/patches/patch-ui_gl_sync__control__vsync__provider.cc b/chromium-next/patches/patch-ui_gl_sync__control__vsync__provider.cc
deleted file mode 100644
index af7a341a3b..0000000000
--- a/chromium-next/patches/patch-ui_gl_sync__control__vsync__provider.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gl/sync_control_vsync_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gl/sync_control_vsync_provider.cc
-@@ -11,7 +11,7 @@
- #include "base/trace_event/trace_event.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // These constants define a reasonable range for a calculated refresh interval.
- // Calculating refreshes out of this range will be considered a fatal error.
- const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400;
-@@ -26,7 +26,7 @@ const double kRelativeIntervalDifference
- namespace gl {
- 
- SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // On platforms where we can't get an accurate reading on the refresh
-   // rate we fall back to the assumption that we're displaying 60 frames
-   // per second.
-@@ -48,7 +48,7 @@ bool SyncControlVSyncProvider::GetVSyncP
-     base::TimeTicks* timebase_out,
-     base::TimeDelta* interval_out) {
-   TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters");
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // The actual clock used for the system time returned by
-   // eglGetSyncValuesCHROMIUM is unspecified. In practice, the clock used is
-   // likely to be either CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the
-@@ -160,7 +160,7 @@ bool SyncControlVSyncProvider::GetVSyncP
- }
- 
- bool SyncControlVSyncProvider::SupportGetVSyncParametersIfAvailable() const {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return true;
- #else
-   return false;
diff --git a/chromium-next/patches/patch-ui_gl_sync__control__vsync__provider.h b/chromium-next/patches/patch-ui_gl_sync__control__vsync__provider.h
deleted file mode 100644
index afe57658ed..0000000000
--- a/chromium-next/patches/patch-ui_gl_sync__control__vsync__provider.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gl/sync_control_vsync_provider.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gl/sync_control_vsync_provider.h
-@@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public 
-   bool SupportGetVSyncParametersIfAvailable() const override;
- 
-   static constexpr bool IsSupported() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     return true;
- #else
-     return false;
-@@ -46,7 +46,7 @@ class SyncControlVSyncProvider : public 
-   virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0;
- 
-  private:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   base::TimeTicks last_timebase_;
-   uint64_t last_media_stream_counter_ = 0;
-   base::TimeDelta last_good_interval_;
diff --git a/chromium-next/patches/patch-ui_gtk_gtk__compat.cc b/chromium-next/patches/patch-ui_gtk_gtk__compat.cc
deleted file mode 100644
index e9b89419fa..0000000000
--- a/chromium-next/patches/patch-ui_gtk_gtk__compat.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gtk/gtk_compat.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gtk/gtk_compat.cc
-@@ -65,27 +65,47 @@ auto DlCast(void* symbol) {
- }
- 
- void* GetLibGio() {
-+#if BUILDFLAG(IS_BSD)
-+  static void* libgio = DlOpen("libgio-2.0.so");
-+#else
-   static void* libgio = DlOpen("libgio-2.0.so.0");
-+#endif
-   return libgio;
- }
- 
- void* GetLibGdkPixbuf() {
-+#if BUILDFLAG(IS_BSD)
-+  static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so");
-+#else
-   static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
-+#endif
-   return libgdk_pixbuf;
- }
- 
- void* GetLibGdk3() {
-+#if BUILDFLAG(IS_BSD)
-+  static void* libgdk3 = DlOpen("libgdk-3.so");
-+#else
-   static void* libgdk3 = DlOpen("libgdk-3.so.0");
-+#endif
-   return libgdk3;
- }
- 
- void* GetLibGtk3(bool check = true) {
-+#if BUILDFLAG(IS_BSD)
-+  static void* libgtk3 = DlOpen("libgtk-3.so", check);
-+#else
-   static void* libgtk3 = DlOpen("libgtk-3.so.0", check);
-+#endif
-   return libgtk3;
- }
- 
- void* GetLibGtk4(bool check = true) {
-+#if BUILDFLAG(IS_BSD)
-+  static void* libgtk4 = DlOpen("libgtk-4.so", check);
-+#else
-   static void* libgtk4 = DlOpen("libgtk-4.so.1", check);
-+#endif
-   return libgtk4;
- }
- 
diff --git a/chromium-next/patches/patch-ui_gtk_printing_print__dialog__gtk.cc b/chromium-next/patches/patch-ui_gtk_printing_print__dialog__gtk.cc
deleted file mode 100644
index fb10441fdf..0000000000
--- a/chromium-next/patches/patch-ui_gtk_printing_print__dialog__gtk.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gtk/printing/print_dialog_gtk.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/gtk/printing/print_dialog_gtk.cc
-@@ -438,7 +438,7 @@ void PrintDialogGtk::ShowDialog(
-   GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
-       GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET |
-       GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
--      GTK_PRINT_CAPABILITY_REVERSE);
-+      GTK_PRINT_CAPABILITY_REVERSE | GTK_PRINT_CAPABILITY_GENERATE_PS);
-   gtk_print_unix_dialog_set_manual_capabilities(
-       GTK_PRINT_UNIX_DIALOG(dialog_.get()), cap);
-   gtk_print_unix_dialog_set_embed_page_setup(
diff --git a/chromium-next/patches/patch-ui_message__center_views_message__popup__view.cc b/chromium-next/patches/patch-ui_message__center_views_message__popup__view.cc
deleted file mode 100644
index ae500f7439..0000000000
--- a/chromium-next/patches/patch-ui_message__center_views_message__popup__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/message_center/views/message_popup_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/message_center/views/message_popup_view.cc
-@@ -153,7 +153,7 @@ std::unique_ptr<views::Widget> MessagePo
-       views::Widget::InitParams::CLIENT_OWNS_WIDGET,
-       views::Widget::InitParams::TYPE_POPUP);
-   params.z_order = ui::ZOrderLevel::kFloatingWindow;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Make the widget explicitly activatable as TYPE_POPUP is not activatable by
-   // default but we need focus for the inline reply textarea.
-   params.activatable = views::Widget::InitParams::Activatable::kYes;
diff --git a/chromium-next/patches/patch-ui_native__theme_features_native__theme__features.cc b/chromium-next/patches/patch-ui_native__theme_features_native__theme__features.cc
deleted file mode 100644
index 28fab81bdd..0000000000
--- a/chromium-next/patches/patch-ui_native__theme_features_native__theme__features.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/native_theme/features/native_theme_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/native_theme/features/native_theme_features.cc
-@@ -59,7 +59,7 @@ namespace ui {
- 
- bool IsFluentOverlayScrollbarEnabled() {
- // Fluent scrollbars are only used for some OSes due to UI design guidelines.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar);
- #else
-   return false;
-@@ -68,7 +68,7 @@ bool IsFluentOverlayScrollbarEnabled() {
- 
- bool IsFluentScrollbarEnabled() {
- // Fluent scrollbars are only used for some OSes due to UI design guidelines.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(features::kFluentScrollbar) ||
-          IsFluentOverlayScrollbarEnabled();
- #else
diff --git a/chromium-next/patches/patch-ui_native__theme_native__theme.h b/chromium-next/patches/patch-ui_native__theme_native__theme.h
deleted file mode 100644
index 3252ff983f..0000000000
--- a/chromium-next/patches/patch-ui_native__theme_native__theme.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/native_theme/native_theme.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/native_theme/native_theme.h
-@@ -61,7 +61,7 @@ class COMPONENT_EXPORT(NATIVE_THEME) Nat
-   // The part to be painted / sized.
-   enum Part {
-     kCheckbox,
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     kFrameTopArea,
- #endif
-     kInnerSpinButton,
diff --git a/chromium-next/patches/patch-ui_native__theme_native__theme__base.cc b/chromium-next/patches/patch-ui_native__theme_native__theme__base.cc
deleted file mode 100644
index 65cbe83a03..0000000000
--- a/chromium-next/patches/patch-ui_native__theme_native__theme__base.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/native_theme/native_theme_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/native_theme/native_theme_base.cc
-@@ -240,7 +240,7 @@ void NativeThemeBase::Paint(cc::PaintCan
-                     std::get<ButtonExtraParams>(extra), color_scheme,
-                     accent_color_opaque);
-       break;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case kFrameTopArea:
-       PaintFrameTopArea(canvas, state, rect,
-                         std::get<FrameTopAreaExtraParams>(extra), color_scheme);
diff --git a/chromium-next/patches/patch-ui_ozone_common_egl__util.cc b/chromium-next/patches/patch-ui_ozone_common_egl__util.cc
deleted file mode 100644
index 1d933d060d..0000000000
--- a/chromium-next/patches/patch-ui_ozone_common_egl__util.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/common/egl_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/common/egl_util.cc
-@@ -27,9 +27,9 @@ const base::FilePath::CharType kDefaultG
-     FILE_PATH_LITERAL("libGLESv2.so");
- #else  // BUILDFLAG(IS_FUCHSIA)
- const base::FilePath::CharType kDefaultEglSoname[] =
--    FILE_PATH_LITERAL("libEGL.so.1");
-+    FILE_PATH_LITERAL("libEGL.so");
- const base::FilePath::CharType kDefaultGlesSoname[] =
--    FILE_PATH_LITERAL("libGLESv2.so.2");
-+    FILE_PATH_LITERAL("libGLESv2.so");
- #endif
- const base::FilePath::CharType kAngleEglSoname[] =
-     FILE_PATH_LITERAL("libEGL.so");
diff --git a/chromium-next/patches/patch-ui_ozone_platform_headless_headless__surface__factory.cc b/chromium-next/patches/patch-ui_ozone_platform_headless_headless__surface__factory.cc
deleted file mode 100644
index 80633d30c6..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_headless_headless__surface__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/headless/headless_surface_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/headless/headless_surface_factory.cc
-@@ -34,7 +34,7 @@
- #include "ui/ozone/platform/headless/headless_window_manager.h"
- #include "ui/ozone/public/surface_ozone_canvas.h"
- 
--#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA))
-+#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD))
- #include "ui/ozone/platform/headless/vulkan_implementation_headless.h"
- #endif
- 
-@@ -281,7 +281,7 @@ std::unique_ptr<gpu::VulkanImplementatio
- HeadlessSurfaceFactory::CreateVulkanImplementation(
-     bool use_swiftshader,
-     bool allow_protected_memory) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   return std::make_unique<VulkanImplementationHeadless>(use_swiftshader);
- #else
-   return nullptr;
diff --git a/chromium-next/patches/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/chromium-next/patches/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
deleted file mode 100644
index ad8aecf239..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/headless/ozone_platform_headless.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/headless/ozone_platform_headless.cc
-@@ -108,7 +108,7 @@ class OzonePlatformHeadlessImpl : public
-   }
- 
- // Desktop Linux, not CastOS.
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS)
-   const PlatformProperties& GetPlatformProperties() override {
-     static base::NoDestructor<OzonePlatform::PlatformProperties> properties;
-     static bool initialized = false;
diff --git a/chromium-next/patches/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/chromium-next/patches/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
deleted file mode 100644
index 9667368c22..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/headless/vulkan_implementation_headless.cc
-@@ -116,7 +116,7 @@ VulkanImplementationHeadless::ExportVkFe
- 
- VkExternalSemaphoreHandleTypeFlagBits
- VulkanImplementationHeadless::GetExternalSemaphoreHandleType() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT;
- #else
-   return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT;
-@@ -126,7 +126,7 @@ VulkanImplementationHeadless::GetExterna
- bool VulkanImplementationHeadless::CanImportGpuMemoryBuffer(
-     gpu::VulkanDeviceQueue* device_queue,
-     gfx::GpuMemoryBufferType memory_buffer_type) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const auto& enabled_extensions = device_queue->enabled_extensions();
-   return gfx::HasExtension(enabled_extensions,
-                            VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME) &&
-@@ -149,7 +149,7 @@ VulkanImplementationHeadless::CreateImag
-       VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
-       VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
-   auto tiling = VK_IMAGE_TILING_OPTIMAL;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (gmb_handle.native_pixmap_handle.modifier !=
-       gfx::NativePixmapHandle::kNoModifier) {
-     tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT;
diff --git a/chromium-next/patches/patch-ui_ozone_platform_wayland_common_wayland__util.cc b/chromium-next/patches/patch-ui_ozone_platform_wayland_common_wayland__util.cc
deleted file mode 100644
index eaf30fafef..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_wayland_common_wayland__util.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/common/wayland_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/wayland/common/wayland_util.cc
-@@ -424,6 +424,7 @@ void RecordConnectionMetrics(wl_display*
-         {"weston", WaylandCompositor::kWeston},
-     };
- 
-+#if !BUILDFLAG(IS_BSD)
-     const int fd = wl_display_get_fd(display);
-     if (fd == -1) {
-       return WaylandCompositor::kUnknown;
-@@ -449,6 +450,7 @@ void RecordConnectionMetrics(wl_display*
-         return compositor;
-       }
-     }
-+#endif
- 
-     return WaylandCompositor::kOther;
-   };
diff --git a/chromium-next/patches/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc b/chromium-next/patches/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
deleted file mode 100644
index 8796e226b6..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc
-@@ -38,7 +38,11 @@ bool VulkanImplementationWayland::Initia
- 
-     path = path.Append("libvk_swiftshader.so");
-   } else {
-+#if BUILDFLAG(IS_BSD)
-+    path = base::FilePath("libvulkan.so");
-+#else
-     path = base::FilePath("libvulkan.so.1");
-+#endif
-   }
- 
-   return vulkan_instance_.Initialize(path, required_extensions, {});
diff --git a/chromium-next/patches/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/chromium-next/patches/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
deleted file mode 100644
index 09dc5a3066..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
-@@ -261,6 +261,10 @@ void ZWPTextInputWrapperV1::SetSurroundi
-   // so if it exceeds 16 bits, it may be broken.
-   static constexpr size_t kSizeLimit = 60000;
-   if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) {
-+#if defined(__FreeBSD_version) && __FreeBSD_version < 1300048
-+    PLOG(ERROR) << "memfd is not supported";
-+    return;
-+#else
-     base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC));
-     if (!memfd.get()) {
-       PLOG(ERROR) << "Failed to create memfd";
-@@ -273,6 +277,7 @@ void ZWPTextInputWrapperV1::SetSurroundi
-     zcr_extended_text_input_v1_set_large_surrounding_text(
-         extended_obj_.get(), memfd.get(), text.length(),
-         selection_range.start(), selection_range.end());
-+#endif
-   } else {
-     zwp_text_input_v1_set_surrounding_text(obj_.get(), text.c_str(),
-                                            selection_range.start(),
diff --git a/chromium-next/patches/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc b/chromium-next/patches/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
deleted file mode 100644
index 3097cb0d5d..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/x11/vulkan_implementation_x11.cc
-@@ -59,7 +59,11 @@ bool VulkanImplementationX11::Initialize
- 
-     path = path.Append("libvk_swiftshader.so");
-   } else {
-+#if BUILDFLAG(IS_BSD) 
-+    path = base::FilePath("libvulkan.so");
-+#else
-     path = base::FilePath("libvulkan.so.1");
-+#endif
-   }
- 
-   return vulkan_instance_.Initialize(path, required_extensions, {});
diff --git a/chromium-next/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.cc b/chromium-next/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
deleted file mode 100644
index d4fe1c0fd8..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/x11/x11_screen_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/x11/x11_screen_ozone.cc
-@@ -22,7 +22,7 @@
- #include "ui/ozone/platform/x11/x11_window.h"
- #include "ui/ozone/platform/x11/x11_window_manager.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
-@@ -97,7 +97,7 @@ X11ScreenOzone::X11ScreenOzone()
-       window_manager_(X11WindowManager::GetInstance()),
-       x11_display_manager_(std::make_unique<XDisplayManager>(this)) {
-   DCHECK(window_manager_);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (auto* linux_ui = ui::LinuxUi::instance()) {
-     display_scale_factor_observer_.Observe(linux_ui);
-   }
-@@ -267,7 +267,7 @@ void X11ScreenOzone::OnEvent(const x11::
-   x11_display_manager_->OnEvent(xev);
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void X11ScreenOzone::OnDeviceScaleFactorChanged() {
-   x11_display_manager_->DispatchDelayedDisplayListUpdate();
- }
diff --git a/chromium-next/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.h b/chromium-next/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.h
deleted file mode 100644
index 8360a52349..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/x11/x11_screen_ozone.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/x11/x11_screen_ozone.h
-@@ -16,7 +16,7 @@
- #include "ui/gfx/x/event.h"
- #include "ui/ozone/public/platform_screen.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/device_scale_factor_observer.h"
- #include "ui/linux/linux_ui.h"
- #endif
-@@ -29,7 +29,7 @@ class X11WindowManager;
- class X11ScreenOzone : public PlatformScreen,
-                        public x11::EventObserver,
-                        public XDisplayManager::Delegate
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     ,
-                        public DeviceScaleFactorObserver
- #endif
-@@ -97,7 +97,7 @@ class X11ScreenOzone : public PlatformSc
-   // ui::XDisplayManager::Delegate:
-   void OnXDisplayListUpdated() override;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // DeviceScaleFactorObserver:
-   void OnDeviceScaleFactorChanged() override;
- #endif
-@@ -109,7 +109,7 @@ class X11ScreenOzone : public PlatformSc
-   // Indicates that |this| is initialized.
-   bool initialized_ = false;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::ScopedObservation<ui::LinuxUi, DeviceScaleFactorObserver>
-       display_scale_factor_observer_{this};
- #endif
diff --git a/chromium-next/patches/patch-ui_ozone_platform_x11_x11__window.cc b/chromium-next/patches/patch-ui_ozone_platform_x11_x11__window.cc
deleted file mode 100644
index eab35aa4d4..0000000000
--- a/chromium-next/patches/patch-ui_ozone_platform_x11_x11__window.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/x11/x11_window.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/platform/x11/x11_window.cc
-@@ -1459,7 +1459,7 @@ void X11Window::OnXWindowStateChanged() 
-   WindowTiledEdges tiled_state = GetTiledState();
-   if (tiled_state != tiled_state_) {
-     tiled_state_ = tiled_state;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     platform_window_delegate_->OnWindowTiledStateChanged(tiled_state);
-     UpdateDecorationInsets();
- #endif
diff --git a/chromium-next/patches/patch-ui_ozone_public_ozone__ui__controls__test__helper.h b/chromium-next/patches/patch-ui_ozone_public_ozone__ui__controls__test__helper.h
deleted file mode 100644
index 9ae6aaa2ac..0000000000
--- a/chromium-next/patches/patch-ui_ozone_public_ozone__ui__controls__test__helper.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/public/ozone_ui_controls_test_helper.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/public/ozone_ui_controls_test_helper.h
-@@ -62,7 +62,7 @@ class OzoneUIControlsTestHelper {
-   // aura::Window.
-   virtual bool MustUseUiControlsForMoveCursorTo() = 0;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   virtual void ForceUseScreenCoordinatesOnce();
- #endif
- };
diff --git a/chromium-next/patches/patch-ui_ozone_test_mock__platform__window__delegate.h b/chromium-next/patches/patch-ui_ozone_test_mock__platform__window__delegate.h
deleted file mode 100644
index 3bba8c8bbf..0000000000
--- a/chromium-next/patches/patch-ui_ozone_test_mock__platform__window__delegate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/test/mock_platform_window_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/ozone/test/mock_platform_window_delegate.h
-@@ -35,7 +35,7 @@ class MockPlatformWindowDelegate : publi
-   MOCK_METHOD2(OnWindowStateChanged,
-                void(PlatformWindowState old_state,
-                     PlatformWindowState new_state));
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   MOCK_METHOD1(OnWindowTiledStateChanged,
-                void(WindowTiledEdges new_tiled_edges));
- #endif
diff --git a/chromium-next/patches/patch-ui_platform__window_platform__window__delegate.cc b/chromium-next/patches/patch-ui_platform__window_platform__window__delegate.cc
deleted file mode 100644
index 47dcd6c6ca..0000000000
--- a/chromium-next/patches/patch-ui_platform__window_platform__window__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/platform_window/platform_window_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/platform_window/platform_window_delegate.cc
-@@ -56,7 +56,7 @@ gfx::Insets PlatformWindowDelegate::Calc
-   return gfx::Insets();
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void PlatformWindowDelegate::OnWindowTiledStateChanged(
-     WindowTiledEdges new_tiled_edges) {}
- #endif
diff --git a/chromium-next/patches/patch-ui_platform__window_platform__window__delegate.h b/chromium-next/patches/patch-ui_platform__window_platform__window__delegate.h
deleted file mode 100644
index 8f37b67f58..0000000000
--- a/chromium-next/patches/patch-ui_platform__window_platform__window__delegate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/platform_window/platform_window_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/platform_window/platform_window_delegate.h
-@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) 
-   virtual void OnWindowStateChanged(PlatformWindowState old_state,
-                                     PlatformWindowState new_state) = 0;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Notifies the delegate that the tiled state of the window edges has changed.
-   virtual void OnWindowTiledStateChanged(WindowTiledEdges new_tiled_edges);
- #endif
diff --git a/chromium-next/patches/patch-ui_platform__window_platform__window__init__properties.h b/chromium-next/patches/patch-ui_platform__window_platform__window__init__properties.h
deleted file mode 100644
index 09097baf8a..0000000000
--- a/chromium-next/patches/patch-ui_platform__window_platform__window__init__properties.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/platform_window/platform_window_init_properties.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/platform_window/platform_window_init_properties.h
-@@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate;
- class ScenicWindowDelegate;
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- class X11ExtensionDelegate;
- #endif
- 
-@@ -120,7 +120,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW)
- 
-   PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool prefer_dark_theme = false;
-   raw_ptr<gfx::ImageSkia> icon = nullptr;
-   std::optional<SkColor> background_color;
diff --git a/chromium-next/patches/patch-ui_qt_BUILD.gn b/chromium-next/patches/patch-ui_qt_BUILD.gn
deleted file mode 100644
index 2794bff807..0000000000
--- a/chromium-next/patches/patch-ui_qt_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/qt/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/qt/BUILD.gn
-@@ -20,7 +20,7 @@ config("qt_internal_config") {
- 
-   # It's OK to depend on the system libstdc++ since it's a dependency of QT, so
-   # it will get loaded into the process anyway.
--  libs = [ "stdc++" ]
-+  # libs = [ "stdc++" ]
- 
-   configs = [
-     "//build/config/linux:runtime_library",
diff --git a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__bn.xtb b/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__bn.xtb
deleted file mode 100644
index 886c6fc44b..0000000000
--- a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__bn.xtb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/strings/translations/app_locale_settings_bn.xtb.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/strings/translations/app_locale_settings_bn.xtb
-@@ -10,7 +10,7 @@
-   <translation id="IDS_WEB_FONT_FAMILY">Vrinda</translation>
-   <translation id="IDS_WEB_FONT_FAMILY_XP">Vrinda</translation>
- </if>
--<if expr="is_linux">
-+<if expr="is_posix">
-   <translation id="IDS_WEB_FONT_FAMILY">Lohit Bengali</translation>
- </if>
- <if expr="is_chromeos">
diff --git a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ja.xtb b/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ja.xtb
deleted file mode 100644
index e026db9207..0000000000
--- a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ja.xtb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/strings/translations/app_locale_settings_ja.xtb.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/strings/translations/app_locale_settings_ja.xtb
-@@ -12,7 +12,7 @@
- <if expr="is_ios">
-   <translation id="IDS_WEB_FONT_FAMILY">Helvetica,Hiragino Kaku Gothic ProN,sans-serif</translation>
- </if>
--<if expr="is_linux">
-+<if expr="is_posix">
-   <translation id="IDS_WEB_FONT_FAMILY">VL PGothic,Sazanami Gothic,Kochi Gothic,sans-serif</translation>
- </if>
- <if expr="is_chromeos">
diff --git a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ko.xtb b/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ko.xtb
deleted file mode 100644
index 730ee84183..0000000000
--- a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ko.xtb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/strings/translations/app_locale_settings_ko.xtb.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/strings/translations/app_locale_settings_ko.xtb
-@@ -12,7 +12,7 @@
- <if expr="is_ios">
-   <translation id="IDS_WEB_FONT_FAMILY">Helvetica,Apple SD Gothic Neo,AppleGothic,sans-serif</translation>
- </if>
--<if expr="is_linux">
-+<if expr="is_posix">
-   <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK KR,NanumGothic,UnDotum,Baekmuk Gulim,sans-serif</translation>
- </if>
- <if expr="is_chromeos">
diff --git a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ml.xtb b/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ml.xtb
deleted file mode 100644
index 24a3fe7e9b..0000000000
--- a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__ml.xtb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/strings/translations/app_locale_settings_ml.xtb.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/strings/translations/app_locale_settings_ml.xtb
-@@ -9,7 +9,7 @@
-   <translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,AnjaliOldLipi,Rachana,Kartika</translation>
-   <translation id="IDS_WEB_FONT_FAMILY_XP">Arial,AnjaliOldLipi,Rachana,Kartika</translation>
- </if>
--<if expr="is_linux">
-+<if expr="is_posix">
-   <translation id="IDS_WEB_FONT_FAMILY">Arial,AnjaliOldLipi,Rachana,Kartika,sans-serif</translation>
- </if>
- <if expr="is_chromeos">
diff --git a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__th.xtb b/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__th.xtb
deleted file mode 100644
index 0a8071f745..0000000000
--- a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__th.xtb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/strings/translations/app_locale_settings_th.xtb.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/strings/translations/app_locale_settings_th.xtb
-@@ -6,7 +6,7 @@
-   <translation id="IDS_WEB_FONT_FAMILY">Tahoma,sans-serif</translation>
-   <translation id="IDS_WEB_FONT_FAMILY_XP">Tahoma,sans-serif</translation>
- </if>
--<if expr="is_linux">
-+<if expr="is_posix">
-   <translation id="IDS_WEB_FONT_FAMILY">Norasi,Waree,Garuda,Loma,sans-serif</translation>
- </if>
- <if expr="is_chromeos">
diff --git a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb b/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
deleted file mode 100644
index a25e1f82a1..0000000000
--- a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/strings/translations/app_locale_settings_zh-CN.xtb.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/strings/translations/app_locale_settings_zh-CN.xtb
-@@ -12,7 +12,7 @@
- <if expr="is_ios">
-   <translation id="IDS_WEB_FONT_FAMILY">Helvetica,PingFang SC,STHeiti,sans-serif</translation>
- </if>
--<if expr="is_linux">
-+<if expr="is_posix">
-   <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif</translation>
- </if>
- <if expr="is_chromeos">
diff --git a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb b/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
deleted file mode 100644
index 4ae9b7786f..0000000000
--- a/chromium-next/patches/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/strings/translations/app_locale_settings_zh-TW.xtb
-@@ -12,7 +12,7 @@
- <if expr="is_ios">
-   <translation id="IDS_WEB_FONT_FAMILY">Helvetica,PingFang TC,Heiti TC,sans-serif</translation>
- </if>
--<if expr="is_linux">
-+<if expr="is_posix">
-   <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK TC, WenQuanYi Zen Hei, sans-serif</translation>
-   </if>
- <if expr="is_chromeos">
diff --git a/chromium-next/patches/patch-ui_views_BUILD.gn b/chromium-next/patches/patch-ui_views_BUILD.gn
deleted file mode 100644
index a52c6dee52..0000000000
--- a/chromium-next/patches/patch-ui_views_BUILD.gn
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/BUILD.gn
-@@ -839,7 +839,6 @@ component("views") {
-       sources += [ "accessibility/widget_ax_tree_id_map.cc" ]
-     }
-     deps += [
--      "//components/crash/core/common:crash_key",
-       "//ui/aura",
-       "//ui/base/cursor/mojom:cursor_type_shared",
-       "//ui/events",
diff --git a/chromium-next/patches/patch-ui_views_accessibility_view__accessibility.cc b/chromium-next/patches/patch-ui_views_accessibility_view__accessibility.cc
deleted file mode 100644
index 82ccfe7600..0000000000
--- a/chromium-next/patches/patch-ui_views_accessibility_view__accessibility.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/accessibility/view_accessibility.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/accessibility/view_accessibility.cc
-@@ -34,7 +34,7 @@
- #include "ui/views/accessibility/view_ax_platform_node_delegate_win.h"
- #elif BUILDFLAG(IS_MAC)
- #include "ui/views/accessibility/view_ax_platform_node_delegate_mac.h"
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/views/accessibility/view_ax_platform_node_delegate_auralinux.h"
- #endif
- 
-@@ -101,7 +101,7 @@ std::unique_ptr<ViewAccessibility> ViewA
-   return ViewAXPlatformNodeDelegateWin::CreatePlatformSpecific(view);
- #elif BUILDFLAG(IS_MAC)
-   return ViewAXPlatformNodeDelegateMac::CreatePlatformSpecific(view);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return ViewAXPlatformNodeDelegateAuraLinux::CreatePlatformSpecific(view);
- #endif
- }
diff --git a/chromium-next/patches/patch-ui_views_controls_prefix__selector.cc b/chromium-next/patches/patch-ui_views_controls_prefix__selector.cc
deleted file mode 100644
index fd0938b5aa..0000000000
--- a/chromium-next/patches/patch-ui_views_controls_prefix__selector.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/controls/prefix_selector.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/controls/prefix_selector.cc
-@@ -192,7 +192,7 @@ bool PrefixSelector::ShouldDoLearning() 
-   return false;
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- bool PrefixSelector::SetCompositionFromExistingText(
-     const gfx::Range& range,
-     const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
diff --git a/chromium-next/patches/patch-ui_views_controls_prefix__selector.h b/chromium-next/patches/patch-ui_views_controls_prefix__selector.h
deleted file mode 100644
index 67536ce31c..0000000000
--- a/chromium-next/patches/patch-ui_views_controls_prefix__selector.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/controls/prefix_selector.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/controls/prefix_selector.h
-@@ -91,7 +91,7 @@ class VIEWS_EXPORT PrefixSelector : publ
-   ukm::SourceId GetClientSourceForMetrics() const override;
-   bool ShouldDoLearning() override;
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool SetCompositionFromExistingText(
-       const gfx::Range& range,
-       const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override;
diff --git a/chromium-next/patches/patch-ui_views_controls_textfield_textfield.cc b/chromium-next/patches/patch-ui_views_controls_textfield_textfield.cc
deleted file mode 100644
index 187fde78b8..0000000000
--- a/chromium-next/patches/patch-ui_views_controls_textfield_textfield.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/controls/textfield/textfield.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/controls/textfield/textfield.cc
-@@ -87,7 +87,7 @@
- #include "base/win/win_util.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/base/ime/linux/text_edit_command_auralinux.h"
- #include "ui/base/ime/text_input_flags.h"
- #include "ui/linux/linux_ui.h"
-@@ -184,7 +184,7 @@ bool IsControlKeyModifier(int flags) {
- // Control-modified key combination, but we cannot extend it to other platforms
- // as Control has different meanings and behaviors.
- // https://crrev.com/2580483002/#msg46
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return flags & ui::EF_CONTROL_DOWN;
- #else
-   return false;
-@@ -791,7 +791,7 @@ bool Textfield::OnKeyPressed(const ui::K
-     return handled;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!handled) {
-     if (auto* linux_ui = ui::LinuxUi::instance()) {
-       const auto command =
-@@ -976,7 +976,7 @@ void Textfield::AboutToRequestFocusFromT
- }
- 
- bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Skip any accelerator handling that conflicts with custom keybindings.
-   if (auto* linux_ui = ui::LinuxUi::instance()) {
-     if (IsTextEditCommandEnabled(linux_ui->GetTextEditCommandForEvent(
-@@ -2062,7 +2062,7 @@ bool Textfield::ShouldDoLearning() {
-   return false;
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // TODO(crbug.com/41452689): Implement this method to support Korean IME
- // reconversion feature on native text fields (e.g. find bar).
- bool Textfield::SetCompositionFromExistingText(
-@@ -2580,7 +2580,7 @@ ui::TextEditCommand Textfield::GetComman
- #endif
-         return ui::TextEditCommand::DELETE_BACKWARD;
-       }
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // Only erase by line break on Linux and ChromeOS.
-       if (shift) {
-         return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
-@@ -2588,7 +2588,7 @@ ui::TextEditCommand Textfield::GetComman
- #endif
-       return ui::TextEditCommand::DELETE_WORD_BACKWARD;
-     case ui::VKEY_DELETE:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // Only erase by line break on Linux and ChromeOS.
-       if (shift && control) {
-         return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
diff --git a/chromium-next/patches/patch-ui_views_controls_textfield_textfield.h b/chromium-next/patches/patch-ui_views_controls_textfield_textfield.h
deleted file mode 100644
index 83f711e3ce..0000000000
--- a/chromium-next/patches/patch-ui_views_controls_textfield_textfield.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/controls/textfield/textfield.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/controls/textfield/textfield.h
-@@ -48,7 +48,7 @@
- #include "ui/views/view_observer.h"
- #include "ui/views/word_lookup_client.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <vector>
- #endif
- 
-@@ -475,7 +475,7 @@ class VIEWS_EXPORT Textfield : public Vi
-   // Set whether the text should be used to improve typing suggestions.
-   void SetShouldDoLearning(bool value) { should_do_learning_ = value; }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool SetCompositionFromExistingText(
-       const gfx::Range& range,
-       const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override;
diff --git a/chromium-next/patches/patch-ui_views_corewm_tooltip__aura.cc b/chromium-next/patches/patch-ui_views_corewm_tooltip__aura.cc
deleted file mode 100644
index a0a861085b..0000000000
--- a/chromium-next/patches/patch-ui_views_corewm_tooltip__aura.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/corewm/tooltip_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/corewm/tooltip_aura.cc
-@@ -42,7 +42,7 @@ static constexpr int kTooltipMaxWidth = 
- 
- // TODO(varkha): Update if native widget can be transparent on Linux.
- bool CanUseTranslucentTooltipWidget() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return false;
- #else
-   return true;
diff --git a/chromium-next/patches/patch-ui_views_examples_widget__example.cc b/chromium-next/patches/patch-ui_views_examples_widget__example.cc
deleted file mode 100644
index 4ba2346f20..0000000000
--- a/chromium-next/patches/patch-ui_views_examples_widget__example.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/examples/widget_example.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/examples/widget_example.cc
-@@ -51,7 +51,7 @@ void WidgetExample::CreateExampleView(Vi
-   modal_button->SetCallback(
-       base::BindRepeating(&WidgetExample::CreateDialogWidget,
-                           base::Unretained(this), modal_button, true));
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Windows does not support TYPE_CONTROL top-level widgets.
-   LabelButton* control_button = BuildButton(
-       container, GetStringUTF16(IDS_WIDGET_CHILD_WIDGET_BUTTON_LABEL));
diff --git a/chromium-next/patches/patch-ui_views_focus_focus__manager.cc b/chromium-next/patches/patch-ui_views_focus_focus__manager.cc
deleted file mode 100644
index 8638fc6c55..0000000000
--- a/chromium-next/patches/patch-ui_views_focus_focus__manager.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/focus/focus_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/focus/focus_manager.cc
-@@ -606,7 +606,7 @@ bool FocusManager::RedirectAcceleratorTo
-     return false;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Processing an accelerator can delete things. Because we
-   // need these objects afterwards on Linux, save widget_ as weak pointer and
-   // save the close_on_deactivate property value of widget_delegate in a
-@@ -621,7 +621,7 @@ bool FocusManager::RedirectAcceleratorTo
-   const bool accelerator_processed =
-       focus_manager->ProcessAccelerator(accelerator);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Need to manually close the bubble widget on Linux. On Linux when the
-   // bubble is shown, the main widget remains active. Because of that when
-   // focus is set to the main widget to process accelerator, the main widget
diff --git a/chromium-next/patches/patch-ui_views_style_platform__style.cc b/chromium-next/patches/patch-ui_views_style_platform__style.cc
deleted file mode 100644
index 2559714ce5..0000000000
--- a/chromium-next/patches/patch-ui_views_style_platform__style.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/style/platform_style.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/style/platform_style.cc
-@@ -23,7 +23,7 @@
- #include "ui/views/controls/focusable_border.h"
- #include "ui/views/controls/scrollbar/scroll_bar_views.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
- #endif
- #endif
-@@ -35,7 +35,7 @@ namespace views {
- // static
- std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(
-     ScrollBar::Orientation orientation) {
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return std::make_unique<OverlayScrollBar>(orientation);
- #else
-   return std::make_unique<ScrollBarViews>(orientation);
diff --git a/chromium-next/patches/patch-ui_views_style_platform__style.h b/chromium-next/patches/patch-ui_views_style_platform__style.h
deleted file mode 100644
index a3bfc8c38d..0000000000
--- a/chromium-next/patches/patch-ui_views_style_platform__style.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/style/platform_style.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/style/platform_style.h
-@@ -84,7 +84,7 @@ class VIEWS_EXPORT PlatformStyle {
-   // Default setting at bubble creation time for whether arrow will be adjusted
-   // for bubbles going off-screen to bring more bubble area into view. Linux
-   // clips bubble windows that extend outside their parent window bounds.
--  static constexpr bool kAdjustBubbleIfOffscreen = !BUILDFLAG(IS_LINUX);
-+  static constexpr bool kAdjustBubbleIfOffscreen = (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD));
- 
-   // Default focus behavior on the platform.
-   static constexpr View::FocusBehavior kDefaultFocusBehavior =
diff --git a/chromium-next/patches/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc b/chromium-next/patches/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
deleted file mode 100644
index 86b5178711..0000000000
--- a/chromium-next/patches/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
-@@ -237,7 +237,7 @@ bool SendMouseClick(MouseButton type, gf
-                          window_hint);
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // static
- void ForceUseScreenCoordinatesOnce() {
-   g_ozone_ui_controls_test_helper->ForceUseScreenCoordinatesOnce();
diff --git a/chromium-next/patches/patch-ui_views_views__delegate.cc b/chromium-next/patches/patch-ui_views_views__delegate.cc
deleted file mode 100644
index efaba6fe75..0000000000
--- a/chromium-next/patches/patch-ui_views_views__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/views_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/views_delegate.cc
-@@ -101,7 +101,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx:
-   return false;
- }
- #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
-   return nullptr;
- }
diff --git a/chromium-next/patches/patch-ui_views_views__delegate.h b/chromium-next/patches/patch-ui_views_views__delegate.h
deleted file mode 100644
index f262b49e55..0000000000
--- a/chromium-next/patches/patch-ui_views_views__delegate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/views_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/views_delegate.h
-@@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate {
-   // environment.
-   virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
- #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
-   virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
- #endif
- 
diff --git a/chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
deleted file mode 100644
index 2109d7296c..0000000000
--- a/chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
-@@ -203,7 +203,7 @@ DragOperation DesktopDragDropClientOzone
-   return selected_operation_;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void DesktopDragDropClientOzone::UpdateDragImage(const gfx::ImageSkia& image,
-                                                  const gfx::Vector2d& offset) {
-   DCHECK(drag_handler_);
diff --git a/chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
deleted file mode 100644
index 05545e7ba4..0000000000
--- a/chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
-@@ -67,7 +67,7 @@ class VIEWS_EXPORT DesktopDragDropClient
-     // The offset of |drag_widget_| relative to the mouse position.
-     gfx::Vector2d offset;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // The last received drag location.  The drag widget is moved asynchronously
-     // so its position is updated when the UI thread has time for that.  When
-     // the first change to the location happens, a call to UpdateDragWidget()
-@@ -88,7 +88,7 @@ class VIEWS_EXPORT DesktopDragDropClient
-       const gfx::Point& root_location,
-       int allowed_operations,
-       ui::mojom::DragEventSource source) override;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void UpdateDragImage(const gfx::ImageSkia& image,
-                        const gfx::Vector2d& offset) override;
- #endif
diff --git a/chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
deleted file mode 100644
index e1a7b99a7f..0000000000
--- a/chromium-next/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -50,7 +50,7 @@
- #include "ui/wm/core/window_util.h"
- #include "ui/wm/public/window_move_client.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
- #endif
- 
-@@ -353,7 +353,7 @@ std::unique_ptr<aura::client::DragDropCl
- DesktopWindowTreeHostPlatform::CreateDragDropClient() {
-   ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
-   std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
- #else
-       std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1185,7 +1185,7 @@ bool DesktopWindowTreeHostPlatform::Rota
- // DesktopWindowTreeHost:
- 
- // Linux subclasses this host and adds some Linux specific bits.
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
- // static
- DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
-     internal::NativeWidgetDelegate* native_widget_delegate,
diff --git a/chromium-next/patches/patch-ui_views_widget_root__view.cc b/chromium-next/patches/patch-ui_views_widget_root__view.cc
deleted file mode 100644
index af490e5c61..0000000000
--- a/chromium-next/patches/patch-ui_views_widget_root__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/widget/root_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/widget/root_view.cc
-@@ -169,7 +169,7 @@ class AnnounceTextView : public View {
- #if BUILDFLAG(IS_CHROMEOS)
-     // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting.
-     GetViewAccessibility().SetRole(ax::mojom::Role::kStaticText);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/40658933): Use live regions (do not use alerts).
-     // May require setting kLiveStatus, kContainerLiveStatus to "polite".
-     GetViewAccessibility().SetRole(ax::mojom::Role::kAlert);
diff --git a/chromium-next/patches/patch-ui_views_widget_widget.cc b/chromium-next/patches/patch-ui_views_widget_widget.cc
deleted file mode 100644
index 5df45c1913..0000000000
--- a/chromium-next/patches/patch-ui_views_widget_widget.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/widget/widget.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/widget/widget.cc
-@@ -63,7 +63,7 @@
- #include "ui/views/window/custom_frame_view.h"
- #include "ui/views/window/dialog_delegate.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/linux/linux_ui.h"
- #endif
- 
-@@ -2453,7 +2453,7 @@ const ui::NativeTheme* Widget::GetNative
-     return parent_->GetNativeTheme();
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (auto* linux_ui_theme =
-           ui::LinuxUiTheme::GetForWindow(GetNativeWindow())) {
-     return linux_ui_theme->GetNativeTheme();
diff --git a/chromium-next/patches/patch-ui_views_widget_widget.h b/chromium-next/patches/patch-ui_views_widget_widget.h
deleted file mode 100644
index 6b85e3ae40..0000000000
--- a/chromium-next/patches/patch-ui_views_widget_widget.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/widget/widget.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/widget/widget.h
-@@ -487,7 +487,7 @@ class VIEWS_EXPORT Widget : public inter
-     bool force_system_menu_for_frameless = false;
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // Only used by X11, for root level windows. Specifies the res_name and
-     // res_class fields, respectively, of the WM_CLASS window property. Controls
-     // window grouping and desktop file matching in Linux window managers.
diff --git a/chromium-next/patches/patch-ui_views_window_custom__frame__view.cc b/chromium-next/patches/patch-ui_views_window_custom__frame__view.cc
deleted file mode 100644
index fccdbe16e8..0000000000
--- a/chromium-next/patches/patch-ui_views_window_custom__frame__view.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/window/custom_frame_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/window/custom_frame_view.cc
-@@ -279,7 +279,7 @@ int CustomFrameView::NonClientTopBorderH
- int CustomFrameView::CaptionButtonY() const {
-   // Maximized buttons start at window top so that even if their images aren't
-   // drawn flush with the screen edge, they still obey Fitts' Law.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return FrameBorderThickness();
- #else
-   return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness;
diff --git a/chromium-next/patches/patch-ui_views_window_dialog__delegate.cc b/chromium-next/patches/patch-ui_views_window_dialog__delegate.cc
deleted file mode 100644
index fb7d49483a..0000000000
--- a/chromium-next/patches/patch-ui_views_window_dialog__delegate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/window/dialog_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/window/dialog_delegate.cc
-@@ -106,7 +106,7 @@ Widget* DialogDelegate::CreateDialogWidg
- 
- // static
- bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
--#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
-   // The new style doesn't support unparented dialogs on Linux desktop.
-   return parent != nullptr;
- #else
diff --git a/chromium-next/patches/patch-ui_views_window_frame__background.cc b/chromium-next/patches/patch-ui_views_window_frame__background.cc
deleted file mode 100644
index b783b07bf7..0000000000
--- a/chromium-next/patches/patch-ui_views_window_frame__background.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/window/frame_background.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ ui/views/window/frame_background.cc
-@@ -110,7 +110,7 @@ void FrameBackground::PaintMaximized(gfx
-                                      int width) const {
- // Fill the top with the frame color first so we have a constant background
- // for areas not covered by the theme image.
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
-     BUILDFLAG(ENABLE_DESKTOP_AURA)
-   ui::NativeTheme::FrameTopAreaExtraParams frame_top_area;
-   frame_top_area.use_custom_frame = use_custom_frame_;
diff --git a/chromium-next/patches/patch-v8_BUILD.gn b/chromium-next/patches/patch-v8_BUILD.gn
deleted file mode 100644
index 9db2c2b89f..0000000000
--- a/chromium-next/patches/patch-v8_BUILD.gn
+++ /dev/null
@@ -1,139 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/BUILD.gn
-@@ -1000,6 +1000,9 @@ external_v8_defines = [
-   "V8_TARGET_OS_MACOS",
-   "V8_TARGET_OS_WIN",
-   "V8_TARGET_OS_CHROMEOS",
-+  "V8_TARGET_OS_OPENBSD",
-+  "V8_TARGET_OS_FREEBSD",
-+  "V8_TARGET_OS_NETBSD",
- ]
- 
- enabled_external_v8_defines = [
-@@ -1079,6 +1082,15 @@ if (target_os == "android") {
- } else if (target_os == "chromeos") {
-   enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
-   enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ]
-+} else if (target_os == "openbsd") {
-+  enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
-+  enabled_external_v8_defines += [ "V8_TARGET_OS_OPENBSD" ]
-+} else if (target_os == "freebsd") {
-+  enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
-+  enabled_external_v8_defines += [ "V8_TARGET_OS_FREEBSD" ]
-+} else if (target_os == "netbsd") {
-+  enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
-+  enabled_external_v8_defines += [ "V8_TARGET_OS_NETBSD" ]
- }
- 
- disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines
-@@ -2401,6 +2413,23 @@ action("generate_bytecode_builtins_list"
-   ]
- }
- 
-+action("run_paxctl_mksnapshot") {
-+    deps = [ ":mksnapshot($v8_snapshot_toolchain)" ]
-+
-+    script = "tools/run-paxctl.py"
-+    stamp = "$target_gen_dir/paxctl_stamp"
-+    outputs = [ stamp ]
-+
-+    sources = []
-+    data = []
-+
-+    args = [
-+      rebase_path(stamp, root_build_dir), "/usr/sbin/paxctl", "+m", "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
-+                                        "root_out_dir") + "/mksnapshot",
-+                         root_build_dir),
-+    ]
-+}
-+
- # Template to generate different V8 snapshots based on different runtime flags.
- # Can be invoked with run_mksnapshot(<name>). The target will resolve to
- # run_mksnapshot_<name>. If <name> is "default", no file suffixes will be used.
-@@ -2419,7 +2448,11 @@ template("run_mksnapshot") {
-     suffix = "_$name"
-   }
-   action("run_mksnapshot_" + name) {
--    deps = [ ":mksnapshot($v8_snapshot_toolchain)" ]
-+    if (target_os == "netbsd") {
-+      deps = [ ":mksnapshot($v8_snapshot_toolchain)", ":run_paxctl_mksnapshot" ]
-+    } else {
-+      deps = [ ":mksnapshot($v8_snapshot_toolchain)" ]
-+    }
-     if (v8_verify_deterministic_mksnapshot) {
-       # We archive the snapshot executable when verifying snapshot
-       # determinism to ease debugging.
-@@ -2537,6 +2570,12 @@ template("run_mksnapshot") {
-       if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) {
-         args += [ "--reorder-builtins" ]
-       }
-+
-+      if (v8_current_cpu == "x86") {
-+        args -= [
-+          "--abort-on-bad-builtin-profile-data",
-+        ]
-+      }
-     }
- 
-     if (v8_enable_turboshaft_csa) {
-@@ -4641,7 +4680,7 @@ v8_header_set("v8_internal_headers") {
-       # iOS Xcode simulator builds run on an x64 target. iOS and macOS are both
-       # based on Darwin and thus POSIX-compliant to a similar degree.
-       if (is_linux || is_chromeos || is_mac || is_ios ||
--          target_os == "freebsd") {
-+          target_os == "freebsd" || target_os == "netbsd") {
-         sources += [ "src/trap-handler/handler-inside-posix.h" ]
-       } else if (is_win) {
-         sources += [ "src/trap-handler/handler-inside-win.h" ]
-@@ -6003,7 +6042,7 @@ v8_source_set("v8_base_without_compiler"
-       # iOS Xcode simulator builds run on an x64 target. iOS and macOS are both
-       # based on Darwin and thus POSIX-compliant to a similar degree.
-       if (is_linux || is_chromeos || is_mac || is_ios ||
--          target_os == "freebsd") {
-+          target_os == "freebsd" || target_os == "netbsd") {
-         sources += [
-           "src/trap-handler/handler-inside-posix.cc",
-           "src/trap-handler/handler-outside-posix.cc",
-@@ -6631,7 +6670,7 @@ v8_component("v8_libbase") {
-     }
-   }
- 
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [
-       "src/base/debug/stack_trace_posix.cc",
-       "src/base/platform/platform-linux.cc",
-@@ -6642,6 +6681,27 @@ v8_component("v8_libbase") {
-       "dl",
-       "rt",
-     ]
-+  } else if (is_openbsd) {
-+    sources += [
-+      "src/base/debug/stack_trace_posix.cc",
-+      "src/base/platform/platform-openbsd.cc",
-+    ]
-+    libs = [ "execinfo" ]
-+  } else if (is_netbsd) {
-+    sources += [
-+      "src/base/debug/stack_trace_posix.cc",
-+      "src/base/platform/platform-openbsd.cc",
-+    ]
-+    libs = [
-+      "rt",
-+      "execinfo",
-+    ]
-+  } else if (is_freebsd) {
-+    sources += [
-+      "src/base/debug/stack_trace_posix.cc",
-+      "src/base/platform/platform-freebsd.cc",
-+    ]
-+    libs = [ "execinfo" ]
-   } else if (current_os == "aix") {
-     sources += [
-       "src/base/debug/stack_trace_posix.cc",
diff --git a/chromium-next/patches/patch-v8_include_v8-internal.h b/chromium-next/patches/patch-v8_include_v8-internal.h
deleted file mode 100644
index 78ec0c3d33..0000000000
--- a/chromium-next/patches/patch-v8_include_v8-internal.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/include/v8-internal.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/include/v8-internal.h
-@@ -232,7 +232,7 @@ using SandboxedPointer_t = Address;
- #ifdef V8_ENABLE_SANDBOX
- 
- // Size of the sandbox, excluding the guard regions surrounding it.
--#if defined(V8_TARGET_OS_ANDROID)
-+#if (defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD))
- // On Android, most 64-bit devices seem to be configured with only 39 bits of
- // virtual address space for userspace. As such, limit the sandbox to 128GB (a
- // quarter of the total available address space).
diff --git a/chromium-next/patches/patch-v8_include_v8config.h b/chromium-next/patches/patch-v8_include_v8config.h
deleted file mode 100644
index 538f594889..0000000000
--- a/chromium-next/patches/patch-v8_include_v8config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/include/v8config.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/include/v8config.h
-@@ -201,6 +201,9 @@ path. Add it with -I<path> to the comman
-   && !defined(V8_TARGET_OS_FUCHSIA) \
-   && !defined(V8_TARGET_OS_IOS) \
-   && !defined(V8_TARGET_OS_LINUX) \
-+  && !defined(V8_TARGET_OS_OPENBSD) \
-+  && !defined(V8_TARGET_OS_FREEBSD) \
-+  && !defined(V8_TARGET_OS_NETBSD) \
-   && !defined(V8_TARGET_OS_MACOS) \
-   && !defined(V8_TARGET_OS_WIN) \
-   && !defined(V8_TARGET_OS_CHROMEOS)
-@@ -213,6 +216,9 @@ path. Add it with -I<path> to the comman
-   || defined(V8_TARGET_OS_FUCHSIA) \
-   || defined(V8_TARGET_OS_IOS) \
-   || defined(V8_TARGET_OS_LINUX) \
-+  || defined(V8_TARGET_OS_OPENBSD) \
-+  || defined(V8_TARGET_OS_FREEBSD) \
-+  || defined(V8_TARGET_OS_NETBSD) \
-   || defined(V8_TARGET_OS_MACOS) \
-   || defined(V8_TARGET_OS_WIN) \
-   || defined(V8_TARGET_OS_CHROMEOS)
-@@ -236,6 +242,22 @@ path. Add it with -I<path> to the comman
- # define V8_TARGET_OS_LINUX
- #endif
- 
-+#ifdef V8_OS_OPENBSD
-+# define V8_TARGET_OS_OPENBSD
-+# define V8_TARGET_OS_BSD
-+#endif
-+
-+#ifdef V8_OS_FREEBSD
-+# define V8_TARGET_OS_OPENBSD
-+# define V8_TARGET_OS_BSD
-+#endif
-+
-+#ifdef V8_OS_NETBSD
-+# define V8_TARGET_OS_OPENBSD
-+# define V8_TARGET_OS_NETBSD
-+# define V8_TARGET_OS_BSD
-+#endif
-+
- #ifdef V8_OS_MACOS
- # define V8_TARGET_OS_MACOS
- #endif
-@@ -383,6 +405,7 @@ path. Add it with -I<path> to the comman
- #if (defined(_M_X64) || defined(__x86_64__)            /* x64 (everywhere) */  \
-      || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */    \
-          && !defined(_WIN32)))                         /* not on windows */    \
-+     && !defined(__OpenBSD__)                          /* not on OpenBSD */    \
-      && !defined(COMPONENT_BUILD)                      /* no component build */\
-      && __clang_major__ >= 17                          /* clang >= 17 */
- # define V8_HAS_ATTRIBUTE_PRESERVE_MOST (__has_attribute(preserve_most))
diff --git a/chromium-next/patches/patch-v8_src_api_api.cc b/chromium-next/patches/patch-v8_src_api_api.cc
deleted file mode 100644
index 209c45d348..0000000000
--- a/chromium-next/patches/patch-v8_src_api_api.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/api/api.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/api/api.cc
-@@ -153,7 +153,7 @@
- #include "src/wasm/wasm-serialization.h"
- #endif  // V8_ENABLE_WEBASSEMBLY
- 
--#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD
-+#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD || V8_OS_OPENBSD || V8_OS_NETBSD
- #include <signal.h>
- #include <unistd.h>
- 
-@@ -6483,7 +6483,7 @@ bool v8::V8::Initialize(const int build_
-   return true;
- }
- 
--#if V8_OS_LINUX || V8_OS_DARWIN
-+#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD || V8_OS_OPENBSD|| V8_OS_NETBSD
- bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info,
-                                    void* context) {
- #if V8_ENABLE_WEBASSEMBLY && V8_TRAP_HANDLER_SUPPORTED
diff --git a/chromium-next/patches/patch-v8_src_base_atomicops.h b/chromium-next/patches/patch-v8_src_base_atomicops.h
deleted file mode 100644
index 3137016fbd..0000000000
--- a/chromium-next/patches/patch-v8_src_base_atomicops.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/base/atomicops.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/base/atomicops.h
-@@ -57,10 +57,10 @@ using Atomic64 = SbAtomic64;
- using Atomic8 = char;
- using Atomic16 = int16_t;
- using Atomic32 = int32_t;
--#if defined(V8_HOST_ARCH_64_BIT)
-+#if defined(V8_HOST_ARCH_64_BIT) || defined(V8_OS_OPENBSD)
- // We need to be able to go between Atomic64 and AtomicWord implicitly.  This
- // means Atomic64 and AtomicWord should be the same type on 64-bit.
--#if defined(__ILP32__)
-+#if defined(__ILP32__) && !defined(V8_OS_OPENBSD)
- using Atomic64 = int64_t;
- #else
- using Atomic64 = intptr_t;
-@@ -266,7 +266,7 @@ inline Atomic32 SeqCst_Load(volatile con
-                                    std::memory_order_seq_cst);
- }
- 
--#if defined(V8_HOST_ARCH_64_BIT)
-+#if defined(V8_HOST_ARCH_64_BIT) || defined(V8_OS_OPENBSD)
- 
- inline Atomic64 Relaxed_CompareAndSwap(volatile Atomic64* ptr,
-                                        Atomic64 old_value, Atomic64 new_value) {
diff --git a/chromium-next/patches/patch-v8_src_base_platform_memory.h b/chromium-next/patches/patch-v8_src_base_platform_memory.h
deleted file mode 100644
index cd74d1ce1d..0000000000
--- a/chromium-next/patches/patch-v8_src_base_platform_memory.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/base/platform/memory.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/base/platform/memory.h
-@@ -21,13 +21,13 @@
- #include <malloc/malloc.h>
- #elif V8_OS_OPENBSD
- #include <sys/malloc.h>
--#elif V8_OS_ZOS
-+#elif (V8_OS_ZOS || V8_OS_BSD)
- #include <stdlib.h>
- #else
- #include <malloc.h>
- #endif
- 
--#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS && !V8_OS_OPENBSD) || V8_OS_WIN
-+#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS && !V8_OS_BSD) || V8_OS_WIN
- #define V8_HAS_MALLOC_USABLE_SIZE 1
- #endif
- 
diff --git a/chromium-next/patches/patch-v8_src_base_platform_platform-freebsd.cc b/chromium-next/patches/patch-v8_src_base_platform_platform-freebsd.cc
deleted file mode 100644
index 62d1cdf7d1..0000000000
--- a/chromium-next/patches/patch-v8_src_base_platform_platform-freebsd.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/base/platform/platform-freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/base/platform/platform-freebsd.cc
-@@ -43,14 +43,10 @@ TimezoneCache* OS::CreateTimezoneCache()
-   return new PosixDefaultTimezoneCache();
- }
- 
--static unsigned StringToLong(char* buffer) {
--  return static_cast<unsigned>(strtol(buffer, nullptr, 16));
--}
--
- std::vector<OS::SharedLibraryAddress> OS::GetSharedLibraryAddresses() {
-   std::vector<SharedLibraryAddress> result;
-   int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid()};
--  size_t miblen = sizeof(mib) / sizeof(mib[0]);
-+  unsigned int miblen = sizeof(mib) / sizeof(mib[0]);
-   size_t buffer_size;
-   if (sysctl(mib, miblen, nullptr, &buffer_size, nullptr, 0) == 0) {
-     // Overallocate the buffer by 1/3 to account for concurrent
-@@ -82,8 +78,13 @@ std::vector<OS::SharedLibraryAddress> OS
-             lib_name = std::string(path);
-           }
-           result.push_back(SharedLibraryAddress(
-+#if defined(__i386__) || defined(OS_FREEBSD)
-+              lib_name, static_cast<uintptr_t>(map->kve_start),
-+              static_cast<uintptr_t>(map->kve_end)));
-+#else
-               lib_name, reinterpret_cast<uintptr_t>(map->kve_start),
-               reinterpret_cast<uintptr_t>(map->kve_end)));
-+#endif
-         }
- 
-         start += ssize;
diff --git a/chromium-next/patches/patch-v8_src_base_platform_platform-openbsd.cc b/chromium-next/patches/patch-v8_src_base_platform_platform-openbsd.cc
deleted file mode 100644
index fcf74fcbc6..0000000000
--- a/chromium-next/patches/patch-v8_src_base_platform_platform-openbsd.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/base/platform/platform-openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/base/platform/platform-openbsd.cc
-@@ -6,6 +6,9 @@
- // POSIX-compatible parts, the implementation is in platform-posix.cc.
- 
- #include <pthread.h>
-+#if !defined(__NetBSD__)
-+#include <pthread_np.h>
-+#endif
- #include <semaphore.h>
- #include <signal.h>
- #include <stdlib.h>
-@@ -122,6 +125,34 @@ void OS::SignalCodeMovingGC() {
- 
- void OS::AdjustSchedulingParams() {}
- 
-+// static
-+Stack::StackSlot Stack::ObtainCurrentThreadStackStart() {
-+#if defined(__NetBSD__)
-+  pthread_attr_t attr;
-+  int error;
-+  pthread_attr_init(&attr);
-+  error = pthread_attr_get_np(pthread_self(), &attr);
-+  if (!error) {
-+    void* base;
-+    size_t size;
-+    error = pthread_attr_getstack(&attr, &base, &size);
-+    CHECK(!error);
-+    pthread_attr_destroy(&attr);
-+    return reinterpret_cast<uint8_t*>(base) + size;
-+  }
-+  pthread_attr_destroy(&attr);
-+  return nullptr;
-+#else
-+  stack_t ss;
-+  void *base;
-+  if (pthread_stackseg_np(pthread_self(), &ss) != 0)
-+    return nullptr;
-+
-+  base = (void*)((size_t) ss.ss_sp - ss.ss_size);
-+  return reinterpret_cast<uint8_t*>(base) + ss.ss_size;
-+#endif
-+}
-+
- std::optional<OS::MemoryRange> OS::GetFirstFreeMemoryRangeWithin(
-     OS::Address boundary_start, OS::Address boundary_end, size_t minimum_size,
-     size_t alignment) {
diff --git a/chromium-next/patches/patch-v8_src_base_platform_platform-posix.cc b/chromium-next/patches/patch-v8_src_base_platform_platform-posix.cc
deleted file mode 100644
index 7a7c9ba403..0000000000
--- a/chromium-next/patches/patch-v8_src_base_platform_platform-posix.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/base/platform/platform-posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/base/platform/platform-posix.cc
-@@ -27,6 +27,9 @@
-     defined(__NetBSD__) || defined(__OpenBSD__)
- #include <sys/sysctl.h>  // for sysctl
- #endif
-+#if defined(__NetBSD__)
-+#include <lwp.h>
-+#endif
- 
- #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
- #define LOG_TAG "v8"
-@@ -76,9 +79,11 @@
- #include <sys/syscall.h>
- #endif
- 
--#if V8_OS_FREEBSD || V8_OS_DARWIN || V8_OS_OPENBSD || V8_OS_SOLARIS
-+#if V8_OS_FREEBSD || V8_OS_DARWIN || V8_OS_BSD || V8_OS_SOLARIS
-+#ifndef MAP_ANONYMOUS
- #define MAP_ANONYMOUS MAP_ANON
- #endif
-+#endif
- 
- #if defined(V8_OS_SOLARIS)
- #if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE > 2) || defined(__EXTENSIONS__)
-@@ -315,6 +320,13 @@ void OS::SetRandomMmapSeed(int64_t seed)
-   }
- }
- 
-+#if V8_OS_OPENBSD
-+// Allow OpenBSD's mmap to select a random address on OpenBSD
-+// static
-+void* OS::GetRandomMmapAddr() {
-+  return nullptr;
-+}
-+#else
- // static
- void* OS::GetRandomMmapAddr() {
-   uintptr_t raw_addr;
-@@ -413,6 +425,7 @@ void* OS::GetRandomMmapAddr() {
- #endif
-   return reinterpret_cast<void*>(raw_addr);
- }
-+#endif
- 
- // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files.
- #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA
-@@ -701,7 +714,7 @@ void OS::DestroySharedMemoryHandle(Platf
- #if !V8_OS_ZOS
- // static
- bool OS::HasLazyCommits() {
--#if V8_OS_AIX || V8_OS_LINUX || V8_OS_DARWIN
-+#if V8_OS_AIX || V8_OS_LINUX || V8_OS_DARWIN || V8_OS_BSD
-   return true;
- #else
-   // TODO(bbudge) Return true for all POSIX platforms.
-@@ -855,6 +868,8 @@ int OS::GetCurrentThreadIdInternal() {
-   return static_cast<int>(thread_self());
- #elif V8_OS_FUCHSIA
-   return static_cast<int>(zx_thread_self());
-+#elif V8_OS_NETBSD
-+  return static_cast<int>(_lwp_self());
- #elif V8_OS_SOLARIS
-   return static_cast<int>(pthread_self());
- #elif V8_OS_ZOS
-@@ -1156,7 +1171,11 @@ Thread::Thread(const Options& options)
-       stack_size_(options.stack_size()),
-       priority_(options.priority()),
-       start_semaphore_(nullptr) {
-+#if !defined(V8_OS_NETBSD)
-   const int min_stack_size = static_cast<int>(PTHREAD_STACK_MIN);
-+#else
-+  const int min_stack_size = static_cast<int>(sysconf(_SC_THREAD_STACK_MIN));
-+#endif
-   if (stack_size_ > 0) stack_size_ = std::max(stack_size_, min_stack_size);
-   set_name(options.name());
- }
-@@ -1171,7 +1190,7 @@ static void SetThreadName(const char* na
-   pthread_set_name_np(pthread_self(), name);
- #elif V8_OS_NETBSD
-   static_assert(Thread::kMaxThreadNameLength <= PTHREAD_MAX_NAMELEN_NP);
--  pthread_setname_np(pthread_self(), "%s", name);
-+  pthread_setname_np(pthread_self(), "%s", (void *)name);
- #elif V8_OS_DARWIN
-   // pthread_setname_np is only available in 10.6 or later, so test
-   // for it at runtime.
-@@ -1346,7 +1365,7 @@ void Thread::SetThreadLocal(LocalStorage
- // keep this version in POSIX as most Linux-compatible derivatives will
- // support it. MacOS and FreeBSD are different here.
- #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \
--    !defined(V8_OS_SOLARIS)
-+    !defined(V8_OS_SOLARIS) && !defined(V8_OS_OPENBSD) && !defined(V8_OS_NETBSD)
- 
- namespace {
- #if DEBUG
diff --git a/chromium-next/patches/patch-v8_src_base_strings.h b/chromium-next/patches/patch-v8_src_base_strings.h
deleted file mode 100644
index 850ec1b473..0000000000
--- a/chromium-next/patches/patch-v8_src_base_strings.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/base/strings.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/base/strings.h
-@@ -8,6 +8,9 @@
- #include "src/base/base-export.h"
- #include "src/base/macros.h"
- #include "src/base/vector.h"
-+#if defined(__NetBSD__)
-+#include <stdarg.h>
-+#endif
- 
- namespace v8 {
- namespace base {
diff --git a/chromium-next/patches/patch-v8_src_base_sys-info.cc b/chromium-next/patches/patch-v8_src_base_sys-info.cc
deleted file mode 100644
index 79ff2b8e04..0000000000
--- a/chromium-next/patches/patch-v8_src_base_sys-info.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/base/sys-info.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/base/sys-info.cc
-@@ -35,8 +35,12 @@ namespace base {
- 
- // static
- int SysInfo::NumberOfProcessors() {
-+#if V8_OS_OPENBSD || V8_OS_NETBSD
- #if V8_OS_OPENBSD
-+  int mib[2] = {CTL_HW, HW_NCPUONLINE};
-+#else
-   int mib[2] = {CTL_HW, HW_NCPU};
-+#endif
-   int ncpu = 0;
-   size_t len = sizeof(ncpu);
-   if (sysctl(mib, arraysize(mib), &ncpu, &len, nullptr, 0) != 0) {
diff --git a/chromium-next/patches/patch-v8_src_base_utils_random-number-generator.cc b/chromium-next/patches/patch-v8_src_base_utils_random-number-generator.cc
deleted file mode 100644
index 1b7073ad35..0000000000
--- a/chromium-next/patches/patch-v8_src_base_utils_random-number-generator.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/base/utils/random-number-generator.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/base/utils/random-number-generator.cc
-@@ -56,7 +56,7 @@ RandomNumberGenerator::RandomNumberGener
-   DCHECK_EQ(0, result);
-   USE(result);
-   SetSeed((static_cast<int64_t>(first_half) << 32) + second_half);
--#elif V8_OS_DARWIN || V8_OS_FREEBSD || V8_OS_OPENBSD
-+#elif V8_OS_DARWIN || V8_OS_FREEBSD || V8_OS_OPENBSD || V8_OS_NETBSD
-   // Despite its prefix suggests it is not RC4 algorithm anymore.
-   // It always succeeds while having decent performance and
-   // no file descriptor involved.
diff --git a/chromium-next/patches/patch-v8_src_diagnostics_perf-jit.cc b/chromium-next/patches/patch-v8_src_diagnostics_perf-jit.cc
deleted file mode 100644
index 8846e4121a..0000000000
--- a/chromium-next/patches/patch-v8_src_diagnostics_perf-jit.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/diagnostics/perf-jit.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/diagnostics/perf-jit.cc
-@@ -31,7 +31,7 @@
- #include "src/flags/flags.h"
- 
- // Only compile the {LinuxPerfJitLogger} on Linux.
--#if V8_OS_LINUX
-+#if defined(V8_OS_LINUX) || defined(V8_OS_BSD)
- 
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/chromium-next/patches/patch-v8_src_diagnostics_perf-jit.h b/chromium-next/patches/patch-v8_src_diagnostics_perf-jit.h
deleted file mode 100644
index ced129256c..0000000000
--- a/chromium-next/patches/patch-v8_src_diagnostics_perf-jit.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/diagnostics/perf-jit.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/diagnostics/perf-jit.h
-@@ -31,7 +31,7 @@
- #include "include/v8config.h"
- 
- // {LinuxPerfJitLogger} is only implemented on Linux.
--#if V8_OS_LINUX
-+#if defined(V8_OS_LINUX) || defined(V8_OS_BSD)
- 
- #include "src/logging/log.h"
- 
diff --git a/chromium-next/patches/patch-v8_src_execution_isolate.cc b/chromium-next/patches/patch-v8_src_execution_isolate.cc
deleted file mode 100644
index bcb5e73bb1..0000000000
--- a/chromium-next/patches/patch-v8_src_execution_isolate.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/execution/isolate.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/execution/isolate.cc
-@@ -173,6 +173,10 @@
- #include "src/execution/simulator-base.h"
- #endif
- 
-+#if defined(V8_OS_OPENBSD)
-+#include <sys/mman.h>
-+#endif
-+
- extern "C" const uint8_t v8_Default_embedded_blob_code_[];
- extern "C" uint32_t v8_Default_embedded_blob_code_size_;
- extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -5115,6 +5119,13 @@ void Isolate::InitializeDefaultEmbeddedB
-   const uint8_t* data = DefaultEmbeddedBlobData();
-   uint32_t data_size = DefaultEmbeddedBlobDataSize();
- 
-+#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
-+  if (code_size > 0) {
-+    mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)),
-+            code_size, PROT_READ | PROT_EXEC);
-+  }
-+#endif
-+
-   if (StickyEmbeddedBlobCode() != nullptr) {
-     base::MutexGuard guard(current_embedded_blob_refcount_mutex_.Pointer());
-     // Check again now that we hold the lock.
diff --git a/chromium-next/patches/patch-v8_src_flags_flags.cc b/chromium-next/patches/patch-v8_src_flags_flags.cc
deleted file mode 100644
index b993ed2bc5..0000000000
--- a/chromium-next/patches/patch-v8_src_flags_flags.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/flags/flags.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/flags/flags.cc
-@@ -16,6 +16,10 @@
- #include <set>
- #include <sstream>
- 
-+#if V8_OS_OPENBSD
-+#include <sys/mman.h>
-+#endif
-+
- #include "src/base/hashing.h"
- #include "src/base/lazy-instance.h"
- #include "src/base/platform/platform.h"
-@@ -823,6 +827,10 @@ void FlagList::FreezeFlags() {
-   // Note that for string flags we only protect the pointer itself, but not the
-   // string storage. TODO(12887): Fix this.
-   base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags));
-+#if V8_OS_OPENBSD
-+  if (mimmutable(&v8_flags, sizeof(v8_flags)) == -1)
-+    FATAL("unable to set immutability of v8_flags");
-+#endif
- }
- 
- // static
diff --git a/chromium-next/patches/patch-v8_src_libsampler_sampler.cc b/chromium-next/patches/patch-v8_src_libsampler_sampler.cc
deleted file mode 100644
index bc49b87cd1..0000000000
--- a/chromium-next/patches/patch-v8_src_libsampler_sampler.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/libsampler/sampler.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/libsampler/sampler.cc
-@@ -520,6 +520,16 @@ void SignalHandler::FillRegisterState(vo
-   state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]);
-   state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]);
-   state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]);
-+#elif V8_HOST_ARCH_ARM64
-+#ifdef __CHERI_PURE_CAPABILITY__
-+  state->pc = reinterpret_cast<void*>(mcontext.mc_capregs.cap_elr);
-+  state->sp = reinterpret_cast<void*>(mcontext.mc_capregs.cap_sp);
-+  state->fp = reinterpret_cast<void*>(mcontext.mc_capregs.cap_x[29]);
-+#else   // !__CHERI_PURE_CAPABILITY__
-+  state->pc = reinterpret_cast<void*>(mcontext.mc_gpregs.gp_elr);
-+  state->sp = reinterpret_cast<void*>(mcontext.mc_gpregs.gp_sp);
-+  state->fp = reinterpret_cast<void*>(mcontext.mc_gpregs.gp_x[29]);
-+#endif  // __CHERI_PURE_CAPABILITY__
- #endif  // V8_HOST_ARCH_*
- #elif V8_OS_NETBSD
- #if V8_HOST_ARCH_IA32
diff --git a/chromium-next/patches/patch-v8_src_sandbox_sandbox.cc b/chromium-next/patches/patch-v8_src_sandbox_sandbox.cc
deleted file mode 100644
index 139a228f0f..0000000000
--- a/chromium-next/patches/patch-v8_src_sandbox_sandbox.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/sandbox/sandbox.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/sandbox/sandbox.cc
-@@ -59,7 +59,7 @@ static Address DetermineAddressSpaceLimi
-   }
- #endif  // V8_TARGET_ARCH_X64
- 
--#if defined(V8_TARGET_ARCH_ARM64) && defined(V8_TARGET_OS_ANDROID)
-+#if defined(V8_TARGET_ARCH_ARM64) && (defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD))
-   // On Arm64 Android assume a 40-bit virtual address space (39 bits for
-   // userspace and kernel each) as that appears to be the most common
-   // configuration and there seems to be no easy way to retrieve the actual
diff --git a/chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
deleted file mode 100644
index 4f900d3c5c..0000000000
--- a/chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
-@@ -148,6 +148,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(cons
-     return EmbeddedTargetOs::kStarboard;
-   } else if (string == "zos") {
-     return EmbeddedTargetOs::kZOS;
-+  } else if (string == "openbsd") {
-+    return EmbeddedTargetOs::kOpenBSD;
-   } else {
-     return EmbeddedTargetOs::kGeneric;
-   }
diff --git a/chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h b/chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
deleted file mode 100644
index a3bc799e65..0000000000
--- a/chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.h
-@@ -36,6 +36,7 @@ enum class EmbeddedTargetOs {
-   kWin,
-   kStarboard,
-   kZOS,
-+  kOpenBSD,
-   kGeneric,  // Everything not covered above falls in here.
- };
- 
diff --git a/chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
deleted file mode 100644
index 136de90eed..0000000000
--- a/chromium-next/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
-@@ -9,6 +9,10 @@
- 
- #include "src/objects/instruction-stream.h"
- 
-+#if V8_OS_OPENBSD
-+#include <sys/param.h>
-+#endif
-+
- namespace v8 {
- namespace internal {
- 
-@@ -35,6 +39,10 @@ const char* DirectiveAsString(DataDirect
- void PlatformEmbeddedFileWriterGeneric::SectionText() {
-   if (target_os_ == EmbeddedTargetOs::kChromeOS) {
-     fprintf(fp_, ".section .text.hot.embedded\n");
-+#if !defined(V8_TARGET_ARCH_IA32)
-+  } else if (target_os_ == EmbeddedTargetOs::kOpenBSD) {
-+    fprintf(fp_, ".section .openbsd.mutable,\"a\"\n");
-+#endif
-   } else {
-     fprintf(fp_, ".section .text\n");
-   }
-@@ -66,6 +74,8 @@ void PlatformEmbeddedFileWriterGeneric::
-   // On these architectures and platforms, we remap the builtins, so need these
-   // to be aligned on a page boundary.
-   fprintf(fp_, ".balign 4096\n");
-+#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
-+  fprintf(fp_, ".balign %d\n", PAGE_SIZE);
- #elif V8_TARGET_ARCH_X64
-   // On x64 use 64-bytes code alignment to allow 64-bytes loop header alignment.
-   static_assert(64 >= kCodeAlignment);
-@@ -86,6 +96,8 @@ void PlatformEmbeddedFileWriterGeneric::
-     (V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64)
-   // Since the builtins are remapped, need to pad until the next page boundary.
-   fprintf(fp_, ".balign 4096\n");
-+#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
-+  fprintf(fp_, ".balign %d\n", PAGE_SIZE);
- #endif
- }
- 
diff --git a/chromium-next/patches/patch-v8_src_trap-handler_handler-inside-posix.cc b/chromium-next/patches/patch-v8_src_trap-handler_handler-inside-posix.cc
deleted file mode 100644
index 413b6d3207..0000000000
--- a/chromium-next/patches/patch-v8_src_trap-handler_handler-inside-posix.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/trap-handler/handler-inside-posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/trap-handler/handler-inside-posix.cc
-@@ -27,7 +27,7 @@
- 
- #include <signal.h>
- 
--#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)
-+#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD) || defined(V8_OS_NETBSD)
- #include <ucontext.h>
- #elif V8_OS_DARWIN
- #include <sys/ucontext.h>
-@@ -61,6 +61,10 @@ namespace trap_handler {
- #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg
- #elif V8_OS_FREEBSD
- #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.mc_##reg
-+#elif V8_OS_OPENBSD
-+#define CONTEXT_REG(reg, REG) &uc->sc_##reg
-+#elif V8_OS_NETBSD
-+#define CONTEXT_REG(reg, REG) &uc->uc_mcontext.__gregs[_REG_##REG]
- #else
- #error "Unsupported platform."
- #endif
-@@ -80,8 +84,12 @@ bool IsKernelGeneratedSignal(siginfo_t* 
-   // si_code at its default of 0 for signals that don’t originate in hardware.
-   // The other conditions are only relevant for Linux.
-   return info->si_code > 0 && info->si_code != SI_USER &&
--         info->si_code != SI_QUEUE && info->si_code != SI_TIMER &&
--         info->si_code != SI_ASYNCIO && info->si_code != SI_MESGQ;
-+         info->si_code != SI_QUEUE && info->si_code != SI_TIMER
-+#ifdef V8_OS_OPENBSD
-+         ;
-+#else
-+         && info->si_code != SI_ASYNCIO && info->si_code != SI_MESGQ;
-+#endif
- }
- 
- class UnmaskOobSignalScope {
diff --git a/chromium-next/patches/patch-v8_src_trap-handler_handler-inside-posix.h b/chromium-next/patches/patch-v8_src_trap-handler_handler-inside-posix.h
deleted file mode 100644
index 61718f3ad8..0000000000
--- a/chromium-next/patches/patch-v8_src_trap-handler_handler-inside-posix.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/trap-handler/handler-inside-posix.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/trap-handler/handler-inside-posix.h
-@@ -13,7 +13,7 @@ namespace v8 {
- namespace internal {
- namespace trap_handler {
- 
--#if V8_OS_LINUX || V8_OS_FREEBSD
-+#if V8_OS_LINUX || V8_OS_FREEBSD || V8_OS_OPENBSD || V8_OS_NETBSD
- constexpr int kOobSignal = SIGSEGV;
- #elif V8_OS_DARWIN
- constexpr int kOobSignal = SIGBUS;
diff --git a/chromium-next/patches/patch-v8_src_trap-handler_trap-handler.h b/chromium-next/patches/patch-v8_src_trap-handler_trap-handler.h
deleted file mode 100644
index 9287eebf4e..0000000000
--- a/chromium-next/patches/patch-v8_src_trap-handler_trap-handler.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/trap-handler/trap-handler.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/trap-handler/trap-handler.h
-@@ -18,7 +18,7 @@ namespace v8::internal::trap_handler {
- // X64 on Linux, Windows, MacOS, FreeBSD.
- #if V8_HOST_ARCH_X64 && V8_TARGET_ARCH_X64 &&                        \
-     ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_DARWIN || \
--     V8_OS_FREEBSD)
-+     V8_OS_FREEBSD || V8_OS_OPENBSD || V8_OS_NETBSD)
- #define V8_TRAP_HANDLER_SUPPORTED true
- // Arm64 (non-simulator) on Linux, Windows, MacOS.
- #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && \
diff --git a/chromium-next/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/chromium-next/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
deleted file mode 100644
index d9cec1ee14..0000000000
--- a/chromium-next/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h
-@@ -579,7 +579,7 @@ void LiftoffAssembler::StoreTaggedPointe
- }
- 
- void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
--                            Register offset_reg, uint32_t offset_imm,
-+                            Register offset_reg, uintptr_t offset_imm,
-                             LoadType type, uint32_t* protected_load_pc,
-                             bool /* is_load_mem */, bool /* i64_offset */,
-                             bool needs_shift) {
-@@ -659,7 +659,7 @@ void LiftoffAssembler::Load(LiftoffRegis
- }
- 
- void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
--                             uint32_t offset_imm, LiftoffRegister src,
-+                             uintptr_t offset_imm, LiftoffRegister src,
-                              StoreType type, LiftoffRegList pinned,
-                              uint32_t* protected_store_pc,
-                              bool /* is_store_mem */, bool /* i64_offset */) {
-@@ -738,7 +738,7 @@ void LiftoffAssembler::Store(Register ds
- }
- 
- void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
--                                  Register offset_reg, uint32_t offset_imm,
-+                                  Register offset_reg, uintptr_t offset_imm,
-                                   LoadType type, LiftoffRegList /* pinned */,
-                                   bool /* i64_offset */) {
-   if (type.value() != LoadType::kI64Load) {
-@@ -756,7 +756,7 @@ void LiftoffAssembler::AtomicLoad(Liftof
- }
- 
- void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
--                                   uint32_t offset_imm, LiftoffRegister src,
-+                                   uintptr_t offset_imm, LiftoffRegister src,
-                                    StoreType type, LiftoffRegList pinned,
-                                    bool /* i64_offset */) {
-   DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max());
-@@ -826,7 +826,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor
- 
- inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop,
-                                        Register dst_addr, Register offset_reg,
--                                       uint32_t offset_imm,
-+                                       uintptr_t offset_imm,
-                                        LiftoffRegister value,
-                                        LiftoffRegister result, StoreType type) {
-   DCHECK_EQ(value, result);
-@@ -894,7 +894,7 @@ inline void AtomicAddOrSubOrExchange32(L
- }
- 
- inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr,
--                          Register offset_reg, uint32_t offset_imm,
-+                          Register offset_reg, uintptr_t offset_imm,
-                           LiftoffRegister value, LiftoffRegister result,
-                           StoreType type) {
-   DCHECK_EQ(value, result);
-@@ -1009,7 +1009,7 @@ inline void AtomicBinop32(LiftoffAssembl
- }
- 
- inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr,
--                          Register offset_reg, uint32_t offset_imm,
-+                          Register offset_reg, uintptr_t offset_imm,
-                           LiftoffRegister value, LiftoffRegister result) {
-   // We need {ebx} here, which is the root register. As the root register it
-   // needs special treatment. As we use {ebx} directly in the code below, we
-@@ -1105,7 +1105,7 @@ inline void AtomicBinop64(LiftoffAssembl
- }  // namespace liftoff
- 
- void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
--                                 uint32_t offset_imm, LiftoffRegister value,
-+                                 uintptr_t offset_imm, LiftoffRegister value,
-                                  LiftoffRegister result, StoreType type,
-                                  bool /* i64_offset */) {
-   if (type.value() == StoreType::kI64Store) {
-@@ -1119,7 +1119,7 @@ void LiftoffAssembler::AtomicAdd(Registe
- }
- 
- void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
--                                 uint32_t offset_imm, LiftoffRegister value,
-+                                 uintptr_t offset_imm, LiftoffRegister value,
-                                  LiftoffRegister result, StoreType type,
-                                  bool /* i64_offset */) {
-   if (type.value() == StoreType::kI64Store) {
-@@ -1132,7 +1132,7 @@ void LiftoffAssembler::AtomicSub(Registe
- }
- 
- void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
--                                 uint32_t offset_imm, LiftoffRegister value,
-+                                 uintptr_t offset_imm, LiftoffRegister value,
-                                  LiftoffRegister result, StoreType type,
-                                  bool /* i64_offset */) {
-   if (type.value() == StoreType::kI64Store) {
-@@ -1146,7 +1146,7 @@ void LiftoffAssembler::AtomicAnd(Registe
- }
- 
- void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
--                                uint32_t offset_imm, LiftoffRegister value,
-+                                uintptr_t offset_imm, LiftoffRegister value,
-                                 LiftoffRegister result, StoreType type,
-                                 bool /* i64_offset */) {
-   if (type.value() == StoreType::kI64Store) {
-@@ -1160,7 +1160,7 @@ void LiftoffAssembler::AtomicOr(Register
- }
- 
- void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
--                                 uint32_t offset_imm, LiftoffRegister value,
-+                                 uintptr_t offset_imm, LiftoffRegister value,
-                                  LiftoffRegister result, StoreType type,
-                                  bool /* i64_offset */) {
-   if (type.value() == StoreType::kI64Store) {
-@@ -1174,7 +1174,7 @@ void LiftoffAssembler::AtomicXor(Registe
- }
- 
- void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
--                                      uint32_t offset_imm,
-+                                      uintptr_t offset_imm,
-                                       LiftoffRegister value,
-                                       LiftoffRegister result, StoreType type,
-                                       bool /* i64_offset */) {
-@@ -1189,7 +1189,7 @@ void LiftoffAssembler::AtomicExchange(Re
- }
- 
- void LiftoffAssembler::AtomicCompareExchange(
--    Register dst_addr, Register offset_reg, uint32_t offset_imm,
-+    Register dst_addr, Register offset_reg, uintptr_t offset_imm,
-     LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result,
-     StoreType type, bool /* i64_offset */) {
-   // We expect that the offset has already been added to {dst_addr}, and no
diff --git a/chromium-next/patches/patch-v8_tools_run-paxctl.py b/chromium-next/patches/patch-v8_tools_run-paxctl.py
deleted file mode 100644
index 254a8eb954..0000000000
--- a/chromium-next/patches/patch-v8_tools_run-paxctl.py
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/tools/run-paxctl.py.orig	2025-05-08 12:01:57.924673269 +0000
-+++ v8/tools/run-paxctl.py
-@@ -0,0 +1,16 @@
-+#!@PYTHONBIN@
-+# Copyright 2014 the V8 project authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+"""This program wraps an arbitrary command since gn currently can only execute
-+scripts."""
-+
-+import subprocess
-+import sys
-+import os
-+
-+with open(sys.argv[1], 'w'):
-+  os.utime(sys.argv[1], None)
-+
-+sys.exit(subprocess.call(sys.argv[2:]))
diff --git a/chromium-next/patches/patch-v8_tools_run.py b/chromium-next/patches/patch-v8_tools_run.py
deleted file mode 100644
index 7003e21571..0000000000
--- a/chromium-next/patches/patch-v8_tools_run.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/tools/run.py.orig	2025-05-05 19:21:24.000000000 +0000
-+++ v8/tools/run.py
-@@ -21,7 +21,7 @@ if cmd and cmd[0] == '--redirect-stdout'
-   kwargs = dict(stdout=subprocess.PIPE)
-   cmd = cmd[2:]
- 
--process = subprocess.Popen(cmd, **kwargs)
-+process = subprocess.Popen(cmd, env={"LD_LIBRARY_PATH":"@WRKSRC@/out/Release"}, **kwargs)
- stdout, _ = process.communicate()
- if stdout_file:
-   with stdout_file.open('w') as f:
diff --git a/chromium-next/tests.mk b/chromium-next/tests.mk
deleted file mode 100644
index ba3a6797b1..0000000000
--- a/chromium-next/tests.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD$
-
-REGRESS_DISTFILE=		chromium-${VERSION}-testdata${EXTRACT_SUFX_C}
-DISTFILES+=			${REGRESS_DISTFILE}
-EXTRACT_ONLY=			${DISTNAME}${EXTRACT_SUFX_C}
-#EXTRACT_ONLY+=			${PROFILE_DISTFILES}
-EXTRACT_ONLY+=			${_GITHUB_DEFAULT_DISTFILES}
-
-USE_TOOLS+=	xzcat gzip tar
-
-#TEST_ENV+=	FONTCONFIG_SYSROOT=${WRKSRC}/third_party/test_fonts
-
-TEST_TARGET=	base_unittests
-TEST_TARGET+=	blink_unittests
-TEST_TARGET+=	chromedriver_unittests
-
-# third_party/crashpad/crashpad/handler/handler_main.cc: error:
-# use of undeclared identifier 'ReinstallCrashHandler'
-# use of undeclared identifier 'InstallCrashHandler'
-# use of undeclared identifier 'CrashReportExceptionHandler'
-# use of undeclared identifier 'exception_handler_server'
-#TEST_TARGET+=	components_unittests
-
-TEST_TARGET+=	content_unittests
-TEST_TARGET+=	crypto_unittests
-TEST_TARGET+=	gl_tests
-TEST_TARGET+=	gpu_unittests
-TEST_TARGET+=	headless_unittests
-TEST_TARGET+=	media_unittests
-
-# third_party/ipcz/src/reference_drivers/wrapped_file_descriptor.h:
-# no member named 'kFileDescriptor' in 'ipcz::reference_drivers::Object'
-#TEST_TARGET+=	mojo_unittests
-
-TEST_TARGET+=	net_unittests
-TEST_TARGET+=	pdf_unittests
-
-# printing/mojom/printing_context_mojom_traits_unittest.cc:88:2:
-# error: "System print dialog support not implemented for this platform."
-#TEST_TARGET+=	printing_unittests
-
-TEST_TARGET+=	skia_unittests
-TEST_TARGET+=	url_unittests
-TEST_TARGET+=	wm_unittests
-
-pre-test:
-	@${ECHO_MSG} "=> Extracting ${REGRESS_DISTFILE}"
-	${XZCAT} ${DISTDIR}/${REGRESS_DISTFILE} | ${TAR} -C ${WRKDIR} -xf -
-	${MKDIR} ${WRKSRC}/third_party/llvm-build/Release+Asserts/bin
-	${LN} -sf ${PREFIX}/bin/clang++ ${WRKSRC}/third_party/llvm-build/Release+Asserts/bin/clang++
-	${LN} -sf ${PREFIX}/bin/clang ${WRKSRC}/third_party/llvm-build/Release+Asserts/bin/clang
-	${LN} -sf ${PREFIX}/bin/llvm-ar ${WRKSRC}/third_party/llvm-build/Release+Asserts/bin/llvm-ar
-
-do-test:
-.for t in ${TEST_TARGET}
-	@${ECHO_MSG} "=> Test target: ${t}"
-	cd ${WRKSRC} && \
-	${SETENV} ${TEST_ENV} ${PREFIX}/bin/ninja -j ${MAKE_JOBS:U1} -C out/${BUILDTYPE} ${t}
-.endfor
diff --git a/chromium/COMMIT_MSG b/chromium/COMMIT_MSG
new file mode 100644
index 0000000000..7363236555
--- /dev/null
+++ b/chromium/COMMIT_MSG
@@ -0,0 +1,277 @@
+www/chromium: update to ***
+
+* 131.0.6778.264
+This update includes 4 security fixes. Below, we highlight
+fixes that were contributed by external researchers.
+Please see the Chrome Security Page for more information.
+[$55000][383356864] High CVE-2025-0291: Type Confusion in
+V8. Reported by Popax21 on 2024-12-11
+We would also like to thank all security researchers that
+worked with us during the development cycle to prevent
+security bugs from ever reaching the stable channel.
+
+As usual, our ongoing internal security work was responsible
+for a wide range of fixes:
+[388088544] Various fixes from internal audits, fuzzing and
+other initiatives
+
+* 132.0.6834.83
+This update includes 16 security fixes. Below, we highlight
+fixes that were contributed by external researchers.
+Please see the Chrome Security Page for more information.
+[$7000][374627491] High CVE-2025-0434: Out of bounds memory
+access in V8. Reported by ddme on 2024-10-21
+[$7000][379652406] High CVE-2025-0435: Inappropriate
+implementation in Navigation. Reported by Alesandro Ortiz
+on 2024-11-18
+[$3000][382786791] High CVE-2025-0436: Integer overflow in
+Skia. Reported by Han Zheng (HexHive) on 2024-12-08
+[$2000][378623799] High CVE-2025-0437: Out of bounds read
+in Metrics. Reported by Xiantong Hou of Wuheng Lab and
+Pisanbao on 2024-11-12
+[TBD][384186539] High CVE-2025-0438: Stack buffer overflow
+in Tracing. Reported by Han Zheng (HexHive) on 2024-12-15
+[$5000][371247941] Medium CVE-2025-0439: Race in Frames.
+Reported by Hafiizh on 2024-10-03
+[$5000][40067914] Medium CVE-2025-0440: Inappropriate
+implementation in Fullscreen. Reported by Umar Farooq on 2023-07-22
+[$2000][368628042] Medium CVE-2025-0441: Inappropriate
+implementation in Fenced Frames. Reported by someoneverycurious
+on 2024-09-21
+[$2000][40940854] Medium CVE-2025-0442: Inappropriate
+implementation in Payments. Reported by Ahmed ElMasry on 2023-11-08
+[$1000][376625003] Medium CVE-2025-0443: Insufficient
+data validation in Extensions. Reported by Anonymous on 2024-10-31
+[$1000][359949844] Low CVE-2025-0446: Inappropriate
+implementation in Extensions. Reported by Hafiizh on 2024-08-15
+[$1000][375550814] Low CVE-2025-0447: Inappropriate
+implementation in Navigation. Reported by Khiem Tran (@duckhiem)
+on 2024-10-25
+[$1000][377948403] Low CVE-2025-0448: Inappropriate
+implementation in Compositing. Reported by Dahyeon Park on 2024-11-08
+We would also like to thank all security researchers that
+worked with us during the development cycle to prevent security
+bugs from ever reaching the stable channel.
+
+As usual, our ongoing internal security work was responsible
+for a wide range of fixes:
+[389761478] Various fixes from internal audits, fuzzing and
+other initiatives
+
+* 132.0.6834.110
+This update includes 3 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$11000][386143468] High CVE-2025-0611: Object corruption in V8.
+Reported by 303f06e3 on 2024-12-26
+[$8000][385155406] High CVE-2025-0612: Out of bounds memory access
+in V8. Reported by Alan Goodman on 2024-12-20
+
+As usual, our ongoing internal security work was responsible for
+a wide range of fixes:
+[391144311] Various fixes from internal audits, fuzzing and other
+initiatives
+
+* 132.0.6834.159
+This update includes 2 security fixes. Below, we highlight fixes that
+were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$2000][384844003] Medium CVE-2025-0762: Use after free in DevTools.
+Reported by Sakana.S on 2024-12-18
+
+As usual, our ongoing internal security work was responsible for a
+wide range of fixes:
+[392630675] Various fixes from internal audits, fuzzing and other
+initiatives
+
+* 133.0.6943.53
+This update includes 12 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$7000][390889644] High CVE-2025-0444: Use after free in Skia.
+Reported by Francisco Alonso (@revskills) on 2025-01-19
+[TBD][392521083] High CVE-2025-0445: Use after free in V8.
+Reported by 303f06e3 on 2025-01-27
+[$2000][40061026] Medium CVE-2025-0451: Inappropriate implementation
+in Extensions API. Reported by Vitor Torres and
+Alesandro Ortiz on 2022-09-18
+
+As usual, our ongoing internal security work was responsible for
+a wide range of fixes:
+[394135363] Various fixes from internal audits, fuzzing and other
+initiatives
+
+* 133.0.6943.98
+This update includes 4 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$55000][391907159] High CVE-2025-0995: Use after free in V8.
+Reported by Popax21 on 2025-01-24
+[TBD][391788835] High CVE-2025-0996: Inappropriate implementation
+in Browser UI. Reported by yuki yamaoto on 2025-01-23
+[TBD][391666328] High CVE-2025-0997: Use after free in Navigation.
+Reported by asnine on 2025-01-23
+[TBD][386857213] High CVE-2025-0998: Out of bounds memory access
+in V8. Reported by Alan Goodman on 2024-12-31
+
+* 133.0.6943.126
+This update includes 3 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$11000][394350433] High CVE-2025-0999: Heap buffer overflow in V8.
+Reported by Seunghyun Lee (@0x10n) on 2025-02-04
+[TBD][383465163] High CVE-2025-1426: Heap buffer overflow in GPU.
+Reported by un3xploitable && GF on 2024-12-11
+[$4000][390590778] Medium CVE-2025-1006: Use after free in Network.
+Reported by Tal Keren, Sam Agranat, Eran Rom, Edouard Bochin,
+Adam Hatsir of Palo Alto Networks on 2025-01-18
+
+* 133.0.6943.141
+This update includes 1 security fix. Please see the Chrome Security
+Page for more information.
+
+As usual, our ongoing internal security work was responsible for a
+wide range of fixes:
+[399107077]Various fixes from internal audits, fuzzing and other
+initiatives
+
+* 134.0.6998.35
+This update includes 14 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$7000][397731718] High CVE-2025-1914: Out of bounds read in V8.
+Reported by Zhenghang Xiao (@Kipreyyy) and Nan Wang (@eternalsakura13)
+on 2025-02-20
+[$4000][391114799] Medium CVE-2025-1915: Improper Limitation of a
+Pathname to a Restricted Directory in DevTools. Reported by
+Topi Lassila on 2025-01-20
+[$3000][376493203] Medium CVE-2025-1916: Use after free in Profiles.
+Reported by parkminchan, SSD Labs Korea on 2024-10-31
+[$2000][329476341] Medium CVE-2025-1917: Inappropriate Implementation
+in Browser UI. Reported by Khalil Zhani on 2024-03-14
+[$2000][388557904] Medium CVE-2025-1918: Out of bounds read in PDFium.
+AReported by asnine on 2025-01-09
+[$2000][392375312] Medium CVE-2025-1919: Out of bounds read in Media.
+Reported by @Bl1nnnk and @Pisanbao on 2025-01-26
+[$1000][387583503] Medium CVE-2025-1921: Inappropriate Implementation
+in Media Stream. Reported by Kaiido on 2025-01-04
+[$5000][384033062] Low CVE-2025-1922: Inappropriate Implementation in
+Selection. Reported by Alesandro Ortiz on 2024-12-14
+[$1000][382540635] Low CVE-2025-1923: Inappropriate Implementation in
+Permission Prompts. Reported by Khalil Zhani on 2024-12-06
+
+As usual, our ongoing internal security work was responsible for a
+wide range of fixes:
+[400559715] Various fixes from internal audits, fuzzing and other initiatives
+
+* 134.0.6998.88
+This update includes 5 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$7000][398065918] High CVE-2025-1920: Type Confusion in V8.
+Reported by Excello s.r.o. on 2025-02-21
+[TBD][400052777] High CVE-2025-2135: Type Confusion in V8.
+Reported by Zhenghang Xiao (@Kipreyyy) and Nan Wang (@eternalsakura13)
+on 2025-03-02
+[NA][401059730] High CVE-2025-24201: Out of bounds write in
+GPU on Mac. Reported by Apple Security Engineering and
+Architecture (SEAR) on 2025-03-05
+[$3000][395032416] Medium CVE-2025-2136: Use after free in
+Inspector. Reported by Sakana.S on 2025-02-10
+[$2000][398999390] Medium CVE-2025-2137: Out of bounds read in V8.
+Reported by zeroxiaobai@ on 2025-02-25
+
+Google is aware of reports that an exploit for CVE-2025-24201 exists in the wild.
+
+* 134.0.6998.117
+This update includes 2 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[TBD][401029609] Critical CVE-2025-2476: Use after free in Lens.
+Reported by SungKwon Lee of Enki Whitehat on 2025-03-05
+
+As usual, our ongoing internal security work was responsible for a
+wide range of fixes:
+[404324707] Various fixes from internal audits, fuzzing and other initiatives
+
+* 134.0.6998.165
+This update doesn't include security fix.
+
+* 135.0.7049.52
+This update includes 13 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$10000][376491759] Medium CVE-2025-3067: Inappropriate implementation
+in Custom Tabs. Reported by Philipp Beer (TU Wien) on 2024-10-31
+[$2000][401823929] Medium CVE-2025-3068: Inappropriate implementation
+in Intents. Reported by Simon Rawet on 2025-03-09
+[$1000][40060076] Medium CVE-2025-3069: Inappropriate implementation in
+Extensions. Reported by NDevTK on 2022-06-26
+[$1000][40086360] Medium CVE-2025-3070: Insufficient validation of
+untrusted input in Extensions. Reported by Anonymous on 2017-01-01
+[$2000][40051596] Low CVE-2025-3071: Inappropriate implementation in
+Navigations. Reported by David Erceg on 2020-02-23
+[$1000][362545037] Low CVE-2025-3072: Inappropriate implementation in
+Custom Tabs. Reported by Om Apip on 2024-08-27
+[$500][388680893] Low CVE-2025-3073: Inappropriate implementation in
+Autofill. Reported by Hafiizh on 2025-01-09
+[$500][392818696] Low CVE-2025-3074: Inappropriate implementation in
+Downloads. Reported by Farras Givari on 2025-01-28
+
+As usual, our ongoing internal security work was responsible for a
+wide range of fixes:
+[407621901]Various fixes from internal audits, fuzzing and other initiatives
+
+* 135.0.7049.84
+This update includes 2 security fixes. Below, we highlight fixes that
+were contributed by external researchers. Please see the Chrome Security
+Page for more information.
+[$4000][405140652] High CVE-2025-3066: Use after free in Site Isolation.
+Reported by Sven Dysthe (@svn-dys) on 2025-03-21
+
+As usual, our ongoing internal security work was responsible for a
+wide range of fixes:
+[409114118] Various fixes from internal audits, fuzzing and other initiatives
+
+* 135.0.7049.95
+This update includes 2 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[TBD][409619251] Critical CVE-2025-3619: Heap buffer overflow
+in Codecs. Reported by Elias Hohl on 2025-04-09
+[TBD][405292639] High CVE-2025-3620: Use after free in USB.
+Reported by @retsew0x01 on 2025-03-21
+
+* 135.0.7049.114
+This update includes 1 security fix. Please see the Chrome Security Page
+for more information.
+Our ongoing internal security work was responsible for a wide range of fixes:
+[412443038] Various fixes from internal audits, fuzzing and other initiatives
+
+* 136.0.7103.59
+This update includes 8 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$5000][409911705] High CVE-2025-4096: Heap buffer overflow in HTML.
+Reported by Anonymous on 2025-04-11
+[$2000][409342999] Medium CVE-2025-4050: Out of bounds memory access
+in DevTools. Reported by Anonymous on 2025-04-09
+[$2000][404000989] Medium CVE-2025-4051: Insufficient data validation
+in DevTools. Reported by Daniel Fröjdendahl on 2025-03-16
+[$1000][401927528] Low CVE-2025-4052: Inappropriate implementation
+in DevTools. Reported by vanillawebdev on 2025-03-10
+
+As usual, our ongoing internal security work was responsible for a
+wide range of fixes:
+[414433561]Various fixes from internal audits, fuzzing and other initiatives
+
+* 136.0.7103.92
+This update includes 2 security fixes. Below, we highlight fixes
+that were contributed by external researchers. Please see the
+Chrome Security Page for more information.
+[$7000][412057896] Medium CVE-2025-4372: Use after free in WebAudio.
+Reported by Huang Xilin of Ant Group Light-Year Security Lab on 2025-04-20
+
+As usual, our ongoing internal security work was responsible for a
+wide range of fixes:
+[415837391] Various fixes from internal audits, fuzzing and other initiatives
diff --git a/chromium/Makefile b/chromium/Makefile
index bafefb0b7a..c23e523db3 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.4 2025/02/18 10:33:22 wiz Exp $
+# $NetBSD$
 
 DISTNAME=			chromium-${VERSION}
-VERSION=			131.0.6778.204
-PKGREVISION=			6
+VERSION=			136.0.7103.92
 CATEGORIES=			www
 MASTER_SITES=			https://commondatastorage.googleapis.com/chromium-browser-official/
 EXTRACT_SUFX_C=			.tar.xz
 
-PROFILE_DISTFILES=		chromium-linux-${VERSION}-llvm17.profdata${EXTRACT_SUFX_C}
-SITES.${PROFILE_DISTFILES}=	https://nerd.hu/distfiles/
+#PROFILE_DISTFILES=		chromium-linux-${VERSION}-llvm17.profdata${EXTRACT_SUFX_C}
+#SITES.${PROFILE_DISTFILES}=	https://nerd.hu/distfiles/
 DISTFILES+=			${DISTNAME}${EXTRACT_SUFX_C}
-DISTFILES+=			${PROFILE_DISTFILES}
+#DISTFILES+=			${PROFILE_DISTFILES}
 
 # audioio source
 A_VERSION=			130.0
 GITHUB_SUBMODULES=		kikadf chromium-audioio v${A_VERSION} media/audio/audioio
 
 # LLVM_MAJOR_VERSION
-LLVM_MV=			18
+LLVM_MV=			19
 
 MAINTAINER=			kikadf.01%gmail.com@localhost
-#MAINTAINER=			ryoon%NetBSD.org@localhost
 HOMEPAGE=			https://www.chromium.org/Home
 COMMENT=			Open source web browser
 LICENSE=			modified-bsd AND gnu-lgpl-v3 AND mpl-2.0
@@ -86,14 +84,15 @@ SUBST_MESSAGE.path=	Fixing pathes
 SUBST_FILES.path+=	base/base_paths_posix.cc
 SUBST_FILES.path+=	base/process/process_handle_openbsd.cc
 SUBST_FILES.path+=	build/rust/rust_bindgen.gni
+SUBST_FILES.path+=	build/rust/rust_bindgen_generator.gni
 SUBST_FILES.path+=	chrome/common/chrome_paths.cc
 SUBST_FILES.path+=	chromium.sh
 SUBST_FILES.path+=	components/policy/core/common/policy_paths.cc
 SUBST_FILES.path+=	sandbox/policy/openbsd/sandbox_openbsd.cc
 SUBST_FILES.path+=	services/device/hid/hid_service_freebsd.cc
 SUBST_FILES.path+=	services/device/time_zone_monitor/time_zone_monitor_linux.cc
+SUBST_FILES.path+=	third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp
 SUBST_FILES.path+=	third_party/perfetto/src/base/utils.cc
-SUBST_FILES.path+=	ui/qt/qt.gni
 SUBST_FILES.path+=	v8/tools/run-paxctl.py
 SUBST_VARS.path+=	PREFIX PKG_SYSCONFBASE VARBASE QTDIR X11BASE PYTHONBIN
 
@@ -125,8 +124,7 @@ GN_SYSTEM_LIBS=		dav1d
 GN_SYSTEM_LIBS+=	fontconfig
 GN_SYSTEM_LIBS+=	icu
 GN_SYSTEM_LIBS+=	libaom
-GN_SYSTEM_LIBS+=	libevent
-#GN_SYSTEM_LIBS+=	libjpeg # libjpeg-turbo
+GN_SYSTEM_LIBS+=	libjpeg # libjpeg-turbo
 GN_SYSTEM_LIBS+=	libpng
 GN_SYSTEM_LIBS+=	libvpx
 GN_SYSTEM_LIBS+=	libxml
@@ -134,17 +132,18 @@ GN_SYSTEM_LIBS+=	libxslt
 GN_SYSTEM_LIBS+=	openh264
 GN_SYSTEM_LIBS+=	opus
 
+#GN_ARGS+=	chrome_pgo_phase=0
 GN_ARGS+=	clang_use_chrome_plugins=false
 GN_ARGS+=	disable_fieldtrial_testing_config=true
 GN_ARGS+=	enable_backup_ref_ptr_support=false
 GN_ARGS+=	enable_hangout_services_extension=true
-GN_ARGS+=	enable_log_error_not_reached=true
 GN_ARGS+=	enable_nacl=false
 GN_ARGS+=	enable_remoting=false
 GN_ARGS+=	fatal_linker_warnings=false
 GN_ARGS+=	icu_use_data_file=false
 GN_ARGS+=	is_cfi=false
 GN_ARGS+=	is_clang=true
+GN_ARGS+=	moc_qt6_path=\"${PREFIX}/qt6/libexec\"
 GN_ARGS+=	optimize_webui=true
 GN_ARGS+=	thin_lto_enable_optimizations=true
 GN_ARGS+=	treat_warnings_as_errors=false
@@ -156,6 +155,8 @@ GN_ARGS+=	use_kerberos=false
 GN_ARGS+=	use_lld=false
 GN_ARGS+=	use_partition_alloc=true
 GN_ARGS+=	use_partition_alloc_as_malloc=false
+GN_ARGS+=	use_qt5=false
+GN_ARGS+=	use_qt6=true
 GN_ARGS+=	use_sndio=false
 GN_ARGS+=	use_sysroot=false
 GN_ARGS+=	use_system_freetype=true
@@ -226,6 +227,8 @@ NOT_PAX_MPROTECT_SAFE+=	lib/chromium/chrome
 PKG_CC=			clang
 PKG_CXX=		clang++
 
+CONFLICTS=		chromium-[0-9]*
+
 post-extract:
 	${CP} ${FILESDIR}/chromium.sh.in ${WRKSRC}/chromium.sh
 
@@ -313,7 +316,6 @@ do-install:
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/dconf/buildlink3.mk"
 .include "../../devel/libepoll-shim/buildlink3.mk"
-.include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
@@ -331,7 +333,7 @@ BUILDLINK_DEPMETHOD.clang=	build
 .include "../../lang/python/tool.mk"
 .include "../../lang/rust/rust.mk"
 .include "../../misc/usbids/buildlink3.mk"
-#.include "../../mk/jpeg.buildlink3.mk" # libjpeg-turbo
+.include "../../mk/jpeg.buildlink3.mk" # libjpeg-turbo
 .include "../../multimedia/dav1d/buildlink3.mk"
 .include "../../multimedia/libaom/buildlink3.mk"
 .include "../../multimedia/libvpx/buildlink3.mk"
@@ -366,5 +368,5 @@ BUILDLINK_TRANSFORM+=	l:pci:pciutils
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chromium/PLIST b/chromium/PLIST
index 764d9af4e4..fef392748e 100644
--- a/chromium/PLIST
+++ b/chromium/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2025/02/06 09:57:37 wiz Exp $
+@comment $NetBSD$
 bin/chromedriver
 bin/chromium
 lib/chromium/chrome
 lib/chromium/chrome_100_percent.pak
 lib/chromium/chrome_200_percent.pak
 lib/chromium/headless_command_resources.pak
-lib/chromium/headless_lib_data.pak
-lib/chromium/headless_lib_strings.pak
 lib/chromium/libEGL.so
 lib/chromium/libGLESv2.so
 lib/chromium/libVkICD_mock_icd.so
diff --git a/chromium/TODO b/chromium/TODO
new file mode 100644
index 0000000000..e611a939c9
--- /dev/null
+++ b/chromium/TODO
@@ -0,0 +1,17 @@
+To Do:
+
+0) Build on NetBSD-10 amd64
+
+1) Audio backends
+ a) NetBSD uses sunaudio (https://github.com/kikadf/chromium-audioio)
+ b) FreeBSD uses pulseaudio
+
+If pulseaudio not run, chromium can't start it, so no sound:
+VERBOSE1:pulse_util.cc(261)] Failed to connect to the context. Error: Connection refused
+WARNING:audio_manager_linux.cc(53)] Falling back to ALSA for audio output. PulseAudio is not available or could not be initialized.
+
+If pulseaudio already started, chromium can join it, and has sound.
+This is the workaround, see the files/chromium.sh.in launch wrapper.
+
+2) HID doesn't work on NetBSD.
+NOTE: For this OpenBSD uses libudev-openbsd, FreeBSD uses devd.
diff --git a/chromium/distinfo b/chromium/distinfo
index 68ecee332d..fb12dd3cd2 100644
--- a/chromium/distinfo
+++ b/chromium/distinfo
@@ -1,1414 +1,1452 @@
-$NetBSD: distinfo,v 1.1 2025/02/06 09:57:37 wiz Exp $
+$NetBSD$
 
-BLAKE2s (chromium-131.0.6778.204-testdata.tar.xz) = c8e99fa924e08b74fe4913b13ee1030ffe96b5dfb5da0f5afc0a8e0adcf22d29
-SHA512 (chromium-131.0.6778.204-testdata.tar.xz) = f6b71812815d0988f054d998a67ee95b9190cbdc4269ffb3fd99fa088ad6ce77b652a5f569f8078274c0aaaba1a8eecb4de84bf8d7dd360def152787640961ba
-Size (chromium-131.0.6778.204-testdata.tar.xz) = 279241924 bytes
-BLAKE2s (chromium-131.0.6778.204.tar.xz) = b345bdcaabd833b85f38c1eeeeb94862e09ce89661d653304c9ac8217ed88bbf
-SHA512 (chromium-131.0.6778.204.tar.xz) = f9eaff8bd9f62deee64cbaa301eaac928a5d5ab6c4dc1d559284afcf62017016ec96d86e4cf17e34940cd9ddde5b1607413cd3426924cc898dfd5fb7dcca2d38
-Size (chromium-131.0.6778.204.tar.xz) = 7179406604 bytes
-BLAKE2s (chromium-linux-131.0.6778.204-llvm17.profdata.tar.xz) = 03211ec7edde6e9a63c5b76f415471f236a2099cfa49150c1cd7c148455361b5
-SHA512 (chromium-linux-131.0.6778.204-llvm17.profdata.tar.xz) = 879e96299854f2c654e692eb6f6e04edbc44e67433c50234fff49a8d9e88b92f2ea223d38aaa5ea526783a5b2ecab88c9975dcb59d6bfc6acac140888cb7dc30
-Size (chromium-linux-131.0.6778.204-llvm17.profdata.tar.xz) = 30667836 bytes
+BLAKE2s (chromium-136.0.7103.92-testdata.tar.xz) = 5c0f1bb395618d0a1c9b9ad3ee2badca9418ba8d072ffc389de059b049cad60e
+SHA512 (chromium-136.0.7103.92-testdata.tar.xz) = 82d1c3a01d3859a9f0b311d9b75421bd5d9cc01ae13cfd9c7d18efbfa90768b6eae5fdafa84142b42c455c797f02471aa0d42995b00fc5a4d6e8f81c0d48f626
+Size (chromium-136.0.7103.92-testdata.tar.xz) = 651393856 bytes
+BLAKE2s (chromium-136.0.7103.92.tar.xz) = d60bc473fcab6277415b41831a5d50b803c664a72b2f71200e3d93cf116ac790
+SHA512 (chromium-136.0.7103.92.tar.xz) = 63cf064de6e6a17bfd6e337a7c8ae66a503275e6be0f119317c1d923d78d56e0cc2a906e84a3d173d9e584c696dd5276533b156a4f8ab368e53b2f350bee480a
+Size (chromium-136.0.7103.92.tar.xz) = 7188412240 bytes
 BLAKE2s (kikadf-chromium-audioio-v130.0.tar.gz) = 45fe07cb8280f81b8ef490059002da426b59fe69b5ebd53951fe1dc3e9495a10
 SHA512 (kikadf-chromium-audioio-v130.0.tar.gz) = 840aed119dc69982f14fd5f4767e144bfc8a66672b660f0f05f5459070d7f6a36b8719ae7c0de049f7345dec39266759aedcdd5ee37aa4e98bcd2b44d06a3a4c
 Size (kikadf-chromium-audioio-v130.0.tar.gz) = 7824 bytes
-SHA1 (patch-.gn) = 0e738eba601b7aa365be6a72be03f8d4167d089e
-SHA1 (patch-BUILD.gn) = e35f515c82743b551aa2148e235ee7c51315f1a5
-SHA1 (patch-apps_ui_views_app__window__frame__view.cc) = 1f34022b64fc9f10549d973dea3ee0a282c0aef4
-SHA1 (patch-ash_display_mirror__window__controller.cc) = 2abcfa291d0c49d7faef8e1a72049cf5a595e605
-SHA1 (patch-base_BUILD.gn) = d414d2aa2330a0edceb2eeca1d52497986be4839
-SHA1 (patch-base_allocator_dispatcher_tls.h) = ddcf1048ae63c72e09344d65e2bf9cccd06a8d96
-SHA1 (patch-base_allocator_partition__allocator_partition__alloc.gni) = 47ca9c5a91695b445a2be0d98b417fd6aa286595
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn) = c9faa30f473d47fc6a4f54b3cdbc5341d74b5053
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h) = bc12df8057d01d130b953505d79eefea4a03e36e
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h) = 5f3023340fbc12158334fc8ba6be5bdd8d4dce39
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h) = a4b14ec1245ecf5695d6daa1ecbf3d3e4a196963
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc) = fbfd4905be0ee50f38fb3bce1a2c15a39086497d
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h) = 477a79f47cb2ac6c4477bc79b361a6ef2af6d149
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc) = 8d04ea203d9167094271f6acba2e6b05cfc24278
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc) = 36de98c7c80922d9ee31ff80122ec7307c3cbb1c
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc) = 31d0f3feb6fbeb40f72516a013e3db79eefacc1c
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h) = 75db3c38e4cb3d3af005407f1e50192b56fe1dd3
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h) = 4924be9a1fa15a1394781e3b87b5fd1ebc69984a
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc) = 9355b29fff060250457c28190cb1075f144baa3b
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h) = c61edb60b17237a2285409fc5b89f22897c89eea
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h) = 5cff54cc485f1a3db991cc60a91bc1725c811a34
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h) = 22e5ba1e10da1196b20e1efb43cc0119413fa73a
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc) = 451d430041d33839a6d62151882e2da9e5cda9ad
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc) = 2b873a2968d7dcae5c5c34065d1b27a56ab25eeb
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc) = 609cc1ab32f371cbb9c50c2fff3087eb782622a6
-SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc) = 9a0b8a287e8d91ba6408bc8c7e74eb8cd51dce6e
-SHA1 (patch-base_atomicops.h) = 66cd358dae6707d694ab025d303735f588388334
-SHA1 (patch-base_base__paths__posix.cc) = b77307ff1ecb720841419871b3e1efb279d1f669
-SHA1 (patch-base_compiler__specific.h) = e70b0e7f906b1158c914c8e47c63a9677811dd18
-SHA1 (patch-base_debug_debugger__posix.cc) = 1538e8fd44082b814d6a9383174e9f33df22317a
-SHA1 (patch-base_debug_elf__reader.cc) = b192ae8d6cac3e544d138dd63a4bb5cb88441eaa
-SHA1 (patch-base_debug_proc__maps__linux.cc) = 430fe90a97e1e6300f47a8e956233227b4300b50
-SHA1 (patch-base_debug_stack__trace.cc) = 50b1c97640a84051aa596412b85e95a4206eabf0
-SHA1 (patch-base_debug_stack__trace__posix.cc) = 94999ffef037078b2faa0dcce33b38ab6772c9f9
-SHA1 (patch-base_files_dir__reader__linux.h) = 2dac3419b575f16c8f5e2a8c2416160e071a330a
-SHA1 (patch-base_files_dir__reader__posix.h) = 86d05dffcb4bb20b6c68f8e39ce66a5bd435d09f
-SHA1 (patch-base_files_drive__info.h) = 843017e0c62903d5baefc5825cd00aee9c78ead2
-SHA1 (patch-base_files_drive__info__posix.cc) = cfb992c03651a29741fb38dc886aece89b615979
-SHA1 (patch-base_files_file__path__watcher.h) = 9c897a13048fe52fa4adf589b046dd8c22b78d09
-SHA1 (patch-base_files_file__path__watcher__bsd.cc) = 07607a72f6797cd84ad1e0594ec65daf60075d0a
-SHA1 (patch-base_files_file__path__watcher__kqueue.cc) = 0d71af930e95e8a23fa4957ad51f23ce9a2d7e05
-SHA1 (patch-base_files_file__path__watcher__kqueue.h) = 1d3a6ac9ca40332b52aced68400a1faa64b1d8ce
-SHA1 (patch-base_files_file__path__watcher__unittest.cc) = e11207355c0bcefea5c84a947cc7304bb9ae77e0
-SHA1 (patch-base_files_file__util__posix.cc) = b0197eaa63bc99272d69cb06d6aeef3752aca0ff
-SHA1 (patch-base_files_file__util__unittest.cc) = c83a1db57411bafbf0338157ed84c3165fbaa4bd
-SHA1 (patch-base_files_important__file__writer__cleaner.cc) = 0dc7f571dc5b44d5a8969c4ece6f8ec686ec73d1
-SHA1 (patch-base_files_scoped__file.cc) = 4011de527268b174a5b29b1708f267e48b1dae3f
-SHA1 (patch-base_functional_unretained__traits.h) = 803cb99fd3cae535b73dcc0043012426a9689f99
-SHA1 (patch-base_i18n_icu__util.cc) = 207329886bf1f87a58e4a75cc0c83c90a82235ab
-SHA1 (patch-base_linux__util.cc) = 62f12e62f1eeb907d450e17b95e9032e737adb4d
-SHA1 (patch-base_logging__unittest.cc) = 0d78c429e10e5991e32769abc69d8253978259de
-SHA1 (patch-base_memory_discardable__memory.cc) = 4cbac4a49e111ad78fd664783bec1a80d573b9a2
-SHA1 (patch-base_memory_discardable__memory__internal.h) = c8cee718df7cd7bc04f6042d179e0b445bab5c36
-SHA1 (patch-base_memory_madv__free__discardable__memory__posix.cc) = 973e89faabf0c14183c1aadb0b077d0eb5f5ecdc
-SHA1 (patch-base_memory_platform__shared__memory__region.h) = fe6fb9c429cc8e4e0e9a36aff74227ae89984ee1
-SHA1 (patch-base_memory_platform__shared__memory__region__posix.cc) = 1bfa3dd2c3cce3a0062ac6b5459ba255b208b544
-SHA1 (patch-base_memory_protected__memory.h) = 72960cd76417409c4a75303af51fa018555f4d48
-SHA1 (patch-base_memory_protected__memory__posix.cc) = 4543a8d8357267bb58c431a36b2fc57adaa62a69
-SHA1 (patch-base_message__loop_message__pump__epoll.cc) = 81532d2a328285fb6b9f7081b6029af5d2969bb9
-SHA1 (patch-base_message__loop_message__pump__epoll.h) = 76635910f18a2bd5bf75de186133a16ebbeec41c
-SHA1 (patch-base_message__loop_message__pump__glib.cc) = a7245952a0a092b6c50123304d84e1ff49668861
-SHA1 (patch-base_native__library__posix.cc) = 50e8cad22f4e01e560ad8cd0f5b30cc32c401eb1
-SHA1 (patch-base_native__library__unittest.cc) = 95116629326ad8e8075dace5b1e795e5939a2aa3
-SHA1 (patch-base_posix_can__lower__nice__to.cc) = a632206dca8717ec75576c56bc92ea962080072d
-SHA1 (patch-base_posix_file__descriptor__shuffle.h) = c2f28209de6419a1f145bd601a3403ac328cecf9
-SHA1 (patch-base_posix_sysctl.cc) = 3ff907fea8407005e30f0c8cb0d83ef16ba335ea
-SHA1 (patch-base_posix_unix__domain__socket.cc) = 23323cf641a631c90f9595af8418b6109a11361c
-SHA1 (patch-base_posix_unix__domain__socket__unittest.cc) = c824bff3068cfe3db1bc3a451ea37ed1da909afa
-SHA1 (patch-base_process_internal__linux.h) = d1e7f1e3d7cd300e77ef9c561368e8511f169593
-SHA1 (patch-base_process_kill.h) = c1a30fb33f0ca5ff941120e3a35c2a083f6a44a1
-SHA1 (patch-base_process_kill__posix.cc) = 21c232487796bf1f6734d111771d0350264bf683
-SHA1 (patch-base_process_launch.h) = 7756d6b89f8874d86cc95482ccf433c0d7ac9674
-SHA1 (patch-base_process_launch__posix.cc) = 3b00d2a88258ad43622b791782854ffc422da7cd
-SHA1 (patch-base_process_memory__linux.cc) = 8dc54b6ec54118846b552bcae1f5910b7069b0ff
-SHA1 (patch-base_process_process__handle.cc) = bc23bba0ba4154c3a9f1d6ca60f95b6b50021b72
-SHA1 (patch-base_process_process__handle.h) = b404ae0a46c34fa204c3d2d6d12d9859ac16f060
-SHA1 (patch-base_process_process__handle__freebsd.cc) = 19eecded83037ab53ff95f5166990acfccfb0ee4
-SHA1 (patch-base_process_process__handle__netbsd.cc) = 7d3b3b4c64e77aa070d3b9a48abff8206def9a2f
-SHA1 (patch-base_process_process__handle__openbsd.cc) = f8c12ee9b8323c5ace2effa1288f285fe2ba93f5
-SHA1 (patch-base_process_process__iterator.h) = 9c32472428f85bd8f33f59b509efca3626c4fa58
-SHA1 (patch-base_process_process__iterator__freebsd.cc) = e6dafc2419772a86bbc8097bf9f709716d2e3b5a
-SHA1 (patch-base_process_process__iterator__netbsd.cc) = 27a539d3a61bf8b1f8fbfffe1af7971b3a7d886d
-SHA1 (patch-base_process_process__iterator__openbsd.cc) = 8d1a88ac063395e77bc352cd2a46efc4c745c61b
-SHA1 (patch-base_process_process__metrics.cc) = 9cdd5d259d3dce9e94b711c598af792eeda4e6e6
-SHA1 (patch-base_process_process__metrics.h) = 60cf3246249094fc26142878dead902ed8cb8d90
-SHA1 (patch-base_process_process__metrics__freebsd.cc) = 7cd06d60e3324095cc9bb63d1523222b7ccae904
-SHA1 (patch-base_process_process__metrics__netbsd.cc) = 03eab0d757d7141efd3fb9e011e8ea1acdb0fe86
-SHA1 (patch-base_process_process__metrics__openbsd.cc) = 592ff9dcf5de3bfa71d1d3c1ab45e8dc17bdb74c
-SHA1 (patch-base_process_process__metrics__posix.cc) = 09628e542a86c68f432ae0df881747423a6fbe37
-SHA1 (patch-base_process_process__metrics__unittest.cc) = d87f17fb8239d6f2c58af9b9461b8b56ade33979
-SHA1 (patch-base_process_process__posix.cc) = 0d06b1da8fa41be72cf6e9f53abca50157e6cd63
-SHA1 (patch-base_process_process__unittest.cc) = fedb7a12bae003c7cac14daaea9430cea742bb0a
-SHA1 (patch-base_profiler_module__cache.cc) = f1b0ac6671a3e6e4be2748c310d69ebad5f37f10
-SHA1 (patch-base_profiler_sampling__profiler__thread__token.cc) = 6394e01489a32c91172f71799e352ff22daa135f
-SHA1 (patch-base_profiler_sampling__profiler__thread__token.h) = 9ea96a7a19cdb37d20d4a9ab0f4ad1f259c9cfa0
-SHA1 (patch-base_profiler_stack__base__address__posix.cc) = 43bebf5f0d3c352317311abe50ed6b6515f73c3d
-SHA1 (patch-base_profiler_stack__sampling__profiler__test__util.cc) = aeb0dcf0660c136a7bb08f62afbc7139dd876a48
-SHA1 (patch-base_profiler_stack__sampling__profiler__unittest.cc) = 6c6ad505e60b31b15fe737103fcc77161682c9c1
-SHA1 (patch-base_profiler_thread__delegate__posix.cc) = 3df4abca7d78e5cea7accf3dcaab5e6835d7ea32
-SHA1 (patch-base_rand__util.h) = b23dbad5c2f99fc18da3b3c36d33dbbea2494030
-SHA1 (patch-base_rand__util__posix.cc) = 2eb54adf808fa709778aab57c381eb5d17868f4b
-SHA1 (patch-base_strings_safe__sprintf__unittest.cc) = 72b0bf86e80f8a90dd79f082d54ea0a3edc46f4c
-SHA1 (patch-base_synchronization_lock__impl.h) = a70791a28c5bd50ea6167ddbba739cb8b59fdfce
-SHA1 (patch-base_syslog__logging.cc) = a6dc78d5dd652375410451e560a0339e5045c651
-SHA1 (patch-base_system_sys__info.cc) = dc8f7159caa2d57f4a21a8d0a982a85b0f4c612c
-SHA1 (patch-base_system_sys__info.h) = cb5767cc157cba876dcd3ff27328fab585b81aee
-SHA1 (patch-base_system_sys__info__freebsd.cc) = 4ea51f7f5dee0a4176c81a959488d81a381cde78
-SHA1 (patch-base_system_sys__info__netbsd.cc) = 5edcd57f42923d95435026074fa708e748c73268
-SHA1 (patch-base_system_sys__info__openbsd.cc) = 85ece51c4956ecd11c31aebaa336528bf78dc042
-SHA1 (patch-base_system_sys__info__posix.cc) = e543908c60fd5d62af8fd4ddc71eb732ff92a616
-SHA1 (patch-base_system_sys__info__unittest.cc) = 9730b79771eaaa65bc1d2d868e801ac36ad3a744
-SHA1 (patch-base_task_thread__pool_environment__config__unittest.cc) = 42e5559ad75cbd7e802945ee37f86a1b5bd61dad
-SHA1 (patch-base_test_launcher_test__launcher.cc) = 7c9e6acc4eef8f5408ded8ff790440b9ed7fc792
-SHA1 (patch-base_test_test__file__util__linux.cc) = 75f996c76b4a0a4362522cd7e1ef6576b84c596f
-SHA1 (patch-base_test_test__file__util__posix.cc) = d19b73848b01d415487b8b2006fc13734f47f8e8
-SHA1 (patch-base_threading_hang__watcher.cc) = f8169a99b979740556074e497b79f5a4789cbcf0
-SHA1 (patch-base_threading_platform__thread.h) = 7b7234d87218eed18108819fb0a5c8642adcb1db
-SHA1 (patch-base_threading_platform__thread__bsd.cc) = 4a39788e29fd7d7a412dd8acc9308c340febfaf5
-SHA1 (patch-base_threading_platform__thread__internal__posix.cc) = 43a8b056065d9ab8427efc670599a71184d79fa5
-SHA1 (patch-base_threading_platform__thread__posix.cc) = 664a32c99a3eceac6b66827738732eb9b4ef2949
-SHA1 (patch-base_threading_platform__thread__unittest.cc) = 414ef0c8e03306ea2fc3167c81e5cf41548f8d4a
-SHA1 (patch-base_trace__event_malloc__dump__provider.cc) = 07e64efa15caf970603de8e9dfd543129e65a4c6
-SHA1 (patch-base_trace__event_memory__dump__manager.cc) = d31b273727b8a68627fd56e021b9dfabe5302a04
-SHA1 (patch-base_trace__event_process__memory__dump.cc) = 82bcb3a7a18cd8b5a45fcbdc6f379ce58c2b68f1
-SHA1 (patch-base_tracing_trace__time.cc) = 706a73521026a225129608b41dcde01bcb7b26de
-SHA1 (patch-base_tracing_trace__time.h) = a789231251ea696d28ac0969be6963fc2a4a1e4b
-SHA1 (patch-base_version__info_version__info.h) = d9642e8a1027fdeea678f526ddce739848d1454f
-SHA1 (patch-build_config_BUILD.gn) = 238af5e19911f22efd267706c357ea2b5c2aca0c
-SHA1 (patch-build_config_BUILDCONFIG.gn) = c386a59a58026b8ba90c9b816325c102fc5ec0e3
-SHA1 (patch-build_config_clang_BUILD.gn) = 4b0da9f1ce8ec0dd758cf1dc546e7f6615921fc8
-SHA1 (patch-build_config_compiler_BUILD.gn) = cb0c731c3287995fc9557f5b2023ca2becc42217
-SHA1 (patch-build_config_linux_BUILD.gn) = cb87b778e7eaa6d9f3f5b53502c62824e4688d3d
-SHA1 (patch-build_config_linux_pkg-config.py) = d41205c0ccfa08be9b8fe879d7234e82d9752a23
-SHA1 (patch-build_config_ozone.gni) = 5ae4f8c236c2e9b505d2d438e0a69328e73391e0
-SHA1 (patch-build_config_rust.gni) = ce41c836ba624903d24a34abe984e95a503f0d78
-SHA1 (patch-build_config_v8__target__cpu.gni) = f5a37fa2170acbb0e857394bfdbdfe713ce3f228
-SHA1 (patch-build_detect__host__arch.py) = 42b3d2f5edf58a3663ca72ff7309352b4af8d7be
-SHA1 (patch-build_gn__run__binary.py) = 752aa7c70696cd05bae26d82929b07a2086b0504
-SHA1 (patch-build_linux_chrome.map) = 1e72ed1d14785e0c8330fc706c3622e10b8aa47f
-SHA1 (patch-build_linux_strip__binary.py) = 14a3b5cf3d7b2f53944cd6766d58437fa24f9884
-SHA1 (patch-build_linux_unbundle_icu.gn) = 97756f4e6d53e8182088cf58f701e1583ebc82f3
-SHA1 (patch-build_linux_unbundle_libevent.gn) = e8e495163a084f1f424c18a415afdbc46a715ccd
-SHA1 (patch-build_linux_unbundle_libusb.gn) = da7cc3aa911de226061f60b566bdf8fde0395778
-SHA1 (patch-build_rust_rust__bindgen.gni) = 25f08b53ad42ac49138cf2bbd0cc8fc7ead10e67
-SHA1 (patch-build_rust_std_BUILD.gn) = c69ea48e3c2f2f509c443b1ebb522be40db6c32b
-SHA1 (patch-build_toolchain_freebsd_BUILD.gn) = c4fdab29af4ca835e7fa368f03361debe8e1dab0
-SHA1 (patch-build_toolchain_gcc__solink__wrapper.py) = 203b72e268514548d406fb385daa74c77ee35216
-SHA1 (patch-build_toolchain_gcc__toolchain.gni) = 3703844c5bcd4e16402f44419b0c280dadb38b2a
-SHA1 (patch-build_toolchain_netbsd_BUILD.gn) = 356331870b9bef186b7e4de3a7a05044b34bc861
-SHA1 (patch-build_toolchain_openbsd_BUILD.gn) = cf5a0838165b99986abfb9262fc90d8b9a378275
-SHA1 (patch-build_toolchain_toolchain.gni) = 32b2886c0ae5a8fde2bea66b38b03692cf44de05
-SHA1 (patch-cc_base_features.cc) = 966be14b707532791bd2c07d2e410e923c6df5a2
-SHA1 (patch-chrome_app_chrome__command__ids.h) = a0d901ee1a0e8a28c5fcb926dd4e1cc37583332c
-SHA1 (patch-chrome_app_chrome__main.cc) = 92ff6aeb8c3a52248f1a226e1c6b94221e926999
-SHA1 (patch-chrome_app_chrome__main__delegate.cc) = 02b3efc907464d4b2663ab76d03660997deddba7
-SHA1 (patch-chrome_browser_BUILD.gn) = c24f185907062ad61ca0e1cf3d630e6ca8cf445d
-SHA1 (patch-chrome_browser_about__flags.cc) = c73489b7f7103b66eb8e39cd858dbccc32ac30aa
-SHA1 (patch-chrome_browser_accessibility_page__colors.cc) = fa3f71ec138b654ded5236945cd22f664cda379d
-SHA1 (patch-chrome_browser_after__startup__task__utils.cc) = 4b4083b4232f17bff61e001e60ae9501b93a9b53
-SHA1 (patch-chrome_browser_apps_app__service_publishers_extension__apps.cc) = efcb39419cdeaa72ef128b3c7ad9b0ac9fc4e8da
-SHA1 (patch-chrome_browser_apps_platform__apps_platform__app__launch.cc) = 1faa5cd841e5b844d3a8f29909fbd9817de81114
-SHA1 (patch-chrome_browser_apps_platform__apps_platform__app__launch.h) = 2568f71b1947b4adaf356f313113a23911339584
-SHA1 (patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc) = 04d0a91c3002d193ab3dcfe2b0fee553f2cf40a0
-SHA1 (patch-chrome_browser_background_background__mode__manager.cc) = bcf808a5b1be67f95ad60bbde8e5c34dffd888dd
-SHA1 (patch-chrome_browser_background_background__mode__optimizer.cc) = 00a96cd6aedcec91388651dddb12d04d69c8f7c5
-SHA1 (patch-chrome_browser_browser__features.cc) = a5385c30d1d532d100b9d0c700d78bf96f334fd8
-SHA1 (patch-chrome_browser_browser__features.h) = ab5afab9ef46be74c575cbdc0beb7a2d7ef533f8
-SHA1 (patch-chrome_browser_browser__process__impl.cc) = 8bea7ef12528221ed8655a443d20f3eca46fe7f8
-SHA1 (patch-chrome_browser_browser__process__impl.h) = 26fe9b9b4daf66f5e527ef0205f170666d71ad49
-SHA1 (patch-chrome_browser_chrome__browser__field__trials.cc) = 9689dd209cc43bc03bbf908a59c98fcd33f19444
-SHA1 (patch-chrome_browser_chrome__browser__field__trials.h) = 7de27338f23cf92dba29330e5541b0cbfb7021da
-SHA1 (patch-chrome_browser_chrome__browser__interface__binders.cc) = eefb414632a65de066f33e43504c5f7a9704714d
-SHA1 (patch-chrome_browser_chrome__browser__main.cc) = 54b79d85fa7fc541391f1c79820c49dfc9ab6c49
-SHA1 (patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc) = a6a75c665355727eb6e2659fc814b95a7201b715
-SHA1 (patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc) = 4cdfbe29424a433f901f7eba10528c9ae3af0a20
-SHA1 (patch-chrome_browser_chrome__browser__main__linux.cc) = f9b54ce273aafdd2a2cfc1ce40d5900102eb8837
-SHA1 (patch-chrome_browser_chrome__browser__main__linux.h) = 0c4d490a5200c577b28527b6abcdbf2124e610e9
-SHA1 (patch-chrome_browser_chrome__browser__main__posix.cc) = 8036a0f6aa7abd8be323d4d86b3e5e7db41232fa
-SHA1 (patch-chrome_browser_chrome__content__browser__client.cc) = 719f36880823e5a3c81d7fd005ebcbe558d44836
-SHA1 (patch-chrome_browser_chrome__content__browser__client.h) = 279c119f96b225cf96c85a24ff1340a034c880d4
-SHA1 (patch-chrome_browser_component__updater_registration.cc) = 967742bfcf4a9b5c8347ce1c20834f56b69ccc10
-SHA1 (patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc) = ed2c93eba58855ab3441f55061f2c71b144fec0c
-SHA1 (patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc) = a4d510d071b371fe41b699aa9b9c1be8c7cd6c61
-SHA1 (patch-chrome_browser_defaults.cc) = 607913209cac4a0b896f7e4b98866d0b22028882
-SHA1 (patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc) = 67bc8256391235fe9c05b6a432b57ec0e5cd16d3
-SHA1 (patch-chrome_browser_diagnostics_diagnostics__writer.h) = 2f65207c6b7adf04b9ea3605978ea3c9d0e9e5db
-SHA1 (patch-chrome_browser_download_chrome__download__manager__delegate.cc) = 763297de9ba934a289e7bab10bbb8606a083d30a
-SHA1 (patch-chrome_browser_download_download__commands.cc) = 75dd2b015f0869b584a4febcf9279c2879b0836e
-SHA1 (patch-chrome_browser_download_download__commands.h) = c08448e41330886a195035f5e00e4e2aeda1f777
-SHA1 (patch-chrome_browser_download_download__file__picker.cc) = 3f76ddf110e519b3ed22476ddb8d9796c4727e7c
-SHA1 (patch-chrome_browser_download_download__item__model.cc) = e519d9e36c8285e92393d426cb4fede9f5f2deff
-SHA1 (patch-chrome_browser_download_download__prefs.cc) = 5650799b1348c8785914b64abd2003143918bbdf
-SHA1 (patch-chrome_browser_download_download__prefs.h) = ce92e9b0b7bed5e3b68d53dcca12de356c2af4fb
-SHA1 (patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc) = e74f36818b5371551367bbd1370b20f3e0688224
-SHA1 (patch-chrome_browser_enterprise_connectors_common.cc) = 60c10fecbf22d4aaa65050bf31838cf92966e2c7
-SHA1 (patch-chrome_browser_enterprise_connectors_connectors__service.cc) = 8b02ff67b9d22fa49b329c57075fa083a2afeb2e
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc) = 71105f5ec40cf802f197d544ae207a28157eb429
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc) = 82ad5455e111ff16c876077f05fa28315c58b0cf
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc) = 96f98fb1b2b6d8345e673c4fc41f7864bb55cf63
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc) = 003fc069fddb9ac41b535d45ef580a9c4713aebf
-SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc) = a6a58de99d0fe02b358174ec37cae3a39e51fb2e
-SHA1 (patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc) = d94e49721e6e15222fb9f9d1f378a7900bae40c6
-SHA1 (patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc) = 78941982463a4e24494deecda8c2b7bca95545b4
-SHA1 (patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc) = 42aefefc1ff41b33a8d3eb324c26ab1c7bdae335
-SHA1 (patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h) = 6134b836b40dedde81b5ffe0b4f15190534db4bd
-SHA1 (patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc) = f06f3f97c58c73cff0c261516832a3eebe2cd4f1
-SHA1 (patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc) = 2f0860fdd98250c453376dddb1cc68d13dd1fb20
-SHA1 (patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc) = d7bcb9daee5000090887588a25d38bd6060c1606
-SHA1 (patch-chrome_browser_enterprise_signals_device__info__fetcher.cc) = 511ad414c1b38bc8076d6d80d0d6cb1475319c1f
-SHA1 (patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc) = 12b988aff17544252075632778fa9308065c1190
-SHA1 (patch-chrome_browser_enterprise_signin_enterprise__signin__service.h) = 4f196dfad32f8888d447df066f837f3e7a221666
-SHA1 (patch-chrome_browser_extensions_BUILD.gn) = 15256fadea88975712b0d6191baf5dc25112edd4
-SHA1 (patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc) = 8a517f76530783d98fa14c72ca89c9d75b06be47
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc) = 681c81cde1f1a3616ea2922f84d886b1e268b1e1
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc) = c52cd49b48cbee0f12369d77b43769857e17d4f6
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h) = e6dd654927a408e9a3042e3b36b4e53271b2821b
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc) = 53b9068449c3f19357de8bc94b0b296204294618
-SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h) = c78222b4764f85a448fb504f7f734fa5fccbc6bc
-SHA1 (patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc) = 2b7dedc6c223f295121eea85acf6f18597f6e1c7
-SHA1 (patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc) = 50f78db8de4241af472f36c2f19a538190db6416
-SHA1 (patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc) = eed8296c04a74aebe61a8b3695424eb1f586e969
-SHA1 (patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc) = 4cfa19ddce27a4d3ebc58bfc0c5031b148441f1b
-SHA1 (patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc) = b6461ebaed2ccb32f047605006c9270a2f01fd89
-SHA1 (patch-chrome_browser_extensions_api_settings__private_prefs__util.cc) = 020917395c43f0ea5546043b84279e5cb2865a01
-SHA1 (patch-chrome_browser_extensions_api_tabs_tabs__api.cc) = d6c33b5037f9f0505c811c341b2d5d308b3afade
-SHA1 (patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc) = 3dbc0961db7d7e0e61215887de89d5e70a991623
-SHA1 (patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc) = 7c2033a75e0afab9211897a29224e8951b5734d9
-SHA1 (patch-chrome_browser_extensions_external__provider__impl.cc) = f24bb0318773afab33a18cb00688bf68c2177761
-SHA1 (patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc) = f7531ff0ff649e77165ccc148b6a9c8311db6bf4
-SHA1 (patch-chrome_browser_first__run_first__run__dialog.h) = e6b0dac705faff5b0a6a843b703944d448726013
-SHA1 (patch-chrome_browser_first__run_first__run__internal.h) = d0703e0f3ec611954792ebd3e3fcdad767c296da
-SHA1 (patch-chrome_browser_flag__descriptions.cc) = 10c7897aa0e5050b559c90767898a6f7b2975a4e
-SHA1 (patch-chrome_browser_flag__descriptions.h) = eccd2835c381aca9fa2e319d162e1731b07b77d6
-SHA1 (patch-chrome_browser_gcm_gcm__profile__service__factory.cc) = 7bb659ed2ef1c128f993ae568dbcc75c3de06e05
-SHA1 (patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc) = 8d6491adf2cd5dcc4f5ca4cde1a467348d0b6c86
-SHA1 (patch-chrome_browser_global__features.cc) = 2ed51cbd3ecacc742fb9ad2ae911367d00696ef5
-SHA1 (patch-chrome_browser_global__features.h) = b291fbec4d0c4516f2f05d271a091c4ecac049d4
-SHA1 (patch-chrome_browser_headless_headless__mode__util.cc) = 6dc58567fddd5237eb1ff7655648003313f0c9c7
-SHA1 (patch-chrome_browser_intranet__redirect__detector.h) = 618a66c662223e7bc983747b8cdd7d779b611192
-SHA1 (patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc) = 683bdc1749ea1b380e2366f3b0e88507b09e48c3
-SHA1 (patch-chrome_browser_media__galleries_media__file__system__registry.cc) = 2bc080adfb3735f9f77c45aac3490c78fabfb06a
-SHA1 (patch-chrome_browser_media_audio__service__util.cc) = 2921f7e66551cdca7d1697d2bf38b8834ad25c58
-SHA1 (patch-chrome_browser_media_router_discovery_BUILD.gn) = 4cf54e7bb0384d5403eb07cf10f9650dc37e3273
-SHA1 (patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc) = 101a4489eec0e823991e23422f0fd8da7b312f63
-SHA1 (patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc) = 61b78bfafef352c7fca87f3ae72951bb6c7ee749
-SHA1 (patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc) = 15c081481861fd03eeefdb2af7780bcd4134cc0a
-SHA1 (patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h) = 5e12cf95b2e93a375ee7f863f0f342c05823658f
-SHA1 (patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc) = 58498e8c550c6981549f5e5340cce6705af370c6
-SHA1 (patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc) = 3e61631485c96cce37a1dfff1e5f1e6b83842f08
-SHA1 (patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc) = 6ab47d30ad3f9be271fe65338d288a72f00be73a
-SHA1 (patch-chrome_browser_media_webrtc_webrtc__logging__controller.h) = afe898ab85010d339105c36ce339d654c3ef1e7a
-SHA1 (patch-chrome_browser_memory__details.cc) = fbf428c7c55ef6d44e5085704303957e52c4076d
-SHA1 (patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc) = aaf9529290c45556c5dc5d471f3c7c4e9e6f4799
-SHA1 (patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h) = 6edeea99b8b03ea2dae957434d3dd0e84d4ce11d
-SHA1 (patch-chrome_browser_metrics_chrome__metrics__service__client.cc) = 55b45c01dd87ceda25a937eb1b2c4435e2536e31
-SHA1 (patch-chrome_browser_metrics_perf_cpu__identity.cc) = 5979958eef0d1c6076bead69a1ba50e3ee04d04e
-SHA1 (patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc) = 78c0090d1a181d4c978d6dac8b8fc633a334284a
-SHA1 (patch-chrome_browser_metrics_power_process__monitor.cc) = 79be6877bde8fb362151a9f8069403e0b7af334d
-SHA1 (patch-chrome_browser_metrics_power_process__monitor.h) = 71b4f90589d284fa55c89df848c879a8723da03a
-SHA1 (patch-chrome_browser_net_profile__network__context__service.cc) = 1e883d8fd5321b1226a2eb789d7252a29a3b2d86
-SHA1 (patch-chrome_browser_net_system__network__context__manager.cc) = 44664e2e4bfc48b3b374f48b1abbf03217e2c76a
-SHA1 (patch-chrome_browser_net_system__network__context__manager.h) = f7b8637ef573f1702032720b42882b606c7af001
-SHA1 (patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc) = c7d77ba0341d2e6b1dadd8ac152d12d38d30f653
-SHA1 (patch-chrome_browser_new__tab__page_new__tab__page__util.cc) = aa82d2bb3bb811d22019d6eaf4a556a9f7f7e5a0
-SHA1 (patch-chrome_browser_notifications_notification__display__service__impl.cc) = 7769d15d4004e07b573e65e334f949c5a5d7cef9
-SHA1 (patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc) = 5a88874cfe9baf27f1ef82c7ee3b69f5dc1087e2
-SHA1 (patch-chrome_browser_password__manager_chrome__password__manager__client.cc) = f38dddd5299cbe09aee474daecc32db4f9f8d96c
-SHA1 (patch-chrome_browser_password__manager_password__reuse__manager__factory.cc) = 83722b5876eea8fc72e56076624c432256c62234
-SHA1 (patch-chrome_browser_platform__util__linux.cc) = 1ef544633f85590b5eaa875db011e0f8d3bdf3a2
-SHA1 (patch-chrome_browser_policy_browser__signin__policy__handler.cc) = d0c6fadebc77d50411e621f2b2d20e12abcf3bf9
-SHA1 (patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc) = 7798bd62a8cb3ddae1ca272c0e211e528dc7c477
-SHA1 (patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc) = 19b6928821332128d960253fe0df4ce3d9204253
-SHA1 (patch-chrome_browser_policy_device__management__service__configuration.cc) = c65accde90fa25714f9685f71bc7df4091f242d8
-SHA1 (patch-chrome_browser_policy_policy__value__and__status__aggregator.cc) = 74e79ece555cf33eb66340a41adef6fae1cea6a9
-SHA1 (patch-chrome_browser_prefs_browser__prefs.cc) = 2fba8c8ee404c43fab06b878d0a17a1c5d2da00c
-SHA1 (patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc) = 16e62f2deee852c69814d19b94d91912dac6c780
-SHA1 (patch-chrome_browser_printing_print__backend__service__manager.cc) = f2e5d54fed83d7605684d97b1f4b6241c79ad5c1
-SHA1 (patch-chrome_browser_printing_printer__query.cc) = 779771dd21053d16df03574888788637bd669074
-SHA1 (patch-chrome_browser_process__singleton__posix.cc) = f962d4ff66aa365b27f53f036eae640f0139deab
-SHA1 (patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc) = 44309d692737bfb50dd1ecb8c76de30beb1ccbc0
-SHA1 (patch-chrome_browser_profiles_profile__impl.cc) = babd1034fb3c11218e2f62af523e3e114646001d
-SHA1 (patch-chrome_browser_profiles_profiles__state.cc) = de4715ddda49817bd77c12259fa23a8c6e654054
-SHA1 (patch-chrome_browser_renderer__preferences__util.cc) = f43369698e16c8d8be71369cda2fba29c404f0fe
-SHA1 (patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css) = a68bb41da860fa6a7d024f8ec7f3a460a67f3b46
-SHA1 (patch-chrome_browser_resources_signin_signin__shared.css) = 2606b0d1109ff610cb7203b523dd60013da102fa
-SHA1 (patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc) = 84b5503fded92dbbced7ca78cea381b47358a9a4
-SHA1 (patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc) = 846c114e784225c216feabf50a0abfe531232df0
-SHA1 (patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc) = 574ce0516ea03ec532a5fb81a08ef1365a00f817
-SHA1 (patch-chrome_browser_screen__ai_screen__ai__install__state.cc) = cbdee4607a198d86f61f523b72da92880980b21b
-SHA1 (patch-chrome_browser_screen__ai_screen__ai__service__router.cc) = 60590cffe950ca083ba038627702df7945e42f9a
-SHA1 (patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc) = a7c5af55a2ea272eb4c98f0b4aae1e899e77a54f
-SHA1 (patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc) = 7ae5259dd7ae92db6d7fbf31b0f811fdf4cce8ec
-SHA1 (patch-chrome_browser_sessions_session__restore.cc) = 439cb68d1a9727c031a228aa947af9569facbee9
-SHA1 (patch-chrome_browser_sharing_sharing__handler__registry__impl.cc) = ad74c92118a6d301f80a1ddfab6c42712e8860f1
-SHA1 (patch-chrome_browser_shortcuts_icon__badging.cc) = c2556c56ba44176e373ef705c2d6ce217b35e71b
-SHA1 (patch-chrome_browser_signin_signin__util.cc) = 1b8414cf02904db6fceda7f8e29247161f00b01b
-SHA1 (patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc) = c02663bc1e923ab99173ad5ab95ef65ec4618b33
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc) = 495bfdce8d86e13307b412dd5dd39b76615ee23c
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__browser__utils.h) = 932beaa19d806aa3a4cf17b694e8915fcd46f0bb
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc) = dee6c31fd749de7919a422010915e09a20769bdd
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc) = 56e2d663b9f7e2442791f3331e4093490054fcab
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h) = cf6567ab68ca68675e85cac98b6149105cf07d5b
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc) = ec1b3f49796c0a54e483145d0ed303aa35e3dc5f
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc) = 9594d41f591b9ec24551adf1c0a3873a83a335bc
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc) = fb39127879b77ebb53166812edb7ec059aed0757
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc) = 7867c6207fb60198d44620ee7d2a33708458b537
-SHA1 (patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h) = 6661a6cac7705bc6e88896d0c1117e9293d520e2
-SHA1 (patch-chrome_browser_sync_chrome__sync__controller__builder.cc) = 8d157c84498a68aaf4199bd3b53b9e3bd95ab202
-SHA1 (patch-chrome_browser_sync_device__info__sync__client__impl.cc) = 4bd2dadecac31feb1b74c311db6e7fc56c168a9b
-SHA1 (patch-chrome_browser_sync_sync__service__factory.cc) = de7f6e0c1056ee36696863277ea69254da855fb4
-SHA1 (patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc) = fa49c952c3bcc5dd4d12df723b7f1ae3985b43cc
-SHA1 (patch-chrome_browser_task__manager_sampling_task__group.cc) = 3042008d51988e09ca64c0ad6377ea502b72aa57
-SHA1 (patch-chrome_browser_task__manager_sampling_task__group.h) = ba4a3dabdf4df04eacdeafba10b3ec38e87828b6
-SHA1 (patch-chrome_browser_task__manager_sampling_task__group__sampler.cc) = 6299a58de9ea3f926253c5e8ae8f2c27c0dbf152
-SHA1 (patch-chrome_browser_task__manager_sampling_task__group__sampler.h) = 89a63432cce2712a532c8f0ca9d40201101506ec
-SHA1 (patch-chrome_browser_task__manager_sampling_task__manager__impl.cc) = b77d5513b1acad127a81a0e9d0c6818562e3bf66
-SHA1 (patch-chrome_browser_task__manager_task__manager__observer.h) = 6c910c618628ec8c9d95be8321b4fcc04e280163
-SHA1 (patch-chrome_browser_themes_theme__helper.cc) = 0b5ea4d57359d3df8faf6a874882e07121b34556
-SHA1 (patch-chrome_browser_themes_theme__service.cc) = f5e8eb02575f9f514886a7b4e3e005d733dbd3f0
-SHA1 (patch-chrome_browser_themes_theme__service__aura__linux.cc) = 9f1a7696718c10778d707ee2c5e1b03d68e55fb5
-SHA1 (patch-chrome_browser_themes_theme__service__factory.cc) = 92b3c56e028637c8bcaa8c4cc23c76565a6214e0
-SHA1 (patch-chrome_browser_ui_actions_chrome__action__id.h) = 266c008b0367f2e52bc1e3ed3bec11fff152b10f
-SHA1 (patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc) = b5fd3155babaa6bc3a5f39370ade9ca295d64b8b
-SHA1 (patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h) = 62d6db9df50467cd1739978ef97f39dc22f146a5
-SHA1 (patch-chrome_browser_ui_browser.h) = 51aa04fba69b0c7838db93d9c116395a3936df65
-SHA1 (patch-chrome_browser_ui_browser__command__controller.cc) = c138671984fe5238ec27a90548031060f8469818
-SHA1 (patch-chrome_browser_ui_browser__commands.cc) = 69db12349334456a2311a9bf9f1ef2fc5005269d
-SHA1 (patch-chrome_browser_ui_browser__ui__prefs.cc) = 5af4b74508ccc37e07919e283d261e6d26ded93f
-SHA1 (patch-chrome_browser_ui_browser__view__prefs.cc) = 66ac183bb725833dc11d6e84cb8f08b58e8dec96
-SHA1 (patch-chrome_browser_ui_chrome__pages.cc) = a489b5af91c5b2efed6ada2cc66af9e8abf8ada1
-SHA1 (patch-chrome_browser_ui_chrome__pages.h) = d84af7042909c0433175ca0f4432f99b11d05e72
-SHA1 (patch-chrome_browser_ui_color_native__chrome__color__mixer.cc) = b45300282dcc933b65f88f9adee72d6602cb60ac
-SHA1 (patch-chrome_browser_ui_managed__ui.cc) = 25e9c101fbdf637020ced804db53ebb8fbecf86f
-SHA1 (patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc) = 3ef0c178477b5e969cd80933f59ac2a5dd784abb
-SHA1 (patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc) = 119a8c25a5fc4447637bb093f4713dc9901871e4
-SHA1 (patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc) = a4340ceb62068431f6c745024a95bad2eb0ecd10
-SHA1 (patch-chrome_browser_ui_sad__tab.cc) = 83fd2f56d25ded98a88a220bb7d44b46110f84e1
-SHA1 (patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h) = 2b54bd24b0346987dc95f4b4a27e60b9998bf92b
-SHA1 (patch-chrome_browser_ui_signin_signin__view__controller.cc) = 48fe82790a2d530a7d9003cb36f970532fc2ea71
-SHA1 (patch-chrome_browser_ui_signin_signin__view__controller__delegate.h) = 6c8045a865653a1ae2c21409f187c9780377ed9e
-SHA1 (patch-chrome_browser_ui_startup_bad__flags__prompt.cc) = e7d7a0bede2714782ba6cb761ce233c5183396ab
-SHA1 (patch-chrome_browser_ui_startup_startup__browser__creator.cc) = 13897d3a3e47aa47559369b2d781de4abfb02aa5
-SHA1 (patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc) = 9ec903b8597667c8e6ed60ee6fbc0db04375b178
-SHA1 (patch-chrome_browser_ui_startup_startup__tab__provider.cc) = 90369561dbc7b9ba21c64ff90f304dd1ffc1de1c
-SHA1 (patch-chrome_browser_ui_tab__helpers.cc) = 6724e7835b4423986438a6acbb2c1dce47a7b93f
-SHA1 (patch-chrome_browser_ui_tabs_features.cc) = 11071022c6508e9b6c4aaad15d078eb0eef4c9b8
-SHA1 (patch-chrome_browser_ui_tabs_tab__strip__prefs.cc) = 31dcf61ea0d0dcd02c3d314a9ac61a13be8d6b0d
-SHA1 (patch-chrome_browser_ui_task__manager_task__manager__columns.cc) = b26e35fde4ae68b85b2eabea0b7b353d5a2f8d5c
-SHA1 (patch-chrome_browser_ui_task__manager_task__manager__table__model.cc) = ef71320b357f78266d37f3c302b43a119e62cb64
-SHA1 (patch-chrome_browser_ui_test_popup__browsertest.cc) = 6be2189d9b8fb62b2507bc8cd235cb7f76234c8f
-SHA1 (patch-chrome_browser_ui_test_test__browser__ui.cc) = 01fb55e8b2663b516d1c4348162747deaaf5b899
-SHA1 (patch-chrome_browser_ui_ui__features.cc) = 1d0de8d1c410071bf27b8d3271310244ab2acbc2
-SHA1 (patch-chrome_browser_ui_ui__features.h) = 29ab6c423a25e03e34616be23870fe0a451982ae
-SHA1 (patch-chrome_browser_ui_views_accelerator__table.cc) = 68ce7d43258002bb86a4095d31c998ac9af3dd2a
-SHA1 (patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc) = ebd29a02f8a61e64dba54d3d41e88f3ecc2889c3
-SHA1 (patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc) = e0921a7713957f91114c374345b3b9429a2d2455
-SHA1 (patch-chrome_browser_ui_views_chrome__views__delegate.h) = 7d3db56deb07d2a087c9a7d7aff3d4affd557a9c
-SHA1 (patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc) = 1249d0709c0fd7925180d39e6afd8502ff7b0a3e
-SHA1 (patch-chrome_browser_ui_views_compose_compose__dialog__view.cc) = 4a10f0da1952ed2b24a5360bc4debedb26dc7a58
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame.cc) = a28e35fe2931e1705ca4e6fe2b1f564002a273b3
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame.h) = 0ac7d9fe46348eb2c7845d538a1eaf37ce0944d8
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc) = 223183d357eeef7d90a309d23ac58948fe666e21
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc) = d8f6f2f18b10c2bcf5ca98faeecc267901e7d6d2
-SHA1 (patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc) = faebfeba210af06717398944be10b396f79b88f9
-SHA1 (patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc) = f71d21a90a539f59686744163dfd3bc00c5a8c05
-SHA1 (patch-chrome_browser_ui_views_frame_browser__view.cc) = c1892ce6c802e26271f121a0e90eaebe2c68561e
-SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc) = 87e3be637a0f5e897694c19cd017a3e8f3577c11
-SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h) = f85a4438b0762ebe7fe0c6b4c1c5d18f4f55e42f
-SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h) = 3100c7a852b67278007cb75a945ca20823eebbed
-SHA1 (patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc) = f0968703c341a17f7a89fc5da970711347bb6d53
-SHA1 (patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h) = 06085bb46bf736a6fcbb99d40b0dcf49d6ef069e
-SHA1 (patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc) = b5d1accf3645a8ae7deda26276ee930534eedafb
-SHA1 (patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc) = ee092ab60be19e362698754a87b320c44857be7f
-SHA1 (patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc) = 88cf5ac93f8ddd597801e6bb2b1e747743f47e5b
-SHA1 (patch-chrome_browser_ui_views_hung__renderer__view.cc) = 10617520375e3ebfa2fecfa4f01574b4f65b4736
-SHA1 (patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc) = 3b982843630c9b1a1ac4f536a3800032bcc2282e
-SHA1 (patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc) = e6d86c7ff2a8225f6510c392ea671834d6e11b5b
-SHA1 (patch-chrome_browser_ui_views_profiles_profile__menu__view.cc) = a038e9432e755d98e51e0a21fb25e781103ea3a2
-SHA1 (patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc) = 9538bbf71526211f43913e19fe710a456feb261a
-SHA1 (patch-chrome_browser_ui_views_profiles_profile__picker__view.cc) = 74b1862dee55b8f65f5726e2b767de56efb62efa
-SHA1 (patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc) = c5604ff9acb36eaf3db1a6088d9e2042d1f63f64
-SHA1 (patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h) = 23c903144bb7bef73df9a987bb81fe5a5a6cc95f
-SHA1 (patch-chrome_browser_ui_views_tabs_tab.cc) = bad631c585b11a228cdfd5fa6a9ff35575e6b1d3
-SHA1 (patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc) = f953c6293af1b76bc948af4a3dd5d4bd0bbe6836
-SHA1 (patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc) = 4d830d6419e7be8924db5b2838987bed735d8898
-SHA1 (patch-chrome_browser_ui_views_tabs_tab__style__views.cc) = 925ab3fcce624485f9c7f434a97307db59fffed6
-SHA1 (patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc) = aab255a09c0f69c239091d1591ff5cd59ed72f93
-SHA1 (patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc) = 307e57bb752624c8504eef11d54c26b889c1b62f
-SHA1 (patch-chrome_browser_ui_web__applications_web__app__dialogs.h) = 942fe8f01eb7dbd751b75975e045a8b1ff0f71a6
-SHA1 (patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc) = 71d7a18308711ab0b6e27cc41e2f3e2a6b991074
-SHA1 (patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h) = ea06304757e59607ef01e9b87e47ad6bb10498bf
-SHA1 (patch-chrome_browser_ui_webui_about_about__ui.cc) = 3fdd2cbcd51f70c9ec3f3abb59c132df2bd1c6ec
-SHA1 (patch-chrome_browser_ui_webui_about_about__ui.h) = d2c1f40ab4194e87534118ab342d021df0b65bb3
-SHA1 (patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc) = ab4fb3765cbbdfea38e2197658f1d22f981db92e
-SHA1 (patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h) = 8f3c7ef65376c93ba1f8afdb66aabf8f1e440a6f
-SHA1 (patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h) = aa894cb98374489105db128e51a30277e4143da8
-SHA1 (patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc) = f4fad7728a6420dc656b205be800aa656d451697
-SHA1 (patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc) = 6331740705bba521d2b885625ca85e31bf9b79f5
-SHA1 (patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h) = aa1077d02e7070cd822384677da6f99cf8e68b60
-SHA1 (patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc) = 0e6196524a6891a1d6104395b866f7b1c8835d17
-SHA1 (patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc) = d70fff74be5f010e13cc761901207c88aed8b801
-SHA1 (patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc) = b88586f8a22474368b3fbc306aecfa604eb66b1b
-SHA1 (patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc) = 8cff8766dda3e2dc09f818578e65972291776ab6
-SHA1 (patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc) = 37190e485c00c85a51fc26891f351e78fa7d475c
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui.cc) = d83e909e2b6ad4a857501f17091d9e27579b3787
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui__constants.cc) = 8eb55db9a03cdf5a7c8891e99094198b91b822b7
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui__constants.h) = b13af72c71c6e8d5a8fefc175af8944b1d22aca2
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui__handler.cc) = 4b0136a8f1132a77b5b57c25f6d52019c9ccff77
-SHA1 (patch-chrome_browser_ui_webui_management_management__ui__handler.h) = 78d53d2a89768b2eec387fbf9096555e7da0fa36
-SHA1 (patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc) = 7328e45f3d765f972eb8d939a1361c352caca1a6
-SHA1 (patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc) = 79ea9affaf9df60891e8ea93e7f730b69738ab7b
-SHA1 (patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc) = 82cb5f37d3bdc7ce0f4637a5012e108fb8c58e8a
-SHA1 (patch-chrome_browser_ui_webui_settings_appearance__handler.cc) = f1defa115461b1bda35d5fd22bfc953967690d5b
-SHA1 (patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc) = d26443f7c0cbcc7edac9f646b81ae9789471c2fb
-SHA1 (patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc) = bea09c52121ff37fc0f91b68ce2dbe159391a8eb
-SHA1 (patch-chrome_browser_ui_window__sizer_window__sizer.cc) = c70bad2838928a5121234074544e879bf83647d9
-SHA1 (patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc) = eed53464b3dff97ef73179c26af99d16f247874a
-SHA1 (patch-chrome_browser_web__applications_commands_launch__web__app__command.cc) = 3001522a4af56fb9c294ebe0f2bd0399625ecd68
-SHA1 (patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc) = 7bf9fb26ba9af9840f64cead60dc2c549e1af535
-SHA1 (patch-chrome_browser_web__applications_extension__status__utils.h) = 3523ae6207079ac0b6726773c88e37d11611d4b9
-SHA1 (patch-chrome_browser_web__applications_extensions_extension__status__utils.cc) = e88c6527ec28b43e39b37c876df5ced4ebf3c199
-SHA1 (patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc) = ad1a089f2b56d4ec0a63f32b691c22936aaf8e63
-SHA1 (patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h) = 0a43a97c2261705272bc5892ebf9b7686d17123b
-SHA1 (patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc) = 182ba151b1a2ad4c45f3e4e3d0adfaf1a231e8f9
-SHA1 (patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc) = 9827f438173ef86757a9174580ed2945f8874b36
-SHA1 (patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h) = 40394c79610f16cb940a60c7850db6133cec1859
-SHA1 (patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc) = 9f9dbcc6e56eb8b7e57f0eebaac2095f8dabcd2a
-SHA1 (patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h) = 3c7bbc27346cc461f73d22b3db7c743956a47035
-SHA1 (patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc) = d3e4fefdce0ee50d47acdcc71a9827b536924c01
-SHA1 (patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc) = 4bc2ec61de4145365186167d62216de06053ba70
-SHA1 (patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h) = 2182bc9cfd33273aa4456c637479ce0b15a6bc97
-SHA1 (patch-chrome_browser_web__applications_web__app__helpers.cc) = af74ff17a29b3e3647979866fe3b639cf4785bb2
-SHA1 (patch-chrome_browser_web__applications_web__app__install__info.h) = b6a7bc40f8dc528bab66a3f34421e29f05a65e3a
-SHA1 (patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc) = 2aa363a28a79d401c454b085b69cd4aff59a8021
-SHA1 (patch-chrome_browser_webauthn_enclave__manager.cc) = 6b04597f717bf0519d733ea8d2bcaf7c8dfc1bc3
-SHA1 (patch-chrome_browser_webauthn_gpm__user__verification__policy.cc) = de717bbd68b7e5cdabcd832980535ec98b69de08
-SHA1 (patch-chrome_browser_webauthn_unexportable__key__utils.cc) = de63270c4c9c2fbcf18db191902e99178608aa47
-SHA1 (patch-chrome_common_channel__info.h) = 2ba8a9d6593fa463f129020d4c98cd0bc0e913d6
-SHA1 (patch-chrome_common_channel__info__posix.cc) = ad0c57782ecd4d493808771a54b50d1ec6af8836
-SHA1 (patch-chrome_common_chrome__features.cc) = e462063ba38aae02490c6b692ef0e73fe003d628
-SHA1 (patch-chrome_common_chrome__features.h) = 37ad42c73393e7ac6f60e5ed2dab1e19fde07500
-SHA1 (patch-chrome_common_chrome__paths.cc) = 0f9d19efc731d6bf587befce5e8f30d4bfaff0ed
-SHA1 (patch-chrome_common_chrome__paths.h) = 939cb6ee316b69fa016ce8e7806c7a91eaa459c5
-SHA1 (patch-chrome_common_chrome__paths__internal.h) = e649e51754b6185d0b1ab712ed6f3c8bc9ae8e98
-SHA1 (patch-chrome_common_chrome__switches.cc) = b75b38136e4278c8dd35a1c15cbaab75e5815faa
-SHA1 (patch-chrome_common_chrome__switches.h) = ff6706d1d554610f8c3a0c6a916af9bf171a6f86
-SHA1 (patch-chrome_common_crash__keys.cc) = 56e6fcf2690954eaff38c43a6f8bf0011401ae9b
-SHA1 (patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc) = 0b8dfe31567b64eb2caf9462234c10fc7c5fd1d9
-SHA1 (patch-chrome_common_media_cdm__host__file__path.cc) = 4d8bf41e8d09c9f20433278d8c440060e99602e5
-SHA1 (patch-chrome_common_media_cdm__registration.cc) = 00c3e800a4bb7abdf6db25ed638816be7e9310aa
-SHA1 (patch-chrome_common_media_cdm__registration.h) = bc80fbcd65784ee21442e614b76f7c81200ccfc3
-SHA1 (patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h) = a0f0db4917787adb1d0e63e6f158bd2d3b06e4a0
-SHA1 (patch-chrome_common_pref__names.h) = 46c1405475ca99dd0fe8b21e419134d2f1fc6764
-SHA1 (patch-chrome_common_url__constants.h) = 7ac27965ac9eb6a3a8c4fb893f75867985b43106
-SHA1 (patch-chrome_common_webui__url__constants.cc) = 4f587776c78c81dfe3ef3b1542b631cdd6a7a34f
-SHA1 (patch-chrome_common_webui__url__constants.h) = 3e8ab537e5fadd20198092807d01fdd11604e3ce
-SHA1 (patch-chrome_enterprise__companion_enterprise__companion__client.cc) = 131fc0a291738b14d52575bf7c236cf4c0099a43
-SHA1 (patch-chrome_enterprise__companion_lock.cc) = a5676ae27dc27bdced729b37da14b71620bf8eb5
-SHA1 (patch-chrome_services_printing_print__backend__service__impl.cc) = 9b34945880aad5432e36744b2cadf182c7d9fad7
-SHA1 (patch-chrome_services_speech_audio__source__fetcher__impl.cc) = 99cbacc8ed281490cb8e1935095e3dad9e7bf632
-SHA1 (patch-chrome_test_base_scoped__channel__override__posix.cc) = 4ecabb6cb0bc5e8d790651ff96a67768c7d61abd
-SHA1 (patch-chrome_test_chromedriver_chrome__launcher.cc) = c5488017fb46283147339c235167288891bc359d
-SHA1 (patch-chrome_test_chromedriver_chrome_chrome__finder.cc) = d28ddde8665ac1288c0204b3602ebfc92d66333a
-SHA1 (patch-chrome_test_chromedriver_key__converter__unittest.cc) = de1b974380aaf83f90a13b71392c08350b605911
-SHA1 (patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc) = 589e7d48b2b2fc990e26476c499f30122e5487cb
-SHA1 (patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc) = 5687349271b1da176a48db3a1b109a1e3d92ae2b
-SHA1 (patch-chrome_updater_app_app__uninstall.cc) = 69b406185e92e92db80706a743425fefa2f1bfb9
-SHA1 (patch-chrome_updater_configurator.cc) = 2256dd1a2f3d5fd1a37ca6e66da791ddf522c020
-SHA1 (patch-chrome_updater_lock.cc) = 5ac7879a81d6537c6b07cf9556eb18aadd115aea
-SHA1 (patch-chrome_updater_util_posix__util.cc) = 565d3e24d9d1460898efada92a19088dd5f2ccad
-SHA1 (patch-chrome_utility_services.cc) = 9cbbb381d247b3a05daab0b316da6055133439d6
-SHA1 (patch-chromecast_browser_cast__browser__main__parts.cc) = 5352c5afa12827d69fe2d14e56c2c16a5863bcf2
-SHA1 (patch-chromecast_browser_cast__content__browser__client.cc) = 291490817943d6ade65348f6e46ef017c62bd813
-SHA1 (patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc) = d7ff72fd0aeb9d28d45b265353510f09fbdde769
-SHA1 (patch-chromecast_media_base_default__monotonic__clock.cc) = 0bbf8d9eac41ccf5c0cc95fee6b1a9f58ce1ec36
-SHA1 (patch-components_autofill_core_browser_autofill__optimization__guide.cc) = ffe019d4c372a6f081516fa0a7da940669e84bf7
-SHA1 (patch-components_autofill_core_browser_payments__data__manager.cc) = 35681e4276fdcd4bc79a2b7c87a083a1d33264bb
-SHA1 (patch-components_autofill_core_common_autofill__payments__features.cc) = edc00e1fbd35b71d614a3e0a843dd1f27d8e7d13
-SHA1 (patch-components_autofill_core_common_autofill__payments__features.h) = cf4bf97e1778fcd11058bf04130712e581fad307
-SHA1 (patch-components_autofill_core_common_autofill__prefs.cc) = 3db90ecebec18717bf6a4cb276400a8afdbff306
-SHA1 (patch-components_autofill_core_common_autofill__prefs.h) = 7630b46bafbe43f32c64fc9ed51ec4752beea96a
-SHA1 (patch-components_commerce_core_commerce__feature__list.cc) = 55d17214116a5314c7361572362496e689f047ab
-SHA1 (patch-components_constrained__window_constrained__window__views.cc) = bf444affd2300502f6932c8c8be1db00f1da76f1
-SHA1 (patch-components_content__settings_core_browser_website__settings__registry.cc) = fdfe8e7aa1e435c8c17c50be27955807ca0b93a4
-SHA1 (patch-components_cookie__config_cookie__store__util.cc) = 857c302d47244b069e0a3a7ebed87630a143e0a0
-SHA1 (patch-components_crash_core_app_BUILD.gn) = daf02267f82312ceb0eb9a2548a07f4c90e6d2a0
-SHA1 (patch-components_crash_core_app_chrome__crashpad__handler.cc) = 2f59e286a9a43cdf45101912059f90e1aa770f07
-SHA1 (patch-components_crash_core_app_crashpad__handler__main.cc) = 2d11a59d035e1b5ca36e32642151f62624198355
-SHA1 (patch-components_crash_core_browser_crash__upload__list__crashpad.cc) = 59bde7234b2d42e5b6ec896832d2f510c4241f79
-SHA1 (patch-components_crash_core_common_BUILD.gn) = 9df54357e862a14d8e0407e0dd09c1ca5f210cce
-SHA1 (patch-components_device__signals_core_browser_mock__signals__aggregator.h) = 059e3188c3288a6100ba14981c1f98b79cf95392
-SHA1 (patch-components_device__signals_core_browser_signals__aggregator.h) = a32a197d421ddbf3f93d38d4921de88263beba54
-SHA1 (patch-components_device__signals_core_browser_signals__aggregator__impl.cc) = 7c2b07f9df2d8d455cf328e3cb029e4254de5f78
-SHA1 (patch-components_device__signals_core_browser_signals__aggregator__impl.h) = 07393852839969ce0e8c556f589f01c27557ae59
-SHA1 (patch-components_device__signals_core_browser_user__permission__service.h) = 59feadc41f4382e1288520a9873dcbe63f2d296e
-SHA1 (patch-components_device__signals_core_browser_user__permission__service__impl.cc) = fb66c7d663e3ff1f61ebba69d4b638f351b6d678
-SHA1 (patch-components_device__signals_core_browser_user__permission__service__impl.h) = 55542857199a088383428e6848a79e72ee8c0129
-SHA1 (patch-components_device__signals_core_common_signals__features.cc) = bdf006a10fa05bf5d17d3909fe5778b61dcee1a1
-SHA1 (patch-components_device__signals_core_common_signals__features.h) = d6293236ae029429201d8d9561c3edb88cc92478
-SHA1 (patch-components_device__signals_core_system__signals_platform__delegate.cc) = 4ab63606258e5ddafc2d594c00294b8685cb6773
-SHA1 (patch-components_device__signals_test_signals__contract.cc) = a3f48a241b7c633b126c1fa683c98ba8afb6b131
-SHA1 (patch-components_discardable__memory_service_discardable__shared__memory__manager.cc) = aab53587910bc933ca412283103bc57009b5fc80
-SHA1 (patch-components_embedder__support_user__agent__utils.cc) = 09a9e3a5125ea1ae4ee6bf8f4d6ca1d0bc40d9f2
-SHA1 (patch-components_embedder__support_user__agent__utils__unittest.cc) = ceec25cd4920cafc66d98b2b8c6071e89421fd50
-SHA1 (patch-components_enterprise_watermarking_watermark.cc) = 40c742971ebb5c6e7086174aeebcc6d855fe5887
-SHA1 (patch-components_eye__dropper_eye__dropper__view.cc) = 3ca4a52be394cff9d75a26efb0cbd07266ed5871
-SHA1 (patch-components_feature__engagement_public_event__constants.cc) = 83d46ea98815124363a44e85fe6ca49158d48336
-SHA1 (patch-components_feature__engagement_public_event__constants.h) = c6012d8ef1443e2b3b02428cd7e7946837f8c5dd
-SHA1 (patch-components_feature__engagement_public_feature__configurations.cc) = 31eef3d286b8dc862cb820bb2cd0ed916caa8512
-SHA1 (patch-components_feature__engagement_public_feature__constants.cc) = 874fbd02f01758c35fa3cb6a115ab63f54e73c53
-SHA1 (patch-components_feature__engagement_public_feature__constants.h) = 62af61c00a9b4b6539fdb18f34aed0324dc6d35d
-SHA1 (patch-components_feature__engagement_public_feature__list.cc) = d8cc58833bc1a2f219a61c9aa36f4afd498fd578
-SHA1 (patch-components_feature__engagement_public_feature__list.h) = a0a9907478fa94a503fdc64097306ec2f441ae17
-SHA1 (patch-components_feed_core_proto_v2_wire_version.proto) = e9155dd8c64698c1227f520f1b657747f5e518ab
-SHA1 (patch-components_feed_core_v2_feed__network__impl__unittest.cc) = 3c0b133ba4b06dfcf430e11a343f5725f2faf28e
-SHA1 (patch-components_feed_core_v2_proto__util.cc) = e28fa5c59077f096be63f443968e2d15131ebce2
-SHA1 (patch-components_feed_core_v2_proto__util__unittest.cc) = c3895f3497c873301112aec9a117dcd9f44620cf
-SHA1 (patch-components_feed_core_v2_test_proto__printer.cc) = a5cc716275834f18f54307cbab2dddb6046ed78a
-SHA1 (patch-components_flags__ui_flags__state.cc) = 6dc0afc02c9616df2ff6313e9c9f209581946c22
-SHA1 (patch-components_gwp__asan_BUILD.gn) = d09b1977b0e27997b8befaed287bea3218236d51
-SHA1 (patch-components_gwp__asan_client_guarded__page__allocator__posix.cc) = ff1979cf5946c158e60508aa77487285d296c22a
-SHA1 (patch-components_gwp__asan_client_gwp__asan.cc) = 83d54126dd2729746d73f8f2eb96f970f1167ded
-SHA1 (patch-components_gwp__asan_client_gwp__asan__features.cc) = 47758643b73939bde95133dbb1f2b46f3171e25a
-SHA1 (patch-components_gwp__asan_crash__handler_crash__analyzer.cc) = 67eac570df855a395321ef115007632ad8672a7b
-SHA1 (patch-components_live__caption_caption__util.cc) = 30fb2b20467edf799173bf06536fb1d45e06ef42
-SHA1 (patch-components_live__caption_caption__util.h) = 13dd015b4caa467509f4258b2fdaff9bb8268e6a
-SHA1 (patch-components_media__router_common_media__source.cc) = a57257f76d4fe5f8c60636b8137657408d788c39
-SHA1 (patch-components_media__router_common_providers_cast_channel_cast__message__util.cc) = 26a110b9e0a5dda638b9a82d8395b6bdd18ecb8e
-SHA1 (patch-components_media__router_common_providers_cast_channel_enum__table.h) = b6be76e11980c56ecced8e0893d06a087c51b0f7
-SHA1 (patch-components_metrics_drive__metrics__provider__linux.cc) = dadd6f9bacf42feebbec60dbd3318657fa757da3
-SHA1 (patch-components_metrics_dwa_dwa__service.cc) = c3d0e18c4d28529d9838c2e87235dddaa452f1bc
-SHA1 (patch-components_metrics_metrics__log.cc) = 874f041f44cf2586dadc5f2408b4695692b30626
-SHA1 (patch-components_metrics_motherboard.cc) = e1d61f23f3b2de89de215752188de55a785602b6
-SHA1 (patch-components_named__mojo__ipc__server_connection__info.h) = 0242a3d5c03f8cef3b8e66c8137aa3ed8c6e896e
-SHA1 (patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc) = 165ac1f96c5d65722a7e6142b07c8887ada5c740
-SHA1 (patch-components_named__system__lock_lock.h) = e1b1e6f64ebf5f9afad2efe54f7ebda7e83f1c42
-SHA1 (patch-components_neterror_resources_neterror.js) = 4a33c6fa04816d04c817b7c677bb65dbe01f97b3
-SHA1 (patch-components_optimization__guide_core_optimization__guide__features.cc) = 230ea4fe8d980d4a3f14b380e1366f5fd90ccfd8
-SHA1 (patch-components_optimization__guide_core_optimization__guide__util.cc) = 6f05faa95ab97669306c27dc4c63c2a564098e84
-SHA1 (patch-components_os__crypt_async_browser_secret__portal__key__provider.cc) = e12c3473ae0b135380fbed143cb0321eb1cd829c
-SHA1 (patch-components_os__crypt_async_common_encryptor.cc) = 726a6ffd09d15be8d16cf77d0a345477d7b67362
-SHA1 (patch-components_os__crypt_sync_libsecret__util__linux.cc) = 8abb5705da314580d09f54fe4493c1319fd272a2
-SHA1 (patch-components_os__crypt_sync_os__crypt.h) = 150024359b675f2cfde3833aa235256b5dc3b074
-SHA1 (patch-components_paint__preview_browser_paint__preview__client.cc) = 1d9ae26730f2437441742d5c7e5b29b342a577d6
-SHA1 (patch-components_paint__preview_browser_paint__preview__client__unittest.cc) = ad245b927285ead18e1aa9d86ce89f027d1dd3ca
-SHA1 (patch-components_paint__preview_common_proto_paint__preview.proto) = fe055eec4fb4bc4833e63b5b1207dd0cca262b6e
-SHA1 (patch-components_paint__preview_player_player__compositor__delegate.cc) = e4a3503b50b7f1f96346b0de669d4da403a410d3
-SHA1 (patch-components_password__manager_core_browser_features_password__features.cc) = df7b804cdb02c85ef03c7fedbc54aab805706f31
-SHA1 (patch-components_password__manager_core_browser_features_password__features.h) = 54a478e892656ade7f982ae49b5c505f206f3be3
-SHA1 (patch-components_password__manager_core_browser_password__form__manager.cc) = cc300cb461d90d08be27ffa7b009466af443d554
-SHA1 (patch-components_password__manager_core_browser_password__manager.cc) = 6571d8b0eeb58b329d0288b0228225a81223747e
-SHA1 (patch-components_password__manager_core_browser_password__manager__client.h) = e948c244e08097c54f7c8b42a62cdb490e39fea2
-SHA1 (patch-components_password__manager_core_browser_password__manager__switches.cc) = 1f01b91413b0cb1cea014ca58b5c3225b88d04f7
-SHA1 (patch-components_password__manager_core_browser_password__manager__switches.h) = ea7b9431f94863e16638ba8c13a6d13da6a4c71c
-SHA1 (patch-components_password__manager_core_browser_password__manual__fallback__flow.cc) = 600fbd9eb412452f99d5817c5268c716e4f30236
-SHA1 (patch-components_password__manager_core_browser_password__manual__fallback__flow.h) = 5e0ebfd9ec483bf46e4eae002b1daaef21236a0a
-SHA1 (patch-components_password__manager_core_browser_password__store__factory__util.cc) = a4602018bc36a21e07e22ba6ec6f940d047cdb69
-SHA1 (patch-components_password__manager_core_browser_password__store_login__database.cc) = ffd92fc54eba2b6d9106433fa54bed737baa1da5
-SHA1 (patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc) = 250e93ddd7e97bdfa2a8f0ffd479f714afa2d337
-SHA1 (patch-components_password__manager_core_browser_password__store_login__database__unittest.cc) = ca5db1e9ca90f2729b55a7edffce085999fc0c76
-SHA1 (patch-components_password__manager_core_browser_stub__password__manager__client.cc) = 484265aa4890ba7699c489f9a966ca4261c2dbb5
-SHA1 (patch-components_password__manager_core_browser_stub__password__manager__client.h) = 38f1ecbb0a2730443b65d17371bdf7b720f35d85
-SHA1 (patch-components_password__manager_core_common_password__manager__pref__names.h) = 3f11f8d48c3c9e2a7110275ce28fa0d5a3f4eb33
-SHA1 (patch-components_performance__manager_decorators_process__metrics__decorator.cc) = 4600c1b3dbd5a56f2ad4f65b4f51a7f96b0b4d50
-SHA1 (patch-components_performance__manager_public_features.h) = 025f2ce80fedd8b8eb46f87e4d1a486de07c9b5a
-SHA1 (patch-components_permissions_prediction__service_prediction__common.cc) = ab5b6f5e2c6a597f3885142db53bbc05f51df7b4
-SHA1 (patch-components_policy_core_browser_policy__pref__mapping__test.cc) = 0000ebaf7b1170ee79c9c7388a3a5174e562d7a7
-SHA1 (patch-components_policy_core_common_cloud_cloud__policy__client.cc) = 975fe8df8fc237fc1460bd0d61fb31c4c0fda1e1
-SHA1 (patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc) = 33c15644815f6dfe7c86243958c44de2bdffbf3c
-SHA1 (patch-components_policy_core_common_cloud_cloud__policy__util.cc) = c6c2c7330a0f54ee5322e5e829746e5363c9f21a
-SHA1 (patch-components_policy_core_common_policy__loader__common.cc) = cd45f1307ecf3b0ec317cef67909ab0dd3cc99ef
-SHA1 (patch-components_policy_core_common_policy__paths.cc) = 6ee3ec0f1bf8ace2c7d3773af316ed29f2445be9
-SHA1 (patch-components_policy_core_common_policy__utils.cc) = 19d807452d6d9c1b3ff7564dec036cc0635c5f74
-SHA1 (patch-components_policy_tools_generate__policy__source.py) = 78512e1b14621df1c34cec897b55fc0793c9e2d4
-SHA1 (patch-components_power__metrics_BUILD.gn) = dfb4c453920a8c9cd161ed8892d17ebe0f16cda4
-SHA1 (patch-components_power__metrics_energy__metrics__provider.cc) = 5e86d683531958e01ad0a29590449a569415031d
-SHA1 (patch-components_safe__browsing_content_common_file__type__policies__unittest.cc) = 060d5e23652ac3e4f8ed7a404170e95f7b097461
-SHA1 (patch-components_safe__browsing_content_resources_gen__file__type__proto.py) = 06a4213beb7a1c5fc78dc70187aba92d122911fc
-SHA1 (patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc) = 3667703a128ef59d00f2fc4431395dade8170d89
-SHA1 (patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc) = 37c5e173763f814d55c5d76ce0144a8568709ac6
-SHA1 (patch-components_safe__browsing_core_common_features.cc) = bad06335a3a22534b27e42bab82b7273a2fc8958
-SHA1 (patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc) = 4ff3073e870ac9bf5ef8e472db0314d983ab0483
-SHA1 (patch-components_search__engines_template__url__service.cc) = ae061396e6ec511002a88ab365fd29ee43d54484
-SHA1 (patch-components_security__interstitials_content_utils.cc) = dbffe991e36838d50fa92df350846508c2f4de16
-SHA1 (patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc) = 8a9e91e76f2e7075e4a2d410c26b1a2f29f277a7
-SHA1 (patch-components_services_on__device__translation_sandbox__hook.cc) = 2d3c35f6a97e74e4787e5c059a2e6c028be5a884
-SHA1 (patch-components_services_on__device__translation_sandbox__hook.h) = 3d01889dc72aa8bd5d9b6e3213429dde0ff92cc1
-SHA1 (patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc) = df8ebe8118d9af231f42028fdf133cf6acdab764
-SHA1 (patch-components_soda_soda__util.cc) = 4f06055e3f9f55754a5d0904969a0354d89718c6
-SHA1 (patch-components_startup__metric__utils_common_startup__metric__utils.cc) = 57ce1dd1458db7adf44d147110519094ef8d9831
-SHA1 (patch-components_storage__monitor_BUILD.gn) = 5c389ff23c7298d967f0638fdb017d53561511f7
-SHA1 (patch-components_storage__monitor_removable__device__constants.cc) = 5f5eaee8e4475acee7f08bf02e02d8f5853c3440
-SHA1 (patch-components_storage__monitor_removable__device__constants.h) = 01be9d9b5c42d386597afb3ff0b72e002b62e208
-SHA1 (patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc) = bfaa344bd2fed9bda0345612d9a2f548b001c11b
-SHA1 (patch-components_supervised__user_core_browser_supervised__user__preferences.cc) = 02d7de1d8e709531a94595a18eea861ba53b0bea
-SHA1 (patch-components_supervised__user_core_browser_supervised__user__service.cc) = 4e9432bce43c8c99c3a00765d75116180ee310f9
-SHA1 (patch-components_supervised__user_core_common_features.cc) = aa998d32fc042bb3f203a6d3aae20661ac780e8e
-SHA1 (patch-components_supervised__user_core_common_features.h) = b1868fee6ed5b4571c05dbb757e6701bae91ee2d
-SHA1 (patch-components_supervised__user_core_common_pref__names.h) = 41aca3662865c63d828a18e3890d2d3273b7bc0f
-SHA1 (patch-components_sync__device__info_local__device__info__util.cc) = e0b01ae0de821a2acaea6f9a9ed18f7681fdc0d0
-SHA1 (patch-components_sync__device__info_local__device__info__util__linux.cc) = 45a6da5f0d49ba896d315e013c41165924abb1b7
-SHA1 (patch-components_sync_base_sync__util.cc) = 8e1613365d121484ff12bc59e61a2f6773459eae
-SHA1 (patch-components_system__cpu_cpu__probe.cc) = 34f412335caa7954c6dcf05ae2f907d62083268e
-SHA1 (patch-components_translate_core_common_translate__util.cc) = ffad111f8211a3eae477dc8ac3376b6785534565
-SHA1 (patch-components_trusted__vault_trusted__vault__connection__impl.cc) = 49a97a871734eb579ae4860dbbd8de79dbaa5f34
-SHA1 (patch-components_update__client_update__query__params.cc) = ab3dd2627ed4067eb22c9b25b1d56c9c9f9da1f3
-SHA1 (patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc) = d74454931e0d347d420938186d5559ed40b0758d
-SHA1 (patch-components_user__education_views_help__bubble__view.cc) = ed30c38c3cdfd97ee1441987ccd41801a94b64cc
-SHA1 (patch-components_variations_service_variations__service.cc) = bebc8adab703b909b2bf51ac315365f1a2e2f6a8
-SHA1 (patch-components_visited__url__ranking_public_url__visit__util.cc) = 72ed60c947806648a40879f87d56e03e1d6bd7a0
-SHA1 (patch-components_viz_host_host__display__client.cc) = 5ef1e0549f3b155f28853a46de3a34310c704fb9
-SHA1 (patch-components_viz_host_host__display__client.h) = 323af0d95dfad87bafcf08de26a9b09d9e0d1ea8
-SHA1 (patch-components_viz_service_display__embedder_skia__output__surface__impl.cc) = 28d0be213c2aa793bb4d388e20efea033e5a54f7
-SHA1 (patch-components_viz_service_display__embedder_software__output__surface.cc) = 690939a2fbea1aefa976c5a16b0c931f37bfc1b6
-SHA1 (patch-components_viz_service_display__embedder_software__output__surface.h) = 401067f593b8a7da4e5f795ed157c276d280c4c8
-SHA1 (patch-components_viz_service_display_skia__renderer.cc) = e2bbc54368f705f3e1b07da305975cc533d26e98
-SHA1 (patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc) = 09c8a0bf9799e8fd2067346ac6698991956d5b71
-SHA1 (patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h) = 01dc1ec7d988230549d26b3860c22110cc7124d8
-SHA1 (patch-components_viz_test_fake__display__client.cc) = fa1b4736b8c3a923b8c0fbf2344ab0045006ae67
-SHA1 (patch-components_viz_test_fake__display__client.h) = 7f023ca03f66ca0791a657693ddf3c3645eb2aad
-SHA1 (patch-components_viz_test_mock__display__client.h) = e31780109c8708b6e96c1bd122dc126cfd451be7
-SHA1 (patch-content_app_BUILD.gn) = 5cd01e524b4ada06eecfd539c987fd6a2e426317
-SHA1 (patch-content_app_content__main.cc) = 09c7ddd26612861511027200ef060b7a3591acb1
-SHA1 (patch-content_app_content__main__runner__impl.cc) = 049ec7a47bfc793d94f43ac32066552f25fbba75
-SHA1 (patch-content_browser_BUILD.gn) = ea0b9b664c6c4be32d0b96a1b025b3072175f2bd
-SHA1 (patch-content_browser_audio_audio__service.cc) = 43e93bee4cb0a78f65fb3893429e1fee96cd23cd
-SHA1 (patch-content_browser_browser__child__process__host__impl.cc) = 024b9c5972bb9087b05959b31af392b2ec13c288
-SHA1 (patch-content_browser_browser__child__process__host__impl.h) = 1ccd369f2bf069e3156edce802f23f2bc4e67ab1
-SHA1 (patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc) = 9271eb9fe1631d5f927d5a7d7f8033c9074e3965
-SHA1 (patch-content_browser_browser__main__loop.cc) = 67f560b7a1158a4ebdadb44219bac642d5413d0f
-SHA1 (patch-content_browser_child__process__launcher__helper.h) = ac27c5a0a2ac82f1f6e611fce8f9030f71df992a
-SHA1 (patch-content_browser_child__process__launcher__helper__linux.cc) = 7d17fd8212e117c31aa23f240b3f2c59910631d1
-SHA1 (patch-content_browser_child__thread__type__switcher__linux.cc) = d0ecb91562d0ab33a2cfed3f8881f5407db3b68a
-SHA1 (patch-content_browser_compositor_viz__process__transport__factory.cc) = c867dab022299dd7906f99abaa7ce80f36ce09dd
-SHA1 (patch-content_browser_devtools_devtools__frontend__host__impl.cc) = 29226602078930f6b98c4b39cf00a7b3197430fa
-SHA1 (patch-content_browser_devtools_devtools__frontend__host__impl.h) = 63edf3742354f6a729c92358af0aecee05a1d8d6
-SHA1 (patch-content_browser_devtools_protocol_system__info__handler.cc) = 6055dcf118bd416d354a81e0b49c5d3c40b1ee3a
-SHA1 (patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h) = c7f27a0bc1aaa8881f5051e1251f871958e7cd47
-SHA1 (patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc) = c5bd97add12979128cbb4e6f4a0f7897ff42df2b
-SHA1 (patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h) = 5d11aa6bafb2c989f19683e9fe83d81c99cd145f
-SHA1 (patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc) = 68ea1a0da5d77bd0dfc18bd5c6a50b0629274bed
-SHA1 (patch-content_browser_font__access_font__enumeration__data__source.cc) = 171a946cbe876c72567d665662063dbe59ed0b94
-SHA1 (patch-content_browser_gpu_compositor__util.cc) = 4ed299bbba8b7499512a7e40cd4709e9dd55b552
-SHA1 (patch-content_browser_gpu_gpu__data__manager__impl.cc) = a03001270f32a093e3ed895907a1ec2fae629b30
-SHA1 (patch-content_browser_gpu_gpu__data__manager__impl.h) = 8ff5c9e1eb4a8aac0f84eb308c768da0df37438f
-SHA1 (patch-content_browser_gpu_gpu__data__manager__impl__private.cc) = 9fe7f2d55792e2d103ca0dcfd777825f8bd2b897
-SHA1 (patch-content_browser_gpu_gpu__data__manager__impl__private.h) = 8c77d0e555eb0fb76236d16b4c6024dca53a5b86
-SHA1 (patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc) = 107f6a05912ddf1aa4d40f6d2b315c5cb6973920
-SHA1 (patch-content_browser_gpu_gpu__process__host.cc) = 505d973f3dae7ffc45b880611a85320180bc227b
-SHA1 (patch-content_browser_media_frameless__media__interface__proxy.h) = 0bbcd94c22d0e0a12b4d4e4e1a98b7cb01e8f320
-SHA1 (patch-content_browser_media_media__keys__listener__manager__impl.cc) = 1d85a48f8e35e09b2cd9ded2f737e4b46683367b
-SHA1 (patch-content_browser_network__service__instance__impl.cc) = 1a26a252faee399aa120c46db08da0b816f52c62
-SHA1 (patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc) = 715b1068902188ace07950ea253dae11e617d40e
-SHA1 (patch-content_browser_renderer__host_delegated__frame__host.cc) = f82807c5d354852860c90075cb01b45e82e99600
-SHA1 (patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc) = c25b3137528cad4f5a7561412d7a5fdbd35b173f
-SHA1 (patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc) = 4db24342c9c322e120ff060bd9a1c5fec9af2def
-SHA1 (patch-content_browser_renderer__host_render__process__host__impl.cc) = cbd1120f48ef000498ce4d071f49d61f5271d8c1
-SHA1 (patch-content_browser_renderer__host_render__process__host__impl.h) = c49458aa4c77ad19a1a54df586dbc2d969ef9fb1
-SHA1 (patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc) = b7184af29baca7e84b096b1ed73032f5192e57b3
-SHA1 (patch-content_browser_renderer__host_render__view__host__impl.cc) = dad13b383b47eab092f191290b16400db25a275d
-SHA1 (patch-content_browser_renderer__host_render__widget__host__view__aura.cc) = 1a3a1b0f0d4d8ec1d47ffea361304f391ae55563
-SHA1 (patch-content_browser_renderer__host_render__widget__host__view__aura.h) = 413eeef228f81cd8ada95eb1ded0143e47210112
-SHA1 (patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc) = d61c89555f343fce29c5c13a1f57f0e507400378
-SHA1 (patch-content_browser_sandbox__host__linux.cc) = 29e12623b00a32a980bf364108f6d865bc47a0dd
-SHA1 (patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc) = a12c840ea0bc85df9caeedfe6edcaa5b029eabce
-SHA1 (patch-content_browser_scheduler_responsiveness_native__event__observer.cc) = 6f957385f11aa773ddedce5bb782ef83c8f5d84e
-SHA1 (patch-content_browser_scheduler_responsiveness_native__event__observer.h) = cd22f683f4acb55da4dd4627a40b2aace8be64f7
-SHA1 (patch-content_browser_utility__process__host.cc) = 007b0bca6d33f00be4ec0632f2c2b731a2fde1d9
-SHA1 (patch-content_browser_utility__process__host.h) = 12982b9ef7c5205e1df7ed06d9a139ed39007e40
-SHA1 (patch-content_browser_utility__process__host__receiver__bindings.cc) = 3478c8a841707223568c621578c5794ba3b26c7d
-SHA1 (patch-content_browser_utility__sandbox__delegate.cc) = 42aa4da8f0cc7df4b5b0f4d948fa5e4e47f0bd39
-SHA1 (patch-content_browser_v8__snapshot__files.cc) = af7820ddbf2702a94929ddfe09d8691bca871f23
-SHA1 (patch-content_browser_web__contents_slow__web__preference__cache.cc) = 72f5a4b46261c65147c20d9692082fe294c02df3
-SHA1 (patch-content_browser_web__contents_web__contents__view__aura.cc) = 78aca8688bc98a51f3811aaf66f6cd3a56cec412
-SHA1 (patch-content_browser_web__contents_web__contents__view__aura__unittest.cc) = ee12cdcc5cda5765c5dc59f0f9368d0a15a642bd
-SHA1 (patch-content_browser_webui_web__ui__main__frame__observer.cc) = 5f489d0c7c6d9446fd650f393c3341292d4c1bd1
-SHA1 (patch-content_browser_webui_web__ui__main__frame__observer.h) = fc2ba4496eab5ebc0410fb6dd5eb341377189195
-SHA1 (patch-content_browser_zygote__host_zygote__host__impl__linux.cc) = 89afd718ff99a72cbebb22b4350397496549cbff
-SHA1 (patch-content_browser_zygote__host_zygote__host__impl__linux.h) = f54561a02528d8e804f81ec99cc4c1b521851023
-SHA1 (patch-content_child_BUILD.gn) = 964158514744c0236d3f6261b1ee038eea7b2e2b
-SHA1 (patch-content_child_child__process.cc) = d4985256fee101b2820364307a5005d5c98a2a3e
-SHA1 (patch-content_child_child__process.h) = 01da16b7aec3d7e14eab032b18578424fac7e6c0
-SHA1 (patch-content_common_BUILD.gn) = 48f79179abe091e74f3c733db3b05fa022c2eb1c
-SHA1 (patch-content_common_features.cc) = a4bc5b0508bbc1d7c91686e969fa808d2b39f5e7
-SHA1 (patch-content_common_features.h) = da8b67d7e2f6837dc08427d7414d1ab69cf1456e
-SHA1 (patch-content_common_font__list__unittest.cc) = 60b0a7833b4ad8d892b4142dbda06e4a92195304
-SHA1 (patch-content_common_gpu__pre__sandbox__hook__bsd.cc) = ffc6c4fa7d1f92d900a3530a30ac705fb7c9aefc
-SHA1 (patch-content_common_gpu__pre__sandbox__hook__bsd.h) = bdb119e5a05b5779dda1eb435ab71ceb59957efe
-SHA1 (patch-content_common_gpu__pre__sandbox__hook__linux.h) = e420f40b47f3c8757e0ae3a70ced52e575e44392
-SHA1 (patch-content_common_user__agent.cc) = 8cf7a7c1cc126f2d9b80e12ad9af7cc9d14af54b
-SHA1 (patch-content_gpu_gpu__child__thread.cc) = ef856770fe7fccac98aaeae2eea8c3d35c64a74d
-SHA1 (patch-content_gpu_gpu__main.cc) = 113626e245e150597197a64cd597aaee5e3694d0
-SHA1 (patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc) = 917996c270dadb4ffc014f1c34a31b64cb509065
-SHA1 (patch-content_ppapi__plugin_ppapi__blink__platform__impl.h) = c50c189454561931e1f89362a068f7990a2fa495
-SHA1 (patch-content_ppapi__plugin_ppapi__plugin__main.cc) = cce7ccae717d84ffb1009eae6077848180501874
-SHA1 (patch-content_public_browser_content__browser__client.cc) = 4665d4950fae75d4730146725cc5823498ca9a8a
-SHA1 (patch-content_public_browser_service__process__host.cc) = 8633fc4befe497d12f8478970c834bd34bc6e30e
-SHA1 (patch-content_public_browser_zygote__host_zygote__host__linux.h) = 4988ab07cdd3ddc302b9859992eee566dd64dc9b
-SHA1 (patch-content_public_common_content__features.cc) = b5ba0e04546ed7dfb2da3b638459e7352993496c
-SHA1 (patch-content_public_common_content__switches.cc) = fd1bf67a250277c0bbdde23127099bf76d2061b8
-SHA1 (patch-content_public_common_content__switches.h) = 410c8249637245b6f1d108b5075f2f2e891771c6
-SHA1 (patch-content_public_common_zygote_features.gni) = a3af72bd2904ff7c2ed4058e6ce95075b9c82613
-SHA1 (patch-content_renderer_render__thread__impl.cc) = 0abd224f163627a1158cfc7d323231f7106bb2d7
-SHA1 (patch-content_renderer_renderer__blink__platform__impl.cc) = 362d20324fbf74b97ca0da28abe577719331a0ff
-SHA1 (patch-content_renderer_renderer__blink__platform__impl.h) = 46597e5c9ef0356d5237522bfec5422a987d15b4
-SHA1 (patch-content_renderer_renderer__main__platform__delegate__linux.cc) = 01cb8ff83b10b8508109613bf00e0646039e9796
-SHA1 (patch-content_shell_BUILD.gn) = 7f76b9606d36ea09782ad9a7051faa11755ac645
-SHA1 (patch-content_shell_app_shell__main__delegate.cc) = 02b329568897e93db2d6e48d1ecbb47b2669beca
-SHA1 (patch-content_shell_browser_shell__browser__main__parts.cc) = dd6c2e8175dc749ace77d9050c1da29aae115edc
-SHA1 (patch-content_shell_browser_shell__paths.cc) = a3770e0884944c8bd51ee66dbe1288b9a705d79a
-SHA1 (patch-content_shell_renderer_shell__content__renderer__client.cc) = 4c2300d8e86b05df3b3134141857b4d07453c696
-SHA1 (patch-content_shell_utility_shell__content__utility__client.cc) = c951f6ea6c168b013aa3e18bc01feea2a286d4bf
-SHA1 (patch-content_test_BUILD.gn) = a279df84612dc95fc7c10582874d90a5bd5c7f62
-SHA1 (patch-content_utility_services.cc) = 1f51cbbe64ebb6b123885174f0228ed66e1d2331
-SHA1 (patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc) = a7d0eed5ed9ac55c916e9a37fe54c9e0c4aa26d3
-SHA1 (patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h) = 6227b169bff8bc9daee64292d5bef970e9fcfeae
-SHA1 (patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc) = 61c9e49f830f996d362b7e03d38961dbb0aea17c
-SHA1 (patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h) = 38c532016162d15d77481d81d2f3e00122b69cd1
-SHA1 (patch-content_utility_utility__main.cc) = 2d04a1a897753400e2a42e917e1ef1d65852b7f9
-SHA1 (patch-content_utility_utility__thread__impl.cc) = 9dec0cba21ea19192ad0fd51b73db528b2667b3a
-SHA1 (patch-content_zygote_BUILD.gn) = 2154d5ce222bbc04263fef0f7a19d44ca6e37503
-SHA1 (patch-content_zygote_zygote__linux.cc) = 588b5c9f2838d081e4ce758bcda4dd91bfd17e95
-SHA1 (patch-content_zygote_zygote__main__linux.cc) = c34b705dfff289f625287db8caf5ce7ec7e1ee5a
-SHA1 (patch-device_bluetooth_bluetooth__adapter.cc) = baf92709051418656fcb0ac07a0c82a683ac0f16
-SHA1 (patch-device_bluetooth_cast__bluetooth.gni) = 03b3452843ff583d3689b0d1412f98624d82d1d7
-SHA1 (patch-device_gamepad_BUILD.gn) = 3ae35c24432f84cdf161c7e654c0b7d1598838c7
-SHA1 (patch-device_gamepad_gamepad__provider.cc) = e00ccdbb41447de49c895acacd59e27fe5419a5f
-SHA1 (patch-device_gamepad_hid__writer__linux.cc) = 537b3860557fa38b95bb6779b36b28101991c7c0
-SHA1 (patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc) = f745b5f4c3a4d5a1c25c773c2cf1255ccf660985
-SHA1 (patch-extensions_browser_api_management_management__api.cc) = fe6f080ef8eb2855c678e177fbd6f14153d4f8f6
-SHA1 (patch-extensions_browser_api_messaging_message__service.cc) = 8ce41bf2d6163117e08db6e2bcf905af35bb33b9
-SHA1 (patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc) = d29a49b81cab493e9ed1276a2c217384444f2df1
-SHA1 (patch-extensions_common_api___permission__features.json) = 18ce54792460d27b545ec52e4f1cc81000858c78
-SHA1 (patch-extensions_common_api_runtime.json) = 2798ef83e3bdfbd996c58de2d9adfd91cc1cfdef
-SHA1 (patch-extensions_common_command.cc) = c78385e3c57ab09995a0bec1ddc77628ec1ca6e2
-SHA1 (patch-extensions_common_features_feature.cc) = a91286e6099aac54a3e90939beea78a6f90505b2
-SHA1 (patch-extensions_renderer_bindings_api__binding__util.cc) = 0c1d50938ad9341d963d2c8bef743fb592afc783
-SHA1 (patch-extensions_renderer_bindings_argument__spec.cc) = eb134bf9b6a4dfd77a7fba7e0cc50cdeae9651bb
-SHA1 (patch-extensions_shell_app_shell__main__delegate.cc) = 78a6c5d87d7023926c4cf2f65b40e7e672194ec6
-SHA1 (patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc) = 1990568415ce6f823b44321fa26a133d212c2a99
-SHA1 (patch-extensions_shell_browser_shell__browser__main__parts.cc) = 943c5f1533d04855cebe6a20e729980935494b6f
-SHA1 (patch-extensions_shell_browser_shell__extensions__api__client.cc) = 773e21fa88e8634de9ca931e1dc320109eee9d13
-SHA1 (patch-extensions_shell_browser_shell__extensions__api__client.h) = 02e15a1b2f57f158c0f19cf6986b8f953d058228
-SHA1 (patch-google__apis_gcm_engine_heartbeat__manager.cc) = 7029fdc515808dc320d563530229be5818b52e99
-SHA1 (patch-gpu_command__buffer_service_dawn__context__provider.cc) = e6808e08cc1ea29654414b458da774d1587b02bb
-SHA1 (patch-gpu_command__buffer_service_gles2__cmd__decoder.cc) = 3517e0dbe0050db23b9adcbbdf1ff7a20d400fd9
-SHA1 (patch-gpu_command__buffer_service_shared__context__state.cc) = c98cb97e9e72748a629056bf703167507bb8960d
-SHA1 (patch-gpu_command__buffer_service_shared__context__state.h) = a6c54a70abb36487a83c012f436622b6a08853df
-SHA1 (patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc) = 38dcbe7da968a01ece927bed269a5446db2bcc1d
-SHA1 (patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc) = c872e7ec6374f4e7cb790f83e72fc32fc2296d7e
-SHA1 (patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc) = 25a8b2e8e6a2dace4099863eaa38df3bb0b0818d
-SHA1 (patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc) = 1d7b01557317088d2006efb33b2b02089a13f04b
-SHA1 (patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc) = 5ce3f7bde2031e9b07cb90574232d100ee5efec0
-SHA1 (patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc) = 49b039ba44980a004f9b740e3e776aa1f1af5332
-SHA1 (patch-gpu_command__buffer_service_webgpu__decoder__impl.cc) = 6a0b6ad948e82a1f677d7a9dfe78a9b0646e09e5
-SHA1 (patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc) = ef5d9e82dc753016aec43e5b0192097304f22379
-SHA1 (patch-gpu_config_gpu__control__list.cc) = 4e5dbad499c1935359381db333cf83d6d3f2b200
-SHA1 (patch-gpu_config_gpu__finch__features.cc) = b52176287263341e84d2c21f68ddc6dd8b5a61fc
-SHA1 (patch-gpu_config_gpu__info__collector.cc) = ecce163b23db4104574793be2b70e8e555e212c6
-SHA1 (patch-gpu_config_gpu__test__config.cc) = f93c965256137cb8c377966d7635bfb281d83257
-SHA1 (patch-gpu_ipc_common_gpu__memory__buffer__support.cc) = 145bc57b9bf08c2b4609517793804fe8f2e897b0
-SHA1 (patch-gpu_ipc_common_gpu__memory__buffer__support.h) = 2e379c13309b0a39cb9db88e63e94a949f4ab591
-SHA1 (patch-gpu_ipc_service_gpu__init.cc) = 692081240bbf23be483bbba8f7f59d5b0a5c8999
-SHA1 (patch-gpu_ipc_service_gpu__memory__buffer__factory.cc) = e77f27e21adf32d89d5ed99f8014dd66ca1601c9
-SHA1 (patch-gpu_ipc_service_x__util.h) = 8548add08fada34e5b7c0276ebf1bcda627b1abd
-SHA1 (patch-gpu_vulkan_generate__bindings.py) = 5221d329d74a53a79feca40548ad129b8922e62b
-SHA1 (patch-gpu_vulkan_semaphore__handle.cc) = 4bde679bb40b966ee30f845fe48e31891b33e1c5
-SHA1 (patch-gpu_vulkan_vulkan__device__queue.cc) = e5fc1f25039d50b0909ade56a90b7175603c8947
-SHA1 (patch-gpu_vulkan_vulkan__device__queue.h) = 049f1b773555ae667058ca61360c062bf05b7242
-SHA1 (patch-gpu_vulkan_vulkan__function__pointers.cc) = e6609bd35b40f810d247f961c6ca44d947b1f8e2
-SHA1 (patch-gpu_vulkan_vulkan__function__pointers.h) = d34a44796e91da865a1a54fb98d80c198a705d73
-SHA1 (patch-gpu_vulkan_vulkan__image.h) = add9407a228f61bb3b3e759d92bae69e8a338e96
-SHA1 (patch-gpu_vulkan_vulkan__util.cc) = 10adcf1643fda416cb05d139c8c41d0661e1b347
-SHA1 (patch-headless_lib_browser_headless__browser__main__parts__posix.cc) = f372057829fd0d0d9dc63d3442e0afbb229a4bf7
-SHA1 (patch-headless_lib_browser_headless__content__browser__client.cc) = d4437ceb78c8f799119a1b2f236708bc4170b952
-SHA1 (patch-headless_lib_browser_headless__content__browser__client.h) = 06bf5363e843de0f642e93ed6bd14fc28977c9c3
-SHA1 (patch-headless_lib_browser_headless__web__contents__impl.cc) = 24efd92e9f42c15e01463d6db91f04b55491deb2
-SHA1 (patch-headless_lib_headless__content__main__delegate.cc) = 478510d7095b97152cb89a75b3847504343d8f36
-SHA1 (patch-ipc_ipc__channel.h) = 1b4076276c1b914d76fd5f855296e8dd70252a40
-SHA1 (patch-ipc_ipc__channel__common.cc) = 6314709532eebbc3524ac2cf0c8a91d5f6c3132c
-SHA1 (patch-ipc_ipc__channel__mojo.cc) = 3a1cc2ebf616d2acb0219067cd084e8f9ce6df36
-SHA1 (patch-ipc_ipc__message__utils.cc) = 020d8dfe0bb7fa4043e9141948107ef1d0a1882c
-SHA1 (patch-ipc_ipc__message__utils.h) = 4479c2ee6e7cebf2b3e724b6249bd257dbf3018d
-SHA1 (patch-media_BUILD.gn) = 0265d4cf0b98e65ae06398585cd0f2bfe5e186f9
-SHA1 (patch-media_audio_BUILD.gn) = b911cafa2f822a09f94acc679806a834cb9842fa
-SHA1 (patch-media_audio_alsa_audio__manager__alsa.cc) = a3aa7dd7922bc0bc005b95925ebaa158845f9327
-SHA1 (patch-media_audio_audio__input__device.cc) = c948e6d61ff289e07fe5e1e18694da50013ed8cf
-SHA1 (patch-media_audio_audio__output__proxy__unittest.cc) = 4b47d9c47b11070d8ff0472d7936bafd2a6f0df0
-SHA1 (patch-media_audio_pulse_pulse__util.cc) = 58b61876ae3c1d53811e412d94b293316b4cdfb2
-SHA1 (patch-media_audio_sndio_audio__manager__sndio.cc) = 763690a9ed76f3a5a8564863daafc867be99f00d
-SHA1 (patch-media_audio_sndio_audio__manager__sndio.h) = 6fed621a20f26f90c8909465a9baee111e96bf59
-SHA1 (patch-media_audio_sndio_sndio__input.cc) = 48814df4794538b94a0c47dca7ff5b28f7a52dca
-SHA1 (patch-media_audio_sndio_sndio__input.h) = 5d907ebbbc388418435b5ccf857c14b53eacbeae
-SHA1 (patch-media_audio_sndio_sndio__output.cc) = ce15cab7eac40cd0f5c2a29ba0c8c457a2d68d33
-SHA1 (patch-media_audio_sndio_sndio__output.h) = 314b53b500161a4b181c9557ec0fdcb00ebbc691
-SHA1 (patch-media_base_audio__latency.cc) = b2106e2a5d2653147ffd23c786ecdc3c39100e44
-SHA1 (patch-media_base_libaom__thread__wrapper.cc) = ce4a456114a984995da4b58eadcc36382e88e933
-SHA1 (patch-media_base_libvpx__thread__wrapper.cc) = 1ffab5b250997912d08b1d187a402e0617fe03a4
-SHA1 (patch-media_base_media__switches.cc) = fa90c7fd126ba5c531e634f7723f5e9037a34269
-SHA1 (patch-media_base_media__switches.h) = b77485ba1edbd1056392082a4f4811ae47483e5f
-SHA1 (patch-media_base_user__input__monitor__unittest.cc) = 2674f854745209b11f8854b3a242151ffc067e80
-SHA1 (patch-media_base_video__frame.cc) = a05d37f40372ac972a809bb2b480d2e8c0cf858f
-SHA1 (patch-media_base_video__frame.h) = eb706964ed6751182962559ea3ddaac53d8a1990
-SHA1 (patch-media_capture_video_create__video__capture__device__factory.cc) = 296ae038e75e770cbe262a71b8a373fb01959430
-SHA1 (patch-media_capture_video_fake__video__capture__device__factory.cc) = 4cca36a98c2ae3dcfdb0b3db481310b276f9b0c5
-SHA1 (patch-media_capture_video_file__video__capture__device__factory.cc) = fb87eaf5b6dceb4c57121cf642eeeb925a929bfb
-SHA1 (patch-media_capture_video_linux_fake__v4l2__impl.cc) = c46d0a1582a5e14ae96edde1b24adba61f3e2220
-SHA1 (patch-media_capture_video_linux_fake__v4l2__impl.h) = 783153c936eec7a6d315e1fadec72cc1f4d12326
-SHA1 (patch-media_capture_video_linux_v4l2__capture__delegate.cc) = fe5543025d7446f970fae5af10959599c9fc3524
-SHA1 (patch-media_capture_video_linux_v4l2__capture__delegate.h) = c8ca830d5e6dedd66acfd51e6f0937932f3c0ea7
-SHA1 (patch-media_capture_video_linux_v4l2__capture__device.h) = 5ad15ed15e2bf78770021d9a96992204da122839
-SHA1 (patch-media_capture_video_linux_v4l2__capture__device__impl.cc) = 7b22cc4d096f4091667ce077228d407ae5e15c6b
-SHA1 (patch-media_capture_video_linux_v4l2__capture__device__impl.h) = 0daa7b36f8f6c8632ee4b5ce26919062634aaf1a
-SHA1 (patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc) = 9a04a1b15a38ec6d2ed888d0a74bf4fa5ee8f415
-SHA1 (patch-media_capture_video_linux_video__capture__device__factory__v4l2.h) = 330c73ce93398403d80386c4bb22d5816bc34fc1
-SHA1 (patch-media_capture_video_linux_video__capture__device__linux.cc) = 9c9e9d6f0a9687420c12ecec9986b2f2e40a9d87
-SHA1 (patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc) = 642e20ef032a4f529b08045f3659520dcc4cfbda
-SHA1 (patch-media_capture_video_video__capture__device__client.cc) = 7839a06f71c1853184f639301407efde37345ae4
-SHA1 (patch-media_cdm_cdm__paths__unittest.cc) = 90e34aa938ad63a601a0d9bdfe073f60748c95e9
-SHA1 (patch-media_cdm_library__cdm_cdm__paths.gni) = 6c5411e34eafed89b0f7d1c674ff920c2f412214
-SHA1 (patch-media_ffmpeg_scripts_build__ffmpeg.py) = 823a5524710e6838352d24f6a043fe0467678b6f
-SHA1 (patch-media_ffmpeg_scripts_robo__lib_config.py) = e3d5ae578a034a684c3da556ebadc288b7fbc5af
-SHA1 (patch-media_gpu_buffer__validation.cc) = 9b77209cba3d532e48f7a7a1b6dc1fa923a4b859
-SHA1 (patch-media_gpu_chromeos_gl__image__processor__backend.cc) = 411de5c935a3d02f8f17c19639821d0ea48a2717
-SHA1 (patch-media_gpu_chromeos_libyuv__image__processor__backend.cc) = 998bde1cf7dce41943ff1c5d02012540fe9d4d32
-SHA1 (patch-media_gpu_chromeos_mailbox__video__frame__converter.cc) = fd206f4accb6c8af6d362d04c36f3c53d2c52f67
-SHA1 (patch-media_gpu_chromeos_platform__video__frame__utils.cc) = bf25d8d92c4a6b17935d58db3c631f4fe560482e
-SHA1 (patch-media_gpu_chromeos_video__decoder__pipeline.cc) = 276cb7177126bd49ab0b11b14d24b8d91241e59e
-SHA1 (patch-media_gpu_gpu__video__encode__accelerator__factory.cc) = b8eea104cdec7c28313e25a13cfe8ddbd100123d
-SHA1 (patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc) = 0486580dc0e57a1f288be71a43570c62d0d284ba
-SHA1 (patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h) = b1d6516d4f54818e4a118e7b6369a084c9c4c761
-SHA1 (patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc) = 98cecc8e2cf084753bc11a752e542a0ad3b3d62e
-SHA1 (patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h) = 09a2807109c1f2bb95fd0dcc142f19ce726108a1
-SHA1 (patch-media_gpu_test_raw__video.cc) = 2db490673335116cf8d92fd5b4f95274a2343a2a
-SHA1 (patch-media_gpu_test_video__frame__file__writer.cc) = c0550f280455bcb698819f710ab848dc5937a55d
-SHA1 (patch-media_gpu_test_video__frame__helpers.cc) = 87dd697593f54c69df6970d6e2a743b5cf7ec43f
-SHA1 (patch-media_gpu_test_video__frame__validator.cc) = 03a553ef012fef0c73de993ff1e042d50ace9f33
-SHA1 (patch-media_gpu_vaapi_vaapi__video__decoder.cc) = 530cd4956e913ebf40b119b2ae4da214171b66f2
-SHA1 (patch-media_gpu_vaapi_vaapi__wrapper.cc) = 12962e17d4c0bfbf65269d2e732f10ea41fe7af2
-SHA1 (patch-media_media__options.gni) = f46acfbe3078e8bcde8ead64354838fe8e64a29f
-SHA1 (patch-media_mojo_mojom_stable_BUILD.gn) = dcf4bc0375994f800b7d5dc8d8c55d2482b6fd43
-SHA1 (patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc) = 1b6a1bc365b47e402866e5b5c3012357e8b77186
-SHA1 (patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h) = 4db5f5f205c44d9751176f084fe5f190e0effaf7
-SHA1 (patch-media_mojo_mojom_video__frame__mojom__traits.cc) = d237bc67066ed945dba5d0d549e83fe6d693e285
-SHA1 (patch-media_video_fake__gpu__memory__buffer.cc) = f139acab5e4d5026f509a460ba276ef9f2e2553a
-SHA1 (patch-media_video_gpu__memory__buffer__video__frame__pool.cc) = 4a3ee7914a51440ed4c48a75d3bc9e91f1d394a8
-SHA1 (patch-media_video_video__encode__accelerator__adapter.cc) = 48895a921bceafd67823f704fec7abccc27bb07b
-SHA1 (patch-media_video_video__encode__accelerator__adapter__test.cc) = 6e03c1d200b0337b0fe676fedbeb078706195f37
-SHA1 (patch-media_webrtc_audio__processor.cc) = ad0dfa625ee0b3a1e376efa0a483b144b1b4a076
-SHA1 (patch-media_webrtc_helpers.cc) = d3deb6fe26ede172bf471710cacc74bc3e5b4dd2
-SHA1 (patch-media_webrtc_helpers__unittests.cc) = f4e08fa6c0b7ec1783ede78f754b82572a0b226b
-SHA1 (patch-mojo_core_BUILD.gn) = a970a9a5fd45bcb6c417e3b61b5b6a7b9b85f3af
-SHA1 (patch-mojo_core_channel.cc) = 413eb15a21e62169da96a5fc657d072cf7c91054
-SHA1 (patch-mojo_core_embedder_features.h) = 9feb9a404a21392e76071465af3b7eedc265492c
-SHA1 (patch-mojo_public_cpp_platform_socket__utils__posix.cc) = e27998a1cb0bbf3850e00e190d20aaeea9b83345
-SHA1 (patch-mojo_public_tools_bindings_mojom.gni) = d27b65ee08d5853f926c1ed58014f424a776a95e
-SHA1 (patch-net_BUILD.gn) = ef24a28b7c2fb81c05259324b51df2d40c1a6b51
-SHA1 (patch-net_base_features.cc) = f79e0648f767b263f68c44a0a0c2a23f203e10ce
-SHA1 (patch-net_base_mock__network__change__notifier.cc) = 67fb635bb5acf289beba40032d2b9fca72d920e7
-SHA1 (patch-net_base_mock__network__change__notifier.h) = a8177dc08e86cadc67e7b07b9b7aa94138dfcb6d
-SHA1 (patch-net_base_network__change__notifier.cc) = 808543c466c99e7aeb7e229df4a9234ed25980dc
-SHA1 (patch-net_base_network__change__notifier.h) = 2a33e61080133a95df18cf9d2bfc7bf3c860ce7e
-SHA1 (patch-net_base_network__change__notifier__passive.cc) = c5ede275021c9071e8d8a6b5e19a5fa49eb9b43a
-SHA1 (patch-net_base_network__interfaces__posix.h) = 92b6aaa74fea74a86d035b496f5b4028dfa46ebd
-SHA1 (patch-net_base_sockaddr__util__posix.cc) = 047c0b2289b3c423169e8141db61bfbe9aefb627
-SHA1 (patch-net_base_sockaddr__util__posix__unittest.cc) = 1e13ec7ffe7b3eb1e8dd08bfddf9bb0b0c382234
-SHA1 (patch-net_cert_cert__verify__proc.h) = e1e70193998602d0730b2cbb817dcffa1bf1a8dd
-SHA1 (patch-net_disk__cache_backend__experiment.h) = e4e34a800554cce5629e3f27b1828fe68e0026fc
-SHA1 (patch-net_disk__cache_simple_simple__file__tracker.cc) = 3871e40bc0f0e0f50f7129049907082da4b75281
-SHA1 (patch-net_dns_BUILD.gn) = 23ae7c2e521caed266a6bfe3cb48b0260ad3797a
-SHA1 (patch-net_dns_address__info.cc) = 14c6fa9dd9c8d65f694b0130602f7f72775cc2b0
-SHA1 (patch-net_dns_address__sorter__posix.cc) = dc6b793f241033f99527f3645cc9749905f7ac94
-SHA1 (patch-net_dns_dns__config__service__posix.cc) = 1b39c3b5564c80c7c81438a363461e52d23a0de9
-SHA1 (patch-net_dns_dns__reloader.cc) = 0f95937e91383f2d9478f69786c3c171dd793b3f
-SHA1 (patch-net_dns_dns__util.cc) = 1a6bbfbd29c4c24e1aee94c895b5c2f226b251d9
-SHA1 (patch-net_dns_host__resolver__proc.cc) = 8a93f21535a3deba3be2180e6cdb656bb91c81b6
-SHA1 (patch-net_dns_public_BUILD.gn) = e3df09e8b753eb3a905623a842650f4f6032b783
-SHA1 (patch-net_dns_public_resolv__reader.cc) = a5581b013186587e7a4a90791a1ea7fdaca510f8
-SHA1 (patch-net_dns_public_resolv__reader.h) = 0d7f0a232724f34490141811687196558cf7217c
-SHA1 (patch-net_dns_public_scoped__res__state.cc) = b515dadb2062615d5dacfae73a6eb25aead7591d
-SHA1 (patch-net_dns_public_scoped__res__state.h) = 065d500d6ad9165208084492914c7eafca1cedbd
-SHA1 (patch-net_filter_zstd__source__stream.cc) = e671b04eead2b4740f54d71f129981e15f811e2a
-SHA1 (patch-net_http_http__auth__gssapi__posix.cc) = ae6757285171f2092f38a4ad46b379cf05ae698d
-SHA1 (patch-net_http_http__auth__gssapi__posix.h) = fabea5f797f6fb47db02d8ec75982c85ea1360a1
-SHA1 (patch-net_http_http__auth__handler__negotiate.cc) = 77528a795ca6dca274d625850e6b08f0de5ac504
-SHA1 (patch-net_http_http__auth__preferences.cc) = a9a65d776b5fb0216d1c99133f284947a263d85d
-SHA1 (patch-net_http_http__auth__preferences.h) = bd57985bf5861816cadd838e6d9389e06e9f7078
-SHA1 (patch-net_http_http__network__session.cc) = a22f8cf3e93767ee034feca1ab66542dd12d5476
-SHA1 (patch-net_proxy__resolution_proxy__config__service.cc) = e89ad052c3f08ec1c1390f21a6c64c43f987d13c
-SHA1 (patch-net_proxy__resolution_proxy__config__service__linux.cc) = f681941520936f39bb2219d7047d795c75c7d5ee
-SHA1 (patch-net_socket_socket__posix.cc) = c4d39c95a4cc5e513ca490c4b1c8a728038d783a
-SHA1 (patch-net_socket_socks5__client__socket.cc) = f0a8c43fb99b5f722d64b22a2acb21e5991004b1
-SHA1 (patch-net_socket_tcp__socket__posix.cc) = 6ef7ea5dbdfcabbc965e757eb7d3333e9f0b2c01
-SHA1 (patch-net_socket_udp__socket__posix.cc) = d23d1fe85fb543430b0ad0c1d05883898faf23ce
-SHA1 (patch-net_socket_udp__socket__unittest.cc) = 7b824d96a6be7b4256d1e9fafe1a1442d6334b9e
-SHA1 (patch-net_third__party_quiche_BUILD.gn) = 10fdc01ffedda25a08071cb139205348786bcb03
-SHA1 (patch-net_tools_cert__verify__tool_cert__verify__tool.cc) = bb51c21a06a896f93db9e50ae92ec19b749e21d8
-SHA1 (patch-net_tools_net__watcher_net__watcher.cc) = 4a4d726c8f06b24060ec8a811158aef96c4030fc
-SHA1 (patch-net_traffic__annotation_network__traffic__annotation.h) = 8989bd72628e54bb175ff11f86b16816fa5bd6fc
-SHA1 (patch-net_url__request_url__request__context.cc) = 3ddb64d37d5a437029e25d4b59e6efdd0fa91074
-SHA1 (patch-net_url__request_url__request__context.h) = 490ad240b4f946307f3d694a5ddb0d3a36bdf428
-SHA1 (patch-net_url__request_url__request__context__builder.cc) = ef8bf73ae5d0813214d3bce7809ffed106d030b0
-SHA1 (patch-pdf_pdfium_pdfium__engine.cc) = f39d73dba48c403677b7096c0acbcbb70a0af90e
-SHA1 (patch-ppapi_tests_test__utils.h) = 50ab6427a829edab7d65ae3e71911cd687d5c21d
-SHA1 (patch-printing_backend_cups__ipp__helper.cc) = 28375c9683f8c8ef0966f9f51b32861f2285f223
-SHA1 (patch-printing_backend_print__backend__cups.cc) = 7faa5b5e72cb6db4d24ce5cb713e03c9ef9f68fb
-SHA1 (patch-printing_mojom_printing__context__mojom__traits.cc) = 3086f139f468f6517add634a4e41c48fd1896558
-SHA1 (patch-printing_mojom_printing__context__mojom__traits.h) = be480edaad9ee0f12612d43de99e7a32000dc1bf
-SHA1 (patch-printing_print__settings.cc) = 5a856782f62b54b4b6219ae63fab9172000f9316
-SHA1 (patch-printing_print__settings.h) = fb26a84f543b69870ca5eb5280caf531e6eb408c
-SHA1 (patch-printing_print__settings__conversion.cc) = f3e1deccf62edb3a662528f12a5507d84ef9ee53
-SHA1 (patch-printing_printing__context__linux.cc) = 1073079912ff9582927265d1f933fb63d2270bf9
-SHA1 (patch-printing_printing__features.cc) = 745701c8a1821503ff18633e7b143a6a86ad0dc0
-SHA1 (patch-printing_printing__features.h) = b1059c9cae97cfc270b57ed588e318c80732bf79
-SHA1 (patch-printing_sandbox_print__backend__sandbox__hook__linux.cc) = 9f67d56cd08f0729f7ad58e86fb069ec7dc8a977
-SHA1 (patch-printing_sandbox_print__backend__sandbox__hook__linux.h) = 833ac9683d79a040740da85d165dc3dfd8c78ad0
-SHA1 (patch-remoting_base_chromoting__event.cc) = bccba653170ffb50313e201a45abff031c544932
-SHA1 (patch-remoting_base_host__settings.cc) = a4e024f44d50c5e8e0497b3f997d215aa47a5749
-SHA1 (patch-remoting_client_display_sys__opengl.h) = 60ba243606cdd98156cda0fcda75303fc626f2c0
-SHA1 (patch-remoting_codec_webrtc__video__encoder__vpx.cc) = 530dde90234720e98e53e52a1a9bee67e20a0773
-SHA1 (patch-remoting_host_base_desktop__environment__options.cc) = d3bfc0d0c6c805af5a650943369b4f8e9bcc3850
-SHA1 (patch-remoting_host_base_switches.cc) = 8c9ebf296c12b3cb42ece399adb93e6ae6264779
-SHA1 (patch-remoting_host_base_switches.h) = a1950af38860b00ffb0f33450f2a08e8280acd70
-SHA1 (patch-remoting_host_basic__desktop__environment.cc) = cbfec78485335ca648636ce460ec5278ae205a57
-SHA1 (patch-remoting_host_chromoting__host.cc) = 36fdc677e1bf61e03e2a9a1cc33ff3e67422abc0
-SHA1 (patch-remoting_host_chromoting__host.h) = ce2ad67b27914b53dbd1fcf28e2b9374f6ba52e3
-SHA1 (patch-remoting_host_chromoting__host__context.cc) = 680ea2d076d4ede143da54e40cac4a35a40bd25e
-SHA1 (patch-remoting_host_chromoting__host__services__client.cc) = 90ade1855f6a3eeab04ac36adacda49802a2c274
-SHA1 (patch-remoting_host_client__session.cc) = 77ee6d72aeea169b950504ab7a482989f497cd96
-SHA1 (patch-remoting_host_crash_crash__file__uploader.cc) = 81d50e2f0d13ce4024d51f2e1b7a67eb01c6750b
-SHA1 (patch-remoting_host_desktop__and__cursor__conditional__composer.cc) = 09ba2953af310d60c9d25d53cee9c38b3fd43604
-SHA1 (patch-remoting_host_desktop__capturer__proxy.cc) = fb2a4c79e02d63485c7ec8e7b0c8582c6c9e0d77
-SHA1 (patch-remoting_host_desktop__capturer__wrapper.cc) = 5a8d10b8a4319c17277acf9fb09cdc4abc888a94
-SHA1 (patch-remoting_host_evaluate__capability.cc) = 631749e2d7b3514c0ddf29dbd29ce0aab5ffea58
-SHA1 (patch-remoting_host_host__attributes.cc) = f535941f8e0e3ca497daf52e648e9f14ca04d874
-SHA1 (patch-remoting_host_host__details.cc) = 455aeacfdcc29f3871b57dca930f548f1ea03a38
-SHA1 (patch-remoting_host_host__main.cc) = d4d56adf708b1a8a74652e74e1dc1ef39660f173
-SHA1 (patch-remoting_host_ipc__constants.cc) = 2932a876df4345b8878cd96943e2110f15672366
-SHA1 (patch-remoting_host_it2me_it2me__host.cc) = 66c588a8a30d48736b18fc14192dd2ba26085afb
-SHA1 (patch-remoting_host_it2me_it2me__native__messaging__host__main.cc) = 46280ce795262a128fbb755cc78a4ab55a377e44
-SHA1 (patch-remoting_host_me2me__desktop__environment.cc) = 87327071d0b42309972d14113bae3f3c2e9dbf8d
-SHA1 (patch-remoting_host_mojo__caller__security__checker.cc) = 4238081d67c54ef711d609b12d70f94a79ace10c
-SHA1 (patch-remoting_host_mouse__cursor__monitor__proxy.cc) = 44ef9a9b3d4adf97fa7995238b2fc1136ba5cea3
-SHA1 (patch-remoting_host_policy__watcher.cc) = c92c9d256c98ef048e476f7cf09159ca38a19238
-SHA1 (patch-remoting_host_remote__open__url_remote__open__url__client.cc) = af9799530886ad2e13eaa09bfc8b3b1c8bd977f8
-SHA1 (patch-remoting_host_remote__open__url_remote__open__url__util.cc) = 97e7f00d35967c90cfc026efc11738243ee67b07
-SHA1 (patch-remoting_host_remote__open__url_url__forwarder__configurator.cc) = 2fb86392e76360d8ee7c55aadc1fe3585b94c6ea
-SHA1 (patch-remoting_host_remoting__me2me__host.cc) = 42f8379a1033db65a72ccf75f39ab3dc2a043f71
-SHA1 (patch-remoting_host_setup_start__host__main.cc) = 616ceec9013517f2199fe2192137a6c2da2f76fa
-SHA1 (patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc) = 2f5a739bcdb0b80726930982e48f741a8e3d7c51
-SHA1 (patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc) = ed349bcd0ee13683106b584d5addbc5bf7c69dd6
-SHA1 (patch-remoting_protocol_webrtc__video__stream.cc) = 2127afae75051d44aa506d9c4c2445c113d8305a
-SHA1 (patch-sandbox_BUILD.gn) = a61f385e215accf0c52e8b749e4bd37bb13ee398
-SHA1 (patch-sandbox_features.gni) = d7f0679aff669e5ba0b4520e671217be2b6b3941
-SHA1 (patch-sandbox_linux_BUILD.gn) = a6772e9215e35418eb1e2b91789c75703cdda726
-SHA1 (patch-sandbox_linux_services_init__process__reaper.cc) = 1771f1ad4eaa541c9e204663a7f0ab9eb259b829
-SHA1 (patch-sandbox_linux_services_libc__interceptor.cc) = fdff95dbd5a619b0ef99c2eb485ffb02710753d7
-SHA1 (patch-sandbox_policy_BUILD.gn) = cd199a0edcb94c4689dee7a45a96399c385baedc
-SHA1 (patch-sandbox_policy_features.cc) = 099894a5365bcb66d3782b7c28d4ad61e93775d2
-SHA1 (patch-sandbox_policy_features.h) = 9bce22b84f00fa703cd7c6ad3cdff50584fa8535
-SHA1 (patch-sandbox_policy_freebsd_sandbox__freebsd.cc) = 2dbb1d9ba65322d0c84368a8c411bb28b05442e9
-SHA1 (patch-sandbox_policy_freebsd_sandbox__freebsd.h) = 5fa6dd3db16506f2f7ed772bb7c60d3359d48a01
-SHA1 (patch-sandbox_policy_mojom_sandbox.mojom) = 1d674e0783b9185089e54d50fc190d4b51194553
-SHA1 (patch-sandbox_policy_netbsd_sandbox__netbsd.cc) = 96fa5b5f15094c8b58b51ef21af2a62c16b93c0a
-SHA1 (patch-sandbox_policy_netbsd_sandbox__netbsd.h) = d96f7e890b402fb73929e4d3578a5509866f73cb
-SHA1 (patch-sandbox_policy_openbsd_sandbox__openbsd.cc) = 3b5528c3f5f5b1ab28b664f97cac2795dbc8b871
-SHA1 (patch-sandbox_policy_openbsd_sandbox__openbsd.h) = 84ff154f058e867793f0f04a9ddf30c9c53482a9
-SHA1 (patch-sandbox_policy_sandbox.cc) = 768a76b42e1c095490cd59dd7d269e4276b1d8d5
-SHA1 (patch-sandbox_policy_sandbox.h) = 849e906b4270c040f0f90438ae4cd1aa65749caa
-SHA1 (patch-sandbox_policy_sandbox__type.cc) = c65fc4fc7212f47cd5a4c1cb762f286f846b4169
-SHA1 (patch-sandbox_policy_switches.cc) = 853936f5c074a1bfe61b6964a4b95e79a9c8b948
-SHA1 (patch-sandbox_policy_switches.h) = f370eea2cf48b6c7273db4806e78f9eb74465a12
-SHA1 (patch-services_audio_audio__sandbox__hook__linux.cc) = 1a5ee0a376fecc6726c334b0c27822762f516ae8
-SHA1 (patch-services_audio_audio__sandbox__hook__linux.h) = 05d22be9972a29db6749a0e9d0388d380bb1ff9a
-SHA1 (patch-services_device_BUILD.gn) = ed708a1d74bf4f99ae03c9f9e2138baf62138c07
-SHA1 (patch-services_device_geolocation_location__provider__manager.cc) = bd5abce01b975cef468276b5b1ee482d7306db7f
-SHA1 (patch-services_device_hid_BUILD.gn) = 39df0f1f4395e21daaebc417503666309b256005
-SHA1 (patch-services_device_hid_hid__connection__fido.cc) = 2ac4159a84d1ecfc7412bd8c59c198c1a1f8e165
-SHA1 (patch-services_device_hid_hid__connection__fido.h) = 4e4ee556a72b6e72ab9f8d3930ef201f12f4e67a
-SHA1 (patch-services_device_hid_hid__connection__freebsd.cc) = 15cf8cb01f544b7c350b2ddc39f90a260b797769
-SHA1 (patch-services_device_hid_hid__connection__freebsd.h) = 341c3281fb66a6a3a8e576f83b859bd07a882dbc
-SHA1 (patch-services_device_hid_hid__service.cc) = a5d061c59086b2159051b48159530fae3f7d0bf5
-SHA1 (patch-services_device_hid_hid__service__fido.cc) = 6d319b78b3d91ea69ebeea681f443aed45f35a33
-SHA1 (patch-services_device_hid_hid__service__fido.h) = a4cf46d51328f0b3c1f8e1e7cccd0a42ae93581f
-SHA1 (patch-services_device_hid_hid__service__freebsd.cc) = 40960017d1a76950b6622ec36b4932b0eff2f224
-SHA1 (patch-services_device_hid_hid__service__freebsd.h) = 5fe5aeecb5efcdef43cb8b9d406c7763f5f14703
-SHA1 (patch-services_device_hid_hid__service__netbsd.cc) = e021ea6e887452d4e05a2a3e5e4bfeb69b74d375
-SHA1 (patch-services_device_hid_hid__service__netbsd.h) = d19da1345b8dff3b970784006d195ba4c9ac8279
-SHA1 (patch-services_device_public_cpp_generic__sensor_sensor__reading.h) = 644a5337a7a2276de4cb278ea2dea912e9eb914b
-SHA1 (patch-services_device_public_mojom_BUILD.gn) = e12c8d9d68e153d377d642f5da98c575333417c6
-SHA1 (patch-services_device_serial_BUILD.gn) = 4cfcd88dad9e8b97a213112062d362a098f8d2e4
-SHA1 (patch-services_device_serial_serial__device__enumerator.cc) = b5295efc83211c44ea952eaa2647ea37512eb7f0
-SHA1 (patch-services_device_serial_serial__io__handler__posix.cc) = 738d091398971e1ff2f167516b868c7d4d2d13a4
-SHA1 (patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc) = 9b73234f3dfef2479c8de4e55998dd08f3e1c8de
-SHA1 (patch-services_device_usb_BUILD.gn) = 3317e5d90ad6e47168f7d758239b0d890ebe765e
-SHA1 (patch-services_device_usb_usb__service.cc) = d309aa0a936e4cb997784977ff84d1922bc2a705
-SHA1 (patch-services_device_usb_usb__service__fake.cc) = 8692a28bd588d683f264a4f60782479d7213ded9
-SHA1 (patch-services_device_usb_usb__service__fake.h) = e7c3b9473c069fb9aee7a16a62af5a110b62ec3b
-SHA1 (patch-services_network_BUILD.gn) = 79d793af5abe8341aef5bd34ce34c1e665fd3cfa
-SHA1 (patch-services_network_network__context.cc) = 95e8eb6dbe4f506a04d294947e3b8e8e1f23b8e9
-SHA1 (patch-services_network_network__context.h) = 604bb20ae653b88f35cfe49700f6f56ccf9094cc
-SHA1 (patch-services_network_network__sandbox__hook__linux.cc) = e5d0529a272e46ebacd679f4a2a3c38faac98a0f
-SHA1 (patch-services_network_network__sandbox__hook__linux.h) = 7b97700390c3dd47b45d6b492a68a07c1e8e04c2
-SHA1 (patch-services_network_network__service.cc) = a7e2a711ba392d6f5772790d596c3fdb883e40af
-SHA1 (patch-services_network_network__service.h) = 4630440ba3d91a8ba7a339b95a30cb7095eef732
-SHA1 (patch-services_network_public_cpp_BUILD.gn) = 88240f1a3556e4ba7a2d94169a00a8693907583b
-SHA1 (patch-services_network_public_cpp_features.cc) = ceda5ef34843e8981cf1183c08a639d3cace9db1
-SHA1 (patch-services_network_public_mojom_BUILD.gn) = 120a6db00ef19a87fa25036dc348eaa5f8b87d57
-SHA1 (patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h) = 9e01fa321696875a663a92b3f34e1ed4ea761b6e
-SHA1 (patch-services_on__device__model_on__device__model__service.h) = 8fa1d1d9a6f784d17f7451d966993bc464c24ef3
-SHA1 (patch-services_on__device__model_pre__sandbox__init.cc) = 317303b6cf5d264cf1056d186c758ed2dec7c490
-SHA1 (patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc) = 6dfe2fb04f3073afcdda5ea7bea8ac6308da10df
-SHA1 (patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn) = 2abee15a0c820e59e780ea08273f1253ee8d0632
-SHA1 (patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h) = fd13d2669c29d95e5e1e92a6056ceb76ec641d51
-SHA1 (patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc) = 5a8804b07496a26d9ee88844497783217688a8ef
-SHA1 (patch-services_screen__ai_public_cpp_utilities.cc) = f5a1c609c93c518497608297ff553438eca37b54
-SHA1 (patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc) = 470a25eee8f7130e6159aae80924137de922ee36
-SHA1 (patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h) = 212e2fa3fa001ec1dccb713978d839ef6f8bb392
-SHA1 (patch-services_service__manager_BUILD.gn) = 7b12bf772446936a7c08f1f5df1128c45c92d927
-SHA1 (patch-services_service__manager_public_cpp_service__executable_BUILD.gn) = 6f3b55293448faed830198c92f96bb6718ec5d56
-SHA1 (patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc) = de777f854ee2cdae439b1aeeeb5d5e31afddd32d
-SHA1 (patch-services_video__capture_public_mojom_video__capture__service.mojom) = 9977ffb8654ed6388fb5cc6d422131e368b4b81c
-SHA1 (patch-services_video__capture_video__capture__service__impl.cc) = 405d2e5a0f2fb7bb488bf7b3f1e2b68e2ee42901
-SHA1 (patch-services_video__capture_video__capture__service__impl.h) = 09c4238426508e2135461b09c0e915a15be37347
-SHA1 (patch-services_video__effects_video__effects__sandbox__hook__linux.cc) = 14aa3977cc46d6d6a3b6aa4fb272ab2cb2ec4c57
-SHA1 (patch-services_video__effects_video__effects__sandbox__hook__linux.h) = a0af9cef12034d467adb02da80eaaaa71c719ab3
-SHA1 (patch-skia_ext_SkMemory__new__handler.cpp) = 183821354342ec2ae46d28177ae83e3197efbee0
-SHA1 (patch-skia_ext_font__utils.cc) = 14570114e2be47050c46f04af12b4b28747f5c68
-SHA1 (patch-skia_ext_platform__canvas.h) = a9dc7aadaad0b35833d8b702947e8d1cff03c247
-SHA1 (patch-skia_ext_skcolorspace__trfn.cc) = 9fec70aeca78197f2bf7f373edd70a8f16f31f5d
-SHA1 (patch-third__party_abseil-cpp_absl_base_config.h) = 5b55ea618bc6f7c612946ca9f073bd884ac0ed51
-SHA1 (patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc) = e8e6eff5ec3103f1bf2e8b5edaa3403f438645d8
-SHA1 (patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc) = d8200a7a81c22100b1d4a1471d8e53252749eb0d
-SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h) = f4c0be81186a77cef174611c71560c03a1e31f5d
-SHA1 (patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc) = 7f7b70e7e24eed1667a104663d7b85ea180c6d01
-SHA1 (patch-third__party_afl_src_afl-fuzz.c) = 4fadabc3ab8668542dcb2edbacbfddce4b727135
-SHA1 (patch-third__party_angle_BUILD.gn) = 9cf333a3e979d136677ac19fadc8393e5302aeab
-SHA1 (patch-third__party_angle_src_common_platform.h) = 109f14748f32f63f65f7c52502fcff5db643e02b
-SHA1 (patch-third__party_angle_src_common_platform__helpers.h) = b4049708766ac88878e50569ec8e648e6f52ab8d
-SHA1 (patch-third__party_angle_src_common_system__utils.cpp) = 9d6b8d9935c781d4cb52817ebccdc5ff49ba806d
-SHA1 (patch-third__party_angle_src_common_system__utils__linux.cpp) = 4669ec90ead1a0427ce6c5012e9cf190394001c8
-SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h) = dd0295b3e3eca91ea62cece0c0d47c09566efac5
-SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp) = 1b37990a644a4e9bfb6ca1f0e949222541b40ba3
-SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp) = a5716be0d5e501f1fbdda29dfe8ceb8233338a13
-SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp) = cf8387d16fc58fc165106ff2f7065f954cde9d84
-SHA1 (patch-third__party_angle_src_libANGLE_Display.cpp) = 756fc6bff557e1d698426438f15f362e6ff1d59c
-SHA1 (patch-third__party_angle_src_libANGLE_formatutils.cpp) = a79a932d0bb65cc0be443db6f5c62a2b35557e2c
-SHA1 (patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp) = 4db516971f6cbf5125aaa077b0b9eee409393efb
-SHA1 (patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h) = 1319cdddbd090b5d9ea340d32bd4f47f12826bff
-SHA1 (patch-third__party_angle_util_BUILD.gn) = 145b82d03ab8c1b1251d5228a2ff7d7bdf176e90
-SHA1 (patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc) = 6046f7edc6bc8856f66d30596b780212b30ffc21
-SHA1 (patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h) = 11691bcb9641e2c7375a2155cdb7988874a02d7d
-SHA1 (patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h) = e5a01f24c77513feae9d7b7d2d77ee3e1ae03a30
-SHA1 (patch-third__party_blink_public_platform_platform.h) = e048996eb704dadec1ef2ab8b524659610e9b8d1
-SHA1 (patch-third__party_blink_public_platform_web__vector.h) = 2153b41cca994cb9232fccbca3d3e21d51240652
-SHA1 (patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py) = 2a14e70b3abf70caba7f10e89b125223d9a11465
-SHA1 (patch-third__party_blink_renderer_build_scripts_gperf.py) = 48eb40f6767acca98a55edbc2aea48c9d2f0d62c
-SHA1 (patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py) = 94a55da4e044728eb857917c28109fddef1e8bd6
-SHA1 (patch-third__party_blink_renderer_controller_blink__initializer.cc) = e075b8c26ffba4ec9ade861e969597f16628e206
-SHA1 (patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc) = a51d6f2acff5c5a85d8bb7f58c45ffa91e9d1125
-SHA1 (patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h) = 87e0b53828901e70639154af73873f7704f83f0f
-SHA1 (patch-third__party_blink_renderer_core_editing_editing__behavior.cc) = 80a2ad78c10ac626d4633d39a5202406b1b4e395
-SHA1 (patch-third__party_blink_renderer_core_execution__context_navigator__base.cc) = e739b522f653b4da5a36c5a4e07f8e55b1462b97
-SHA1 (patch-third__party_blink_renderer_core_exported_web__view__impl.cc) = edca3f2fee20905762b209b16bfdf702782225d6
-SHA1 (patch-third__party_blink_renderer_core_frame_web__frame__test.cc) = 41540dcccaed9abf720032c45cf1eff212571969
-SHA1 (patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc) = 25bca21a6949e633b30a7d5caa9dba3b29584f9e
-SHA1 (patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc) = 56afe2eb48e9fcf9ed63b7b5ed4268005c86b5a0
-SHA1 (patch-third__party_blink_renderer_core_layout_layout__view.cc) = 76e1fdeeeed557eb4623a2d742c86fa93b12733b
-SHA1 (patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc) = 2c25c8315ac53fb9a0627cd1499ef40540b8325f
-SHA1 (patch-third__party_blink_renderer_core_paint_paint__layer.cc) = e4a4e17108bf1465bf168fcd5f1a768c7313ea11
-SHA1 (patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc) = 640c04b6c0ad9638bf0412df1572c860762ed6e9
-SHA1 (patch-third__party_blink_renderer_core_xml_xslt__processor.h) = 0921aaa1014c9fe61bbd3c06f92316ca207da974
-SHA1 (patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc) = 20c912627031ca5a5d49e34092a8ab403c7375e5
-SHA1 (patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc) = 626f237f36dd5d7a23d2601edfe6cc6f27502823
-SHA1 (patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc) = 59f987f20035930d7e47676ed249e8c1f12535ae
-SHA1 (patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc) = 6388f1ac2516cb7e2c7479411a7dec51c7ceb787
-SHA1 (patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc) = c772291aa5e8298a6d947a64dde9c5884e694376
-SHA1 (patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc) = a81d227ccd1a2b2de626177b49794bf3cf0e1851
-SHA1 (patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc) = 955427b32a4df9fc2a4ef015e5f2535a456ada04
-SHA1 (patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc) = a9dbfb760b9f7b0ee5cd92d24a3dbc4df40adaae
-SHA1 (patch-third__party_blink_renderer_platform_BUILD.gn) = 9cea9a685789605ae28ac32eb9b966986cd7513b
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__cache.cc) = e807533bbfec7b3b7711938b3e205a14d427b33b
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__cache.h) = a8b6a497f64f79687cf33fff3b5f246d94f29da0
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__description.cc) = 62879c4cee7bbdf7b65190ed6181c33b841f54b4
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__metrics.cc) = 2884a57912bddc84fe40258b6510bfd8fc675111
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc) = 74d218937da0449242d10d83372059308c0f94f7
-SHA1 (patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc) = 1bb61e94cda4307b8326bb6e13867c6cc16ce563
-SHA1 (patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc) = ff163d1e99e556e6b54017dd96394c7d11a300d5
-SHA1 (patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc) = d9b229e6e040939c42a3516752a2a32f968abd6e
-SHA1 (patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc) = 86ef41c843b97a1dd92a0a4d592bdab7f87c1fb2
-SHA1 (patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc) = eb6c5cb699482fb2dfc77eb9d0458f090d4f3850
-SHA1 (patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc) = 2253341a47272df2686a10dacf79bd90bfde5184
-SHA1 (patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc) = 9f7a81a0ea0abd4fe858b2731a2559bed1172be2
-SHA1 (patch-third__party_blink_renderer_platform_runtime__enabled__features.json5) = 361d3f3fe6e70b0309596119af2704f190d9d30d
-SHA1 (patch-third__party_blink_renderer_platform_scheduler_common_thread.cc) = c6c779e933ec46df699aca1f3da53a8fd9926951
-SHA1 (patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc) = 2675fd62c695c0529b961ae2e21f2fe09028ea07
-SHA1 (patch-third__party_blink_renderer_platform_wtf_container__annotations.h) = adf92ef965d54937f94ef8ae1d3fd428c2d7fc67
-SHA1 (patch-third__party_blink_renderer_platform_wtf_math__extras.h) = 7734ca6d36a6095e2bea1df9bfb2ba230a3febbd
-SHA1 (patch-third__party_blink_renderer_platform_wtf_stack__util.cc) = 15a004feafaf05908699ce18e741e98bd102e6f8
-SHA1 (patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc) = 8d8fe2b3ff280b0ff70e1d5317fa92e7513647f3
-SHA1 (patch-third__party_brotli_common_platform.h) = b0b5caec28d82c2bf74f1b0ae8df5a4a91286d98
-SHA1 (patch-third__party_cpuinfo_cpuinfo.gni) = c1e0e85b2dcf413a10f2647340d98a94299bb5a3
-SHA1 (patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni) = 49e8e97dd0699954dfd288c4da1c2ec701d61838
-SHA1 (patch-third__party_crashpad_crashpad_client_BUILD.gn) = dc9363a21d488dd661d3704069a397bdaa2d67d8
-SHA1 (patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc) = f94d499ae3295d8dfb0b4224a5ba3ba48ad3b16e
-SHA1 (patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc) = def8c2a24a26d3327fe6948e72d091e826c127c8
-SHA1 (patch-third__party_crashpad_crashpad_util_misc_address__types.h) = 5b90f12c6bda952761655e832cee23420ad3b3c7
-SHA1 (patch-third__party_crashpad_crashpad_util_misc_capture__context.h) = 1d0dfdb869516f91df8d575518c7704ba4a6c4c9
-SHA1 (patch-third__party_crashpad_crashpad_util_misc_metrics.cc) = 97feee266d8aeca57272efc7fcb02c71e2072afd
-SHA1 (patch-third__party_crashpad_crashpad_util_misc_uuid.cc) = a4cd6a399b18ec0173eb3608ab9c06314cad4e57
-SHA1 (patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc) = 12bb3e27698fb0ed59515dee5e690d3024a0677a
-SHA1 (patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc) = e1112890819faab73a8ea674bf14a46152ac9a87
-SHA1 (patch-third__party_crashpad_crashpad_util_posix_signals.cc) = cbcec41de09c02a15aa08d6b7d7fcb612ee4f04a
-SHA1 (patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc) = cec1c3c7993fee221aa8e2d9f46b1a24e64dd027
-SHA1 (patch-third__party_crc32c_BUILD.gn) = 251b001b55c7916b772caee1a1a5105be1a628ff
-SHA1 (patch-third__party_dawn_include_dawn_native_VulkanBackend.h) = 446fc13133c439765a02f173909606cc43e0a4e4
-SHA1 (patch-third__party_dawn_src_dawn_common_Platform.h) = d0f9fc3a0f096a2a32622d0221e0ff0f4dfb3422
-SHA1 (patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp) = 16bafb05151af775707e6d3a0435076271eaf858
-SHA1 (patch-third__party_ffmpeg_BUILD.gn) = f388c17efc229f36606e552cfe1567f23bec93c0
-SHA1 (patch-third__party_ffmpeg_libavcodec_x86_cabac.h) = b60b2be36c965d65d3a13e86e6c97eb723ede7e0
-SHA1 (patch-third__party_ffmpeg_libavutil_cpu.c) = 2e9115f4ce7c6b4200b9774eaac4dc42c2aa912c
-SHA1 (patch-third__party_ffmpeg_libavutil_mem.c) = dd972677d666296e8575be1bc54844f5942c48a1
-SHA1 (patch-third__party_ffmpeg_libavutil_random__seed.c) = a7fec0b27a4381f0e2f7bdae62c533ceffac8f38
-SHA1 (patch-third__party_ffmpeg_libavutil_x86_x86inc.asm) = 236cd9297de18919c05eb202db0aedaa2ab24e66
-SHA1 (patch-third__party_fontconfig_include_config.h) = cb37977c1e79a0d8e93a2cc4888446325fcfd199
-SHA1 (patch-third__party_fontconfig_src_src_fccompat.c) = 4421843d39c4f4099eb787ee8d4ce5db4d98ca49
-SHA1 (patch-third__party_ipcz_src_reference__drivers_random.cc) = 8a50832e50a499debed2db8ed92f533c281eb782
-SHA1 (patch-third__party_ipcz_src_standalone_base_logging.cc) = 889ddd420d40afd600e39e498216f55627c25890
-SHA1 (patch-third__party_leveldatabase_env__chromium.cc) = ed91c43f9e27bdbb282355202c1632b1334f9646
-SHA1 (patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c) = 61f250abc166ca580fbdad4323f241212dfa4707
-SHA1 (patch-third__party_libc++_src_src_chrono.cpp) = 8373e7b1f4ebfbdfa046168334285bdf0ce2d56c
-SHA1 (patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp) = 78b365bad27430a8c2e18428d7069c5c1793d865
-SHA1 (patch-third__party_libc++abi_src_src_cxa__guard__impl.h) = 321b342e5a0af48b8b79dd881027dccb2d384382
-SHA1 (patch-third__party_libdrm_src_xf86drmMode.c) = 321a5843a11c1e7a4fd6dae929d0068c24cdf9ab
-SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h) = 72327457637882a39ecba6fdb526bcf42802273f
-SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h) = c0d12bf7bf01cb458c383da3f25beb14e737386d
-SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h) = 6336885a0190f49c8447fadf599eb955d3bbe0ca
-SHA1 (patch-third__party_libsync_src_include_sync_sync.h) = 663e1d023cbba5aac8ec21b9f7efe6f8e33e523f
-SHA1 (patch-third__party_libsync_src_sync.c) = b96354baeea20020a7c5496098811e010d0ad24f
-SHA1 (patch-third__party_libusb_BUILD.gn) = 1df67db2b0556dfcfed03a6b9d2d4577a2ea5ad4
-SHA1 (patch-third__party_libusb_src_libusb_core.c) = 064e96f44c5754af3139d5e18a4aeafabcbe028e
-SHA1 (patch-third__party_libusb_src_libusb_os_threads__posix.c) = 35f2328e7864286f8746df5ceb209ef2720252b4
-SHA1 (patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c) = 3b7119ee71dfb8c874dea2f426976c9df569d276
-SHA1 (patch-third__party_lzma__sdk_C_CpuArch.c) = e76b206247e4e97bd3e96f669444a060317aebd5
-SHA1 (patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc) = d08954c9026c264da15e1f493ac109ae4603e212
-SHA1 (patch-third__party_nasm_BUILD.gn) = 12cc656f301c9330621c079369f0a61b491e83ea
-SHA1 (patch-third__party_nasm_config_config-linux.h) = 9c9f098793aa4a7740582b00948f41e5e6181c34
-SHA1 (patch-third__party_node_node.gni) = b61f9a5ebeccad126f4828038162094c362ba5e4
-SHA1 (patch-third__party_node_node.py) = 3462aba446f1240ac0e3496f402825d290dc7b7a
-SHA1 (patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp) = 6eae6e5f22043cc7fbc4b3aa4a58d4e36c23119e
-SHA1 (patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp) = be767c7c86166475addfe4ff534174d99f57ed1b
-SHA1 (patch-third__party_pdfium_fxjs_fx__date__helpers.cpp) = 3e4831d1e096bff65d2cd5b49100952d9aae977d
-SHA1 (patch-third__party_pdfium_pdfium.gni) = fd083b77ee9634eaf2e7df1cd0fa097725558534
-SHA1 (patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp) = 29a5d1a8db243a1c6c003d3200bd42054fa84f2d
-SHA1 (patch-third__party_perfetto_include_perfetto_base_build__config.h) = ffca82d3b439bbc9a3e63f618a0e280937ca61fd
-SHA1 (patch-third__party_perfetto_include_perfetto_base_thread__utils.h) = 0cdf4a945e8d427bba1c21e88a0de0659ce49fb4
-SHA1 (patch-third__party_perfetto_include_perfetto_base_time.h) = 35f02f52dc8c680e122ac7e8efdb7b71f9329370
-SHA1 (patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h) = ffdee95ecf9ada98a4b056dc06d68c995cfd57f9
-SHA1 (patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h) = c86936d7c2c0cec5c86a4549ecbef36c678de342
-SHA1 (patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h) = 5e3eafadaa468a3dbe7b8518fd5531868b5d90cc
-SHA1 (patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto) = c262e44f8bc518189fcb2ff157a770aba43ae435
-SHA1 (patch-third__party_perfetto_src_base_clock__snapshots.cc) = deca4b0e52180bba8b21f59ad22e5b15fb317ae1
-SHA1 (patch-third__party_perfetto_src_base_event__fd.cc) = 3821329f7124276e762791f96ea4706829b803e3
-SHA1 (patch-third__party_perfetto_src_base_periodic__task.cc) = a982da349192ff71fed595ad03e05eeb794ad6c5
-SHA1 (patch-third__party_perfetto_src_base_string__utils.cc) = 8428148415a85a0209d5e5788faf2886fcef559b
-SHA1 (patch-third__party_perfetto_src_base_subprocess__posix.cc) = 532f9119a2271acf53a35fe9731e3746f0c42d8a
-SHA1 (patch-third__party_perfetto_src_base_test_vm__test__utils.cc) = e4ae91c6d2444be5175acf7b442243dfa0b34f05
-SHA1 (patch-third__party_perfetto_src_base_thread__task__runner.cc) = 94b2464c86a631859b09812a7c3f1c81eef71baf
-SHA1 (patch-third__party_perfetto_src_base_unix__socket.cc) = 1a129907ad050513750dffbf0504a223836386a8
-SHA1 (patch-third__party_perfetto_src_base_utils.cc) = dad09a54b0aa56a8dc860144dfa688bf4c4ce19c
-SHA1 (patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc) = b4462973c05bdea559621529f164c366dcbf1394
-SHA1 (patch-third__party_perfetto_src_tracing_ipc_memfd.cc) = 3f0afcbcf9c816a77caae490921efd4cdbdfe9c4
-SHA1 (patch-third__party_perfetto_src_tracing_platform__posix.cc) = fdc461db9f3154c7c74f69486a16a22f75ff837e
-SHA1 (patch-third__party_perfetto_src_tracing_track.cc) = 816e168cda022b2e8daf6e64f81a0609a787ef10
-SHA1 (patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h) = f8d39e976fc9887bb675c61ec5ceb24ae639feac
-SHA1 (patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h) = 0e03b5fadac876593b8c40bcd5a1d185ea547edd
-SHA1 (patch-third__party_skia_src_ports_SkMemory__malloc.cpp) = 66ad8f2b556100755f54a616244470334ec2495a
-SHA1 (patch-third__party_skia_src_ports_SkOSFile__posix.cpp) = 54740c5df87ca108a2d9cdf9c28cafe2e1613cde
-SHA1 (patch-third__party_speech-dispatcher_libspeechd__version.h) = 5796b50085126a380618db5a7961516a8183ec1a
-SHA1 (patch-third__party_speech-dispatcher_speechd__types.h) = de82ce973fcbeb2c917df3795995df1952296967
-SHA1 (patch-third__party_sqlite_BUILD.gn) = 2960361bf9b03df4a43e08215028b5cae1c3ecf7
-SHA1 (patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c) = e5324c75a7691943ac3b1b1ba0fc7051f96ee913
-SHA1 (patch-third__party_sqlite_src_amalgamation_sqlite3.c) = 0dd2b451a2789de9401b9815138eb5e2b92bd475
-SHA1 (patch-third__party_swiftshader_src_Reactor_Debug.cpp) = 0222a0a453985a1b594cecc3a36a8e13afee4868
-SHA1 (patch-third__party_swiftshader_src_System_Configurator.cpp) = 728e8b59144c56dd41ae61933c46a427b1d0d006
-SHA1 (patch-third__party_swiftshader_src_System_Linux_MemFd.cpp) = 45fdcea4f8d2f3d0a6f241da9347ae5f17f78218
-SHA1 (patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp) = a498d69491ce2656a45289814b7facac4a561d26
-SHA1 (patch-third__party_swiftshader_src_WSI_libXCB.cpp) = a3659d87729e123681851527788af0f0e14a8ec5
-SHA1 (patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h) = bf1287fc34ddfa701a03c28338fb7d7c7d8d7106
-SHA1 (patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h) = b1c5e337e1c89370f7ebab391150879bfb88c203
-SHA1 (patch-third__party_swiftshader_third__party_marl_src_memory.cpp) = 5146384086fc808797e19378ac61e936c0855eb8
-SHA1 (patch-third__party_swiftshader_third__party_marl_src_thread.cpp) = d3acaba0a4742a7d378d9ccccae8bc60d779a61d
-SHA1 (patch-third__party_test__fonts_fontconfig_BUILD.gn) = 3e353954da554fdb9a8fbf1a67049584fd904406
-SHA1 (patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc) = 44fd50eb273277eb8bb1d88005f57057cfe75500
-SHA1 (patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc) = cfa083614f75a6d234f7396197fb3524ac1a4f36
-SHA1 (patch-third__party_tflite_features.gni) = 6ad7511d8eaf78940370dd249ddb1cd721a57850
-SHA1 (patch-third__party_unrar_src_crypt.cpp) = e773023a6bf0154f5796877bd178e947e0feeeb1
-SHA1 (patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h) = c494acf2c25fdc7488c1310936c4ee92edbd8dc2
-SHA1 (patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp) = cfe8cc21dc70eb6f5a3c57b6af22b509eb6a9a89
-SHA1 (patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h) = 086ec88715df919b1bb12798b4f5365e98bfc142
-SHA1 (patch-third__party_wayland_BUILD.gn) = 768c4b634f97e7f2bbb9b9738826b85f67d7ed39
-SHA1 (patch-third__party_wayland_include_config.h) = 5d7dee31b0fcec9561c9fe1cd1260ecff7e89678
-SHA1 (patch-third__party_webrtc_BUILD.gn) = 9cb65926410090b2d5f783c163fe992c3459a004
-SHA1 (patch-third__party_webrtc_modules_audio__device_BUILD.gn) = 6e158206ef955585b33f83e8105ded9e6375b721
-SHA1 (patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 63ce7bade64e18b47613f32b8ff14c3913de7798
-SHA1 (patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc) = 75151721158319b1b7ef71654b158a08de98b8c1
-SHA1 (patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc) = 8e50bff9d85459fb11d1ea3d4e470cb6d0246b46
-SHA1 (patch-third__party_webrtc_rtc__base_byte__order.h) = 634e33432083a5fcfec2128a1ac9f0cb49ef7f56
-SHA1 (patch-third__party_webrtc_rtc__base_ip__address.cc) = c0f989d7272bafbdecf8f47f30a7e37e29344c21
-SHA1 (patch-third__party_webrtc_rtc__base_net__test__helpers.cc) = fdc7ef1f9a8fbeddd2d145e10600d90ebd045dae
-SHA1 (patch-third__party_webrtc_rtc__base_network.cc) = 5d62650db8918b54db781ad8e7b685d7893a33d3
-SHA1 (patch-third__party_webrtc_rtc__base_physical__socket__server.cc) = 3e58152b1690b1ea1be51743a888022021425ed8
-SHA1 (patch-third__party_webrtc_rtc__base_physical__socket__server.h) = 9a4e8010bdfc36ca228c7638c4957aaff26f3748
-SHA1 (patch-third__party_webrtc_rtc__base_platform__thread__types.cc) = 60f9d252589917327f7b0e8decffca01231bc53c
-SHA1 (patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h) = 01d26b768ed7507acaea99b6cce1717ab1c4b1ac
-SHA1 (patch-third__party_webrtc_system__wrappers_BUILD.gn) = a44b74cde53be7ddd8e00f7860c546e4395990a3
-SHA1 (patch-third__party_widevine_cdm_widevine.gni) = 6f4360743baa08e199f8ca3f70d6e7aad61f83db
-SHA1 (patch-third__party_zlib_BUILD.gn) = b3b8a5881342c346b3de439af3062f45efd8e1bf
-SHA1 (patch-third__party_zlib_cpu__features.c) = 914e3e412bafff416f3434fdd25a02715f8ea8cf
-SHA1 (patch-tools_generate__shim__headers_generate__shim__headers.py) = e6b73789b49a4e0fbb02b4a0bd34da94ac474eed
-SHA1 (patch-tools_generate__stubs_rules.gni) = 037b831a63d9707b17f30b3b583ed643c54c1baa
-SHA1 (patch-tools_gn_build_build__linux.ninja.template) = a07e2e9f9b276f37150f93246c3dcd2a274ff975
-SHA1 (patch-tools_gn_build_gen.py) = d59132255abb6e179fd1e03b3a43674282544ae2
-SHA1 (patch-tools_gn_src_base_files_file__posix.cc) = a52a79db8d5b7e61ee46fc836c61b954ba39d032
-SHA1 (patch-tools_gn_src_gn_version.h) = 9f47c7d4c652c8c388568402343c7ab32abf3746
-SHA1 (patch-tools_gn_src_util_exe__path.cc) = 844127f59e796d04da0b266a7ae0fe38cdcc3243
-SHA1 (patch-tools_grit_grit_node_base.py) = a46817b68483d792732a4c7e6db397c6ee39e66a
-SHA1 (patch-tools_json__schema__compiler_cpp__bundle__generator.py) = 13cd6346f8c1dcb9ee1f51013dc557583d2a5b0d
-SHA1 (patch-tools_json__schema__compiler_feature__compiler.py) = 8d3b9a5be05e7bbaf1bd0dbdfe6296cd72777400
-SHA1 (patch-tools_memory_partition__allocator_inspect__utils.h) = b336f25bff5b77aba063bb687adb8832cc72bbfd
-SHA1 (patch-tools_perf_chrome__telemetry__build_BUILD.gn) = 84c8b34fbf22df70ff0c7a6c12d6613bfe8e9a00
-SHA1 (patch-tools_protoc__wrapper_protoc__wrapper.py) = 192384067b6a6bf7c2e032ddffbc27e0cf25442d
-SHA1 (patch-tools_v8__context__snapshot_BUILD.gn) = bb9d8e7b4bdeea43a97a8abebe24d81311e45dd0
-SHA1 (patch-tools_variations_fieldtrial__to__struct.py) = 860e533fa465fa6d4494121e203be77e291e8273
-SHA1 (patch-ui_aura_client_drag__drop__client.h) = 62f41b35aff20e3b0f081e022d68ccc985611229
-SHA1 (patch-ui_aura_screen__ozone.cc) = 3ad69514efa3b96f043170459159c5a0eee22b1d
-SHA1 (patch-ui_aura_screen__ozone.h) = 3cd979d883fec8fa0e1c2457b9462fd0c223f8c9
-SHA1 (patch-ui_base_clipboard_clipboard__constants.cc) = 3182deeb7b2b11353351925ed0a3cc907774db8f
-SHA1 (patch-ui_base_clipboard_clipboard__constants.h) = b9024666eb5c20c2d2bb2bec0d48a4a63bd57b87
-SHA1 (patch-ui_base_clipboard_clipboard__non__backed.cc) = a9a11ff2d76fc37273b4c961f45bedb556608c82
-SHA1 (patch-ui_base_cursor_cursor__factory.cc) = 0c874027b06aadf5c21f4c3bc21bec2fd039b4af
-SHA1 (patch-ui_base_cursor_cursor__factory.h) = 3436ac9903fe3a4bfb2c6b9f251a85a9310f0424
-SHA1 (patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc) = 9f3d3feb8bd41e5b11edf628286cbb6c8d1d197a
-SHA1 (patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc) = 43521376ef7a91d5cfbb7b1219ae5174eecd85e2
-SHA1 (patch-ui_base_ime_dummy__text__input__client.cc) = feed2bb06e7b5f4988416c37ac4041455d9e0960
-SHA1 (patch-ui_base_ime_dummy__text__input__client.h) = 3b1ff9a0f1f9e2968e59ff222d9a9faf4edb8274
-SHA1 (patch-ui_base_ime_fake__text__input__client.cc) = 991cf6957c9e6f55c01ee97dff95397966c2b6c4
-SHA1 (patch-ui_base_ime_fake__text__input__client.h) = aedd6d003009a9f21f99a1ddcfddbd85a411d3d9
-SHA1 (patch-ui_base_ime_init_input__method__initializer.cc) = dbe3bdfb377c04ca5b67270fefa4d4299074cc9e
-SHA1 (patch-ui_base_ime_linux_linux__input__method__context__factory.cc) = b0cba00cb8dc94eb62e48c9bef244ae1d397c637
-SHA1 (patch-ui_base_ime_text__input__client.h) = 411dcc6897674b73680ef0e0d4563d3f07d75ed2
-SHA1 (patch-ui_base_resource_resource__bundle.cc) = a6644bbc2da4e029a4fbbfa98a4a5b2a6027e90d
-SHA1 (patch-ui_base_test_skia__gold__pixel__diff.cc) = c5365afd596e74e523bfb00eaa103694951e5457
-SHA1 (patch-ui_base_test_ui__controls.h) = a381cc7dd1ea1c142c767c3a934914e2b1d862d9
-SHA1 (patch-ui_base_ui__base__features.cc) = 8abc2565adec844e02ddf22f642c65d9ee968872
-SHA1 (patch-ui_base_ui__base__features.h) = c0065406cd62c75b1fbf02f334eb654540afb079
-SHA1 (patch-ui_base_ui__base__switches.cc) = ad5be40867844a4c521de4a70dc66de478e14079
-SHA1 (patch-ui_base_ui__base__switches.h) = 3908a80fe78f5b728446511e00e7e4c7b0708bb4
-SHA1 (patch-ui_base_webui_web__ui__util.cc) = d068871fded24870ae3b8e1f7ca7b0c9be411796
-SHA1 (patch-ui_base_x_x11__cursor__factory.cc) = bc6caacd715d792ec157d0f19bd10e11884ff3ee
-SHA1 (patch-ui_base_x_x11__cursor__factory.h) = 12c7c56bf5a981dcc91ee1254fd2dd174e2792d0
-SHA1 (patch-ui_base_x_x11__cursor__loader.cc) = d4b1db93593e8886f6db5bfa416c5b007a2c0115
-SHA1 (patch-ui_base_x_x11__display__manager.cc) = f9c97f8dcc1086f4d578b6c567be60505631f42c
-SHA1 (patch-ui_base_x_x11__shm__image__pool.cc) = b51828f6a965dafb9bf02ecfef153b322e677e85
-SHA1 (patch-ui_color_color__id.h) = d2d32a7a290bdf7c0751b556562b6dd3e111f4a8
-SHA1 (patch-ui_color_color__provider__utils.cc) = 889a692e9a90887067f63b851d675cde81f24758
-SHA1 (patch-ui_color_system__theme.h) = f34e2e00e2c658456c9b5ac3a90450c4df8c6c68
-SHA1 (patch-ui_compositor_compositor.cc) = de0802047e1dbd7f9834c0de1b631a03a91149b7
-SHA1 (patch-ui_compositor_compositor.h) = 3fcf716c8e89a4456423bff1bb29ea097effae96
-SHA1 (patch-ui_compositor_compositor__observer.h) = 81f9881f6c47a8eaea89ad71fdde0d854707c8f9
-SHA1 (patch-ui_display_screen.cc) = 8fbfe04c7e38b16e3d7a8fa96aa82c8794dea0d1
-SHA1 (patch-ui_display_screen.h) = a0c91d557abdbd931c05187d08dcc7de9627c05a
-SHA1 (patch-ui_events_devices_x11_device__data__manager__x11.cc) = d967b77d7ab03d807c522e25680bb1d1281606cc
-SHA1 (patch-ui_events_event.cc) = eadfd9c87c7c96d5c4fc5d599511068fe869f637
-SHA1 (patch-ui_events_event__switches.cc) = 06a844e16f8354cd8984d4a6850d85adc3798529
-SHA1 (patch-ui_events_event__switches.h) = b547068aefe30830e655b74d350ecd2a301ecdf5
-SHA1 (patch-ui_events_keycodes_dom_keycode__converter.cc) = 1c54e91deef22309b9621baffe0a64a85dfb1334
-SHA1 (patch-ui_events_keycodes_dom_keycode__converter.h) = a4aaba2b46660deb56fbde29dad00fe92b6fcee4
-SHA1 (patch-ui_gfx_BUILD.gn) = 1e30191122bbca00ff9d55ce988795bea9270e9a
-SHA1 (patch-ui_gfx_canvas__skia.cc) = a9b4b5c7291554cc0686b07553ebd2c55c59748e
-SHA1 (patch-ui_gfx_font__fallback__linux.cc) = 25b08d6d68607c4c6f54dc6f84ac5cb5cb06a9f8
-SHA1 (patch-ui_gfx_font__render__params.h) = e8a943343ad240d5f1c44095d42ce8c489bccac7
-SHA1 (patch-ui_gfx_font__render__params__linux.cc) = 607c9b862f8148633b42b0d1ff0303993aaee17e
-SHA1 (patch-ui_gfx_font__util.cc) = 28b4268c95812ddd661b2d31f8fbdc7355e4b555
-SHA1 (patch-ui_gfx_gpu__memory__buffer.cc) = ded6c6b3471441af51b143d7c78fb8668a846e98
-SHA1 (patch-ui_gfx_gpu__memory__buffer.h) = 01841d6f0963921f2e6047a1d4e21185f81ea998
-SHA1 (patch-ui_gfx_linux_dmabuf__uapi.h) = c6e1ca427a1d555997973c7d8b61c5926b9a26ab
-SHA1 (patch-ui_gfx_linux_gbm__wrapper.cc) = 302aff012284353259e1833847044b4147bd49ac
-SHA1 (patch-ui_gfx_mojom_buffer__types__mojom__traits.cc) = 089f770534318f336ad45497e331d6da2a712f2f
-SHA1 (patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc) = 6a95b0607c04119b03bdc984176dfe5ffe6a9c50
-SHA1 (patch-ui_gfx_mojom_native__handle__types__mojom__traits.h) = 2961b5b623f41c6b915294afa65caafdb01effb2
-SHA1 (patch-ui_gfx_native__pixmap__handle.cc) = 9752cfbf40f25bfa139395395ea43fbe204e103d
-SHA1 (patch-ui_gfx_native__pixmap__handle.h) = 667cb09d784b3df65666de22b7f3500eb86d9750
-SHA1 (patch-ui_gfx_native__widget__types.h) = ff1340ff91bdc4e98b5d770e0d2abf6fac4ac4a7
-SHA1 (patch-ui_gfx_platform__font__skia.cc) = ffca7492e60edbd3575829a54f4aa3720b05e96d
-SHA1 (patch-ui_gfx_render__text__api__fuzzer.cc) = fa6c8fa5d9d3c0eaadc6300902f4c643bf339e1d
-SHA1 (patch-ui_gfx_render__text__fuzzer.cc) = e9197907853d715e6004b75400a38acebcbc74a6
-SHA1 (patch-ui_gfx_switches.cc) = fcb38e5fc7bf23d933a38ed3efd9d4714d7f0b99
-SHA1 (patch-ui_gfx_switches.h) = 78aca1da4820bb6ceabd1f3a1d021303b342bf0d
-SHA1 (patch-ui_gfx_x_generated__protos_dri3.cc) = d789252e781f86c553277734d5f339f1acc3621b
-SHA1 (patch-ui_gfx_x_generated__protos_shm.cc) = da156771c4fd0ecf63dcde332f20bd877695a2a9
-SHA1 (patch-ui_gfx_x_xlib__support.cc) = 72b1df49a6a9435b23b8aa557a1e89d3d343f29c
-SHA1 (patch-ui_gl_BUILD.gn) = 0ff75edf5411d9eeafad4293dacf9bce3d44afe6
-SHA1 (patch-ui_gl_gl__context.cc) = 6ada7be5d1826621c2d8313f7a534a8a7e1aca86
-SHA1 (patch-ui_gl_gl__fence.cc) = ad0f899624588a998fe8034138137f50190714c5
-SHA1 (patch-ui_gl_gl__implementation.cc) = 6ab62a2f50c077cb9ac7a9d947e46c8fe38c96f4
-SHA1 (patch-ui_gl_gl__switches.cc) = 0f3332a1e254a1fb0680af9f5a0f3b4072a03228
-SHA1 (patch-ui_gl_sync__control__vsync__provider.cc) = 240f446b0938bb5b9d5cab7e788f5a87ba1e25ac
-SHA1 (patch-ui_gl_sync__control__vsync__provider.h) = d91be8578bf18aa58a8d586fdf95cf493fd762a4
-SHA1 (patch-ui_gtk_gtk__compat.cc) = 6dfa9f462a62c00f95976f676b97dfec6a6e1910
-SHA1 (patch-ui_gtk_printing_print__dialog__gtk.cc) = dc618d372c940c13114c93ab3842f21388d2d17c
-SHA1 (patch-ui_message__center_views_message__popup__view.cc) = eb779ca8ae8a28dd53b5c700008dc476fa24830f
-SHA1 (patch-ui_native__theme_native__theme.h) = 028411d587ba332aa9c0a3477d760120be13c458
-SHA1 (patch-ui_native__theme_native__theme__base.cc) = 6c4a5965c2db98a4e62d518dbea8c06848159cff
-SHA1 (patch-ui_native__theme_native__theme__features.cc) = 2c7b72ecdccbe4ac8813b9fca317dd156495a8b6
-SHA1 (patch-ui_ozone_common_egl__util.cc) = 11c3edfd84769cee95d4ad229ce63885548c1c05
-SHA1 (patch-ui_ozone_common_features.cc) = 314ae2044b006af92f89802c4e9a909adf0e7b04
-SHA1 (patch-ui_ozone_platform_headless_headless__surface__factory.cc) = 58ef46a84c7b36c961b3c9544e713cfb93614c0d
-SHA1 (patch-ui_ozone_platform_headless_ozone__platform__headless.cc) = 00c0e0fdf2bce72c495f181d0a0df36046f6f0d0
-SHA1 (patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc) = b9d3b4f7b575d99d00fdef0e6a818abe9a2b5c00
-SHA1 (patch-ui_ozone_platform_wayland_common_wayland__util.cc) = db3bcccc5c963926e8b618874ee24e0fe38a43d2
-SHA1 (patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc) = da8a5ee129394b526a2115d49d96aa0d8452bf26
-SHA1 (patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h) = cbf46495ce96619ed8a9d659d0f4a166fe4dfaa6
-SHA1 (patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc) = bac7bb45b1cb2b0ad217e128038ca8dba2a122c4
-SHA1 (patch-ui_ozone_platform_wayland_host_wayland__connection.cc) = 566989e527bb9547ad681dabf2dfda0aa99f72b3
-SHA1 (patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc) = 7e9beda3a6dd3f4257b35d852b7ae1898479e257
-SHA1 (patch-ui_ozone_platform_wayland_host_wayland__popup.cc) = b1b93f46361c90038ecc7e18755b75707c891f8a
-SHA1 (patch-ui_ozone_platform_wayland_host_wayland__screen.cc) = 87eb765a6cc229bd505e8b018334d12371e2e7a8
-SHA1 (patch-ui_ozone_platform_wayland_host_wayland__screen.h) = 2a90e78a11f3053c5015d18421e3ed47bdcd5a82
-SHA1 (patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc) = fd7a8a36cd943e25a8773e17deb3b35cba472c9f
-SHA1 (patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h) = 8cff8dc210fc775f8a6a343b044aed94c4777e46
-SHA1 (patch-ui_ozone_platform_wayland_host_wayland__window.cc) = ed8329d4a1a66540a3ea1763769fca2fadc6ab24
-SHA1 (patch-ui_ozone_platform_wayland_host_wayland__window.h) = fe714e44faae1054b42dabd48f0193ecf0c6e4c1
-SHA1 (patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc) = 684ea571b25a627b817839248e3701f8d33119d5
-SHA1 (patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc) = 375e7d3eaa7e647128baa890796c8e94cf9dd7ee
-SHA1 (patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc) = 66716822f779ffbd4f1b4a0e90b3e9b1ad30e803
-SHA1 (patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc) = 5a3a741307af9b883ba3a512e58fe3be2a0ec288
-SHA1 (patch-ui_ozone_platform_x11_x11__screen__ozone.cc) = eb98cf577fc76d93732c22407ffee2036938f790
-SHA1 (patch-ui_ozone_platform_x11_x11__screen__ozone.h) = b0d43abc8fa4fdbdd16d28077532e979f895c26f
-SHA1 (patch-ui_ozone_platform_x11_x11__window.cc) = a70da64c79de33e9a51ed414c5800a852848dcb7
-SHA1 (patch-ui_ozone_test_mock__platform__window__delegate.h) = c8fefe5b48a3c1a98cd3a75705bf3e92315cb339
-SHA1 (patch-ui_platform__window_platform__window__delegate.cc) = ca568c8cc02909e2c32d47e3a422d2a379f05dba
-SHA1 (patch-ui_platform__window_platform__window__delegate.h) = 08f0e3488162609ae2d34f96a52659142d1820c5
-SHA1 (patch-ui_platform__window_platform__window__init__properties.h) = 67f6c2d8270d7995a29f6c1845cf9a7c439ea7db
-SHA1 (patch-ui_qt_BUILD.gn) = 3e463791c9e0e389b30d266340ee2fa999bcabfa
-SHA1 (patch-ui_qt_qt.gni) = 21287893fe8d116060767af8de49f353fd250228
-SHA1 (patch-ui_strings_translations_app__locale__settings__bn.xtb) = a3d0c0393b72d8b5d0bcee4d5bee26ddc6b3a6ba
-SHA1 (patch-ui_strings_translations_app__locale__settings__ja.xtb) = 30b36267f2bac6d7d0d0e7ef27b38d71ce1e4cd5
-SHA1 (patch-ui_strings_translations_app__locale__settings__ko.xtb) = e6fb8b3b0faa81740a0af410af583c750eba71db
-SHA1 (patch-ui_strings_translations_app__locale__settings__ml.xtb) = 6e89a7abe5aec71b57f1fa071fa5c8fe881e25a8
-SHA1 (patch-ui_strings_translations_app__locale__settings__th.xtb) = 7c7441c567de4d4833de69949c9c68daf6dd9ac8
-SHA1 (patch-ui_strings_translations_app__locale__settings__zh-CN.xtb) = 16ba606b301662c9432fa62168a580a3bafec093
-SHA1 (patch-ui_strings_translations_app__locale__settings__zh-TW.xtb) = 4c76fdf0fd0caa46f8d19764592bea8ee7ffeee5
-SHA1 (patch-ui_views_controls_prefix__selector.cc) = 218f3068eaa693508e7b685ddb02a9632bb179e8
-SHA1 (patch-ui_views_controls_prefix__selector.h) = 65f69d077165e591bad8efda4c3af508c8ac03c3
-SHA1 (patch-ui_views_controls_textfield_textfield.cc) = de894c8dad6e56b796ece09057644efed489a583
-SHA1 (patch-ui_views_controls_textfield_textfield.h) = 816691507c0e585890d38e42afc7b7ce9f25a218
-SHA1 (patch-ui_views_corewm_tooltip__aura.cc) = e21efc7a0976722964103cc93fa39b1e40717b28
-SHA1 (patch-ui_views_examples_widget__example.cc) = ad5b071e4671e1fecb495a91ed05250698379bfb
-SHA1 (patch-ui_views_focus_focus__manager.cc) = 493d988e9448c5f33e185336ccebac55a7df7a47
-SHA1 (patch-ui_views_style_platform__style.cc) = 97dc6af38c3143003d456a70932fa59edbbb7eb2
-SHA1 (patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc) = cd1b77a039b34727ec252b74be34d74488da8277
-SHA1 (patch-ui_views_views__delegate.cc) = 6cca8e9f19b1c8151d51b66d1198b95a8be6e5ef
-SHA1 (patch-ui_views_views__delegate.h) = 969c5b063995ff3e65e43ea2b769cc3c1aa04c24
-SHA1 (patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc) = 20704abd8b921149ee3f9b3b1d6531f8859deb0a
-SHA1 (patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h) = 51283fb9fa85e8b8193a8a1a8a0fa67893c553b5
-SHA1 (patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc) = 28c58050678ea7da8f6599a18f5fd17176ada38a
-SHA1 (patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc) = 83456c7d8fb6dcf43ce6649cf533fbb137892b37
-SHA1 (patch-ui_views_widget_root__view.cc) = 08983eb67b0ef5025b213ab533c4cf500ccf2805
-SHA1 (patch-ui_views_widget_widget.cc) = 28a9f28e1ebd9245aa5caf0e5c0a449010a63664
-SHA1 (patch-ui_views_window_custom__frame__view.cc) = 27b4d980a18643fc4e8b3dcbfbbcc5d971daa3df
-SHA1 (patch-ui_views_window_dialog__delegate.cc) = 9da5753bc27d7497d56eab9246d44e6ee0b8cdd0
-SHA1 (patch-ui_views_window_frame__background.cc) = 09ddf675cd0696f91b07ced46685749fcfa341fa
-SHA1 (patch-v8_BUILD.gn) = f1c6c442ac87424091a13dbd85e8bc4f33fd82d6
-SHA1 (patch-v8_include_v8-internal.h) = 5e9798ee078900a2233f8bfd89d984c2ca9bed12
-SHA1 (patch-v8_include_v8config.h) = 82fcee11292a922875b0474c53a3da426ca49e80
-SHA1 (patch-v8_src_api_api.cc) = edf0815fa88a0c91f48cddfe94aa54c7a1a4b3b7
-SHA1 (patch-v8_src_base_atomicops.h) = 2bd85d35fba4562ed223314834ad0d8666cb5743
-SHA1 (patch-v8_src_base_platform_memory.h) = f848b604bd5e21127bdb7199e0a550991be51da2
-SHA1 (patch-v8_src_base_platform_platform-freebsd.cc) = 2c19c9718b52ac04d4d6954b4cc7955cc0832eb1
-SHA1 (patch-v8_src_base_platform_platform-openbsd.cc) = 7ea891e0473c2f959739947046c88dfa782eaffe
-SHA1 (patch-v8_src_base_platform_platform-posix.cc) = f5a4f23bc6a349e11dd63e2e5d1529ec6c29a4be
-SHA1 (patch-v8_src_base_small-vector.h) = a003b5483c7e42bc3b73ea1b0018a5e7df8fddf8
-SHA1 (patch-v8_src_base_strings.h) = 3206d100d6fe12b80e8254ddd5be040308585f9e
-SHA1 (patch-v8_src_base_sys-info.cc) = 62c1e0beca5bb7e4164287859ffa88cd0ef97776
-SHA1 (patch-v8_src_base_utils_random-number-generator.cc) = a8f8e4606d10730e652dbb6e0b14c7190da720f9
-SHA1 (patch-v8_src_diagnostics_perf-jit.cc) = 8f6c83a9437c4096081574d0c4c24004d34e1cb5
-SHA1 (patch-v8_src_diagnostics_perf-jit.h) = f1d11cdbce826d82102a2d06b9059da88afcfdae
-SHA1 (patch-v8_src_execution_isolate.cc) = eaf598464f506a2da328d925273de1856ee3eed5
-SHA1 (patch-v8_src_flags_flags.cc) = de0298d0192ae1dd2067b746d84e2612dec23bd1
-SHA1 (patch-v8_src_sandbox_sandbox.cc) = 4fd05b0145356ee0e8da44308740ad67b3909a9f
-SHA1 (patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc) = 7d62a3ccad0cce47ce37f6f96b2bd158647b5e42
-SHA1 (patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h) = 5c4c7c3977814a500352e0a92f48c1cc03370a3e
-SHA1 (patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc) = d6b2d145ecf337104035d5f44db54391c31592db
-SHA1 (patch-v8_src_trap-handler_handler-inside-posix.cc) = 039464432123bbe639e5ccef951590badcadbb4d
-SHA1 (patch-v8_src_trap-handler_handler-inside-posix.h) = 48fb92786112675ea5d7d80ee8b91a4fc6823554
-SHA1 (patch-v8_src_trap-handler_trap-handler.h) = c4ec085828f37bc1133aba9ad69c1e573259e68d
-SHA1 (patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h) = fad457de65f3fd5a2dd783beb50ca67fa8b4bcff
-SHA1 (patch-v8_tools_run-paxctl.py) = dff25080211d8fa70e3f458d608fe38c9df43fcb
-SHA1 (patch-v8_tools_run.py) = faa01aa2ae08775e1f297c8b64a7ca1d6851105a
+SHA1 (patch-BUILD.gn) = 81fad72248088176cfee42da5b384a1873d507b1
+SHA1 (patch-apps_ui_views_app__window__frame__view.cc) = 44b1229fe8b71422d9b8c45f83c410399a4a8f45
+SHA1 (patch-ash_display_mirror__window__controller.cc) = 9e8a4f791d5eba16b2c26a4764165dfdface63ed
+SHA1 (patch-base_BUILD.gn) = 2351d49c592134b22dda58d5b756f2a63ef8b06e
+SHA1 (patch-base_allocator_dispatcher_tls.h) = 8f3dbde9302821848a284def72db329da1829137
+SHA1 (patch-base_allocator_partition__allocator_partition__alloc.gni) = a2668e6f32908f01df64287c59732f187648ed87
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn) = d7d9fc1b40fec9360b26169b0202f0f3759fa866
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h) = 7b3a0ac6b9aeecc7389c7e92d475a73df292ad0d
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h) = 160bc43163e070ec218f3c3ee570368214309623
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h) = ffbae8ffeef596b72f1be2491f3433bb6dbe6203
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc) = 45c151af4f382b0e72214867b428a65f84833e02
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h) = a380d2195353410f30af0d1afb7065fd0d87f7f5
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc) = 45febe7f5eb95cb5efb46d77502070fae248eef5
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc) = 3ca63ec69f0a1294d2b77c2ec57f6d212e95bde5
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc) = 02ac45c991d2cb405dcb168324b317e22345f4fc
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h) = 379aa4e06de413c70667835293728e5882fdeaae
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h) = 5a1bbe8a338de868c7d6d6aabe3e5352f513aec5
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc) = a1948534d0a810889e0981197f245d4e6423910b
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h) = 2bac22b84619d2f8e384ec13b5c00c0ed1971480
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h) = 0a12a97c8dfaae48e5aca213545de9d810965f52
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h) = 45a6fa3772b648c3b0eb547452ebc2a8158f649e
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc) = b7dd1cb499b09d787f1ba7888420bd7681d24179
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc) = 94c22de7d7722a35b172ab1447e67e2d51f6983e
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc) = aaeea62dac8fe7932082078f394c090ba7bd0fe2
+SHA1 (patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc) = d97775a431a81519120743140dfe43fd5bb81621
+SHA1 (patch-base_atomicops.h) = 08a26363b962e62b04b45539608c8e2ce6bf2c8f
+SHA1 (patch-base_base__paths__posix.cc) = f23c9235e83112a2e6daf9e4f160e6d4d9497d31
+SHA1 (patch-base_compiler__specific.h) = 809c24b4335062416ca4b74f0da4cf8cf6e13f42
+SHA1 (patch-base_debug_debugger__posix.cc) = 1abca73b0eff8dbb154f9a46c1ab1b0a99fe2d28
+SHA1 (patch-base_debug_elf__reader.cc) = bca19b4a74a28cf7d52e4f5c7797714e8fa35270
+SHA1 (patch-base_debug_proc__maps__linux.cc) = 8f73c800b400bb7b53bb7fc1690ebeb54e5456c6
+SHA1 (patch-base_debug_stack__trace.cc) = ddce880d6cbb1495c0b3af78355b4f8ba05c6150
+SHA1 (patch-base_debug_stack__trace__posix.cc) = 1962a49a43caa5faaee3a072ff64453b38f4261e
+SHA1 (patch-base_files_dir__reader__linux.h) = 7ee1196977662d921e95f96b65d9bf30ef079acf
+SHA1 (patch-base_files_dir__reader__posix.h) = f8ace25850163bd8d362dfb139107cb37545c2e3
+SHA1 (patch-base_files_drive__info.h) = 9269beceacb7ef4afa68223d928f18442bb5de40
+SHA1 (patch-base_files_drive__info__posix.cc) = 7fc57217b31ff6b6bf515ac39e92eb1147975f06
+SHA1 (patch-base_files_file__path__watcher.h) = 4651927149611dd3c29742b92946d696c07a271c
+SHA1 (patch-base_files_file__path__watcher__bsd.cc) = 4b4f33e812b11cceec23b2b9e4b9651a62727c66
+SHA1 (patch-base_files_file__path__watcher__kqueue.h) = 443cea79f92d0a19d6de7b5238318d0dc0c4b8b2
+SHA1 (patch-base_files_file__path__watcher__unittest.cc) = 37f644df816cb9e6d7af4ed3ec2b9e823ce719e7
+SHA1 (patch-base_files_file__util__posix.cc) = 9f04202cd85e8877e911623a634f53f80fe4e08e
+SHA1 (patch-base_files_file__util__unittest.cc) = 2e8d82469325e479259c44d2c60d943c44699eb0
+SHA1 (patch-base_files_important__file__writer__cleaner.cc) = d1365492b18ab5f4fcf4fb9a53b6f879f877c7ed
+SHA1 (patch-base_files_scoped__file.cc) = 89bedb2c6132d5a11ba4349bc5326bfe086277c1
+SHA1 (patch-base_functional_unretained__traits.h) = ff0fef27db201d083cff29abb1e356f81176e8f6
+SHA1 (patch-base_i18n_icu__util.cc) = 79fed33cfb37949589f018fa4f24b19205c25de0
+SHA1 (patch-base_linux__util.cc) = 150e6cee27a4068de91f1b7fb5f227e6b9987275
+SHA1 (patch-base_logging__unittest.cc) = 1ae9e4accf2b2ec38feb08b5cf8b07a45553b0dc
+SHA1 (patch-base_memory_discardable__memory.cc) = 5529ea6708214ea4e5834b512f87a6e030c01d99
+SHA1 (patch-base_memory_discardable__memory__internal.h) = 5d1f25f0124c8e0c7ec560b30233a7aa5956888b
+SHA1 (patch-base_memory_madv__free__discardable__memory__posix.cc) = 582f743db49c0df388c9d03cd30a1fb00bee3147
+SHA1 (patch-base_memory_platform__shared__memory__region.h) = eec420fcacf8924a7a3704720c356f4dfeda0403
+SHA1 (patch-base_memory_platform__shared__memory__region__posix.cc) = 5c1aadb9506ebb4f132b23bc3a71e81b76cd362e
+SHA1 (patch-base_memory_protected__memory.h) = 827a4d397afe0a50763002a9f5992494275b18da
+SHA1 (patch-base_memory_protected__memory__posix.cc) = 294d94c1d0c2e38c03793d6b5b6e280eef6390ac
+SHA1 (patch-base_message__loop_message__pump__epoll.cc) = db91ea3750d1fbb814c826f0bc4f80c83e8718b9
+SHA1 (patch-base_message__loop_message__pump__epoll.h) = a6fc02601ab2eec809cb795e15ed8b8fafbbaaa7
+SHA1 (patch-base_message__loop_message__pump__glib.cc) = 541dd0879325bd7c7da5ad620b2edd0ac1ac12b3
+SHA1 (patch-base_native__library__posix.cc) = c270ebabb6151da5feca775d15ec9120da29520f
+SHA1 (patch-base_native__library__unittest.cc) = 7b93fea8b394ca4a93bf0cec1b5b9464467da050
+SHA1 (patch-base_posix_can__lower__nice__to.cc) = 14c264cd712e507d6811bc77396737c3e25f6d70
+SHA1 (patch-base_posix_file__descriptor__shuffle.h) = e5e8927f75036a7cabc3f75dff4d76111aa7c722
+SHA1 (patch-base_posix_sysctl.cc) = d3945c922634cccb85772d055d06d7a773ce9b59
+SHA1 (patch-base_posix_unix__domain__socket.cc) = c7cd709a20ef0fbb075b98365c76dd32edd7ec54
+SHA1 (patch-base_posix_unix__domain__socket__unittest.cc) = d96885c71f628b11cab21b0ece0b48a550e2f1dd
+SHA1 (patch-base_process_internal__linux.h) = db3d99e01bfe7e2eda2ca243f1d355f4754aabcc
+SHA1 (patch-base_process_kill.h) = 0da20cc843f6633445d4beec3cb6cd638f79561c
+SHA1 (patch-base_process_kill__posix.cc) = f8fcc5c47dea9fc1ec676dd3b20dba5012ffcffd
+SHA1 (patch-base_process_launch.h) = 01d0ff325c319d608a8c1ca4f25b6b620f0c44a9
+SHA1 (patch-base_process_launch__posix.cc) = 7a5f34f00d49f380bd907a1d024b9187f1944bf6
+SHA1 (patch-base_process_memory__linux.cc) = 39da25c441b8bba011d2d5d30f2e980ead29e19c
+SHA1 (patch-base_process_process__handle.cc) = 725b5d1847c62711da3a57d90163dd5b8604f567
+SHA1 (patch-base_process_process__handle.h) = d7508a654177ce7eba79b2a782a025624c4b7c78
+SHA1 (patch-base_process_process__handle__freebsd.cc) = 627e70474bd99198533183cef06aac38681b1fe3
+SHA1 (patch-base_process_process__handle__netbsd.cc) = 791d2357d1f945dd278294707e6bb1fdd453e893
+SHA1 (patch-base_process_process__handle__openbsd.cc) = 95772dcb2e400989f01132dbad1f40effeea0db2
+SHA1 (patch-base_process_process__iterator.h) = b39c32414f3a2a920c8c840dd4ec8825fbdb4571
+SHA1 (patch-base_process_process__iterator__freebsd.cc) = 05fc210c20c4d56e9d469ab26a1a1533f1b7c024
+SHA1 (patch-base_process_process__iterator__netbsd.cc) = eb6cfe5bbf2d23cec2f80309d548e0d1bf22b7e7
+SHA1 (patch-base_process_process__iterator__openbsd.cc) = edbb1262e2d380137ca172f80ec45632e048362a
+SHA1 (patch-base_process_process__metrics.cc) = d5958a6a83bacdc606466f68b41c24278170f8c1
+SHA1 (patch-base_process_process__metrics.h) = 6df8bdabd63641fbf492cf611921afca5935fb5b
+SHA1 (patch-base_process_process__metrics__freebsd.cc) = fc7b1556163c8884a7b0b70c7ff7c44d21e1e75a
+SHA1 (patch-base_process_process__metrics__netbsd.cc) = 03125420708a20102358952d3d0c18cf5c874da5
+SHA1 (patch-base_process_process__metrics__openbsd.cc) = d8d78e31d5d73358acbeb1042acfd0377d6dd7f3
+SHA1 (patch-base_process_process__metrics__posix.cc) = d273b90cd3c8bf22815cb7dd6dad1ff602d22002
+SHA1 (patch-base_process_process__metrics__unittest.cc) = 07b5b3322f604d974d293ed68b158aa6aa0ecae6
+SHA1 (patch-base_process_process__posix.cc) = 2651e8fcb184b376adb98c68340589272d3f54b2
+SHA1 (patch-base_process_process__unittest.cc) = 3a85c0eaee5a546e40fc4bb56999a22f45ae1d9d
+SHA1 (patch-base_profiler_module__cache.cc) = 5f3c57c54ad4e0a8055cf8bc594544322c3fd3bc
+SHA1 (patch-base_profiler_sampling__profiler__thread__token.cc) = 3102b13a0f4a86baac7b75c1cccfb10fd7163517
+SHA1 (patch-base_profiler_sampling__profiler__thread__token.h) = e39f1f2d8fd83716dbf221ca433eec78ff2b0c0f
+SHA1 (patch-base_profiler_stack__base__address__posix.cc) = f5b402be55ed74d06b3bc0ce4cd976aa41edcad2
+SHA1 (patch-base_profiler_stack__sampling__profiler__test__util.cc) = 50dd576d8784bfc79ec7037083f7235a3326d48f
+SHA1 (patch-base_profiler_stack__sampling__profiler__unittest.cc) = 8369dc3047c4238f91ec4842e8ecd56a63c29851
+SHA1 (patch-base_profiler_thread__delegate__posix.cc) = 3c6b96c1233ccd8b5b8c4c0d89911967c94a8907
+SHA1 (patch-base_rand__util.h) = 1d011eca538bf58728ed92a4b81bfa51eac4702c
+SHA1 (patch-base_rand__util__posix.cc) = 85a9ab90aa334861b8b93ccd8ded60eebba15903
+SHA1 (patch-base_strings_safe__sprintf__unittest.cc) = 92c6789ca2cc30331466c5ff1adba1c0f44fa198
+SHA1 (patch-base_synchronization_cancelable__event.h) = 81ec3df5077de6121765c6b0e46bc661336dae20
+SHA1 (patch-base_synchronization_lock__impl.h) = 7e43531432a3863c1300353023a5c8b39941512e
+SHA1 (patch-base_syslog__logging.cc) = 9d6fc9846814f143e7b8be3ab99cfa0b775228ee
+SHA1 (patch-base_system_sys__info.cc) = 897e305f4533561e5f62356431d3d6f143818d67
+SHA1 (patch-base_system_sys__info.h) = f18d3d6a7ace28216ea2e657a2d4b056288103ab
+SHA1 (patch-base_system_sys__info__freebsd.cc) = 8d00ea25b54bd65cff9cf1660dc1d71b4df107a3
+SHA1 (patch-base_system_sys__info__netbsd.cc) = 803df66d72622203db50d5df902277ba2b4fbc70
+SHA1 (patch-base_system_sys__info__openbsd.cc) = ea73c75acc477b8c0c7e337c482dce483478f772
+SHA1 (patch-base_system_sys__info__posix.cc) = d355d219c599afab47856aa992d6afdfe97a53e3
+SHA1 (patch-base_system_sys__info__unittest.cc) = 9e5f8131c0d2590e631af7e7988305ad48a83e67
+SHA1 (patch-base_task_thread__pool_environment__config__unittest.cc) = 05f5f88eb4e6c2b0fe37e682b5c9c4fd04af147b
+SHA1 (patch-base_test_launcher_test__launcher.cc) = c1c945c51e362df4c666deee37c8ce8c67b8bb8e
+SHA1 (patch-base_test_test__file__util__linux.cc) = ef7b948661969daf1a1ffb689a55d70472a5310c
+SHA1 (patch-base_test_test__file__util__posix.cc) = 6e37fc56138dc9d1140752675340e33703462b28
+SHA1 (patch-base_threading_platform__thread.h) = 9c3588ded6ab6eaf62282023341deeb6aa83de4a
+SHA1 (patch-base_threading_platform__thread__bsd.cc) = 547c0caf568ed0e12f4e48225b689e828d9fb58c
+SHA1 (patch-base_threading_platform__thread__internal__posix.cc) = 41bec96e29e12e6ba0389551b3926cc71d042351
+SHA1 (patch-base_threading_platform__thread__posix.cc) = 5442a15c0b9fd0fde90c6aad118d0f256c2123d5
+SHA1 (patch-base_threading_platform__thread__unittest.cc) = e2b35758766c22cb96c6797ff17ffae16d1d8147
+SHA1 (patch-base_time_time__now__posix.cc) = 9ff904d7230e2e057b5752b1fc8851b839314d25
+SHA1 (patch-base_trace__event_malloc__dump__provider.cc) = d5ac600d1033fcb1cbe7d50b8db8a86b0b2e236a
+SHA1 (patch-base_trace__event_memory__dump__manager.cc) = 2aa0913d1697958637204b41c9752846cedc6338
+SHA1 (patch-base_trace__event_process__memory__dump.cc) = c093d03e1992b4afb3dbe8a2c43418ae45b53119
+SHA1 (patch-base_tracing_trace__time.cc) = 6ce6ac76d9abec9820b77fdd9ebf4007efd0f023
+SHA1 (patch-base_tracing_trace__time.h) = c1fed44c8fdc6e94bb7b097b10a44f13321991e6
+SHA1 (patch-base_version__info_version__info.h) = 177e485dfd7e0bea1a3fe913da267914f7099606
+SHA1 (patch-build_config_BUILD.gn) = e169571aab182a69b64b72897644846584aed53b
+SHA1 (patch-build_config_BUILDCONFIG.gn) = 3bf9aa0f3c5f2678aef5939378159de596647c76
+SHA1 (patch-build_config_clang_BUILD.gn) = d4994ead83cece1322c8e513e2e093a030875873
+SHA1 (patch-build_config_compiler_BUILD.gn) = 7ee94d3cab16987ebcf3fca50197e980286e3b6e
+SHA1 (patch-build_config_gcc_BUILD.gn) = 601f5e24f6e4d66a1b41c32788e9567ae009425c
+SHA1 (patch-build_config_linux_BUILD.gn) = b1c4a5219e254a6dc88f975efa38eb50567e8c4b
+SHA1 (patch-build_config_linux_libdrm_BUILD.gn) = 435330e572031360157f5756db339060d948f217
+SHA1 (patch-build_config_linux_pkg-config.py) = 8eb7043fc0e488be17e0267aa3be032d176ec491
+SHA1 (patch-build_config_ozone.gni) = e56bd7306c5b68971c64d8c70c5ae89e10720253
+SHA1 (patch-build_config_rust.gni) = 7cc5977f69eef1c912b3181fb966e21944fd2191
+SHA1 (patch-build_config_v8__target__cpu.gni) = 3c5278d2e9bfa991171b68cf627d0d32410dca79
+SHA1 (patch-build_detect__host__arch.py) = 22623b4cee6b1a496fd0f094f7caf81c788d727b
+SHA1 (patch-build_gn__run__binary.py) = 6cb7313e5809e16a390990723a8865ca918b53fd
+SHA1 (patch-build_linux_chrome.map) = 0cbdf673a31f0e974845d4530fb11fa9407cfeb3
+SHA1 (patch-build_linux_strip__binary.py) = 56218e9748dd663e6c13399ea475cbc18763b652
+SHA1 (patch-build_linux_unbundle_icu.gn) = 46a2a3acdd0c28a2dd8fcfa3d93e20b2d8e1f2ed
+SHA1 (patch-build_linux_unbundle_libusb.gn) = dabb282aa7040d67ae989a4d6962a4e88e2523e4
+SHA1 (patch-build_nocompile.gni) = 38a9c67b3871c05868d6146e97f18ad3265756e9
+SHA1 (patch-build_rust_rust__bindgen.gni) = 8f6efd10ec0aa09640f256be85cabcae2fe3e948
+SHA1 (patch-build_rust_rust__bindgen__generator.gni) = b263c99ce89fdfe8bc28f41ee7dbce83fb266552
+SHA1 (patch-build_rust_std_BUILD.gn) = eba891d40e595ee11a0269c742822d1be0f49ee0
+SHA1 (patch-build_toolchain_freebsd_BUILD.gn) = 3b209745d6b14b90f8300f6dba297133dbba1973
+SHA1 (patch-build_toolchain_gcc__solink__wrapper.py) = d5ca2f5347f18ea4b0371d085bb8e2cfc39c1020
+SHA1 (patch-build_toolchain_gcc__toolchain.gni) = 20c012e541c816d4dfbfe7deae7a70da6afafdf4
+SHA1 (patch-build_toolchain_netbsd_BUILD.gn) = df8540650e7373054e4ff3030e97b0dde950976b
+SHA1 (patch-build_toolchain_openbsd_BUILD.gn) = d65421a400dbd5e89480dc2d474ee671c99df7ef
+SHA1 (patch-build_toolchain_toolchain.gni) = 1759ee53855494aa9418752add3c6cd0c5073fcc
+SHA1 (patch-cc_base_features.cc) = 4f301624b1b3fe36108fe3bc3478688a1e412c20
+SHA1 (patch-chrome_app_chrome__command__ids.h) = 15ef2ba7d53e996ae6448bf3f5c16fc8603a8342
+SHA1 (patch-chrome_app_chrome__main.cc) = 055f70035df89b1de5f802f636d271f3c14d5d5c
+SHA1 (patch-chrome_app_chrome__main__delegate.cc) = 47de5f6f763ee642f8cc961e002926ad91fc9f34
+SHA1 (patch-chrome_browser_BUILD.gn) = 1756316f475190c2beac12f4f4c3e4e7f36c53c6
+SHA1 (patch-chrome_browser_about__flags.cc) = 3d514bd393943f81d46ee66d5a6c584726f9bc4e
+SHA1 (patch-chrome_browser_accessibility_page__colors.cc) = 9316c3f487af3e9e5964c1e2c7b9225e6b511ff7
+SHA1 (patch-chrome_browser_after__startup__task__utils.cc) = cf84239f7255f86525de913828c3209fff584f09
+SHA1 (patch-chrome_browser_apps_app__service_publishers_extension__apps.cc) = c85494f3bf0b48a5a39a61de61d370a1ee7195c9
+SHA1 (patch-chrome_browser_apps_platform__apps_platform__app__launch.cc) = 7e72d40ea565a592b172b5791b12417a4ceabf9f
+SHA1 (patch-chrome_browser_apps_platform__apps_platform__app__launch.h) = a7235f995575a4c2e731c0988a744535ee31836b
+SHA1 (patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc) = 6f1b37b8b262f1aa83ba86fb384c44348d17316a
+SHA1 (patch-chrome_browser_background_extensions_background__mode__manager.cc) = 1c98b136fcc984fca00614538d88a7feba885792
+SHA1 (patch-chrome_browser_background_extensions_background__mode__optimizer.cc) = dc2f5648f0448b34a79e48d15a95da2a4a81bc05
+SHA1 (patch-chrome_browser_background_glic_glic__status__icon.cc) = b88cea77461d35310adba2780e5f8766a65804e6
+SHA1 (patch-chrome_browser_browser__features.cc) = 5cf07cacb4f83aacd8dea966973d3bbb8c5e6888
+SHA1 (patch-chrome_browser_browser__features.h) = 25901dd1183551e65390132399121d610107856e
+SHA1 (patch-chrome_browser_browser__process__impl.cc) = 692ce84401164cba05f83ad4578d79a39d7ae5ff
+SHA1 (patch-chrome_browser_browser__process__impl.h) = 7023fb3a6b415776b14ea7ae3c3e56acc8150159
+SHA1 (patch-chrome_browser_chrome__browser__field__trials.cc) = 21ca9011d76717c01587290b6dcc2a47b544502d
+SHA1 (patch-chrome_browser_chrome__browser__field__trials.h) = 949ecff17510455e31cdc7f5e5608cb3b56f9034
+SHA1 (patch-chrome_browser_chrome__browser__interface__binders.cc) = 118c6fbc89a67c0151aebf3a00bcb345c40059dc
+SHA1 (patch-chrome_browser_chrome__browser__interface__binders__webui.cc) = 037e8182d14ad8c433626df8cb05795658f7f94f
+SHA1 (patch-chrome_browser_chrome__browser__main.cc) = a77e4cd27a16f30e1a89da8454d8d611660d629f
+SHA1 (patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc) = 6c105aa0f598486ca03f66c2120fcb9351011ab0
+SHA1 (patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc) = 50490395f81a817ad32ea51b6f00247f7fda54e7
+SHA1 (patch-chrome_browser_chrome__browser__main__linux.cc) = 819f5dd6e4a3fdc36089ba3795894b0e9b23083a
+SHA1 (patch-chrome_browser_chrome__browser__main__linux.h) = a5e8590a4de1f23e057d23a27b984d5dbee92f0c
+SHA1 (patch-chrome_browser_chrome__browser__main__posix.cc) = ad25fcfcaf187233d093cdc2ca10f65dc63e445c
+SHA1 (patch-chrome_browser_chrome__content__browser__client.cc) = 72b3d87590e4d6b0ba1c03298ee12f80a2800256
+SHA1 (patch-chrome_browser_chrome__content__browser__client.h) = 6ea3f378e4dc38f404812bfcd199e6db01894fa2
+SHA1 (patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc) = 69f25357fcaa1e10cfe0b2b9bca06a06eadbe50f
+SHA1 (patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc) = ded2087f5163f189c3a21a4ff15b3ab15a8474f0
+SHA1 (patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h) = fec537ec8c0ce5b14c99839b51a6480b1cacd14a
+SHA1 (patch-chrome_browser_component__updater_registration.cc) = 56811d48d6fce5361b6def936994147183ba92b8
+SHA1 (patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc) = 3fa56e923fb31c3ee83419bc2eae892e7bbba7de
+SHA1 (patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h) = 513f3322eb141abbc1cef709f89161dd1223f4c9
+SHA1 (patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc) = 60bfdecbe75faee9453eef9988354530e82e6646
+SHA1 (patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc) = b067e4f0e62e55e462d69eeb57c91ac3e39bcf44
+SHA1 (patch-chrome_browser_defaults.cc) = 6295b3f6caf42f6cea1b4516012dff922cef4c13
+SHA1 (patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc) = 5586aba9571a08a4c1840c18abfd93b74cc8b04d
+SHA1 (patch-chrome_browser_devtools_features.cc) = c4ffc2009714f453bfffaeeffbd9b304dc28660f
+SHA1 (patch-chrome_browser_devtools_features.h) = de966c650d56da1a979afce0ad0edc39d649dd6c
+SHA1 (patch-chrome_browser_devtools_remote__debugging__server.cc) = ee77d65f5382a1df38f3f3341d6f12c666a15f30
+SHA1 (patch-chrome_browser_diagnostics_diagnostics__writer.h) = 81fe656919b57e007521a17d8071d032533e0cce
+SHA1 (patch-chrome_browser_download_chrome__download__manager__delegate.cc) = b69600d49ec0a12e5b74179e7298c84174012053
+SHA1 (patch-chrome_browser_download_download__commands.cc) = 6d579378d0b40d713b7815bc781840e35b0fa6ba
+SHA1 (patch-chrome_browser_download_download__commands.h) = 0ea4644689afb592d5b472798a5e80161153cbdd
+SHA1 (patch-chrome_browser_download_download__file__picker.cc) = 088d9b0a2faed13cd0e70ba96106820091ac46cf
+SHA1 (patch-chrome_browser_download_download__item__model.cc) = 2cedca9c463a54145157618bd8cdac8f2b804992
+SHA1 (patch-chrome_browser_download_download__prefs.cc) = 090c35dc6a254c37a0b95436d59cba0bb6523ff3
+SHA1 (patch-chrome_browser_download_download__prefs.h) = cd9b33e8f4078396e8d14ba23a7333b147ea3178
+SHA1 (patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc) = 7a384313285ea3b1b768a0187382dd551339d045
+SHA1 (patch-chrome_browser_enterprise_connectors_common.cc) = 20dfec71be17dda3041a142a9426d90dbfd06393
+SHA1 (patch-chrome_browser_enterprise_connectors_connectors__service.cc) = 9ae131d617454466a1fd13d3e179fdc3aa73b830
+SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc) = 79f62222e5c2029e7a2d4052493bdca678219fb7
+SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc) = 4c1e4ffb25ee4f9e6697bdee58f925d27baeacac
+SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc) = 32fa318171b949d9c82746655a39d40d2c2aa2c5
+SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc) = 0eabf61860fc88e3960e2e2ffb26f5c4b0c7d4b7
+SHA1 (patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc) = 5560e789d6e69412ac7d65567dff11e4d74cc245
+SHA1 (patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc) = 2c90448745d56a360b1bfecfbbba315c095a176f
+SHA1 (patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc) = 6f7ecfa5adfdb3f9e91a530d3f328cf05f8ae3e4
+SHA1 (patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc) = d01404f572a792239ff06559bf4bb6e49030745d
+SHA1 (patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h) = 5db194d87910b6482daedda567fab5c04a88ee36
+SHA1 (patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc) = 65c72f6af74dca63c52dbd088db31603fe6a60db
+SHA1 (patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc) = 99c92979a2c0928bf73a737c2b4ec0d2fc8da75b
+SHA1 (patch-chrome_browser_enterprise_signals_context__info__fetcher.cc) = 32afe178dc502090793dd6592baea3a0f132c241
+SHA1 (patch-chrome_browser_enterprise_signals_device__info__fetcher.cc) = bfde64d4f62e766ab0429be78cd03bf98f75adab
+SHA1 (patch-chrome_browser_enterprise_signin_enterprise__signin__service.h) = 14a1f0a2d9426fa790039d6cdc8587b7f575c61b
+SHA1 (patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc) = 73947caa78f53fe85588494e221c6b4921eba633
+SHA1 (patch-chrome_browser_enterprise_util_managed__browser__utils.cc) = 349a9ccec4d9a489736e0b71a735acd182d88a4f
+SHA1 (patch-chrome_browser_extensions_BUILD.gn) = ca404c1fc795d8a30002bb79c3000eba7b8570dc
+SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc) = ff24bf0736abfbde7b0eb98d238ceacec834e9d3
+SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc) = d01f9cafec8f6f01db319b0a48455f35555bfd02
+SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h) = fde612db57c9d0ae1a8351a22689d17c1a73fcef
+SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc) = 960b0c516a7b6510cae524a920844ecdfd598084
+SHA1 (patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h) = 0ae86a0f63b9606aa158582f3f3a07c46369ebb7
+SHA1 (patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc) = dd745ea34ff8b48a70d3ecda455fa8081332636b
+SHA1 (patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc) = d3e1f864440a9e304b371433b947bde1290df546
+SHA1 (patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc) = 783b7eb1679e83e09a5213c81f3e46846e7cfcb7
+SHA1 (patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc) = bfc6025aa2f62a56975aa5a3455d3db0a1bb4f5d
+SHA1 (patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc) = fcfbf02aa4fff013e37510488bb40c091052ec74
+SHA1 (patch-chrome_browser_extensions_api_settings__private_prefs__util.cc) = 569f93312f51dad186e725e0d66710eb14e11090
+SHA1 (patch-chrome_browser_extensions_api_tabs_tabs__api.cc) = 74942c01a2b1addac898262d7f873741d5bf1355
+SHA1 (patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc) = 6f6cf81bd203b52cf146bb21fd6591fe159e1fcf
+SHA1 (patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc) = 52b0afe787c5c7a01fccc85edd0635bc7f907f4e
+SHA1 (patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc) = 427634e40dcdfad78146eee86635691bcc3bd72c
+SHA1 (patch-chrome_browser_extensions_external__provider__impl.cc) = 193bd548f2e56b8ff8fb869dc1104ffd0e381060
+SHA1 (patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc) = 33ce7629d0c5219ce4ad39481566915adf4fec66
+SHA1 (patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc) = b3875110133a3dbba251b701c25f28aefd1b99d9
+SHA1 (patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc) = 6b350eb1e68e2ac0bf5944069b8380ff53aa413b
+SHA1 (patch-chrome_browser_first__run_first__run__dialog.h) = 10d49fd49eaddd5ae5f44318a6dee8192c566ef3
+SHA1 (patch-chrome_browser_first__run_first__run__internal.h) = b35b9d1c7d587f3000c4235c0c6aba138333206f
+SHA1 (patch-chrome_browser_flag__descriptions.cc) = 5ed0d551a7fb2e3053635ad6126cb423f0b07818
+SHA1 (patch-chrome_browser_flag__descriptions.h) = ed7e80801bd81552b7477eb90da15b5733787d33
+SHA1 (patch-chrome_browser_gcm_gcm__profile__service__factory.cc) = 2afdac8d8f0a3022159c12897ad59548b0404ec1
+SHA1 (patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc) = bfaad1d6cbd113fb7b995a8a7322eae19fef1aa2
+SHA1 (patch-chrome_browser_global__features.cc) = c50e13aa4354c9f54cfb1371769fe0b3a8a86e7a
+SHA1 (patch-chrome_browser_global__features.h) = 3d0e444859c77964c28fb9d9a1a8f7a155dc092e
+SHA1 (patch-chrome_browser_headless_headless__mode__util.cc) = 9c2c19b9646213cf54706a3f61d03585509adb7d
+SHA1 (patch-chrome_browser_intranet__redirect__detector.h) = c2372d1dd6d312cc6436787536a614c7df43a31c
+SHA1 (patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc) = a91a2c985b5c04e77ac7b6d242fdebd56d20461a
+SHA1 (patch-chrome_browser_media__galleries_media__file__system__registry.cc) = 346fea8b4208ebb8dbc4af43b6142aeb7f858b43
+SHA1 (patch-chrome_browser_media_audio__service__util.cc) = 3577e1d9e3a9da26fccf8b9ae405b79e8aa238f1
+SHA1 (patch-chrome_browser_media_router_discovery_BUILD.gn) = aad773e3854d88a664f733f6f3515d29c1e56fd0
+SHA1 (patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc) = ac0c1333a733cf57d23b48d8a65856c813f1cb74
+SHA1 (patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc) = 2f1c2b323cc01874b2464a67c46977c192b169af
+SHA1 (patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc) = ef1514ec44dde074771eacd838c1af23545ba5cc
+SHA1 (patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h) = 15593cad4f3295a1bac4ba57ac5a2e4a8804a554
+SHA1 (patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc) = c37e1198a86fa069220d8e1b372490f3cdf1d40d
+SHA1 (patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc) = 5030e4947044c09ff99de9b60231ce08f36bc376
+SHA1 (patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc) = 48ae0a06046b213991797274678c2b145587a62f
+SHA1 (patch-chrome_browser_media_webrtc_webrtc__logging__controller.h) = e2e331651d2fdcd053d6ded4b74fad0974263eea
+SHA1 (patch-chrome_browser_memory__details.cc) = b6a37a8062fc3b19f6fbb1203d15ec999fe1fb10
+SHA1 (patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc) = b9d6f56316c81b1d69e4b8d7719c9c76c60201cf
+SHA1 (patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h) = 1a2ae8b3edf911210f2124f5c09fb3fe3b3d6221
+SHA1 (patch-chrome_browser_metrics_chrome__metrics__service__client.cc) = 58a9902564d5047c60aac09e3453d358509b10ad
+SHA1 (patch-chrome_browser_metrics_perf_cpu__identity.cc) = f9a3a8b58a183f0700b95e3a591206736eecfb64
+SHA1 (patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc) = 20f9d25552d80f1c519120689c54aef70d5fcd26
+SHA1 (patch-chrome_browser_metrics_power_process__monitor.cc) = 43aabac22e8c2d4a607a4527b633d17ab2af9106
+SHA1 (patch-chrome_browser_metrics_power_process__monitor.h) = 0ae90e714a05f758b334e1dbd7bc385a238e9b8f
+SHA1 (patch-chrome_browser_net_profile__network__context__service.cc) = af01bf0c07f511ab6295f39ddecd91f5a113c619
+SHA1 (patch-chrome_browser_net_profile__network__context__service__factory.cc) = a33f8e69765b608eea0e0400e65ee1906c98d58c
+SHA1 (patch-chrome_browser_net_system__network__context__manager.cc) = bbbb0dd0d2418b8c93399dde700f271ba4d70858
+SHA1 (patch-chrome_browser_net_system__network__context__manager.h) = dfd5440606686e3e26b54e39626a527f0e133b14
+SHA1 (patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc) = d929d869a5cfcf5d85b7943e5d46856682d11d0c
+SHA1 (patch-chrome_browser_new__tab__page_new__tab__page__util.cc) = a2150c3b9aa23b06c306625ad10a76adc368a7e3
+SHA1 (patch-chrome_browser_notifications_notification__display__service__impl.cc) = 7ee1a78218695c2250b42090b0bab65b9adeba48
+SHA1 (patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc) = 796a78ce55b0b782e22ce7583a28abe32a364f64
+SHA1 (patch-chrome_browser_password__manager_chrome__password__manager__client.cc) = 9dd6abac21141e12a6a2b3de806d65123eb2ec07
+SHA1 (patch-chrome_browser_password__manager_password__reuse__manager__factory.cc) = 42095976b95f571aceab53cedefcf2181b03b99e
+SHA1 (patch-chrome_browser_platform__util__linux.cc) = 5a26728d50d040344c28cf7b64507174f1df8a80
+SHA1 (patch-chrome_browser_policy_browser__signin__policy__handler.cc) = 2ee4f5c73b7b8e528069bd1f30dd06b27cc632be
+SHA1 (patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc) = 427dd36c9acd806119fbdd0745be88d681ba3949
+SHA1 (patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc) = c15cb94a2fc9cb6c69bb4b502c26241381ceb224
+SHA1 (patch-chrome_browser_policy_device__management__service__configuration.cc) = 40383db7aa4da19d7d1da4a4bd676677932f09ea
+SHA1 (patch-chrome_browser_policy_policy__value__and__status__aggregator.cc) = f066a25ae696ccd0245daefa85a653f89100c0f5
+SHA1 (patch-chrome_browser_prefs_browser__prefs.cc) = 25d5323fc09487964b426986c3dbe028ee9cb696
+SHA1 (patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc) = 830af07a9d3ec2b1da47383f310d2ffc76406054
+SHA1 (patch-chrome_browser_printing_print__backend__service__manager.cc) = 20f6b15263a0697f7cb0ae32f5afe8f9b7215094
+SHA1 (patch-chrome_browser_printing_printer__query.cc) = 04a5da3de6a130953de99b6b621ac732ce8495f0
+SHA1 (patch-chrome_browser_process__singleton__posix.cc) = 3e4150d7037b4db4d058cebe054f4861d27e189c
+SHA1 (patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc) = 8fbd3581121b99b4559de96ad1647d03d15533c1
+SHA1 (patch-chrome_browser_profiles_profile__impl.cc) = 131148363f2a6abf0fb83649c1bbfdaabca1974a
+SHA1 (patch-chrome_browser_profiles_profiles__state.cc) = f8f879871e353d1c23da9a015ae09ff04f611b36
+SHA1 (patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc) = 05491ae68c7a9b03dcc315781fd6d7d321ac80c5
+SHA1 (patch-chrome_browser_renderer__preferences__util.cc) = 25f11482768bf1a542a20ea15b5d15bc57448887
+SHA1 (patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css) = c282c96b8cb8c9580ed77cc3be513fd3ac723de5
+SHA1 (patch-chrome_browser_resources_signin_signin__shared.css) = 4ff5410116988da8948761d5df8e0f66918996cd
+SHA1 (patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc) = 6dcb14c5de6712b0649ce778c0d02520b93566d9
+SHA1 (patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc) = b5f7a24b56a310673afe735769f532fd1ad44c66
+SHA1 (patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc) = ae61d1758d9bccb34bf6cd6751f36d259e54bed9
+SHA1 (patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc) = da2b9ec8c5db0d0e37055ef1f1e48f082a993ba8
+SHA1 (patch-chrome_browser_screen__ai_screen__ai__install__state.cc) = 18d364f574d8019459a89477edb686e19630bd76
+SHA1 (patch-chrome_browser_screen__ai_screen__ai__service__router.cc) = 9a1f0e9c2543a8614e74e452a41507acc7793735
+SHA1 (patch-chrome_browser_sessions_session__restore.cc) = 75fc4c77588ceac2c860c58ad9714f06eae01d2f
+SHA1 (patch-chrome_browser_sharing_sharing__handler__registry__impl.cc) = a4be9fc2226e00899d5f43b286b778279168dc45
+SHA1 (patch-chrome_browser_shortcuts_icon__badging.cc) = 260242714eb6d92f964f4f3820b81bbc56389bf8
+SHA1 (patch-chrome_browser_signin_accounts__policy__manager.cc) = 15b6615b8610d584ef2133e764194434f92e61d7
+SHA1 (patch-chrome_browser_signin_accounts__policy__manager.h) = a33c2269873690a450614688bac600094f1a708b
+SHA1 (patch-chrome_browser_signin_signin__util.cc) = a740a40dd9ef58def8f0d620bfa59b3cc41c729e
+SHA1 (patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc) = d5feb1977a76edde917d2af75ce4722ecefce552
+SHA1 (patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc) = d96a527a8097b66409cf803e3d80cd077862b017
+SHA1 (patch-chrome_browser_supervised__user_supervised__user__browser__utils.h) = 9851132eb215db91931135a326fe81563230d2e6
+SHA1 (patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc) = 876fc186b2d248281dde271b3727bda6d3135178
+SHA1 (patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc) = aabb488a38cb56b199d592d8a754856f76ad46f2
+SHA1 (patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h) = df4d3e0bc9a483a5e956d7ce37dd983ae2d09024
+SHA1 (patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc) = bf72895584e5aacfe7d4ed24bd4d031fea23f92d
+SHA1 (patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc) = 88f194137638a90f38bdd4841b194b268f5a8be3
+SHA1 (patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc) = 2748f727e334bdf277207a351c600d477ebd00e0
+SHA1 (patch-chrome_browser_sync_chrome__sync__controller__builder.cc) = 5e63a3ad3b78c5adda2514b1c8dc79e78bbb032d
+SHA1 (patch-chrome_browser_sync_device__info__sync__client__impl.cc) = 6703fcaf3fe96cb8199c7a4ca7b461658624224f
+SHA1 (patch-chrome_browser_sync_sync__service__factory.cc) = 5f70f0032b97f68a3eebd17ea0ef99a6fd505211
+SHA1 (patch-chrome_browser_task__manager_sampling_task__group.cc) = c7fc07df85a0acb605cf21182d4af30f690ae250
+SHA1 (patch-chrome_browser_task__manager_sampling_task__group.h) = c3894253eed2715303e0c45ea3c4d09ee5dcf4b1
+SHA1 (patch-chrome_browser_task__manager_sampling_task__group__sampler.cc) = 00adb2dba9ad1bfd4e4c77fbf8574dd913cfc104
+SHA1 (patch-chrome_browser_task__manager_sampling_task__group__sampler.h) = 5e1eef0d7cdfa109a4900f35ada764ff9106c50a
+SHA1 (patch-chrome_browser_task__manager_sampling_task__manager__impl.cc) = 11ec8b535ba8302b7f7b08732baf2e0eafb7abce
+SHA1 (patch-chrome_browser_task__manager_task__manager__observer.h) = 6ecfe4bde1339de88eb56be8b51ccb3cb957a7ab
+SHA1 (patch-chrome_browser_themes_theme__helper.cc) = cee1d4cd79a5c493a97357ba9d99e5f0a7dac1ac
+SHA1 (patch-chrome_browser_themes_theme__service.cc) = c026db645ab237bc4c9d1a292171588b116cab64
+SHA1 (patch-chrome_browser_themes_theme__service__aura__linux.cc) = 966cce4e654c1aa0fba27083646419e0bfaee0c5
+SHA1 (patch-chrome_browser_themes_theme__service__factory.cc) = 7b685642f3ddadb6ac12e0c8632c4011ece6f763
+SHA1 (patch-chrome_browser_ui_actions_chrome__action__id.h) = 9772e7916971f3f92dd1f39f4b783f1d007dd76c
+SHA1 (patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc) = 4ddb4a27434cc0ac3c3b7f7794498c4d8221ebac
+SHA1 (patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h) = 4a87aefe07db738019625926d39ebb665c3fe343
+SHA1 (patch-chrome_browser_ui_browser.h) = 4af609ecafe246fd45d0889596fd10b4ed221fd0
+SHA1 (patch-chrome_browser_ui_browser__command__controller.cc) = 6ccb75e5dba96f7858191207a0809f3618433df4
+SHA1 (patch-chrome_browser_ui_browser__commands.cc) = d06b45a80500462ecee82a5f4faff08f7e71a65e
+SHA1 (patch-chrome_browser_ui_browser__ui__prefs.cc) = 26170f8faa7ebd38744dfce3ac66369b46764a17
+SHA1 (patch-chrome_browser_ui_browser__view__prefs.cc) = 8e19f3f8f51ea7bcf63911c38023e1f5cba8e520
+SHA1 (patch-chrome_browser_ui_chrome__pages.cc) = b85bc27a175ef594ee35b78f9892a6ba12ce914a
+SHA1 (patch-chrome_browser_ui_chrome__pages.h) = 315b505ded5cfd3c67d8f3875e0a055b8f41e8b1
+SHA1 (patch-chrome_browser_ui_color_native__chrome__color__mixer.cc) = a592f3d6ba896c8f48c904ccd2b24d6409a2c944
+SHA1 (patch-chrome_browser_ui_managed__ui.cc) = 585497cb820e8f5de7f5ab3252677e768729bdcd
+SHA1 (patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc) = 0989551f082ec41ae0d3929599aae3661616cd43
+SHA1 (patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc) = 07fe3102e04d05d6b021685f7883c40d372f9a90
+SHA1 (patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc) = 6bcc822bbe85baade4d675a5f22503430f1c2b23
+SHA1 (patch-chrome_browser_ui_prefs_prefs__tab__helper.cc) = ba2f6f4b90c0e34640eb489013c6c14184139e38
+SHA1 (patch-chrome_browser_ui_sad__tab.cc) = ce0c64e717dfa63c63cdc021dba3d01d41aacdd2
+SHA1 (patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h) = 1e967a311e5c9c806acc38feb9d42ef8971cea25
+SHA1 (patch-chrome_browser_ui_signin_signin__view__controller.cc) = 47db9f7f7b308b6351976a2b26c380a2fd03fb23
+SHA1 (patch-chrome_browser_ui_signin_signin__view__controller__delegate.h) = 6d16433326be9d6f0ae2f0e49b12499445a13a24
+SHA1 (patch-chrome_browser_ui_startup_bad__flags__prompt.cc) = c7274e972260cb458e561fc1a79c51d7f2f963a9
+SHA1 (patch-chrome_browser_ui_startup_startup__browser__creator.cc) = c154cc5b51b8155cf5ddc1bf8103d9e37e9aa2f4
+SHA1 (patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc) = 905769d9252c89789d597a32379c7ea6e21ed5a0
+SHA1 (patch-chrome_browser_ui_startup_startup__tab__provider.cc) = ff488e01af234cbea7c0e8e99d732eb8512aa853
+SHA1 (patch-chrome_browser_ui_tab__helpers.cc) = 9084b4be6adbd68e2d96ff45e863d2e78ae8b38f
+SHA1 (patch-chrome_browser_ui_tabs_features.cc) = 7bb62bf06074693821318dd352dab170681dd390
+SHA1 (patch-chrome_browser_ui_tabs_tab__dialog__manager.cc) = 3a71ff1b9f29b0c0a5893b1dda62ba71f1dac9f5
+SHA1 (patch-chrome_browser_ui_tabs_tab__strip__prefs.cc) = bc5187409530c519770e648e56babb2aacee9b92
+SHA1 (patch-chrome_browser_ui_task__manager_task__manager__columns.h) = a21d1261ad3bc86154e19466c8e9def9599c8595
+SHA1 (patch-chrome_browser_ui_task__manager_task__manager__table__model.cc) = f325d92822dfc3d13894d206bf2839acda1a29b0
+SHA1 (patch-chrome_browser_ui_test_popup__browsertest.cc) = f8b397c075662d0be043b2a4d03547e3547e09a5
+SHA1 (patch-chrome_browser_ui_test_test__browser__ui.cc) = a55d8d29b15d8f45037b849c40b2f007157465bc
+SHA1 (patch-chrome_browser_ui_ui__features.cc) = 39a75dc183dbed7d4ec20aa031119bb040e1e265
+SHA1 (patch-chrome_browser_ui_ui__features.h) = f298195074b2914d4f653a43dc69d8958559a49b
+SHA1 (patch-chrome_browser_ui_views_accelerator__table.cc) = f987b386b127daf0379f2661fdcfc57c4435488e
+SHA1 (patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc) = a55c5ba84621051f0a4c4539733219bbe1a895d1
+SHA1 (patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc) = abb49816362f9766bf6a1736c3b7e592c47195a0
+SHA1 (patch-chrome_browser_ui_views_chrome__views__delegate.h) = 8233a5e5d2ace8e84b48cd682c3dbb37ab8a1ea0
+SHA1 (patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc) = 44dd7968f61ef01e1c41913d5cce365e80d6ceea
+SHA1 (patch-chrome_browser_ui_views_compose_compose__dialog__view.cc) = 5c4a5da4556ecb052bbd315928e04a3fa6cfa31c
+SHA1 (patch-chrome_browser_ui_views_frame_browser__frame.cc) = 0e5b7a896d4c54a339db5ba30067282098fe816b
+SHA1 (patch-chrome_browser_ui_views_frame_browser__frame.h) = dae9a85816221943a36b4938a3638398f2a707b5
+SHA1 (patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc) = 3549707f629b32567ce9ff42de5dfbac76d7a38d
+SHA1 (patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc) = e8acbc3e1917a487c50a21caa8bf384a4ea9df32
+SHA1 (patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc) = 2ac05d3abdfbef8fdc69d9c7925f6f1c96728094
+SHA1 (patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc) = e5e204f13e7e4f4c8dc579608a0ab15b6e888a36
+SHA1 (patch-chrome_browser_ui_views_frame_browser__view.cc) = 2b65c401918f0cf49a4ab226e890d9ea0192c86d
+SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc) = 28ba630e7c1557a8939528883fbe6696cbd2af41
+SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h) = 9fd3bea63eb086581a6c9e157f45d78385ba7b2e
+SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h) = 53cc661c57b4f362d4e6a2f34a6cf299c3806604
+SHA1 (patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc) = 4ea75d7a945a8c990f2e544621af01dc475b643e
+SHA1 (patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h) = 068a6b160beec495fd4b1020cd20e2b4af083af7
+SHA1 (patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc) = fea0b97a0db62718542fc4efc26979c63e9b7bbf
+SHA1 (patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc) = fcbe5f71e8fa40a4cde1d5599c6222e590e72662
+SHA1 (patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc) = 99990bf6a021261b4bb9508b6a653b84bf9612bf
+SHA1 (patch-chrome_browser_ui_views_hung__renderer__view.cc) = ca80a1853ef8fff3ef5a1062c5a9c5db75a55f5e
+SHA1 (patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc) = 2bd7c1df9ac4133d81221254a69d9d046e33e3a0
+SHA1 (patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc) = 48fdbebd29e10637e088afd82a18d11aa4c480f9
+SHA1 (patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc) = f77d282820eb7b867fafc8d7a2094326ec4684e6
+SHA1 (patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h) = e2cdb2319ee3203e0bfdc20ea1bce23689eceb61
+SHA1 (patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc) = 01f08e9b7f455d2ad1097d5338a676c8d8414c78
+SHA1 (patch-chrome_browser_ui_views_profiles_profile__menu__view.cc) = 61840a28d55023665970170e333c50163b45f7c4
+SHA1 (patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc) = 85de51f3e5873f4fa412e42c319f5dea3f72dee8
+SHA1 (patch-chrome_browser_ui_views_profiles_profile__picker__view.cc) = e7c0aa290e52281857c727848406618b1f08e50a
+SHA1 (patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc) = b76415c6bce977ab79ed3eb57c9cdf755c97c8fa
+SHA1 (patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h) = 8485451a2436764fc88ab30311bd98f54d8d2935
+SHA1 (patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc) = e677896f404625e82cd583d76d510723fa737d7a
+SHA1 (patch-chrome_browser_ui_views_tabs_tab.cc) = 7561d6e345d47053e7d9b06baa031cb1ee3d3aa8
+SHA1 (patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc) = 67acfb503a5a31e53b0a2c6d2e5b5fd6f73b2b5f
+SHA1 (patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc) = 5db01ba5cf771c6c10ed659fb94c18cf667fd24f
+SHA1 (patch-chrome_browser_ui_views_tabs_tab__style__views.cc) = c70eebc769b7ecbae7d1fafc0ba914e1e387bc49
+SHA1 (patch-chrome_browser_ui_views_task__manager__search__bar__view.cc) = f1d2a921216523888abd2284f11a65b12d837886
+SHA1 (patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc) = fc7cc7bbb80fdfa6ef037bee258aae88131e46c1
+SHA1 (patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc) = c42b5640e2fbcb44806440f129d6ec390e01f34b
+SHA1 (patch-chrome_browser_ui_web__applications_web__app__dialogs.h) = 9331d8cba2b4b7259822cedba8b5f94e2f76e868
+SHA1 (patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc) = ca935b899196ab81e90a3f826c155e8e45cfbcda
+SHA1 (patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h) = 9559f11d6955989d1744703cb17512d619aeea20
+SHA1 (patch-chrome_browser_ui_webui_about_about__ui.cc) = 45e2607d41e029a68390f0eb79faf7cd2b1ca398
+SHA1 (patch-chrome_browser_ui_webui_about_about__ui.h) = 07b85dbd158c1c4e5c399001fdc5a9e5d64d9e29
+SHA1 (patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc) = b989ab43984c836329f9fa06701f80d51bd2f014
+SHA1 (patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h) = a8d430a126e856f158e2dfbf8abd0321ae4f4e2c
+SHA1 (patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h) = d842fc3cb724785c4434bd174e8ba45d824cf886
+SHA1 (patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc) = c08c9cf67f6163e1d5756434d0415c50d674afec
+SHA1 (patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc) = 878fe72ad0034ca9833e94ed0952f26bdb1d9ab9
+SHA1 (patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h) = ba8f1d5c2f64fc3984e58ec298becb3b63b1a75c
+SHA1 (patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc) = d8cbbf5033e2e61680b3a73f51ca96f8e00a5b94
+SHA1 (patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc) = 8059c4f43010812640d9e1c9ac54eed354cb57a8
+SHA1 (patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc) = 323eb6d7d8eb0283a3b1ac3505cb897fc5e1b0be
+SHA1 (patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc) = 5ee7e20dbee0ca9090fa7f2880084da9ff4e2ec8
+SHA1 (patch-chrome_browser_ui_webui_management_management__ui.cc) = 0bcf9b5dc5e84454ca40002beacc0eb38aa057fe
+SHA1 (patch-chrome_browser_ui_webui_management_management__ui__constants.cc) = ae77ccfc9ca5b0e1a3a0f90e567913979ffaa8df
+SHA1 (patch-chrome_browser_ui_webui_management_management__ui__constants.h) = 5058471d69847fb58f28a6fca6500310b592a80f
+SHA1 (patch-chrome_browser_ui_webui_management_management__ui__handler.cc) = e0018d135725565b50ed3eab1946ade9f4dc07bb
+SHA1 (patch-chrome_browser_ui_webui_management_management__ui__handler.h) = c9ca0c78f8b58695e6d55b5f6c291b1960e9180f
+SHA1 (patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc) = 8a3a5b9bbe4e346aeb996f4bdd2a51b5d2baa239
+SHA1 (patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc) = 0b56390c40761b1df44d8fb99c3175cf1a6c45db
+SHA1 (patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc) = 55f1f6c3670f8afc33eb8e0d302ad77cd57b3f30
+SHA1 (patch-chrome_browser_ui_webui_settings_appearance__handler.cc) = 6b0fb60944fcfcdc84ce155bdd7cf5aac6593ff7
+SHA1 (patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc) = 657ba72045dc899ed5d634a7335b271a1026ac1b
+SHA1 (patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc) = 03e65663e69ce9f2bfc3868d13e722810163cdef
+SHA1 (patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc) = 9d3d4491bc9bd82e7b91cd7f249438ac00d27d03
+SHA1 (patch-chrome_browser_ui_window__sizer_window__sizer.cc) = d44a6834ec688f81c19189d8813749c4773d787c
+SHA1 (patch-chrome_browser_upgrade__detector_version__history__client.cc) = c77069327a10e1241aa71bf9a00843e3ac57703f
+SHA1 (patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc) = 4d8761894b284099a530cebdf5bb3a852a837a34
+SHA1 (patch-chrome_browser_web__applications_commands_launch__web__app__command.cc) = 33cc87f910bd50d414c214337202531d56ce2b7c
+SHA1 (patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc) = 5867f8ad580be690541d7e1736a5a17742a59c5b
+SHA1 (patch-chrome_browser_web__applications_extension__status__utils.h) = 03638fa357985929cf0401d0c24a1f7592883b08
+SHA1 (patch-chrome_browser_web__applications_extensions_extension__status__utils.cc) = 4d326dcb006512e759e5f334dfe6fedd49ec7227
+SHA1 (patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc) = 2ea11d35222f91b1a71162742160cd6b1a88e160
+SHA1 (patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h) = 62aa831347bf1455c12bd195839aa21a9f401c2c
+SHA1 (patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc) = 24b5c197a8a2d46faee96df9bf3546a05d241813
+SHA1 (patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc) = eae0ff190894dc590da68e2ad866f85182f74cc7
+SHA1 (patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h) = a121290e563a87a11c99951a71a10026246cfe3c
+SHA1 (patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc) = 443ac5b7de3ce4aa1a15f99be589da2678bbfcd3
+SHA1 (patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h) = c027b68a4b064a2bdb9d3b7f90c9013957970323
+SHA1 (patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc) = 958f918454ab183197b67e5d2a8351defdfcdff5
+SHA1 (patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc) = 15a3c7a42dce1ed02cfcecbe6e80700959e0b1e5
+SHA1 (patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h) = 9748b1f625f3fff5ad5031c1c44aa5a44d43f878
+SHA1 (patch-chrome_browser_web__applications_web__app__helpers.cc) = 8a44f4b06e29d0fa2fdd6b06e8577cefa9e54734
+SHA1 (patch-chrome_browser_web__applications_web__app__install__info.h) = 8ab3552ac4d20afe0637427d6feb5b150854f7eb
+SHA1 (patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc) = bc5a9057a793160eea58b174a33f580d31568d94
+SHA1 (patch-chrome_browser_webauthn_enclave__manager.cc) = 5d1fd9b1d3eeb0266880c5efcbc1e500ce8c5ae8
+SHA1 (patch-chrome_browser_webauthn_gpm__user__verification__policy.cc) = 7ff03790957637518ba11ee8ecdb79c933d4e88d
+SHA1 (patch-chrome_browser_webauthn_password__credential__controller.cc) = bc929b204dbd6e2d2ed30a18594ce5e1cc5f2c12
+SHA1 (patch-chrome_browser_webauthn_unexportable__key__utils.cc) = f53397757af88246323d0efeb17e4fe4b9bfadf3
+SHA1 (patch-chrome_common_channel__info.h) = 3569e3e2e61fe0c31b75216188fceb4457933562
+SHA1 (patch-chrome_common_channel__info__posix.cc) = a14a84894bd693b8c9669f51fc7374a196727ce9
+SHA1 (patch-chrome_common_chrome__features.cc) = 0321a8bd64ef1807c860a54d01d563f2a99e45ec
+SHA1 (patch-chrome_common_chrome__features.h) = 97a8e75764fcc3009c10d1e5c0141fbef5527602
+SHA1 (patch-chrome_common_chrome__paths.cc) = a5c68c8277bcd725a0da68a31605c7f8be7d441e
+SHA1 (patch-chrome_common_chrome__paths.h) = 30550fc8cf48584a41e4f6e403ed1fc756e722d1
+SHA1 (patch-chrome_common_chrome__paths__internal.h) = 584e6991d9d7157653ceb520a6968df2d22b6383
+SHA1 (patch-chrome_common_chrome__switches.cc) = a5a882c6b70b90965860e8bb2c89f76d2091c3de
+SHA1 (patch-chrome_common_chrome__switches.h) = 08017f7d8666bb05a1e1939ba2f48822a604cf18
+SHA1 (patch-chrome_common_crash__keys.cc) = 81cf436665afd4e042e26109e243497b55265d79
+SHA1 (patch-chrome_common_extensions_extension__constants.cc) = f842f5d80cab27f0cc2d44609aebfdedfd932a73
+SHA1 (patch-chrome_common_extensions_extension__constants.h) = 793fc8bb6babcab1f3aa5190d17ac26d56b4b731
+SHA1 (patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc) = 231a259680a8476c58d5fae6e56d9c15ae6649fd
+SHA1 (patch-chrome_common_media_cdm__host__file__path.cc) = da237e2766d219b64024c892aec83348c9190fc2
+SHA1 (patch-chrome_common_media_cdm__registration.cc) = be439ab64fdc698117fc30f914398f59bfa20ec8
+SHA1 (patch-chrome_common_media_cdm__registration.h) = 96f58fd2e13639acb4c5edbdb3fbeee96d419cad
+SHA1 (patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h) = ca3f4f82afeb48cf4956024b1135236ab54de982
+SHA1 (patch-chrome_common_pref__names.h) = 7157726534d96dfb4a238cf3b92e2908f0ac5858
+SHA1 (patch-chrome_common_url__constants.h) = 548ba832cff8463e883ec46797a370a268b6ab10
+SHA1 (patch-chrome_common_webui__url__constants.cc) = f28344909ae8369a0bdf802d6c4a1a09ef7dbb12
+SHA1 (patch-chrome_common_webui__url__constants.h) = 8b314adbb501d76ff70a73469e1c627db679f03a
+SHA1 (patch-chrome_enterprise__companion_enterprise__companion__client.cc) = b6f5d51628975d23f3f60b3b716034ed18552f69
+SHA1 (patch-chrome_enterprise__companion_event__logger.cc) = 5eabd89a8b19a5d73ac494ec968fdc17d3cc1ece
+SHA1 (patch-chrome_enterprise__companion_lock.cc) = 4e4e5c608157f587e4ea719d44151cf36b9c3ab4
+SHA1 (patch-chrome_services_printing_print__backend__service__impl.cc) = c4c0b7d80ce0ac64e725d2840440205edd8cfdb1
+SHA1 (patch-chrome_services_speech_audio__source__fetcher__impl.cc) = e8f452f803050dcea9dd22328184f34723183adb
+SHA1 (patch-chrome_test_base_scoped__channel__override__posix.cc) = fcc6a039aa9efffe036df443dd146b10395550cc
+SHA1 (patch-chrome_test_chromedriver_chrome__launcher.cc) = 47f8404b9412f1f9d508ff682b5205a9df243157
+SHA1 (patch-chrome_test_chromedriver_chrome_chrome__finder.cc) = 6cf6c614acf4ece57310d93430a9b06c150d2386
+SHA1 (patch-chrome_test_chromedriver_key__converter__unittest.cc) = 6a417c058940e1d2d2d71380f227f5cb45b4bbf2
+SHA1 (patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc) = 2fd466301915ae0c9c16c601c2d9a4292331b474
+SHA1 (patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc) = 591f96622bb6b4679654c2cf17b1b37999ce06f5
+SHA1 (patch-chrome_updater_app_app__uninstall.cc) = 85782b1c2d313a4b7edc4b58b8042653ebb668fe
+SHA1 (patch-chrome_updater_configurator.cc) = db17499a58c4d151a7fe95c814848d8ee02d25cf
+SHA1 (patch-chrome_updater_lock.cc) = 6eb285b3c1b56f5ce590adbcddc12ef3da677b80
+SHA1 (patch-chrome_updater_util_posix__util.cc) = 7e452978aa216ba62444a78cc41b913ad08a29b9
+SHA1 (patch-chrome_utility_services.cc) = 44db7620c294105cdcf77a92906a85e8628b29c1
+SHA1 (patch-chromecast_browser_cast__browser__main__parts.cc) = c55dc533141434cc255e3950eee45db132d17d3a
+SHA1 (patch-chromecast_browser_cast__content__browser__client.cc) = 25645c17dfa618822ce201efeea75184e57faef5
+SHA1 (patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc) = 05a97e89bf6567c8f3c90b1b37c522d2728d5083
+SHA1 (patch-chromecast_media_base_default__monotonic__clock.cc) = 0bc801915fb3d7ca40e6a006681e2104a859b08f
+SHA1 (patch-components_BUILD.gn) = 2fc875cf1758a32a76eaa9ce67d7aee163f0549b
+SHA1 (patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc) = 5f0b4b6bdccd10f733947fa69da61d0775085bf9
+SHA1 (patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h) = cc9252125449e32628a142d6e90e7ab73db098af
+SHA1 (patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc) = e0dbee47ecdc20774d04c34780c020f26266686e
+SHA1 (patch-components_autofill_core_browser_payments_bnpl__manager.cc) = 8f7f94cb6e2da347f3443eb1957cbfba1de50652
+SHA1 (patch-components_autofill_core_common_autofill__payments__features.cc) = 4ec7a8a860e8dbde64ccae05a0a3378d3578a868
+SHA1 (patch-components_autofill_core_common_autofill__prefs.cc) = d67aa1e4c769f606a1f2ebafb71304b5a5595e1b
+SHA1 (patch-components_autofill_core_common_autofill__prefs.h) = e6ea2a7b3ad14ec22d53f7128b65fedb3fbd816a
+SHA1 (patch-components_commerce_core_commerce__feature__list.cc) = c41915b173f9b954ba5302fbca848000d80ddc32
+SHA1 (patch-components_constrained__window_constrained__window__views.cc) = a2af18227709832353929a933f56210b0054d4b1
+SHA1 (patch-components_content__settings_core_browser_website__settings__registry.cc) = c45d539f32ff64f416989c0dee8899df834267fc
+SHA1 (patch-components_cookie__config_cookie__store__util.cc) = 54f33ca74a0ea5096fc5f9856108c1d2135be769
+SHA1 (patch-components_crash_core_app_BUILD.gn) = 036a1dddfd1765a8fc0e59933a525c562c857545
+SHA1 (patch-components_crash_core_app_chrome__crashpad__handler.cc) = 42e1b660064461d08b8c2e4588305e0eddc45ddf
+SHA1 (patch-components_crash_core_app_crashpad__handler__main.cc) = 720818258fea9e04740b7e4800d2862cd2e48949
+SHA1 (patch-components_crash_core_browser_crash__upload__list__crashpad.cc) = d16c7934b34de74fbba67439e86a6c4c8ed5fcb1
+SHA1 (patch-components_crash_core_common_BUILD.gn) = 0bfaf1bc23511a8a556b385a246555914b79fa4b
+SHA1 (patch-components_device__signals_core_browser_browser__utils.h) = f2d13e95413643d12d54159d91a15d8c6dc9cae7
+SHA1 (patch-components_device__signals_core_browser_mock__signals__aggregator.h) = 03f8ed4f739ffad818a27f54776ea41df868fa6d
+SHA1 (patch-components_device__signals_core_browser_signals__aggregator.h) = 8273807bdf853775ef2848fcf27a6cbf30c74eab
+SHA1 (patch-components_device__signals_core_browser_signals__aggregator__impl.cc) = 628d3a6ae3ddcd02736c1f6dc72e27186bdd618f
+SHA1 (patch-components_device__signals_core_browser_signals__aggregator__impl.h) = 84f92194fe2f6e6a5a38d62d34e4edf21bd7195d
+SHA1 (patch-components_device__signals_core_browser_user__permission__service.h) = 3b02d32fcf081da88ce67f3374c23b76ec40748e
+SHA1 (patch-components_device__signals_core_browser_user__permission__service__impl.cc) = c8ed742d22e36c80600d422c376d9799c3cc7313
+SHA1 (patch-components_device__signals_core_browser_user__permission__service__impl.h) = db996035f373aa784dc9128609032d28e882e72c
+SHA1 (patch-components_device__signals_core_common_linux_platform__utils__linux.cc) = b973b25d93bd3ebc4aa092655804d1480fd90d4e
+SHA1 (patch-components_device__signals_core_common_signals__features.cc) = 3b6defde41686dbb91cd10f1d651b660b0d3fb66
+SHA1 (patch-components_device__signals_core_common_signals__features.h) = 8e84d702c45142b7c4e072bb6548c86dcd000d39
+SHA1 (patch-components_device__signals_core_system__signals_platform__delegate.cc) = 7b004faaf218fc83619c70c97d97c9d7303f3177
+SHA1 (patch-components_device__signals_test_signals__contract.cc) = 9b5bcda73787883d94ab5e614aa4d94860503ddb
+SHA1 (patch-components_discardable__memory_service_discardable__shared__memory__manager.cc) = 044c6f1ba4b1ebd12d55e3e389339fdda53e1b03
+SHA1 (patch-components_embedder__support_user__agent__utils.cc) = 2e46d494d05f9ccd8ed340383f8d95971141ee44
+SHA1 (patch-components_embedder__support_user__agent__utils__unittest.cc) = 369e526f7a3f4c243967c6441e71070f5f2c47a4
+SHA1 (patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc) = a5380aae2de8713551c0ed4fdc186ce38f7a5486
+SHA1 (patch-components_enterprise_watermarking_watermark.cc) = 207e5e6bc541389922bdcbd4b423986a4197240b
+SHA1 (patch-components_error__page_common_localized__error.cc) = fe3f8c1b88f119c16ce80fbca6a20f8d2d301b11
+SHA1 (patch-components_eye__dropper_eye__dropper__view.cc) = eb91b3040ffeeeeda71dc5d9c390e6344445359e
+SHA1 (patch-components_feature__engagement_public_event__constants.cc) = 7a0f4d6e06a7c211b68d61db1853b49bcafa1324
+SHA1 (patch-components_feature__engagement_public_event__constants.h) = 8e12f5a1f032b3d92d4ab99628cc51a823113f33
+SHA1 (patch-components_feature__engagement_public_feature__configurations.cc) = 73435812c40a9b38b4b7fe3e34b8c557653595ed
+SHA1 (patch-components_feature__engagement_public_feature__constants.cc) = 8b83efba2751864a10172d39600c8e7d83e084e0
+SHA1 (patch-components_feature__engagement_public_feature__constants.h) = 46c3edd83bf509ad7b18788aeed5aca134c5c75d
+SHA1 (patch-components_feature__engagement_public_feature__list.cc) = 871a97b47c6bb7a68f330d2ec3ca9318e1c95b68
+SHA1 (patch-components_feature__engagement_public_feature__list.h) = dd5e66a54706897abbb2a091f9cb1342897eb6e2
+SHA1 (patch-components_feed_core_proto_v2_wire_version.proto) = ffd5215b74132605dec746567122036133797ceb
+SHA1 (patch-components_feed_core_v2_feed__network__impl__unittest.cc) = 2e1c53520d7ab7ee2a257ea569984f28e5924fb7
+SHA1 (patch-components_feed_core_v2_proto__util.cc) = 006b01f689f0c703e71ba82db51226248b01fb14
+SHA1 (patch-components_feed_core_v2_proto__util__unittest.cc) = 39e563f7e92909ab70af466569a1de0e1b6b6bc7
+SHA1 (patch-components_feed_core_v2_test_proto__printer.cc) = a7e756209a910f8b0714886913e83f71573f4fdc
+SHA1 (patch-components_gcm__driver_gcm__desktop__utils.cc) = 9377a84e338939570bab217b8e7723711e373bfc
+SHA1 (patch-components_gwp__asan_BUILD.gn) = 56f728b82c18c39d403757e6b81490f633865356
+SHA1 (patch-components_gwp__asan_buildflags_buildflags.gni) = 07bae982c1c4273768350eec4aac0b0c219fffc5
+SHA1 (patch-components_gwp__asan_client_guarded__page__allocator__posix.cc) = fac860323de2679a9f766733fde6532be2f636a3
+SHA1 (patch-components_gwp__asan_client_gwp__asan.cc) = 24829c7ccfe7a373f28cd9a44779d7cc3ba6836f
+SHA1 (patch-components_gwp__asan_client_gwp__asan__features.cc) = 65acb6860d612f8495e98f420b4f7f8947138207
+SHA1 (patch-components_gwp__asan_crash__handler_crash__analyzer.cc) = 20cff27d42c945b91e32c9bc969e7d865d279f94
+SHA1 (patch-components_live__caption_caption__util.cc) = c80b9751efdfc1fbd97fba73e958c3f2a0409cd5
+SHA1 (patch-components_live__caption_caption__util.h) = a8af5217cb5d7cadddbe80b0c066794acfb2cffe
+SHA1 (patch-components_media__router_common_media__source.cc) = f7fd2dc32725c84db4332a0ae55fcd30434f7fe2
+SHA1 (patch-components_media__router_common_providers_cast_channel_cast__message__util.cc) = fec2bf981e08d221b3f07139a707e1500b959e32
+SHA1 (patch-components_media__router_common_providers_cast_channel_enum__table.h) = 35544dbba0e7027eeda86272621a02d117f0c61a
+SHA1 (patch-components_metrics_drive__metrics__provider.cc) = 273370e99584da5121205d822162233ede5020f4
+SHA1 (patch-components_metrics_dwa_dwa__service.cc) = 1b75bfd95a02423225e17dddba48b042cf0064b7
+SHA1 (patch-components_metrics_metrics__log.cc) = 8b0f130909a0298517ab06969623e4facfc89786
+SHA1 (patch-components_metrics_motherboard.cc) = 07965aeb47f740fe556fb8d8e6f42e1ee698e8a9
+SHA1 (patch-components_named__mojo__ipc__server_connection__info.h) = 2d3a66c84e24ef4458a7b38b1953ab628d9e1d0a
+SHA1 (patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc) = e8b0464b6235752fffbd3b77d35fd940aab79bc6
+SHA1 (patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc) = 9e823a68586bcf0547d36cc528810981407952aa
+SHA1 (patch-components_named__system__lock_BUILD.gn) = a962bbb5dc2a6ed66233577ec7df9329d099c927
+SHA1 (patch-components_named__system__lock_lock.h) = 5f94325676db06111937926165a9ff96bbd5c5a0
+SHA1 (patch-components_named__system__lock_lock__unittest.cc) = 9f9d917412763211556d0da6e72ba658134dacfd
+SHA1 (patch-components_optimization__guide_core_optimization__guide__features.cc) = f85f73cc72c16fd80417c704d2eac3ed2d3fdd8b
+SHA1 (patch-components_optimization__guide_core_optimization__guide__util.cc) = d93fd4202cdd86cc8e4425514d41d88dc1b0b208
+SHA1 (patch-components_os__crypt_async_browser_secret__portal__key__provider.cc) = b025fdfe27e0031444655280c7591c7896d015f7
+SHA1 (patch-components_os__crypt_sync_libsecret__util__linux.cc) = a3b03403bcc3bceac2f40b9a8d8d1d6bc2d6cf5a
+SHA1 (patch-components_os__crypt_sync_os__crypt.h) = b7c0f15bbfc00784cfb4aa433b33b34f948777b8
+SHA1 (patch-components_paint__preview_browser_paint__preview__client.cc) = 30613955ee3bb66949775ea187c5bb1cb6993ecd
+SHA1 (patch-components_paint__preview_browser_paint__preview__client__unittest.cc) = a64d9d8b109d45ecee8a71a655bf4765bf9e00c9
+SHA1 (patch-components_paint__preview_common_proto_paint__preview.proto) = 888910e45cf3544745659e45cc73244884400db9
+SHA1 (patch-components_paint__preview_player_player__compositor__delegate.cc) = a11abee845c4fc1ba437d54096701aaf6ce6887a
+SHA1 (patch-components_password__manager_core_browser_features_password__features.cc) = ffd39747fbfea049f3721a0941b28206925a13df
+SHA1 (patch-components_password__manager_core_browser_features_password__features.h) = 1036dd00b0daa4b7c605df0d358ef5d54537d14b
+SHA1 (patch-components_password__manager_core_browser_password__form__manager.cc) = a0aa79f16ce5ffa9000aab2c984d0ac13b7d6fb9
+SHA1 (patch-components_password__manager_core_browser_password__manager.cc) = fb52664a3fe17098b74a32acb624880ece02be4e
+SHA1 (patch-components_password__manager_core_browser_password__manager__client.h) = b205d652561c963eb4f9976d923a134e639bb1fa
+SHA1 (patch-components_password__manager_core_browser_password__manager__switches.cc) = 5394a048d6daeb43d7aef1cecf62c3ca441c5110
+SHA1 (patch-components_password__manager_core_browser_password__manager__switches.h) = 210384a44b07c50aae183321518e7a45987c34b5
+SHA1 (patch-components_password__manager_core_browser_password__manual__fallback__flow.cc) = 74be72aa6505b88ca8e483e36d1915f1d0e45ffa
+SHA1 (patch-components_password__manager_core_browser_password__manual__fallback__flow.h) = 2143403e51afc3b4137be2dfcfbd5c5eb2baadf1
+SHA1 (patch-components_password__manager_core_browser_password__store__factory__util.cc) = 69827e4e0bedc7509d041a1241f64478ca98f932
+SHA1 (patch-components_password__manager_core_browser_password__store_login__database.cc) = 14502bde74587499e0ab0631d744ed52a08f1840
+SHA1 (patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc) = 88cd23ce34fae1a07e2c231d6727564e74fc5699
+SHA1 (patch-components_password__manager_core_browser_password__store_login__database__unittest.cc) = e19369b5790ad6e97f0d65fd7330e5e49f960a07
+SHA1 (patch-components_password__manager_core_browser_stub__password__manager__client.cc) = f5380164ba1412a8f6b46092049048c8006e65b7
+SHA1 (patch-components_password__manager_core_browser_stub__password__manager__client.h) = 4700ea16236fa1ff7f573709933ad6a2191aacd2
+SHA1 (patch-components_password__manager_core_common_password__manager__pref__names.h) = 7e4335124648c3bd2bc69cd81c72792258fe1169
+SHA1 (patch-components_performance__manager_decorators_process__metrics__decorator.cc) = cedc60b920e7b1922b62a4da19fcf0f051b6d7fd
+SHA1 (patch-components_performance__manager_public_features.h) = 607e46f61515e4cde3330c30497ce21f5b4cb07e
+SHA1 (patch-components_permissions_prediction__service_prediction__common.cc) = 912df77a3877b46b9d53d80190329f751a67fec7
+SHA1 (patch-components_policy_core_browser_policy__pref__mapping__test.cc) = 89631b3a4704f990973fd6e7087a4c458bf1d061
+SHA1 (patch-components_policy_core_common_cloud_cloud__policy__client.cc) = 2de2e358fd3e9de08c4f85d0e8f002420fa19eb1
+SHA1 (patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc) = 14b7513d93e21b2a0cb4c6fd88b3f43dc4c21760
+SHA1 (patch-components_policy_core_common_cloud_cloud__policy__util.cc) = c9af3a4f50399124448dd1038edb5f00e3a59863
+SHA1 (patch-components_policy_core_common_policy__loader__common.cc) = cca72c3714bd00c148539e90e457b93c0402e52a
+SHA1 (patch-components_policy_core_common_policy__paths.cc) = 356335c33379495d8c03ad4b709ee509b5e038db
+SHA1 (patch-components_policy_core_common_policy__utils.cc) = fdfb708a9f4b8fb04ed6d6761b0d3f3f9af9bc76
+SHA1 (patch-components_policy_tools_generate__policy__source.py) = 0af28930c1cbc41efc056779422adf3c16d2ed02
+SHA1 (patch-components_power__metrics_BUILD.gn) = cfd4dbd9d58365aad81618c8054001c69ea2ad9f
+SHA1 (patch-components_power__metrics_energy__metrics__provider.cc) = 5949340b2d484eb4d98a87bebfaa77bba4134e15
+SHA1 (patch-components_regional__capabilities_regional__capabilities__service.cc) = c358f09b7d1a5b0e6faf5f1af32d06014aecb9a9
+SHA1 (patch-components_regional__capabilities_regional__capabilities__switches.cc) = ceff50009696278c2ba46a17e8ebdbc94d428c93
+SHA1 (patch-components_regional__capabilities_regional__capabilities__switches.h) = 121b9116e1ccd530d1b09e5c77dc2886b6d6684d
+SHA1 (patch-components_safe__browsing_content_common_file__type__policies__unittest.cc) = f61e7f93b39bb42b19e3f39d73ff6fe9583aff44
+SHA1 (patch-components_safe__browsing_content_resources_gen__file__type__proto.py) = b1171003379b45f98cc1dcddd81ce042ee403667
+SHA1 (patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc) = 19bb8fdffa41264e1896e0bc8dfd9f7e235adb48
+SHA1 (patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc) = 57216769d67ebbe2af0fa40056a5f1983136f218
+SHA1 (patch-components_search__engines_template__url__service.cc) = d7e6555643cd4decbe8cf8db7f3badef887aac07
+SHA1 (patch-components_security__interstitials_content_utils.cc) = 2b592cebc817d68d286fae1122601af498761e65
+SHA1 (patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc) = 83f9120bae19893d1f5343b839d20bb1ba4751d8
+SHA1 (patch-components_services_on__device__translation_sandbox__hook.cc) = 90afc9e4cd85746ece4b49997b873b0f90fcc8b3
+SHA1 (patch-components_services_on__device__translation_sandbox__hook.h) = 200dd6068d9944a9ab829cd96ef6ef933108afa2
+SHA1 (patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc) = f7759b00a764e21d2929ce803ab6b0ce4538c217
+SHA1 (patch-components_signin_public_base_signin__switches.cc) = f49be6d73fb636d044dbebe9e67aae4b366bc663
+SHA1 (patch-components_signin_public_base_signin__switches.h) = 3eff417a8befee8df0042ca5e91d0d6e00ab3abf
+SHA1 (patch-components_soda_soda__util.cc) = 928a9d624674b9f2910a8f770fc55bea03148870
+SHA1 (patch-components_startup__metric__utils_common_startup__metric__utils.cc) = 40b3ab09405f0c36aba130cd924ca8e9f2134dd0
+SHA1 (patch-components_storage__monitor_BUILD.gn) = 6e141e7c2551a67c7984f89dbdac1b247c250e60
+SHA1 (patch-components_storage__monitor_removable__device__constants.cc) = 7ee24ec4ed4580d080c74393dfec4624b11d879f
+SHA1 (patch-components_storage__monitor_removable__device__constants.h) = 2ef6b66e7ad314f4bf703e8448fee154657097ba
+SHA1 (patch-components_supervised__user_core_browser_list__family__members__service.h) = 6a24a4fa10bbe856681fc310b88fca2e1668854a
+SHA1 (patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc) = 49d7bd3e58fe893ae73b9945bddad966a3fe63a1
+SHA1 (patch-components_supervised__user_core_browser_supervised__user__preferences.cc) = aa4befa8e529936426909801d2b8e750bbb63671
+SHA1 (patch-components_supervised__user_core_common_features.cc) = 677ea4cfded043f2510fc4eadc17a00f407c2412
+SHA1 (patch-components_supervised__user_core_common_features.h) = d923ba4464fa357538f7b5006aed168330ddbe3f
+SHA1 (patch-components_supervised__user_core_common_pref__names.h) = 293015859d8f3f1b9c7e9e85278670535c6d3adf
+SHA1 (patch-components_sync__device__info_local__device__info__util.cc) = a5ff218f5de43f1579c3267e6dcd6ead10519995
+SHA1 (patch-components_sync__device__info_local__device__info__util__linux.cc) = 373f146e666cdf05c07b825beb959009d386a21c
+SHA1 (patch-components_sync__preferences_common__syncable__prefs__database.cc) = 780d0f7116a80072f47d858137fc7dcc299478b3
+SHA1 (patch-components_sync_base_sync__util.cc) = 77b5244409b0c4393a1efcd50cfbe3d5f6e7786d
+SHA1 (patch-components_system__cpu_cpu__probe.cc) = f8a3378cd99875655fad1b3fe528eed45e682b37
+SHA1 (patch-components_translate_core_common_translate__util.cc) = 5e81f47ca6aaebb7e4d17c996413acd15ca217be
+SHA1 (patch-components_trusted__vault_trusted__vault__connection__impl.cc) = cc295346e86958402946a5785a9abe1aa9485d25
+SHA1 (patch-components_update__client_update__query__params.cc) = 652e82537ec5c3d7968e47f9eca94cfb6151b19b
+SHA1 (patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc) = 32cb2cf63f8ec630c9560e70e7c65a5d491c98f1
+SHA1 (patch-components_user__education_views_help__bubble__view.cc) = 04e066476477613c8f65e3d8f3ce372e3a1eac13
+SHA1 (patch-components_user__education_views_help__bubble__view.h) = 5af7360e00fdb2a8293ac092a22a7c2595d90a94
+SHA1 (patch-components_variations_service_variations__service.cc) = e5f35b2e24c47bddd50b7cabe42f3cedc2330c1f
+SHA1 (patch-components_visited__url__ranking_public_url__visit__util.cc) = 32f98357be4237652abba9e956e78e0e94bf7b98
+SHA1 (patch-components_viz_host_gpu__host__impl.cc) = d7f27daf32b09c9b52660e9ed871f98c9b8451c6
+SHA1 (patch-components_viz_host_host__display__client.cc) = 30417726e8bf8e6c8224c660b83bc22ae5ff4f5d
+SHA1 (patch-components_viz_host_host__display__client.h) = 37b13084b43efcbc13ffac6b752b3cf9275b09dd
+SHA1 (patch-components_viz_service_display__embedder_skia__output__surface__impl.cc) = 2c48ca4dce3ee0a4c114de3ea13ce5e58f28bae1
+SHA1 (patch-components_viz_service_display__embedder_software__output__surface.cc) = eba002321ab766591bb899bdeadd7f5e6a872cc1
+SHA1 (patch-components_viz_service_display__embedder_software__output__surface.h) = 6959126a263752a2fb4ffd72bbd664602a1f1f4b
+SHA1 (patch-components_viz_service_display_skia__renderer.cc) = 682875865856e7ef8ee6e98164a327de6103beb9
+SHA1 (patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc) = add35546add043f2d8a1fa9f69bba8e7aa3281b5
+SHA1 (patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h) = f3bc2e614c50e83b3b0517d38f376f7458ec5976
+SHA1 (patch-components_viz_test_fake__display__client.cc) = e8dbac6dfa24768c629d8af0a139504f78e70055
+SHA1 (patch-components_viz_test_fake__display__client.h) = d33d72a35e082927aea74c3ffcb47ea1b7fee7cb
+SHA1 (patch-components_viz_test_mock__display__client.h) = f602cfd353baed9d7ec8202780129aecb4bfdcc0
+SHA1 (patch-components_webui_flags_flags__state.cc) = 90fe7c829c09e80a5002e9cb6e040596599f55ec
+SHA1 (patch-content_app_BUILD.gn) = 672ee049481f4b7234690aa53b2dfb73d3d95a68
+SHA1 (patch-content_app_content__main.cc) = a60fcfcb50d8f350b2ccdd5f3dbd1c3141517fde
+SHA1 (patch-content_app_content__main__runner__impl.cc) = 7b97ec85bd6277e6717d6c81eb4bf4a76769c005
+SHA1 (patch-content_browser_BUILD.gn) = de4e30bb4c2d5fc90331691d8203e9dda0071fd8
+SHA1 (patch-content_browser_accessibility_browser__accessibility__state__impl.cc) = 8fef62449d22bde491fa388f4950d13be98f2f5f
+SHA1 (patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc) = 348ee47c6e4faf1d1229ef8c596248b2e7f35b25
+SHA1 (patch-content_browser_audio_audio__service.cc) = 1796036341f59a10bbb79056fb52cb5d9a29f503
+SHA1 (patch-content_browser_browser__child__process__host__impl.cc) = 80fa8410fad5d238c09c8f76d2f9bb271d2588c5
+SHA1 (patch-content_browser_browser__child__process__host__impl.h) = 8175a619166b6ec06963013258676506562af091
+SHA1 (patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc) = 15de6a4c47f7c9c80c56432c6008b93d43d0b8b2
+SHA1 (patch-content_browser_browser__main__loop.cc) = fe32bed4afc4a182a0f7c676a2d247e73ab340dd
+SHA1 (patch-content_browser_child__process__launcher__helper.h) = acfc79aad224876c2290acdc5b967ee1a1cb87db
+SHA1 (patch-content_browser_child__process__launcher__helper__linux.cc) = b70bac3cea8ceecc59007445f89efa72f9bcf848
+SHA1 (patch-content_browser_child__thread__type__switcher__linux.cc) = 2878bfeaf07df2a7123529374efe2f2852a61697
+SHA1 (patch-content_browser_child__thread__type__switcher__linux.h) = 4cb88e79e7f3ffb17103a0731e6f8fe4b6e3491b
+SHA1 (patch-content_browser_compositor_viz__process__transport__factory.cc) = 094e87ab0529313f6f85450cd55650acfd1cb528
+SHA1 (patch-content_browser_devtools_devtools__frontend__host__impl.cc) = b4543f344439e6d58f7157c312aeb9fb3c8fa44d
+SHA1 (patch-content_browser_devtools_devtools__frontend__host__impl.h) = 32bea1425b520209957a24283c9eaf8fd3ef40b1
+SHA1 (patch-content_browser_devtools_protocol_system__info__handler.cc) = e84266327dc9eee0f23949b09fadf79c7223cc3a
+SHA1 (patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h) = 6a9d12a59a0044b0d29bd6b0b11f695b5ff2008b
+SHA1 (patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc) = 2f915ae16a691a77894e6bdc63ed6136cecccd71
+SHA1 (patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h) = 7d150842de1f3dea427ee6de958a946e6adb85ca
+SHA1 (patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc) = 9afd76fa4307a6a29abd464b134ca9b20a371f11
+SHA1 (patch-content_browser_font__access_font__enumeration__data__source.cc) = 0e4eae877526360f3481644f655d3084b6eec2c6
+SHA1 (patch-content_browser_gpu_compositor__util.cc) = 9b121059481049794d66bcdbec81aaa200286ae1
+SHA1 (patch-content_browser_gpu_gpu__data__manager__impl.cc) = 5434a01bbb003588e8ba0430cb4190e252cd714d
+SHA1 (patch-content_browser_gpu_gpu__data__manager__impl.h) = e0ca60d2c0a52011e6ac2bbd4b1331fdd7e8c642
+SHA1 (patch-content_browser_gpu_gpu__data__manager__impl__private.cc) = 03bb11e1ab0cca6f7ce09fdd45e2c0fb94feb187
+SHA1 (patch-content_browser_gpu_gpu__data__manager__impl__private.h) = f6572b7773503aea89d63233a1adc1bb620491b0
+SHA1 (patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc) = ad5feddffb8a0762c7e842fe9a20e294c5ceee79
+SHA1 (patch-content_browser_gpu_gpu__process__host.cc) = f761bbf486270ef4f471be454d3ee30792aed497
+SHA1 (patch-content_browser_media_frameless__media__interface__proxy.h) = b70c341f1aa04c74bcc029572dfcc67f426e75a2
+SHA1 (patch-content_browser_media_media__keys__listener__manager__impl.cc) = 71f7924f1dbc1a593d627131018f6811d6b81d5f
+SHA1 (patch-content_browser_network__service__instance__impl.cc) = 85991bfe1c4889b70264b4394960c1c93f858b5b
+SHA1 (patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc) = 547a1422b308dbf1e360a4cbdd07dedafd4d62ca
+SHA1 (patch-content_browser_renderer__host_delegated__frame__host.cc) = 52a12e5b0079cadb8cebbf7502f98dd107b6b14c
+SHA1 (patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc) = 1fbd48720a640eee0eeeea70faeb44dbbebf7b5f
+SHA1 (patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc) = 72825c03f50a67a2c9193e8f89eba2cf2249e8f1
+SHA1 (patch-content_browser_renderer__host_render__process__host__impl.cc) = 0915e50fd52b68d49a2d67a43ef261a38829afe2
+SHA1 (patch-content_browser_renderer__host_render__process__host__impl.h) = b0083bdf3cc50e6293cda9c1f803974299bca16d
+SHA1 (patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc) = 1e66eb5aa6df1bb2176c3f575229f6615e4cfadc
+SHA1 (patch-content_browser_renderer__host_render__view__host__impl.cc) = 4033962a5c2080b51cf3e8271f8beb68577f7d4d
+SHA1 (patch-content_browser_renderer__host_render__widget__host__view__aura.cc) = add1221da81ccbae9041c90aaeeb0a0fdec8675c
+SHA1 (patch-content_browser_renderer__host_render__widget__host__view__aura.h) = 59baf60dfd3a420ebb4df4816b0f84aa1eb4151f
+SHA1 (patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc) = db96fa6ae035872c858b52ae503b5c1c56aa240c
+SHA1 (patch-content_browser_sandbox__host__linux.cc) = 12c257baef3be12d084a239f3865dbd2834fa099
+SHA1 (patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc) = 296fe8fcc6efca795e7ffd435006021a323b6882
+SHA1 (patch-content_browser_scheduler_responsiveness_native__event__observer.cc) = fc2d91783aa017395c752df43be5a22279d2ff39
+SHA1 (patch-content_browser_scheduler_responsiveness_native__event__observer.h) = 3e570dd8fde3fd4f65d5bf976cb5a5a5eccc9da4
+SHA1 (patch-content_browser_service__host_utility__process__host.cc) = 68b8e4c1a48be8e8d23ac0d0a7628632813c3712
+SHA1 (patch-content_browser_service__host_utility__process__host__receiver__bindings.cc) = a76a5fd2950d3dbe1d6a34f47f157ae5c160554b
+SHA1 (patch-content_browser_service__host_utility__sandbox__delegate.cc) = bd7f462000a9eec53c9bd45a72b1cd6a02fa07fd
+SHA1 (patch-content_browser_v8__snapshot__files.cc) = 54e766c2a73562b066429a818086ca1645655fde
+SHA1 (patch-content_browser_web__contents_slow__web__preference__cache.cc) = 032704a8a9e6eed0c9837decf552e5a620cc3794
+SHA1 (patch-content_browser_web__contents_web__contents__view__aura.cc) = 673ab916279034a80e4d8497a292c77034e77f9e
+SHA1 (patch-content_browser_web__contents_web__contents__view__aura__unittest.cc) = 4137c3b1a62d97d532d177452ba4302e8e35950b
+SHA1 (patch-content_browser_webui_web__ui__main__frame__observer.cc) = e3d41f92e2ce02b607e327957403196866946e8a
+SHA1 (patch-content_browser_zygote__host_zygote__host__impl__linux.cc) = 8090100d773cc993a517b228e00b5bb4d97f01db
+SHA1 (patch-content_browser_zygote__host_zygote__host__impl__linux.h) = 65b26262530852a5dc35e4207f86bc4a8b279342
+SHA1 (patch-content_child_BUILD.gn) = a4bfd6ba17f2e24f1d877afadfe18e4c4bdb26ba
+SHA1 (patch-content_child_child__process.cc) = 9bf6421acd3a0ef56b82a37ed9ec353d6d62bbe1
+SHA1 (patch-content_child_child__process.h) = eab5096c8e28cc1a59cca6522dddf83ce3e40b74
+SHA1 (patch-content_common_BUILD.gn) = 6f835e11a30d5ddaa2fd83266507388800de2820
+SHA1 (patch-content_common_features.cc) = 8d0a27b3230f0ac59ec5b44ae92356c80365cf73
+SHA1 (patch-content_common_features.h) = 36b15e3d6f9a76cb4b5ac438c0384917a7537d7f
+SHA1 (patch-content_common_font__list__unittest.cc) = 2361b0d1986641bb0f4bdf738337f8a9de67ace1
+SHA1 (patch-content_common_gpu__pre__sandbox__hook__bsd.cc) = 1c1de62940fa7e388897c00ff00a54082b48bd55
+SHA1 (patch-content_common_gpu__pre__sandbox__hook__bsd.h) = 3c518f910e3868f90d463e8a0c96307835258dc8
+SHA1 (patch-content_common_gpu__pre__sandbox__hook__linux.h) = fdf37638bfe00717228d600864f3f503ffa6266c
+SHA1 (patch-content_common_thread__type__switcher.mojom) = 682c3fc22bb863d13cd9cc69b5874d0ebcb8698d
+SHA1 (patch-content_gpu_gpu__child__thread.cc) = af6e00bad4fcdedeb5c77f1fc055fc3b15bfc76c
+SHA1 (patch-content_gpu_gpu__main.cc) = aa3f8c009a056cd0724a79752982036cc610f6d5
+SHA1 (patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc) = 5b2b68ee795c2e115fff867498fdb155e59646a2
+SHA1 (patch-content_ppapi__plugin_ppapi__blink__platform__impl.h) = 18296b702c2c823e284de8dc136637896795e6de
+SHA1 (patch-content_ppapi__plugin_ppapi__plugin__main.cc) = 24e39a7631d61a0ba7c85696ee88e636ee90fec5
+SHA1 (patch-content_public_browser_content__browser__client.cc) = 33be8df89b5338f8b0c6837b8e79e21b64bb5826
+SHA1 (patch-content_public_browser_zygote__host_zygote__host__linux.h) = 6b5eab162fa1de3f5617c85eb8e832746b8e1853
+SHA1 (patch-content_public_common_content__features.cc) = fec42304470c16b5deedbc257c713f6080aa086c
+SHA1 (patch-content_public_common_content__switches.cc) = d7e761b90d40f80b459e69106cede781558872ae
+SHA1 (patch-content_public_common_content__switches.h) = b9128d35eba3f8d575d6592efa4dca68d8bf3fe4
+SHA1 (patch-content_public_common_zygote_features.gni) = 1284b4cfff8d84f63c44c3e6111eb2fa57cdfbc7
+SHA1 (patch-content_renderer_render__thread__impl.cc) = f4cceb23be39b7cdde959813bfa1748e22e83579
+SHA1 (patch-content_renderer_renderer__blink__platform__impl.cc) = 6c909626ff56812d6ca047d8db7877e5f800d917
+SHA1 (patch-content_renderer_renderer__blink__platform__impl.h) = cb4befe60e64c3723c0f2c3b0be35fdc35a30d8e
+SHA1 (patch-content_renderer_renderer__main__platform__delegate__linux.cc) = 61352b74381329a5509f0d6d0842d61c80e3e1a4
+SHA1 (patch-content_shell_BUILD.gn) = ee2b4142ff72508549c68c49931443827def152b
+SHA1 (patch-content_shell_app_shell__main__delegate.cc) = 90e3ccffbd334d77169c4f06aaf87df1ac06ae26
+SHA1 (patch-content_shell_browser_shell__browser__main__parts.cc) = 22c484f4cbe5e718b57f96b87bb628de8510a3f1
+SHA1 (patch-content_shell_browser_shell__paths.cc) = da9c10a7dcd15777f88c0de0dd0abfcf079f5e76
+SHA1 (patch-content_shell_browser_shell__platform__delegate__views.cc) = b05f91dcb7f8ec8841bc6441cc9c03510b191e49
+SHA1 (patch-content_shell_renderer_shell__content__renderer__client.cc) = 397b62180e0bd516572f946841a1df3434f7446d
+SHA1 (patch-content_shell_utility_shell__content__utility__client.cc) = d8c845c32f23d21482a928f0fa9fcd324736e21c
+SHA1 (patch-content_test_BUILD.gn) = 13ace53efba504613f94cfacbce013f8a1c61b8b
+SHA1 (patch-content_utility_services.cc) = f9df11eb32280bea9ee4cecef38e8c8a4a0da35f
+SHA1 (patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc) = 26a6c070c6bc0c84a909b32f245d526be2cb7517
+SHA1 (patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h) = 3ddfd562c2e56d422947528f3bcf872de864c4de
+SHA1 (patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc) = 71bfcc6cf60846b9ef1990c9b6926c9b1665ffc7
+SHA1 (patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h) = 1892d47d1847f7b88d07c33008978112ddab26da
+SHA1 (patch-content_utility_utility__main.cc) = 4114f8805beb01b19fec82b8d6e6dc73bc7cf2c8
+SHA1 (patch-content_utility_utility__thread__impl.cc) = 5ed784131012fd885e1f14127e6891b3f4cfde78
+SHA1 (patch-content_zygote_BUILD.gn) = ad986f664317b3aad302cc318250f94fadba3f81
+SHA1 (patch-content_zygote_zygote__linux.cc) = 646b98e8dd89c4ae6973910726a38bc2c0ff2059
+SHA1 (patch-content_zygote_zygote__main__linux.cc) = f85b4c8e1feeda66f696ea9d0a99f315c09416b3
+SHA1 (patch-device_bluetooth_bluetooth__adapter.cc) = d152aedc1702dc3f0a045ebd7ad2fd6de5c4abed
+SHA1 (patch-device_bluetooth_cast__bluetooth.gni) = 3902e659d5a47f246e01ea3d9c3689d4135fb46a
+SHA1 (patch-device_gamepad_BUILD.gn) = 4af7e4fbfddca7c5975780dafb16784cd0168098
+SHA1 (patch-device_gamepad_gamepad__provider.cc) = 7c541f0118c05bca78fb51d92cd637019c52000f
+SHA1 (patch-device_gamepad_hid__writer__linux.cc) = f84b0c1ec8950241a1a09a97b42ae2adfaa7b1df
+SHA1 (patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc) = 6655c5307ac24118c0101b4e3ae9f7652e7a7350
+SHA1 (patch-extensions_browser_api_management_management__api.cc) = d8cc11b06694a837b88231213133760081bb4ef8
+SHA1 (patch-extensions_browser_api_messaging_message__service.cc) = 2d31cb738ae197ed3a09a85dc73916253b7c1680
+SHA1 (patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc) = 6b115f8b1cc606c470a6df6cc8e8d539b42c98f4
+SHA1 (patch-extensions_common_api___permission__features.json) = fb28f4095e7d0a8938648db62661642cfdd00b98
+SHA1 (patch-extensions_common_api_runtime.json) = 3e3c24939e98771c097f9e7ea8c86e7512a3e8b4
+SHA1 (patch-extensions_common_command.cc) = 6c9949c9f92f23c6d2bf33a43defc989de1c2bf9
+SHA1 (patch-extensions_common_features_feature.cc) = 01acf7c8bcd65dceea7f0c3b3a73e1a1c6a71842
+SHA1 (patch-extensions_renderer_bindings_api__binding__util.cc) = dc833edd2875dbd1998c325149951d7dba76ed19
+SHA1 (patch-extensions_renderer_bindings_argument__spec.cc) = 29a5dab21a99a0570afafd726e531322647ff3ff
+SHA1 (patch-extensions_shell_app_shell__main__delegate.cc) = 1651daf3f3d40cb7c15885672635c261065272e3
+SHA1 (patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc) = 078164db8529543514936faacdeef37b1f17a12c
+SHA1 (patch-extensions_shell_browser_shell__browser__main__parts.cc) = 137a2c8c303c3fdd1ea2c858cf5de1cd52dd5557
+SHA1 (patch-extensions_shell_browser_shell__extensions__api__client.cc) = 7287e8fbb7436054ffdbe59a2a0c42c8582a2f96
+SHA1 (patch-extensions_shell_browser_shell__extensions__api__client.h) = 47187f8f462ba9af35394c171e36a78087487be2
+SHA1 (patch-google__apis_gcm_engine_heartbeat__manager.cc) = ceb9498f0b9d43c69b7970cc51bea18fd96f746d
+SHA1 (patch-gpu_command__buffer_service_dawn__context__provider.cc) = 92049cbbbf5ba48c50222cde442d89c0ec30d9db
+SHA1 (patch-gpu_command__buffer_service_gles2__cmd__decoder.cc) = 16e23cbc36ebc993d1d2fcb585152e76a617c47f
+SHA1 (patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc) = 7c3924b88a06b1cd7ead598bdd9cbe8cb828d12b
+SHA1 (patch-gpu_command__buffer_service_shared__context__state.cc) = 9710d030d2b2ccd5b5a7cd4080613ced190e88b3
+SHA1 (patch-gpu_command__buffer_service_shared__context__state.h) = c01723c233d70c7bbe1e5e7edf9afe338a59515f
+SHA1 (patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc) = 85b5642f1b9a8636a28724a3454f3e748ccdc725
+SHA1 (patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc) = df2974ceb9f5b68d30d28bdfe9fa25dbcecbfac9
+SHA1 (patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc) = 83284907cac8fa992905dc11db7a031ede68e400
+SHA1 (patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc) = b796ebc509672759469b00d55cc59b04cead33c5
+SHA1 (patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc) = 238822bf4b011f975137bf7abb3c269d200cda76
+SHA1 (patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc) = dd1c8458484cda8269a3e9ab6bd3cd6aa7b90975
+SHA1 (patch-gpu_command__buffer_service_webgpu__decoder__impl.cc) = 421bf21232f5cd9a4fabc4b31f0ef0b7e88414b2
+SHA1 (patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc) = 019ec9dfc8f1db126aba0164d9b71b270e0a3938
+SHA1 (patch-gpu_config_gpu__control__list.cc) = b7114acf2c088df5081e104fc62d2686d55ddf4e
+SHA1 (patch-gpu_config_gpu__finch__features.cc) = 341b12dea95b58e69a264f1c3347989141fa3fa4
+SHA1 (patch-gpu_config_gpu__info__collector.cc) = f61dc37b0c493583ad32733e8f6903d8206fb780
+SHA1 (patch-gpu_config_gpu__test__config.cc) = 29c21f0d2c8802a00fbeb56d9044f5796543cbbe
+SHA1 (patch-gpu_ipc_common_gpu__memory__buffer__support.cc) = 6918808b3dd19b8bf8d9e120cfd94214da7e7765
+SHA1 (patch-gpu_ipc_common_gpu__memory__buffer__support.h) = ac8aa17f65c0bdfaff62e6d1a52b5e6b03e3b6f1
+SHA1 (patch-gpu_ipc_service_gpu__init.cc) = a51accffc410dec1fee7d1e182c4ced13fa1b605
+SHA1 (patch-gpu_ipc_service_gpu__memory__buffer__factory.cc) = 7923a9d77833eaf821836810efb6c1bed3a970f8
+SHA1 (patch-gpu_ipc_service_x__util.h) = ae606dc8e128fccd6785de1139cdf18fc1c0259b
+SHA1 (patch-gpu_vulkan_generate__bindings.py) = 8f3f3c182ffdfa8a6cd6552d259699831599abd0
+SHA1 (patch-gpu_vulkan_semaphore__handle.cc) = 4a094dcc70ab8b448582f1ad619777ed0cbbcef0
+SHA1 (patch-gpu_vulkan_vulkan__device__queue.cc) = 1af5e6d53e123fe691ee0ea8f703da11ed18bc16
+SHA1 (patch-gpu_vulkan_vulkan__device__queue.h) = 56abf00976bf8e46c908608f39f808ceb63f2085
+SHA1 (patch-gpu_vulkan_vulkan__function__pointers.cc) = ba86696eaca594e77748d4f6733a4740ac2e7fa2
+SHA1 (patch-gpu_vulkan_vulkan__function__pointers.h) = 12d0a4f58407f17b1381b3bf7d2bf0993e35be2e
+SHA1 (patch-gpu_vulkan_vulkan__image.h) = c642e04264a1b3eb27d03bcb2da4a931395dd7bd
+SHA1 (patch-gpu_vulkan_vulkan__util.cc) = dc3f5918163e0b70c61fcae05e27e78ee56e064e
+SHA1 (patch-headless_BUILD.gn) = f855a198934834bc15cfac9ac0287aa20eafc6ea
+SHA1 (patch-headless_lib_browser_headless__browser__main__parts__posix.cc) = eb4a6ec66612ab8bb93abd6a92eb21c84bf39f38
+SHA1 (patch-headless_lib_browser_headless__content__browser__client.cc) = 013c92e37ca8f318637dc2bcd46b1d1d4e2579da
+SHA1 (patch-headless_lib_browser_headless__content__browser__client.h) = 49ea9e9e21d7afbf2e1b954dd012e34f0e1f72d6
+SHA1 (patch-headless_lib_browser_headless__web__contents__impl.cc) = 7953891834394cc1a80588660d5e067e70140790
+SHA1 (patch-headless_lib_headless__content__main__delegate.cc) = 0eff101525f435aa8c053a8f332b3f3d60c84e27
+SHA1 (patch-ipc_ipc__channel.h) = a8b15ad9974b7eba4e0b2a69fb5a1608e25a4fee
+SHA1 (patch-ipc_ipc__channel__common.cc) = a7bd65b7b112e902d1ba446efd09adde79b7bf98
+SHA1 (patch-ipc_ipc__channel__mojo.cc) = b1023c67881e018d1256b2796fd6bfd1c30f7395
+SHA1 (patch-ipc_ipc__message__utils.cc) = 4ad7ec0681e2fa6176d346bd94ab9e21fa18df25
+SHA1 (patch-ipc_ipc__message__utils.h) = f86af06e434ef5e28f80863a7a3d8b0e00978da5
+SHA1 (patch-media_BUILD.gn) = 4d3d698a483ff305c6987f8a20d34b76889f1a29
+SHA1 (patch-media_audio_BUILD.gn) = 9452d159f4689a48ba44cb5e4b3d447d456c3035
+SHA1 (patch-media_audio_alsa_audio__manager__alsa.cc) = a092dd963f3c7df6b2aa3f03bd2a0e6a7743eb73
+SHA1 (patch-media_audio_audio__input__device.cc) = decc1c3a70e89faf9864df5dcd59fa6d9ad43850
+SHA1 (patch-media_audio_audio__output__proxy__unittest.cc) = 0467ed48ce5fab8259c2567b9ff7229d0d4709a6
+SHA1 (patch-media_audio_pulse_pulse__util.cc) = f27cc903343696ce30756a11b9598f9ca33a0172
+SHA1 (patch-media_audio_sndio_audio__manager__sndio.cc) = 440988c5d976e13738d325a969bd7eeb13e32bd1
+SHA1 (patch-media_audio_sndio_audio__manager__sndio.h) = 066807dbaf6c447b7d708c5b77c78658ee1bcaf7
+SHA1 (patch-media_audio_sndio_sndio__input.cc) = c69121542bff3e078134a25e71cd0768fb9c791b
+SHA1 (patch-media_audio_sndio_sndio__input.h) = 7a8ae41fef8cea6952c33e172b898efedd2a2a9b
+SHA1 (patch-media_audio_sndio_sndio__output.cc) = 4d1727cae67e2d0fb377741d3f0f7ed777f2ac76
+SHA1 (patch-media_audio_sndio_sndio__output.h) = 78ad37daec2cc42b76ee46032918aafb037efbd7
+SHA1 (patch-media_base_audio__latency.cc) = 6d72d56dd0fe85cb65cb037e4dd3c22f51b7f784
+SHA1 (patch-media_base_libaom__thread__wrapper.cc) = 3ed51fdd1084d1061c2bd54d494960fbc1a11768
+SHA1 (patch-media_base_libvpx__thread__wrapper.cc) = d420b2f7ef53386a59186165aad0d110ec992dcc
+SHA1 (patch-media_base_media__switches.cc) = 0e4687024afa729ed88717fd77625e39edc5d04e
+SHA1 (patch-media_base_media__switches.h) = 2331fafb08f901f34f6f8bedc1e29390be80458d
+SHA1 (patch-media_base_video__frame.cc) = e1f12d536bafaa8200ba9e2676a9ea266413006c
+SHA1 (patch-media_base_video__frame.h) = e66d717eacd359d0d5a1021cd68e77b4be8eb4f2
+SHA1 (patch-media_capture_video_create__video__capture__device__factory.cc) = f948eb493992c6cd32f07aa8f9aafa184d0b0748
+SHA1 (patch-media_capture_video_fake__video__capture__device__factory.cc) = 92037370b1aa5b6b517fd01aad3c7d37af652849
+SHA1 (patch-media_capture_video_file__video__capture__device__factory.cc) = bb41178e3100f4a18cb715b03d961a45456f88eb
+SHA1 (patch-media_capture_video_linux_fake__v4l2__impl.cc) = ef6eb582cc71d0cc27619f061432a52a5c24d323
+SHA1 (patch-media_capture_video_linux_fake__v4l2__impl.h) = 1b2a37188ff8f03159d6325f0a5babede27c7ba5
+SHA1 (patch-media_capture_video_linux_v4l2__capture__delegate.cc) = 7cd7155ca8884591c70e54d4a07b65b9bf6983a7
+SHA1 (patch-media_capture_video_linux_v4l2__capture__delegate.h) = d75b2520d4de23a4151a768423f1b350e05ffaae
+SHA1 (patch-media_capture_video_linux_v4l2__capture__device.h) = 9444316ef41f662c4c59ba751e5f7098de14dc9d
+SHA1 (patch-media_capture_video_linux_v4l2__capture__device__impl.cc) = f7eeb7c9d20965cd8fa707510e675da4e64df4d0
+SHA1 (patch-media_capture_video_linux_v4l2__capture__device__impl.h) = 5d8324c3d3b7c251b6cd20dcbcff0ab648aa5148
+SHA1 (patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc) = ba00109a607d58f77b628a7e0d0a5d89c43abcea
+SHA1 (patch-media_capture_video_linux_video__capture__device__factory__v4l2.h) = ab15d4d46397a233694c835087f0b1ddfc8a6a27
+SHA1 (patch-media_capture_video_linux_video__capture__device__linux.cc) = 5743bc037118f0014db4c9e6cc7bedaa68e2a475
+SHA1 (patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc) = 0d80316077ea35f362429298919ef09ff052ba46
+SHA1 (patch-media_capture_video_video__capture__device__client.cc) = 4ce8cc5b6dd45490ce9e0664aa5b542364e5d728
+SHA1 (patch-media_cdm_cdm__paths__unittest.cc) = 8ec11c55bae53f0b2e349d53060967f82c41424e
+SHA1 (patch-media_cdm_library__cdm_cdm__paths.gni) = 3bc0d9b596dcad955d92db998717c5fbd479f428
+SHA1 (patch-media_ffmpeg_scripts_build__ffmpeg.py) = 55036ff5194b84ce71f7d99eb852b63ca759762c
+SHA1 (patch-media_ffmpeg_scripts_robo__lib_config.py) = f0fbee6b0c558a80eaa95ef929cad0687676d91b
+SHA1 (patch-media_gpu_chromeos_gl__image__processor__backend.cc) = 7d8ed103ffdd42cd5a88247ae52bc8f4d21e947f
+SHA1 (patch-media_gpu_chromeos_libyuv__image__processor__backend.cc) = 3011b417276c2061dd1055e1e0731768eae08e37
+SHA1 (patch-media_gpu_chromeos_mailbox__video__frame__converter.cc) = 5c61af674a450d33608728a47a26f55295860c43
+SHA1 (patch-media_gpu_chromeos_platform__video__frame__utils.cc) = e328d77238fd8546d19547bca90ebc03b6a40157
+SHA1 (patch-media_gpu_chromeos_video__decoder__pipeline.cc) = 3f055900ee5fe822bb9e031c59cb6f80f7df8701
+SHA1 (patch-media_gpu_gpu__video__decode__accelerator__factory.cc) = 49cec0ffd49721bbb5e97fabd44cdc14de07a2a2
+SHA1 (patch-media_gpu_gpu__video__encode__accelerator__factory.cc) = f483601bdf8b62795045607262a9076256ddc156
+SHA1 (patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc) = 82f1b42e094abe02d8aedbcd6d55146b87b45ca3
+SHA1 (patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h) = 9a1cc172ce51308cf705e29e1149b57ddce3afa0
+SHA1 (patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc) = d240397d6768cd1deaff9e22bf382291287b7323
+SHA1 (patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h) = ca9a367ade49bd0dbd8e746a81d9a98aec2607e6
+SHA1 (patch-media_gpu_test_raw__video.cc) = 0ccf734c595273a67473cbfa148e465e377c119e
+SHA1 (patch-media_gpu_test_video__frame__file__writer.cc) = 9afd7082098ea928d26b30f0ca7c2551347afc7c
+SHA1 (patch-media_gpu_test_video__frame__helpers.cc) = 82fc682c4f07793b7bcfa069d6b39c0e89c57f61
+SHA1 (patch-media_gpu_test_video__frame__validator.cc) = 337ab14d480d1ad2d04be62a50ac548cbb54f79d
+SHA1 (patch-media_gpu_vaapi_vaapi__video__decoder.cc) = 7eb79e7f8f9d4c90dc830e3b9048023b61943867
+SHA1 (patch-media_gpu_vaapi_vaapi__wrapper.cc) = 12b4d2bd5b8cd9a6bf8a2c80a7f618853c7a4cfe
+SHA1 (patch-media_media__options.gni) = 5da032de2589f29286291653164a0e930a7395a4
+SHA1 (patch-media_mojo_mojom_BUILD.gn) = 70bfd273a2e44c17e847bad9802fd906cc42f5a3
+SHA1 (patch-media_mojo_mojom_video__frame__mojom__traits.cc) = 47998e69020797ff995b4102d5e896a92e32bf16
+SHA1 (patch-media_mojo_mojom_video__frame__mojom__traits.h) = 67e0a32ae92ccf4d623b454bbec5b973b9553249
+SHA1 (patch-media_video_fake__gpu__memory__buffer.cc) = 7d5ef4fc73515b9a38979399db08c527a132f8e9
+SHA1 (patch-media_video_fake__gpu__memory__buffer.h) = f71689a3e37b5f5b0bc3c299441457a6ceca8915
+SHA1 (patch-media_video_gpu__memory__buffer__video__frame__pool.cc) = 956bbdf209090f3a6a1c15d4d6753155d1306e6b
+SHA1 (patch-media_video_video__encode__accelerator__adapter.cc) = 27339cc07b8f5c0d134ff0257f61be8e3c052804
+SHA1 (patch-media_video_video__encode__accelerator__adapter__test.cc) = 023fe50d12b7858d9497355681090967a3772af4
+SHA1 (patch-media_webrtc_audio__processor.cc) = 991967a089e2e9dc667e76dd97ea5cf486784b58
+SHA1 (patch-media_webrtc_helpers.cc) = 691bb69378d207de72827e36bc64c42708366c25
+SHA1 (patch-media_webrtc_helpers__unittests.cc) = fac9f77698f1b910e84847a9f1d1c3e51168b1b5
+SHA1 (patch-mojo_core_BUILD.gn) = d6df268baa14e5f679383c329c306b713e56c917
+SHA1 (patch-mojo_core_channel.cc) = e10ce315c7999987e57c3af4b080684a1dfde7e8
+SHA1 (patch-mojo_core_embedder_features.h) = af999c4104e5a46c2459bc09c851cf69cc145882
+SHA1 (patch-mojo_public_cpp_platform_socket__utils__posix.cc) = fce1612335f6a57b283758bbda3f4a3c24650072
+SHA1 (patch-mojo_public_tools_bindings_mojom.gni) = 501864a1157cb79f442b253cbd4afd48b8bbabcf
+SHA1 (patch-net_BUILD.gn) = ff62ed7c0a1b3af16c1bd0c0ab4a4356959bf613
+SHA1 (patch-net_base_features.cc) = d5394e42f2f482675c540c3085a4e4fbb3a40cac
+SHA1 (patch-net_base_network__change__notifier.cc) = 1e218292f03c1278964f27553e13544caa8bed0c
+SHA1 (patch-net_base_network__change__notifier.h) = c83056c666a3c0cceadffacc452097b218f763a6
+SHA1 (patch-net_base_network__change__notifier__passive.cc) = 8eb02127d30ea40994acf9a6279985b09f1fbe8d
+SHA1 (patch-net_base_network__interfaces__posix.h) = cb96ab047ed4cec5e8cff916b9bf8faa9e8628fc
+SHA1 (patch-net_base_sockaddr__util__posix.cc) = 7a1c396263d91bfda4438137f819897dd0331a26
+SHA1 (patch-net_base_sockaddr__util__posix__unittest.cc) = a704d56d76d6fc85b2ddf825750639a5d359de2d
+SHA1 (patch-net_cert_cert__verify__proc.h) = b870d13fca3f1b4e6288628e6df0d4be251904b2
+SHA1 (patch-net_disk__cache_backend__experiment.h) = 4b5f6b2939deb8100fd95540030cf8da50ea104b
+SHA1 (patch-net_disk__cache_simple_simple__file__tracker.cc) = 3290234bac4dc14e059b820f3b6de93a2c8fc8f8
+SHA1 (patch-net_dns_BUILD.gn) = b53d4026d390854215b00b38825f2df10fc1d453
+SHA1 (patch-net_dns_address__info.cc) = bd8024079316e1061f7ae25f98a0caf2e0c8a05e
+SHA1 (patch-net_dns_address__sorter__posix.cc) = 5621f9b3a7ec602a0b43072991e375b131474c44
+SHA1 (patch-net_dns_dns__config__service__posix.cc) = 2df7968519dede845e50b17fad1966917c817d6e
+SHA1 (patch-net_dns_dns__reloader.cc) = dab2f5551d878385dc546a0213de7fe7acdcb85d
+SHA1 (patch-net_dns_dns__util.cc) = ce44b3b3d95ba31e21f97e94d10c9f88ccff76ff
+SHA1 (patch-net_dns_host__resolver__proc.cc) = edeaf9bd72cb347f82bde1c0908904b402921220
+SHA1 (patch-net_dns_public_BUILD.gn) = bc8025e1b67c18f6846abe6be270da2117877228
+SHA1 (patch-net_dns_public_resolv__reader.cc) = e52a372ad300d26e29615b6e6b41403b91f2acae
+SHA1 (patch-net_dns_public_resolv__reader.h) = e821f5687b3e70d79176dae8aa1a6bc88b422695
+SHA1 (patch-net_dns_public_scoped__res__state.cc) = dcbbdb770fa9d832133ad5d5174526eea7a4c663
+SHA1 (patch-net_dns_public_scoped__res__state.h) = 2564c63818f9a5080d9e9f03aedfd060612b14e6
+SHA1 (patch-net_filter_zstd__source__stream.cc) = a3c3e4a1de9b9d8d78117cfd5a16535b0a0ba0ed
+SHA1 (patch-net_http_http__auth__gssapi__posix.cc) = 1b3b7a99064290138271e34f17f1703aecf992ed
+SHA1 (patch-net_http_http__auth__gssapi__posix.h) = ea467deee84412877e6f52fb5e918ca889a7bfb6
+SHA1 (patch-net_http_http__auth__handler__negotiate.cc) = 6e022d557bd040c3f30b76e68a094c5ff1b0bb8a
+SHA1 (patch-net_http_http__auth__preferences.cc) = 0a3bc10b290e7a17b3a6235ca0912459d9b8694f
+SHA1 (patch-net_http_http__auth__preferences.h) = 4e575727cdf3f6b27671aaa762c42a4359a1a8c3
+SHA1 (patch-net_http_http__network__session.cc) = 592ab9ac1047519714f9cf96bb4f5c5c844c6583
+SHA1 (patch-net_proxy__resolution_proxy__config__service.cc) = cd2b85f6055a90675f0d0b795e81c035b6a9d01d
+SHA1 (patch-net_proxy__resolution_proxy__config__service__linux.cc) = afbcd001c103257af0813c7dbb35f8f5a0f76066
+SHA1 (patch-net_quic_quic__network__transaction__unittest.cc) = abfa8ba876884760fabea9b5daa99e6b86c9b9ff
+SHA1 (patch-net_socket_socks5__client__socket.cc) = 0052c2f31b1da80335d935a19fd3d3c9c323242f
+SHA1 (patch-net_socket_tcp__socket__posix.cc) = 71b9b3078dddf1a2a753a9df692ef78b04ab0c8a
+SHA1 (patch-net_socket_udp__socket__posix.cc) = 191f00ef42515f9643ae3815f1469bd3ad91564d
+SHA1 (patch-net_socket_udp__socket__unittest.cc) = c3319faa02f81dabd35ff152689307fa23827528
+SHA1 (patch-net_third__party_quiche_BUILD.gn) = ec37e7b8b6d528759985e40339a039ec8b41f6aa
+SHA1 (patch-net_tools_cert__verify__tool_cert__verify__tool.cc) = e55c9e99e6b63d17502be450d7fda426adc7a86c
+SHA1 (patch-net_tools_net__watcher_net__watcher.cc) = 5fb4c6d29d95294c7d526ff1021dbf101094818d
+SHA1 (patch-net_traffic__annotation_network__traffic__annotation.h) = d1b660d246726986ac227f442fc5f709a374b389
+SHA1 (patch-net_url__request_url__request__context.cc) = e5e61983f9cea7904a5883698dfe0b9422422030
+SHA1 (patch-net_url__request_url__request__context.h) = a67aadd075c2487d6a10c23c7bb39da86c578900
+SHA1 (patch-net_url__request_url__request__context__builder.cc) = e43618364c408b7a5e017c83ee9749facbfde57e
+SHA1 (patch-net_websockets_websocket__basic__stream__adapters__test.cc) = 32ba80ccc126b089c240be823eae9bfe19eb0159
+SHA1 (patch-pdf_pdfium_pdfium__engine.cc) = e9b4459fabe637fe2a587a8379c7baca3dc3a0b5
+SHA1 (patch-ppapi_tests_test__utils.h) = 588f9a769488ec5f802f812870bd3c1aec347b81
+SHA1 (patch-printing_backend_cups__ipp__helper.cc) = 636ef6174b8e168120155126246820b25fabe7ec
+SHA1 (patch-printing_backend_print__backend__cups.cc) = 99ddb92f09e789cdc240c40b5020b8a58c663415
+SHA1 (patch-printing_mojom_printing__context__mojom__traits.cc) = 6d41c2d6cf803ae1eeaee158f4a31f4bcb18a14f
+SHA1 (patch-printing_mojom_printing__context__mojom__traits.h) = c0dd9f1f2422fae7b6f17ad1d4e142a47dd6179d
+SHA1 (patch-printing_mojom_printing__context__mojom__traits__unittest.cc) = 15dbec43c6db6bb590cd8ac2bf0568eb876b3dbb
+SHA1 (patch-printing_print__settings.cc) = 63ebc0509f54842eab7640a16e2eba2735e41627
+SHA1 (patch-printing_print__settings.h) = 4c1885201b327fbd6de7c9aba82954245cb94556
+SHA1 (patch-printing_print__settings__conversion.cc) = 6f430bc1c5260f6dfbcabd460ddce19a5038b454
+SHA1 (patch-printing_printing__context__linux.cc) = d44edccf97b1b3e3a18cc1221198f9b5c8749f95
+SHA1 (patch-printing_printing__features.cc) = 327786a418981b96e542c6efcc06c264cd4a4040
+SHA1 (patch-printing_printing__features.h) = c6262fe61db5670fe716e86c793904caa5879455
+SHA1 (patch-printing_sandbox_print__backend__sandbox__hook__linux.cc) = 3a57e64598e8d5f71d9c51598b630c02f5181483
+SHA1 (patch-printing_sandbox_print__backend__sandbox__hook__linux.h) = a4adaee3a9de86e3bf24ab004bd4edeb660bfde7
+SHA1 (patch-remoting_base_chromoting__event.cc) = 065922b7d12c3e2a8c4248f02e831fd8dd970e66
+SHA1 (patch-remoting_base_host__settings.cc) = 12650326e561369984f6209a94954ddfb1573bae
+SHA1 (patch-remoting_codec_webrtc__video__encoder__vpx.cc) = 2d3cbe22ab5fef0d4b2b4548c78150b0aad46214
+SHA1 (patch-remoting_host_base_desktop__environment__options.cc) = e7227008ef1eebd81289f3ef1cbfcac45bd2b7e5
+SHA1 (patch-remoting_host_base_switches.cc) = b4c662c43fb1d32ef2606121ebf1318043dccb15
+SHA1 (patch-remoting_host_base_switches.h) = f639bd088c7d901300b11a851748ec8bd5b374e1
+SHA1 (patch-remoting_host_chromoting__host.cc) = 475d366571d3a9c642063df6708c8f8d766d369a
+SHA1 (patch-remoting_host_chromoting__host.h) = c88fb6fcfe1d4263018c84dc0df0da64b2c2d2d9
+SHA1 (patch-remoting_host_chromoting__host__context.cc) = 9089212c815b502d331171d4a0d773e5ed888d16
+SHA1 (patch-remoting_host_chromoting__host__services__client.cc) = 0294a91371a6cebd15df9b91f90a970c4fe7ffd1
+SHA1 (patch-remoting_host_client__session.cc) = c5820a22603e0230f0da146052af51351be02bc0
+SHA1 (patch-remoting_host_crash_crash__file__uploader.cc) = c31c5996d404b74881042a0fdc14f4e5cf68ef37
+SHA1 (patch-remoting_host_evaluate__capability.cc) = 96704a43024d86ed65229ed477335b3962beae64
+SHA1 (patch-remoting_host_host__attributes.cc) = 3c850c788f56044cc9a167b9d3ab8b2508bee26b
+SHA1 (patch-remoting_host_host__details.cc) = e89e2f08fbbd197eef19adbf7ba904ecf8cdd741
+SHA1 (patch-remoting_host_host__main.cc) = afedb4b2075f7464c2a3babf0a861e2317409053
+SHA1 (patch-remoting_host_ipc__constants.cc) = ccdfd648e75049d6e1c23beb3e7dea5b2b465137
+SHA1 (patch-remoting_host_it2me_it2me__native__messaging__host__main.cc) = e4cc495edea185e4b7cfbe38da5d0c74b2c2be00
+SHA1 (patch-remoting_host_me2me__desktop__environment.cc) = fc62cbd7edd87a17ec226aad35f3e8984131191d
+SHA1 (patch-remoting_host_mojo__caller__security__checker.cc) = 199b5cbd25c241380495b843e90651d9129cf197
+SHA1 (patch-remoting_host_policy__watcher.cc) = 4f39b78c38a589b58532e40bc32528ab1f8c3f32
+SHA1 (patch-remoting_host_remote__open__url_remote__open__url__client.cc) = 45efaa223c6d5f113fb68007495edb0184a71799
+SHA1 (patch-remoting_host_remote__open__url_remote__open__url__util.cc) = 27cd965a6bc17e8fee89eedcaafa469c2ce4f3a4
+SHA1 (patch-remoting_host_remote__open__url_url__forwarder__configurator.cc) = b23f0b707a596d3775dd34cda6b0e49162184964
+SHA1 (patch-remoting_host_remoting__me2me__host.cc) = 554aa46370688e4c21c3c017a5289c4cd55736b2
+SHA1 (patch-remoting_host_session__policies__from__dict.cc) = ac6cd4f315682e30a9d5725fe3d8e6602be0b317
+SHA1 (patch-remoting_host_setup_start__host__main.cc) = 4ffa637d08d135d7bf2d9ae0dec61b2dc2dbed2b
+SHA1 (patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc) = ab231be3e1338de472a770f442614d978e383203
+SHA1 (patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc) = 56b2ddd307f296a3648dd0d65b57691e64aa3881
+SHA1 (patch-remoting_protocol_webrtc__video__stream.cc) = 6809e94e551cdebcaace3dd53e56de32b41ecbad
+SHA1 (patch-remoting_signaling_ftl__host__device__id__provider.cc) = 2c6af0d42121ba14119ede1a84d57ba03518cebb
+SHA1 (patch-sandbox_BUILD.gn) = e79ee49b34a5b38b2e8aac390ca39b93920bd8e9
+SHA1 (patch-sandbox_features.gni) = abc0112d0c676c80684ce1bff45cd148e4b92450
+SHA1 (patch-sandbox_linux_BUILD.gn) = c7f579074bcf8b499286d1ccbf9f73e6cfe99ab5
+SHA1 (patch-sandbox_linux_services_init__process__reaper.cc) = 12979691c1f87e3ee1334b355ccf6ead9c785747
+SHA1 (patch-sandbox_linux_services_libc__interceptor.cc) = 4383d771e4c6cd3cf75f96ac313c3c81116ae3c2
+SHA1 (patch-sandbox_policy_BUILD.gn) = 2b551b366aa2d52c82777be688dc714ba8cb5206
+SHA1 (patch-sandbox_policy_features.cc) = 38c2397707b30403115b8196ac7ef0507c71c5b4
+SHA1 (patch-sandbox_policy_freebsd_sandbox__freebsd.cc) = 03682fd78006ef325e1a098b70e3f2bd9fcd4b15
+SHA1 (patch-sandbox_policy_freebsd_sandbox__freebsd.h) = 5fbd49514d83865b70cd270aa8ea70108d076502
+SHA1 (patch-sandbox_policy_mojom_sandbox.mojom) = d011c0e291e4e27b4e8cdc003441b79dfeba774b
+SHA1 (patch-sandbox_policy_netbsd_sandbox__netbsd.cc) = 87de1b29847001f83404c57d94ff40fa4f86d23b
+SHA1 (patch-sandbox_policy_netbsd_sandbox__netbsd.h) = a778bfa1811861943216373ec06f0e6c17ea5c47
+SHA1 (patch-sandbox_policy_openbsd_sandbox__openbsd.cc) = 6479494b919175bb4b3e0d56cf2698e755e9aa36
+SHA1 (patch-sandbox_policy_openbsd_sandbox__openbsd.h) = 18c1c732d7eda2f23d6564b5e57463d24cbfeee2
+SHA1 (patch-sandbox_policy_sandbox.cc) = 8ad3ea4ff2a0a5e8b69b60ebcb1f4ce859eda6ce
+SHA1 (patch-sandbox_policy_sandbox.h) = c5bf01676810c123ea02b7bff42fdf7983d2a566
+SHA1 (patch-sandbox_policy_sandbox__type.cc) = 22b5ed42b888a16c805b1ac5b9ab7b60a4fc8ecf
+SHA1 (patch-sandbox_policy_switches.cc) = c7f7220157be68f0b90c3ce4362583ee480e13d2
+SHA1 (patch-sandbox_policy_switches.h) = 07f5651831310a62028ebcd40a17d0f2370184ae
+SHA1 (patch-services_audio_audio__sandbox__hook__linux.cc) = 7d3ad9748b3ba69b185615d2fda879bea4945d1e
+SHA1 (patch-services_audio_audio__sandbox__hook__linux.h) = ce32eca8297b2c1433e38af0b6de19850429f123
+SHA1 (patch-services_device_BUILD.gn) = 079d4ac0327b8c44b26226f8f802da64a778cfe6
+SHA1 (patch-services_device_geolocation_location__provider__manager.cc) = 6379331196dd174b762d014e930d47ef8adb54d5
+SHA1 (patch-services_device_hid_BUILD.gn) = 72438923336d4ea02f77e01291c4eceee1981849
+SHA1 (patch-services_device_hid_hid__connection__fido.cc) = c972a27210bf8de257e45a80d750e5911b57bfb3
+SHA1 (patch-services_device_hid_hid__connection__fido.h) = 9c5eed37276a27728b9638588f1ca317603b5234
+SHA1 (patch-services_device_hid_hid__connection__freebsd.cc) = e49c2871880ccc5a1823459d7c82069b09520dba
+SHA1 (patch-services_device_hid_hid__connection__freebsd.h) = 3043a880bce930c9cc849e5858e1b2ae32b16d99
+SHA1 (patch-services_device_hid_hid__service.cc) = b3523f7d3f963e6425e55d3a391e1445233603aa
+SHA1 (patch-services_device_hid_hid__service__fido.cc) = 21aa0f05c48e02af49ed54cb28f7037c04fd443d
+SHA1 (patch-services_device_hid_hid__service__fido.h) = 717958f4b1cb1d63b0630b1637890d9e5565a379
+SHA1 (patch-services_device_hid_hid__service__freebsd.cc) = efe99608278cc902e509be7e7dbd50f2dbdf3009
+SHA1 (patch-services_device_hid_hid__service__freebsd.h) = ea0a034ed28e1ecf2ed819a2653cbd19072cfb74
+SHA1 (patch-services_device_hid_hid__service__netbsd.cc) = 93feb3b5e59cbd8ce88aa2f44810c124019e013a
+SHA1 (patch-services_device_hid_hid__service__netbsd.h) = 8354d3b9bce21fdd30cb8ec448af43c8c98cef38
+SHA1 (patch-services_device_public_cpp_device__features.cc) = 07201949acb718d1b313a3c71fa25ebc62dd32dd
+SHA1 (patch-services_device_public_cpp_device__features.h) = 88b0936675687926051b1074c91f411042cafcbf
+SHA1 (patch-services_device_public_cpp_generic__sensor_sensor__reading.h) = c9344a7943a7c87d81423154dd33f7c2abc8e357
+SHA1 (patch-services_device_public_mojom_BUILD.gn) = 4018f56db9cc36b65e15f9837de970d9683712c4
+SHA1 (patch-services_device_serial_BUILD.gn) = 0f1dc190319733c5c1154ea225184da1202b8c38
+SHA1 (patch-services_device_serial_serial__device__enumerator.cc) = 22131216fa2b060fadd05d5d9c84128b1ce7fdd3
+SHA1 (patch-services_device_serial_serial__io__handler__posix.cc) = cc4e1cae2e7014b778e4eeb8afc633089d366689
+SHA1 (patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc) = d3524b5018bffb9cd7cfc6a2a6543c0d914d82f3
+SHA1 (patch-services_device_usb_BUILD.gn) = 22fb76613158fafcf131cdcd2e3ba353996a2c33
+SHA1 (patch-services_device_usb_usb__device__handle__usbfs.cc) = 88d83d55a3fdc746acaaa7cc823d27cfe3d03059
+SHA1 (patch-services_device_usb_usb__device__handle__usbfs.h) = 9a11309553166a3030368fd448d7d9a5311d0cfa
+SHA1 (patch-services_device_usb_usb__service.cc) = 843f0463da5df9163c7505ffc327439312d72b2b
+SHA1 (patch-services_device_usb_usb__service__fake.cc) = 3a86aa36b05b2a23a79adaa12054d57e8675608d
+SHA1 (patch-services_device_usb_usb__service__fake.h) = 93f1377580eae12b093c964da26cee8b8e1cc77f
+SHA1 (patch-services_network_BUILD.gn) = 7d79ca26dd570b7f01c7aeb6e7645b1d438b1ed3
+SHA1 (patch-services_network_network__context.cc) = 85f8466ddbcb715e1c98897928dda3d6e417660a
+SHA1 (patch-services_network_network__context.h) = f97f5a3730057cb12394032bb26d3ad3b38d4d8f
+SHA1 (patch-services_network_network__sandbox__hook__linux.cc) = 4b2cfa3150048d7d897ba57870e2094a975791f4
+SHA1 (patch-services_network_network__sandbox__hook__linux.h) = f0949dea5d6dd392bd9d6dd86e4adf0d9d4f0889
+SHA1 (patch-services_network_network__service.cc) = 80cef8f2b31bdb04739bd1a7493803271cca30cd
+SHA1 (patch-services_network_network__service.h) = 7b112aca46cceb8fc36bb79da887c78c4c69618a
+SHA1 (patch-services_network_public_cpp_BUILD.gn) = 3f46b035492e33f50dc5259afd8c7cf0c37d0dff
+SHA1 (patch-services_network_public_cpp_features.cc) = 88a93bcbf1543ea2ba2797d2d6e232009310d71a
+SHA1 (patch-services_network_public_mojom_BUILD.gn) = 80bdafb2c4d80125f7c405f1e1d79aa8f90d17e7
+SHA1 (patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h) = dbb4bc390f10ef565153416a6fa0a42535b8ab55
+SHA1 (patch-services_on__device__model_on__device__model__service.h) = 6ea2e5d78152f8958b25328b7c6232d6e3421552
+SHA1 (patch-services_on__device__model_pre__sandbox__init.cc) = 7fdb28a6f48a3c2b91c2943809b6637ec53cc0df
+SHA1 (patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc) = 87291cf601299598d77fc64776368e7394e805f5
+SHA1 (patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn) = b8f5e884376f6c779d31d5c48e1c6709410be306
+SHA1 (patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h) = 797443a50c0eb9a1ddbb3b1f4fb8f6938987d184
+SHA1 (patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc) = 0a3a21dee450da4372720ad5ba8bb3f9ff7b2c2d
+SHA1 (patch-services_screen__ai_public_cpp_utilities.cc) = a8801045596dc78ae8ac66b219fbff56f0eabcd5
+SHA1 (patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc) = cbddceeff79b3c4d4c61caeb8c7b841fdb9a8f4f
+SHA1 (patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h) = f3f2eb201718c6f6e1a697e0ef075d79eb262e8e
+SHA1 (patch-services_service__manager_BUILD.gn) = cfecb44aa5db30d771e2e3a5312022220e59e18c
+SHA1 (patch-services_service__manager_public_cpp_service__executable_BUILD.gn) = 7d7ec7d20091b743852ee92e09cfbf931347ea8a
+SHA1 (patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc) = da05881186f87e959a84fc05aec1814dcc62ba1f
+SHA1 (patch-services_tracing_public_cpp_system__metrics__sampler.cc) = 2a362b0b1c807809bfac3b4c70074a59a76ac6d7
+SHA1 (patch-services_video__capture_public_mojom_video__capture__service.mojom) = 035bb1d733cfd20309d7f5bec77dd5029c76f972
+SHA1 (patch-services_video__effects_video__effects__sandbox__hook__linux.cc) = d80802e9ea53a8476690ea62bf02b2fd30758770
+SHA1 (patch-services_video__effects_video__effects__sandbox__hook__linux.h) = a68da27c0a67ee73447c09a2414d79d1686a3b11
+SHA1 (patch-services_viz_public_mojom_BUILD.gn) = 2a1991cab7b4d1be67c3045fdb0abfa2fce56481
+SHA1 (patch-skia_ext_SkMemory__new__handler.cpp) = e7e21085f2e5838b68d1ca0e2b70e496accb533c
+SHA1 (patch-skia_ext_font__utils.cc) = ce269db28ae2ec962cb86d16e8456cac11248a19
+SHA1 (patch-skia_ext_skcolorspace__trfn.cc) = 0d9fb879bdb21f3d50df84f50bbccb8a7f4f0e89
+SHA1 (patch-third__party_abseil-cpp_absl_base_config.h) = 2acd9d7c8146a9bb1576e89e4c1b532e6f2fc78e
+SHA1 (patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc) = fb38300b615c951058a90cda8d78a51a762a0fe7
+SHA1 (patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc) = bce54cfddd10fd8d57cb4ff93e1901643a0717f3
+SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h) = ee6dbb7cb6628708be9279be1a6d701b61e7141a
+SHA1 (patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc) = d58fa34f15ec1a14e7a538d7c638a815dbfa604e
+SHA1 (patch-third__party_afl_src_afl-fuzz.c) = 44b79352e40ca022c61ff79dc23b81d2b387ee07
+SHA1 (patch-third__party_angle_BUILD.gn) = f1075edf5eb14137cf8bbd0c052c61e209434323
+SHA1 (patch-third__party_angle_src_common_platform.h) = 47913f99db34f4ca07aa8e493286669e1aa47e33
+SHA1 (patch-third__party_angle_src_common_platform__helpers.h) = ab9397338c12f9171157085a1d6c4c4eae1152a8
+SHA1 (patch-third__party_angle_src_common_system__utils.cpp) = 6cd41a5fcc1eb06554c69594e4b5dcddbf111583
+SHA1 (patch-third__party_angle_src_common_system__utils__linux.cpp) = 79544b0cf4f81dd0881b6887d5365790ead0b75a
+SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h) = 49bbf047eff6cb3ed5edc6347afb7b34c9e874d2
+SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp) = 9c2f5f590771af9b4913ecc45bb3abafb28b5d16
+SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp) = 3fce316d8dbb298be8c7d699e2153e6b5180376a
+SHA1 (patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp) = 0d26a44993fb4b009fffbb2db65e11bd2dc11e41
+SHA1 (patch-third__party_angle_src_libANGLE_Display.cpp) = 41425adc78e480f96f30fd69bc5642f6eabf1c80
+SHA1 (patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp) = 0977375effd871b73607b26c9ec6b187bee3e421
+SHA1 (patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h) = 1a52b8d8376e817b44e2ab7437fb7741d9b7f1be
+SHA1 (patch-third__party_angle_util_BUILD.gn) = 61bc51ccc1ba0a25d5c0aa7de0972e3dd3e0c37d
+SHA1 (patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc) = 51ec15c0f559fcfa3b635d6f526778fa7e03a135
+SHA1 (patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h) = 92c706584965f27cda2ca8ce90b82c02a2e5d6a7
+SHA1 (patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h) = 9cbc4601e326af3d4b8935e450f55b3c39efc604
+SHA1 (patch-third__party_blink_public_platform_platform.h) = f42b7af16d2a97054e6e370c63c9f13f2b6bddbd
+SHA1 (patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py) = 22e9f92d1fb87274c1e7f2d9bcec6a4fad22c47a
+SHA1 (patch-third__party_blink_renderer_build_scripts_gperf.py) = 5f640f176dd9df422891d50bd101e6b69a43c8b3
+SHA1 (patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py) = c56a12d9ccff6164a09c4e1263bc3f890692ee9a
+SHA1 (patch-third__party_blink_renderer_controller_blink__initializer.cc) = 6bd6f4c27fe337eee1241088115e447baceb270a
+SHA1 (patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc) = e19e3cbe115cf99060cd41a520fb25e511d252a4
+SHA1 (patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h) = d0dbb0e6f87b952a947411b86bf9772841d70d14
+SHA1 (patch-third__party_blink_renderer_core_editing_editing__behavior.cc) = 915413f6509c551d399af25f36fedd3bf6d0e627
+SHA1 (patch-third__party_blink_renderer_core_execution__context_navigator__base.cc) = a3e08d699e4be73ad68f334c45a5304c0f0252f3
+SHA1 (patch-third__party_blink_renderer_core_exported_web__view__impl.cc) = 50fccd5ff69513f3e8516daa163e559d1dad0387
+SHA1 (patch-third__party_blink_renderer_core_frame_web__frame__test.cc) = 0b19098793791d71c607ee2979a0c1bdb750bd6e
+SHA1 (patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc) = 7d4f413138f9e1405dd9a4774786d9b842f590e8
+SHA1 (patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc) = f7efff127ac4cafe9d11581790237fed1c1ba9a8
+SHA1 (patch-third__party_blink_renderer_core_layout_layout__view.cc) = 779dcf800c4af22c233a69e12803ce77c9e44647
+SHA1 (patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc) = ad37b02e7d3c7674612515e06b9f09328caaf715
+SHA1 (patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc) = 481adcb9a921c4ef0e1de52713db09e418e4f877
+SHA1 (patch-third__party_blink_renderer_core_page_context__menu__controller.cc) = 968d94397b9c14e0cef8752f43e9c4b976eb35b4
+SHA1 (patch-third__party_blink_renderer_core_paint_paint__layer.cc) = dabcb8e00a10421ce54c1dad3e8603f28aeea60f
+SHA1 (patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc) = a41cc8ad966f176b1d92735674072ed0ad33b4ea
+SHA1 (patch-third__party_blink_renderer_core_xml_xslt__processor.h) = 1f1c424c76ce30d09a772f0eff840fc5d1723b6c
+SHA1 (patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc) = 186df1bfb64a86ba9324cb6f24f4f01cf5ed6444
+SHA1 (patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc) = fa684a1041fe765b0f77ee0c6620246c5af003f2
+SHA1 (patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc) = 0c82653aa9e16d11a922f9c5d53b5800cc4455a0
+SHA1 (patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc) = 867a8f65c80ca53c70c994fda47d0ef1dac33c27
+SHA1 (patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc) = f39ac66bffe3695353da42265b8b5cf15f016847
+SHA1 (patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc) = 2ed947e3b6ff9fb6bfaebb568d20b2ddca517723
+SHA1 (patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc) = de1eeda534ed29e3424710756bf7536be1700370
+SHA1 (patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc) = ab0bd3e6196a4205e8b73801611a4a0fa175ff7a
+SHA1 (patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc) = 2532c7ad851f7b8be5c6e3812de9241cc2a725a3
+SHA1 (patch-third__party_blink_renderer_platform_BUILD.gn) = c1d2c5473deb5f01118318719ef777c5b567918d
+SHA1 (patch-third__party_blink_renderer_platform_fonts_font__cache.cc) = ef69514f4e87b0a7b65a9e8e2cf5dee00add8d7c
+SHA1 (patch-third__party_blink_renderer_platform_fonts_font__cache.h) = 605cfb3c06a1e317e489d5199caa42e94e5a5104
+SHA1 (patch-third__party_blink_renderer_platform_fonts_font__description.cc) = fe75293a69231b055ae3587c756f7e0fa4a9e84f
+SHA1 (patch-third__party_blink_renderer_platform_fonts_font__metrics.cc) = a73dd4653892c3b6e95a8d2bad29d9f48130b9ed
+SHA1 (patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc) = eb96684062895e4e9ef567c6fd1b9403e16c3282
+SHA1 (patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc) = 68eb6b5711c6199c1bd3bc70f86ea6087282d7d4
+SHA1 (patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc) = f9c5fa97ea75690e1428b55ce885e83aefbca495
+SHA1 (patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc) = da7201f5d431bc031fb36e0a6956ca3c02f34051
+SHA1 (patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc) = 1b8e8c5bfe1f80dc9a2eb92d9885103855abe558
+SHA1 (patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc) = 4bf6ea53d1789183577c720a69a161095fd1dec4
+SHA1 (patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc) = fd168150fe2606c66dfac08e0ad94deb539ded27
+SHA1 (patch-third__party_blink_renderer_platform_runtime__enabled__features.json5) = 2bf1a37867342e07dee76a4c6ca2e10fcd9a5cdb
+SHA1 (patch-third__party_blink_renderer_platform_scheduler_common_thread.cc) = da1a8678f1a91038739952edeea27e9f47c056dd
+SHA1 (patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc) = ea43130f1d66144a7286f3b63ad7a27f646ae8f8
+SHA1 (patch-third__party_blink_renderer_platform_wtf_container__annotations.h) = ca5707f6783a20197a7e5977eaf5f9b9d86de6b4
+SHA1 (patch-third__party_blink_renderer_platform_wtf_math__extras.h) = edc40c964f8cfe1d4e2c013c113463292f73350f
+SHA1 (patch-third__party_blink_renderer_platform_wtf_stack__util.cc) = 7926e84d4995e9c9d34a24b95bcbdd35892c2e50
+SHA1 (patch-third__party_brotli_common_platform.h) = fadbf86e5fd2a5e4ac758ce4301e82615fe4914b
+SHA1 (patch-third__party_cpuinfo_cpuinfo.gni) = 1d052722ff16613c5de2b6d690dacfc9cdd6d750
+SHA1 (patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni) = 0b59e12a476231b9c966d9190d23b660e0d851f8
+SHA1 (patch-third__party_crashpad_crashpad_client_BUILD.gn) = fae9c954441e5b27f5203bef7876480306f2d269
+SHA1 (patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc) = 10283f37672140f70a0c0237a6aed062edfc1b83
+SHA1 (patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc) = fe09f4fe5d45746eb10f92b5daca8018cf2aa9dd
+SHA1 (patch-third__party_crashpad_crashpad_util_misc_address__types.h) = 36d140c24b4db1239d2ec00f2256f95511ea6f89
+SHA1 (patch-third__party_crashpad_crashpad_util_misc_capture__context.h) = 81a08cd3a3da5fd137453defb4bc498bd4696185
+SHA1 (patch-third__party_crashpad_crashpad_util_misc_metrics.cc) = d128b1dcb270f8fa9d352441bbbc49b5a81a741a
+SHA1 (patch-third__party_crashpad_crashpad_util_misc_uuid.cc) = 763a2ce644da674ce42d013861bc84a2dcc7da42
+SHA1 (patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc) = df67dd4f0528a7069189b1b293aaf8bb184fea17
+SHA1 (patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc) = 1a2d9ed4f0b63b960d7adfaba37444ac4d572b36
+SHA1 (patch-third__party_crashpad_crashpad_util_posix_signals.cc) = 9b69bace08d3f7159f265c9006ad6b071c31711c
+SHA1 (patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc) = 9bd424d3f767058255a47dbbb290ef943a22a6c6
+SHA1 (patch-third__party_crc32c_BUILD.gn) = 5f9c0756c786f34cbb19a15da8a843fb44227394
+SHA1 (patch-third__party_dawn_include_dawn_native_VulkanBackend.h) = cd065bf0687ce8cfa49459762419554d9c14014d
+SHA1 (patch-third__party_dawn_src_dawn_common_Platform.h) = 02651feac71807e30c1a497454cd1bbfe309af0c
+SHA1 (patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp) = 18708d5c7d151c32deb6c5969274a7ab9c1bde64
+SHA1 (patch-third__party_ffmpeg_BUILD.gn) = f1cccbe971decce045cc90ca780cff0d9bd4e1a0
+SHA1 (patch-third__party_ffmpeg_libavcodec_x86_cabac.h) = 3ebdc0beaff7cf8f1b7f7a6f86ba73770de7d70b
+SHA1 (patch-third__party_ffmpeg_libavutil_cpu.c) = 29544e515566e2c686deab25acb9daf5653f5b57
+SHA1 (patch-third__party_ffmpeg_libavutil_mem.c) = da1c2697cfe5044404f99ba6e0ccbd829762d0dd
+SHA1 (patch-third__party_ffmpeg_libavutil_random__seed.c) = 20337e782566ad701e977350d9f933200967f695
+SHA1 (patch-third__party_ffmpeg_libavutil_x86_x86inc.asm) = 5ca76823619053b66a59995fc1552ac241fd2c2e
+SHA1 (patch-third__party_fontconfig_include_config.h) = 7499cfe0ee75d785802ba7a0caf91e20e64a5c79
+SHA1 (patch-third__party_fontconfig_src_src_fccompat.c) = e74c2d5aff2b5e26595307c89a971ed4b752b538
+SHA1 (patch-third__party_ipcz_src_BUILD.gn) = a72a233243e3d064c231ca5b1cdca85c68b71936
+SHA1 (patch-third__party_ipcz_src_reference__drivers_random.cc) = 11e5e0aef810700c1a26bb3853abfe28b26a4551
+SHA1 (patch-third__party_ipcz_src_standalone_base_logging.cc) = c1fb4bd59c240da98b6d1f11d2acb30f536b7644
+SHA1 (patch-third__party_leveldatabase_env__chromium.cc) = 9bbabd5ee4014eb57ddecca9990d6210d6ad538d
+SHA1 (patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c) = 513a92b2b59ad71eed2f0820c7c7a17c46fb9956
+SHA1 (patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h) = a034d040ead0f175a8fe22f5031c6b17db107452
+SHA1 (patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h) = e7fb715da956335c0cc73266671b63006d2660f3
+SHA1 (patch-third__party_libc++_src_src_chrono.cpp) = 990e22d9f2d4df89d49554c7db8dd80b112c8db9
+SHA1 (patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp) = 40c340518b2867dd5aa882978038b3c826eb9c6c
+SHA1 (patch-third__party_libc++abi_src_src_cxa__guard__impl.h) = c0584304bb571aca4a250c903acb8942127924a2
+SHA1 (patch-third__party_libdrm_src_xf86drmMode.c) = e98d877cd7ccb22734c30c02359657838d30b43e
+SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h) = c0f937845e31a2a3debc163f6d7169c9c8f6117a
+SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h) = a67b09d82fba92f79c510745f0007897d106cfab
+SHA1 (patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h) = e8a590e6e477696672e9e3d5a37b54c3172db44d
+SHA1 (patch-third__party_libsync_src_include_sync_sync.h) = 6c76bbbcd7f6e9031be675b5934dda00c825b614
+SHA1 (patch-third__party_libsync_src_sync.c) = 219469a80cb63a9e76092aef9c7eb929d1757825
+SHA1 (patch-third__party_libusb_BUILD.gn) = db638b9c12189e7281ba2f0deaa07d28eec0be09
+SHA1 (patch-third__party_libusb_src_libusb_core.c) = d75d286201cbac729eb94a1741e9df8412f0891f
+SHA1 (patch-third__party_libusb_src_libusb_os_threads__posix.c) = 1da825e076a5d5ea0822e2288931304639ac4b52
+SHA1 (patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c) = aaf43676bcc5aedf945758faf4dc0ccac31d28dd
+SHA1 (patch-third__party_lzma__sdk_C_CpuArch.c) = 8cd7ba84ace103b75ca243bbaf1e1bbcb825642c
+SHA1 (patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc) = dd10f9af7fdda52ac7f2c42aaef1f788d87a2627
+SHA1 (patch-third__party_nasm_BUILD.gn) = 7d5b5d80374e53a25d9be57cff88a402f89ab784
+SHA1 (patch-third__party_nasm_config_config-linux.h) = 8b6b36ac5d1661a38e51f0e633fd88f8b40f9b5f
+SHA1 (patch-third__party_node_node.gni) = 72d9d2a8052c4b16fc42e377e6c9da4e973266fa
+SHA1 (patch-third__party_node_node.py) = 97a1d5bcf748303130c7bb25a76d6fb106ce4775
+SHA1 (patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp) = e8914ce6e03d91b8b1ffbd3b78f322ac92791065
+SHA1 (patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp) = c967358f356a7fad992460839502f1afd6cfdd56
+SHA1 (patch-third__party_pdfium_fxjs_fx__date__helpers.cpp) = c0e7ad03b3ebb0235b18fc2ccefbd597cafb3012
+SHA1 (patch-third__party_pdfium_pdfium.gni) = d1d89deb0ed31ee75dff3c1fa9991af5cf17f949
+SHA1 (patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp) = 9d7ac513c41f7f6642a1c389575bf1d2ff8931e6
+SHA1 (patch-third__party_perfetto_include_perfetto_base_build__config.h) = d7af2e4b25ea824803a0c0a62c83adac1de3f5f0
+SHA1 (patch-third__party_perfetto_include_perfetto_base_thread__utils.h) = d872b626cafa80485277579ae66a99463f24f39f
+SHA1 (patch-third__party_perfetto_include_perfetto_base_time.h) = cc3a916f5797293debcd681c5d6da53860b164bd
+SHA1 (patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h) = 32c0019cac535fd5fa0a5a928f13993793fa070a
+SHA1 (patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h) = 6054b01437977fc52f82b44411b115ac2b4c0200
+SHA1 (patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h) = 7aa0826e84fa717f34e67fcd879ab4c260a0b78c
+SHA1 (patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto) = a64857693e2060bb09838074d290cbb60b0746ce
+SHA1 (patch-third__party_perfetto_src_base_clock__snapshots.cc) = cc4e5782a47658a6806798fd06ea984011bb0cc8
+SHA1 (patch-third__party_perfetto_src_base_event__fd.cc) = e8011b194c112d8c231e3368a945862755b58e68
+SHA1 (patch-third__party_perfetto_src_base_periodic__task.cc) = 91ac99ea1b0cb5286b90c3de52b1c6d2afffbc78
+SHA1 (patch-third__party_perfetto_src_base_string__utils.cc) = ce230b9de6b07f41d0ea672e0b2a08b83b0996e5
+SHA1 (patch-third__party_perfetto_src_base_subprocess__posix.cc) = 4119142a384a5f90bff30ebb60ec4c4cce1caa28
+SHA1 (patch-third__party_perfetto_src_base_test_vm__test__utils.cc) = db6061f6f36793647b5249b7dd9ac1aa4d961fa8
+SHA1 (patch-third__party_perfetto_src_base_thread__task__runner.cc) = 145931e868c85fef5a16129131fa7b7ae1607699
+SHA1 (patch-third__party_perfetto_src_base_unix__socket.cc) = d48750c8009fe21989b68769d2c42358fec9ad96
+SHA1 (patch-third__party_perfetto_src_base_utils.cc) = a5d6751693eaf5798c875862fe8c93a21fd45e36
+SHA1 (patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc) = d29c2cb18be8095989ff663af6f1608f585a5c1d
+SHA1 (patch-third__party_perfetto_src_tracing_ipc_memfd.cc) = 570946f9079001f25c6bac3af2d6fbcebe8d5fa0
+SHA1 (patch-third__party_perfetto_src_tracing_platform__posix.cc) = 0b5caacc481d38c148e4e9954c307e76d091e475
+SHA1 (patch-third__party_perfetto_src_tracing_track.cc) = d3840f2692cb32fd8f9f8ed43d31c71a2ceef39b
+SHA1 (patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h) = c57297e1d88e071eeef67e91e0d5e692e9c98f5c
+SHA1 (patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h) = 95bf09a42b53722519a4ad46b383338c299a2502
+SHA1 (patch-third__party_skia_src_ports_SkMemory__malloc.cpp) = ad5e42d384fdd929c472dff2c07b2bff8683ac4a
+SHA1 (patch-third__party_skia_src_ports_SkOSFile__posix.cpp) = dcb76ee45a1c700016a356fa2f205a7a2d82cfff
+SHA1 (patch-third__party_speech-dispatcher_libspeechd__version.h) = 20e7e79c96a97250ab0b9e3b644e4ba21072261b
+SHA1 (patch-third__party_speech-dispatcher_speechd__types.h) = f9c7c0ec8bc1eb0898b4810e6b4d365b2f24ed27
+SHA1 (patch-third__party_sqlite_BUILD.gn) = b2a6d8da2fc6b22d8dea0eeeaa92ae590f52310b
+SHA1 (patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c) = e979d2917aa7e5eef1120aa3c9b88eb049e1c9c1
+SHA1 (patch-third__party_sqlite_src_amalgamation_sqlite3.c) = 148fdbd3862738aad48de6cce1f9ad2b9fb698b8
+SHA1 (patch-third__party_swiftshader_src_Reactor_Debug.cpp) = 0c16afe457678e5039e91d05883349fcc121000b
+SHA1 (patch-third__party_swiftshader_src_System_Configurator.cpp) = 13545b2914c532011c4ae5cf708303f7fed3c25b
+SHA1 (patch-third__party_swiftshader_src_System_Linux_MemFd.cpp) = ced30422ca92c56fae55cdaeebb0412f8f2d161b
+SHA1 (patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp) = 97f511a6d19a0277cbc796f9f61ffd2869fd969b
+SHA1 (patch-third__party_swiftshader_src_WSI_libXCB.cpp) = 4ce6dc595cb55bbe98f82f02146dfae209941e60
+SHA1 (patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h) = 9ce49c0e13d7c19bfd98f364e8e9f6d4f40b8a63
+SHA1 (patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h) = 8285000350fae8198270439af4568782d099c951
+SHA1 (patch-third__party_swiftshader_third__party_marl_src_memory.cpp) = 22e243f7749719f6721570afdf710fa970240b6b
+SHA1 (patch-third__party_swiftshader_third__party_marl_src_thread.cpp) = 7e1df96c4aaff8f84645efac8a1ef8a0887c17da
+SHA1 (patch-third__party_test__fonts_fontconfig_BUILD.gn) = 7223e0306b634175a1cc73ba4c59770cfafce3e8
+SHA1 (patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc) = e0e05bba77444d623f6e67a80a1c46b0810db377
+SHA1 (patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc) = 620a34a7b9570543bf34fb4a910c385c005d52f9
+SHA1 (patch-third__party_tflite_features.gni) = 0ee5f448b96e850e3cc34aec95855fa7df4ba210
+SHA1 (patch-third__party_unrar_src_crypt.cpp) = b3db30a5d702a039364c4fb5b38dd9d1d4731670
+SHA1 (patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h) = 3dce0dfe1ca82de0bfce7ec75f644ddc0d027d4f
+SHA1 (patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp) = 6490d58df48800688d928ddc66031a1abe697e94
+SHA1 (patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h) = 64f8814462c0bcc0ea3ff86222edba7d8979f209
+SHA1 (patch-third__party_wayland_BUILD.gn) = 82e39a60548aef17aa2e1858aa6ac58e75c389bc
+SHA1 (patch-third__party_wayland_include_config.h) = 6d85bad754395ad6467f6b319673bed1f7ba27de
+SHA1 (patch-third__party_webrtc_BUILD.gn) = 8581f73902564959edd991b9421e8cbff59d9d17
+SHA1 (patch-third__party_webrtc_modules_audio__device_BUILD.gn) = fb51a40353e8d03446d882f77fa8a74d45d3cc94
+SHA1 (patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 3aa660890e52d7588cc549ccd98b5cf7b2d344d1
+SHA1 (patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc) = 8339a7bebb642c885c1eefec494647d316ceb303
+SHA1 (patch-third__party_webrtc_rtc__base_byte__order.h) = c0044b2f07883f99fc009af9b713910c471540d3
+SHA1 (patch-third__party_webrtc_rtc__base_ip__address.cc) = 498554d5299e5b965aa955e73e51893342ddb036
+SHA1 (patch-third__party_webrtc_rtc__base_net__test__helpers.cc) = 9155590c2672771d59d3fce2e2bfe86f069c859c
+SHA1 (patch-third__party_webrtc_rtc__base_network.cc) = c162eeab65bf4f9382ec8d05f308ff001dd0284a
+SHA1 (patch-third__party_webrtc_rtc__base_physical__socket__server.cc) = 8ffd78f8eddef017319d6857a8d467c9f3a84267
+SHA1 (patch-third__party_webrtc_rtc__base_physical__socket__server.h) = 0438eb31434c294dc1bde07357bccf00a2223bbd
+SHA1 (patch-third__party_webrtc_rtc__base_platform__thread__types.cc) = e614b57c16e17ec559f989eb156c93646892d122
+SHA1 (patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h) = 9e98bcacac27d7873f606d9282fb4f32963786ce
+SHA1 (patch-third__party_webrtc_system__wrappers_BUILD.gn) = 01328db3e28616d303f288e1af652bf5a3571012
+SHA1 (patch-third__party_widevine_cdm_widevine.gni) = fd37a01632924f6eb50d353a5f74e3ba1abf8266
+SHA1 (patch-third__party_zlib_BUILD.gn) = cb1af5c622ed540b3fac703e2d7738a2faf8e011
+SHA1 (patch-third__party_zlib_cpu__features.c) = e3c22ffa2001b32c6f4fd66f2fe9b70154758242
+SHA1 (patch-tools_code__cache__generator_BUILD.gn) = 76cc84c32b8a02c833ed080e19c9df193d6a418e
+SHA1 (patch-tools_generate__shim__headers_generate__shim__headers.py) = 79710a20dd32589d51aa3147bfbe69b8993fb7eb
+SHA1 (patch-tools_generate__stubs_rules.gni) = 5348554553b33f1f7657dcdd3c4c468e91742857
+SHA1 (patch-tools_gn_build_build__linux.ninja.template) = 674226fcbff6c20c3d6964b82898e3dbbeaa65a4
+SHA1 (patch-tools_gn_build_gen.py) = 4cd3c3a09ca68ded4d12e4585dbcf97595b27c89
+SHA1 (patch-tools_gn_src_base_files_file__posix.cc) = 0491e92067869817b1d5528635038e19f7275844
+SHA1 (patch-tools_gn_src_gn_version.h) = 63cfa4bc938187bdcac64d678e01b37ceb122da3
+SHA1 (patch-tools_gn_src_util_exe__path.cc) = 200fe82702a2f320188ed4355cb79dd16a540bee
+SHA1 (patch-tools_grit_grit_node_base.py) = 9601362c3ae2466c29613d95f7fc94e9ac73501a
+SHA1 (patch-tools_json__schema__compiler_cpp__bundle__generator.py) = f9f853f156ce15d47e79347c72b6cb6de2a5b9cc
+SHA1 (patch-tools_json__schema__compiler_feature__compiler.py) = 263436f965edce1ec6bef62e89cf23e72e652a26
+SHA1 (patch-tools_memory_partition__allocator_inspect__utils.h) = 7c9b0b7f4f9320d193c73a63c968acdac471a2be
+SHA1 (patch-tools_perf_chrome__telemetry__build_BUILD.gn) = 2000aaf67caf9348febf5c8fa198920749e8f2ac
+SHA1 (patch-tools_protoc__wrapper_protoc__wrapper.py) = f64738042e8b70b47475fae5a2e7aced18c41708
+SHA1 (patch-tools_v8__context__snapshot_BUILD.gn) = c5260cf158fc0a15ba8da28588daee2851e43163
+SHA1 (patch-tools_variations_fieldtrial__to__struct.py) = 06bf24c41c50646de3d73bd872ac7c7f3d7269e2
+SHA1 (patch-ui_accessibility_accessibility__features.cc) = afe0133d8ea31ba36aa686fc589582a76efcbe02
+SHA1 (patch-ui_accessibility_accessibility__features.h) = efadf5bc899a6a844e2bdf3caaf0c8f28b2a2901
+SHA1 (patch-ui_accessibility_ax__node.cc) = 55b7906b5416ddd5d0cc72710d1d874d0bb4966c
+SHA1 (patch-ui_accessibility_ax__node.h) = 28df1507fa3667ccca6bdf8988355f9377971ddb
+SHA1 (patch-ui_accessibility_ax__tree.cc) = 6a5af925998f5746602419a5284bb86164f56441
+SHA1 (patch-ui_accessibility_ax__tree.h) = 51e714c3722dde2669a1452b215d32feaf0c7679
+SHA1 (patch-ui_aura_client_drag__drop__client.h) = cea1cad156682557d238ae9314995806dfdc2a12
+SHA1 (patch-ui_aura_screen__ozone.cc) = b4f9ce71159f7b572c6453ed3dccb60ad9a40897
+SHA1 (patch-ui_aura_screen__ozone.h) = 37874488e19deccdaff546c84f05dbca5dde331a
+SHA1 (patch-ui_base_accelerators_accelerator.cc) = ec871aee9082693af335a576f5d1db3a766b09c7
+SHA1 (patch-ui_base_accelerators_command.cc) = 2d9b93f98ae9867443ca3deeafc218b3f6181e40
+SHA1 (patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc) = 979d1e7748f23c83e997068dffd2f63018198751
+SHA1 (patch-ui_base_clipboard_clipboard__constants.cc) = de50e8ba712582caec671055f5a860a0d37f0428
+SHA1 (patch-ui_base_clipboard_clipboard__constants.h) = 25b20c052611c772273c0c5b25269623ee28295a
+SHA1 (patch-ui_base_clipboard_clipboard__non__backed.cc) = bc627f3949d1f3bd6bd6e1ed79fd21c6a43f99ed
+SHA1 (patch-ui_base_cursor_cursor__factory.cc) = 75073eb6fa16f401e547921089348f3e1a104acb
+SHA1 (patch-ui_base_cursor_cursor__factory.h) = 2fc10667695cedd508a72d80396533e684416e2e
+SHA1 (patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc) = f81ee92aef9fb9e76d0fb91001caa303131cdff0
+SHA1 (patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc) = 0c9a87ff4bd63fb50fbd9f60dddc6490e65957ab
+SHA1 (patch-ui_base_ime_dummy__text__input__client.cc) = acbadc51dc93a881f16941152c3dc065169c4b98
+SHA1 (patch-ui_base_ime_dummy__text__input__client.h) = 715ae617f15b47b5b559c9e121443ba32bbc3e4a
+SHA1 (patch-ui_base_ime_fake__text__input__client.cc) = cd522d1ce902d8d9d7aff0a8b0158b4d952ae150
+SHA1 (patch-ui_base_ime_fake__text__input__client.h) = 21e079090ad09b419f7a81d8139e46009eb0bce3
+SHA1 (patch-ui_base_ime_init_input__method__initializer.cc) = a9d1d29f667750166b5446718cffc9b4e86c5709
+SHA1 (patch-ui_base_ime_linux_linux__input__method__context__factory.cc) = 6bca02e8b08813ebcbe419e61fa5f2982a1bdc81
+SHA1 (patch-ui_base_ime_text__input__client.h) = 688cd57f363b35a8b48e1d4a9709f8395856af87
+SHA1 (patch-ui_base_resource_resource__bundle.cc) = fc95c46cb94292c8f5440a8ba4b7b2e578cdcca6
+SHA1 (patch-ui_base_test_skia__gold__pixel__diff.cc) = dd65c778165c20fcac276508f0191fbf8ecc03e9
+SHA1 (patch-ui_base_test_ui__controls.h) = 3ba309dc11ef6a3f78003880fd1576fb9201cb82
+SHA1 (patch-ui_base_ui__base__features.cc) = 1c9c88935d70dbebbf70075f7c03719d40d90c3c
+SHA1 (patch-ui_base_ui__base__features.h) = f95297d04a2bf7b0343fb5d028bd2a59a7291aee
+SHA1 (patch-ui_base_ui__base__switches.cc) = 8ef4caadda246f5d4b8103c05793ad00714a3534
+SHA1 (patch-ui_base_ui__base__switches.h) = 5a7c515219059d6b55dfe62a5740a3dc134eb19a
+SHA1 (patch-ui_base_webui_web__ui__util.cc) = 4fd4fbb15d1e4673fda2e2a505b596b1c73764c3
+SHA1 (patch-ui_base_x_x11__cursor__factory.cc) = baee71333c81257da153d55b7effd5ac8b1f766e
+SHA1 (patch-ui_base_x_x11__cursor__factory.h) = 900a3965a6346e950641d23e0de4e64c486122b5
+SHA1 (patch-ui_base_x_x11__cursor__loader.cc) = 58261d08135b667d08f243607f0bf0d82ca1a76a
+SHA1 (patch-ui_base_x_x11__display__manager.cc) = 4cc89d499b615cf9cfce99560b5649f2ceb3e013
+SHA1 (patch-ui_base_x_x11__shm__image__pool.cc) = bfded3dddd820c8c32402442f850c458e8f48da7
+SHA1 (patch-ui_color_color__id.h) = cf883ad0680ad96ba8172078eaa7cc8004ff72c8
+SHA1 (patch-ui_color_color__provider__utils.cc) = 83b450630f2512212d7e171408f9bb2dd6b86edf
+SHA1 (patch-ui_color_system__theme.h) = 5bc7b4e6791930726ccbd65432d379030e7ea448
+SHA1 (patch-ui_compositor_compositor.cc) = 3b069f6d65b0a9a568fb3eb3fc36f6406ebd4fcf
+SHA1 (patch-ui_compositor_compositor.h) = 9ff1960c7e238ebfa1dc8fffc5d85a4d781a5f12
+SHA1 (patch-ui_compositor_compositor__observer.h) = 64c1e8b20045bf3bb197cfa016d0fe35801ef716
+SHA1 (patch-ui_display_screen.cc) = 7a7731c0aeec65919ed253f4a720c537ac637dde
+SHA1 (patch-ui_display_screen.h) = df9fdb0eb6b513318bbd44f214544f419ed350b1
+SHA1 (patch-ui_events_devices_x11_device__data__manager__x11.cc) = 189d60e2a3bb4afcbda11d16a82d10ec037cf68a
+SHA1 (patch-ui_events_event.cc) = b427e5eca1fe2e9c63dcba5ec998f0b61409af0e
+SHA1 (patch-ui_events_event__switches.cc) = b756c246af5beef52dbc1a5af33ce0e3064943e1
+SHA1 (patch-ui_events_event__switches.h) = eb6d63d95bd22f5d48b18c909c27117d86611514
+SHA1 (patch-ui_events_keycodes_dom_keycode__converter.cc) = 627ce8abe82f7dd88c9defee5b520417c8096297
+SHA1 (patch-ui_events_keycodes_dom_keycode__converter.h) = 356bc75ee450b697d4b6e5f3b71771291bdeecc1
+SHA1 (patch-ui_gfx_BUILD.gn) = 06b09302c0b16512610e2bf789347f614be45f9f
+SHA1 (patch-ui_gfx_canvas__skia.cc) = 96b408e899590464d6eb9e02d01ab9e759b2b8cc
+SHA1 (patch-ui_gfx_font__fallback__linux.cc) = a7ad00e8c5fd14134e25d0b49d3dc96d15cc685e
+SHA1 (patch-ui_gfx_font__render__params.h) = 3b6776ad1ea032b40f12b9bf55401ebde3f19bda
+SHA1 (patch-ui_gfx_font__render__params__linux.cc) = f8237587da03d5ef137c970b403c07e2fe6b285e
+SHA1 (patch-ui_gfx_font__util.cc) = 7e6de8a9836cfa5dd76b99995e9baa936ecaa14a
+SHA1 (patch-ui_gfx_gpu__memory__buffer.cc) = 751e4b38f90ff546089583a6f1a88617876be96c
+SHA1 (patch-ui_gfx_gpu__memory__buffer.h) = 66bc6fb47067d84bea5066edf40e66935065e614
+SHA1 (patch-ui_gfx_linux_dmabuf__uapi.h) = 5dced280ebe4a551a882dc5d16fafe19d112b0ac
+SHA1 (patch-ui_gfx_linux_gbm__wrapper.cc) = 62ccb41c65c311b519fb4e29e9cd660880efaae0
+SHA1 (patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc) = b21b080cba7eb2d18188bb09fd1065bd09d63891
+SHA1 (patch-ui_gfx_mojom_native__handle__types__mojom__traits.h) = 522d86037e57e1a97e48e2e48782c30d4eb51f8b
+SHA1 (patch-ui_gfx_native__pixmap__handle.cc) = afd3a15a4921e962e0dfa6ee863a67da82017023
+SHA1 (patch-ui_gfx_native__pixmap__handle.h) = c6f4e27076cb99497842dd13353c90aa51d18a90
+SHA1 (patch-ui_gfx_native__widget__types.h) = 9decaff6ea2aa9b9160dc6fd0a8419a51db8f285
+SHA1 (patch-ui_gfx_platform__font__skia.cc) = abae566480eae14f462643ea3fa22bbf434ebfd6
+SHA1 (patch-ui_gfx_render__text__api__fuzzer.cc) = 5476cd3f631cc08023b551ca0ddaec127a6c3028
+SHA1 (patch-ui_gfx_render__text__fuzzer.cc) = 739b214256a1cfc9359f5b10ce5d13e57648c767
+SHA1 (patch-ui_gfx_switches.cc) = 3fb4b16330dbc6c857f641b59ae72666803dc695
+SHA1 (patch-ui_gfx_switches.h) = 69fa45afb9fcd6e7759c59529f0d605263bfbac1
+SHA1 (patch-ui_gfx_x_atom__cache.cc) = a735779a01451a819d23c60a5eeb6353e34877fc
+SHA1 (patch-ui_gfx_x_generated__protos_dri3.cc) = f5861c92eba39947e19b7df53a88db0f8534c3f3
+SHA1 (patch-ui_gfx_x_generated__protos_shm.cc) = 23d54dffc0443503da90c0078cc0458e0fd36fa3
+SHA1 (patch-ui_gfx_x_xlib__support.cc) = 8aefc9def428225043a12addd76f34773a87b843
+SHA1 (patch-ui_gl_BUILD.gn) = 27499e13fc6ba695458700cff575c63e3a0edc11
+SHA1 (patch-ui_gl_gl__context.cc) = b40808c0977cd590af6f4a843b4f3e209ad52e3e
+SHA1 (patch-ui_gl_gl__fence.cc) = aac868ba376ec9b25e2e424e275274faf7697d20
+SHA1 (patch-ui_gl_gl__implementation.cc) = 06f0f28bbdc6175f565fd2457df5d77375ebebaa
+SHA1 (patch-ui_gl_gl__switches.cc) = 5f467d4dd3d50f5e138ca90f3ae85e017b2cca25
+SHA1 (patch-ui_gl_sync__control__vsync__provider.cc) = b08a85c883bb509e1d2742b26a393ea9490c9369
+SHA1 (patch-ui_gl_sync__control__vsync__provider.h) = d909811e0a29f1b1d90e99d5f65a5c33a128ecd6
+SHA1 (patch-ui_gtk_gtk__compat.cc) = f8b7472eff5cd6c1bc6d9fa367112e18e140f89d
+SHA1 (patch-ui_gtk_printing_print__dialog__gtk.cc) = a141177309f516cbd3d14b658409fce52ce7f340
+SHA1 (patch-ui_message__center_views_message__popup__view.cc) = 9e4f77495d368913b988fa5d98bda68dff98cde8
+SHA1 (patch-ui_native__theme_features_native__theme__features.cc) = 4314efb311d2a221d8bb613822350b90d809f3ed
+SHA1 (patch-ui_native__theme_native__theme.h) = ccbee7739051a46b317e7512963be1b471d949b0
+SHA1 (patch-ui_native__theme_native__theme__base.cc) = eed06f9a94b4846e0a9571dda13a2b8fa1e73f3d
+SHA1 (patch-ui_ozone_common_egl__util.cc) = 1c0527ec059a86de18de5c4a86a62a8d6c566c98
+SHA1 (patch-ui_ozone_platform_headless_headless__surface__factory.cc) = 442abb390beacf0f870ba1ddfbfa05ef8d244ea1
+SHA1 (patch-ui_ozone_platform_headless_ozone__platform__headless.cc) = aa6d200c9bce71ac0fc2dbda49dfcc135bc1dd27
+SHA1 (patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc) = 89d8a85629d6f7696ef6f6ac4bdad8c9ab5ebfb2
+SHA1 (patch-ui_ozone_platform_wayland_common_wayland__util.cc) = 69e025754ab7c10f26fbed2ed35c3accfae1827a
+SHA1 (patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc) = cc65a479fdfe5bfaa31e08a09d8ec45a9f4e5528
+SHA1 (patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc) = 5b94773ee9ccf9c0ff98f828951f192fac0df6b2
+SHA1 (patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc) = 7fd972d2fb841b9f98821955cff78ac22f970204
+SHA1 (patch-ui_ozone_platform_x11_x11__screen__ozone.cc) = e4058fb8112205c81ea25e7db6cca66ce4e7600f
+SHA1 (patch-ui_ozone_platform_x11_x11__screen__ozone.h) = 4e4e3b0c4fc635409fd23beb97e5397b469a7abc
+SHA1 (patch-ui_ozone_platform_x11_x11__window.cc) = 18a81228a5b6e5d84ae38548134668fc23fed5ca
+SHA1 (patch-ui_ozone_public_ozone__ui__controls__test__helper.h) = 0b88fc9de700aa8ee673cdbede3ae5ebf35b914c
+SHA1 (patch-ui_ozone_test_mock__platform__window__delegate.h) = c3b5dd4787645dfdde509d5f5222e1fc3f6de394
+SHA1 (patch-ui_platform__window_platform__window__delegate.cc) = 64f86a416f3c6f92288401bae4efb9b3d3ff9873
+SHA1 (patch-ui_platform__window_platform__window__delegate.h) = b1d5955c54e50159c4d7583745534cf2cfc6d870
+SHA1 (patch-ui_platform__window_platform__window__init__properties.h) = ac0f744d04a14568c3928f91a90b690aad05ad54
+SHA1 (patch-ui_qt_BUILD.gn) = ff7e4c5b13358a1e2f606de3b16a728b0a095d47
+SHA1 (patch-ui_strings_translations_app__locale__settings__bn.xtb) = 81613d0e08f532906458685f1a1150f859bb98b3
+SHA1 (patch-ui_strings_translations_app__locale__settings__ja.xtb) = b0c72898d2280fbcad3db5ebd5a91d32a44bfaed
+SHA1 (patch-ui_strings_translations_app__locale__settings__ko.xtb) = 23a2c67efc7421900faa673349bc5a70f35eff72
+SHA1 (patch-ui_strings_translations_app__locale__settings__ml.xtb) = 18a0a7ab8761506beb554537fd0efaa7e77015d4
+SHA1 (patch-ui_strings_translations_app__locale__settings__th.xtb) = af3aaf3b77773e888d625cd28d579edd1143827e
+SHA1 (patch-ui_strings_translations_app__locale__settings__zh-CN.xtb) = a6e9740ec1eb3821c49e09134b3096ad29bcdb93
+SHA1 (patch-ui_strings_translations_app__locale__settings__zh-TW.xtb) = bcbda496eca35d9b626ea52cdb44af1235865efe
+SHA1 (patch-ui_views_BUILD.gn) = f93ea99dceb1af497c0edc234fef295d1dcae40e
+SHA1 (patch-ui_views_accessibility_view__accessibility.cc) = 4965069a1ddb724ee97e700b6ce855f6b0e914ab
+SHA1 (patch-ui_views_controls_prefix__selector.cc) = 1f253b1f74272d55f91a4d18b37ef7e819787661
+SHA1 (patch-ui_views_controls_prefix__selector.h) = cc269e597d02993ebcafe0f8882a0233629982f6
+SHA1 (patch-ui_views_controls_textfield_textfield.cc) = fd7a1cfff0755a2c1c3308ac433494ec0509e4bb
+SHA1 (patch-ui_views_controls_textfield_textfield.h) = 8c95b234f11e952ae6be91413ce2dbe2e9373ed3
+SHA1 (patch-ui_views_corewm_tooltip__aura.cc) = 01f283ec6129a777a5d400f99334377e4d5cec7d
+SHA1 (patch-ui_views_examples_widget__example.cc) = 70e3ec0c48734fe5b79fc521761295bd3d3383a8
+SHA1 (patch-ui_views_focus_focus__manager.cc) = 99557f12ba693e827018387be5363b02e88105e0
+SHA1 (patch-ui_views_style_platform__style.cc) = 5c70877335d36d942c26ec26c865e2d07cf3392b
+SHA1 (patch-ui_views_style_platform__style.h) = 572a8d26b0bfc1f05c4092652386d40b732bcd42
+SHA1 (patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc) = d3359fd4b83cd8ca463703710474cead8b953f6b
+SHA1 (patch-ui_views_views__delegate.cc) = b95bfbda47054b7e2bcd902caf736e094b4921f5
+SHA1 (patch-ui_views_views__delegate.h) = c451fa7cd51fd5a2e4986f57a3f663c7ed2dbf05
+SHA1 (patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc) = 25c88abaeda5433634339ce6875f89ff6abeacbf
+SHA1 (patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h) = f19af74488500deb17183f60fac3c14d25a1a992
+SHA1 (patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc) = e3da4e2b9b296fca80e11261652f684460d97389
+SHA1 (patch-ui_views_widget_root__view.cc) = 97d790bd177096d6f7569fc6d2406e22b6de93be
+SHA1 (patch-ui_views_widget_widget.cc) = 6b17e0b2ddc6802da0f590fcb0146285d11f7ed8
+SHA1 (patch-ui_views_widget_widget.h) = 5d9ac2e8adb9f32b5eda6b34aab949f5855904c7
+SHA1 (patch-ui_views_window_custom__frame__view.cc) = 13efc7ee08de55a2dd1f7d3e4158cf9326a44ee4
+SHA1 (patch-ui_views_window_dialog__delegate.cc) = acd14c9c7a0b0e599e76f964c996be7a8dc0216e
+SHA1 (patch-ui_views_window_frame__background.cc) = bba6c5157a294fb9b31c5392a31cd1260d139704
+SHA1 (patch-v8_BUILD.gn) = 02955dafdb4e78920c1eed1a782a23d803df0d7a
+SHA1 (patch-v8_include_v8-internal.h) = b33f15e44e08aa54c67e3283c5220efc90ff717d
+SHA1 (patch-v8_include_v8config.h) = 0f50e8640813d6beda512bdea80760fd8ac94702
+SHA1 (patch-v8_src_api_api.cc) = a30551cb054e176814c1beacc42386c0245423da
+SHA1 (patch-v8_src_base_atomicops.h) = 85fd2da5b5cd6be1fac377121ccab20ef02030b6
+SHA1 (patch-v8_src_base_platform_memory.h) = 6ccafc6271cf34ae61d708807b51b4ee48e2bb33
+SHA1 (patch-v8_src_base_platform_platform-freebsd.cc) = 04b7b92eede0fb92d088c242db22b2a4b3c1a905
+SHA1 (patch-v8_src_base_platform_platform-openbsd.cc) = 7c8f123b951ae528bdc8e7ef4a060565e5fcaa3f
+SHA1 (patch-v8_src_base_platform_platform-posix.cc) = cb7befe54280e819edeeaa94970aa60fba0f2fec
+SHA1 (patch-v8_src_base_strings.h) = 7af7ca0eea276429c0a22281eb6c9b6c0dcbc01e
+SHA1 (patch-v8_src_base_sys-info.cc) = d079f8906264529a98730a406fb9b851f0a173a3
+SHA1 (patch-v8_src_base_utils_random-number-generator.cc) = 7c17289bcc8f0be9e0a88949b59afabb42e1ee70
+SHA1 (patch-v8_src_diagnostics_perf-jit.cc) = 320a3f2de3b04538304d288133b6da04500040c4
+SHA1 (patch-v8_src_diagnostics_perf-jit.h) = f0e3b106f4f4e67920d06d73e28eccfe23cef379
+SHA1 (patch-v8_src_execution_isolate.cc) = a27a005853f85d2af5641a7bf16659c5070d2ca7
+SHA1 (patch-v8_src_flags_flags.cc) = 2459070e9e4b9c76bc222208f4039a3cb0f2494a
+SHA1 (patch-v8_src_libsampler_sampler.cc) = 81cf4fa0cdb1dbddb3321bd2b81fc1135975feb7
+SHA1 (patch-v8_src_sandbox_sandbox.cc) = 53771e14bbb0506b2ac7f84970e38bbc545145b7
+SHA1 (patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc) = 12b36d5516f4c40afb8c2ab1314349408a3cbcea
+SHA1 (patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h) = 00b53acf14c4bd91eff7565f7e2a3b45204af281
+SHA1 (patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc) = f5e933869f6b0e4bc56de2896f26f6d0e25a8ff3
+SHA1 (patch-v8_src_trap-handler_handler-inside-posix.cc) = 38537b0b1fab594d128e68b855f8aa8f029443e3
+SHA1 (patch-v8_src_trap-handler_handler-inside-posix.h) = b4ade1e436620b94e9e8411c338eb9193ceaa13a
+SHA1 (patch-v8_src_trap-handler_trap-handler.h) = a589ed5bec41e92ccd08557d3fbdf5e4017fa31f
+SHA1 (patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h) = 06ce3a46bb17bf92d47b3d6b72276ad2c4d87e12
+SHA1 (patch-v8_tools_run-paxctl.py) = 0138ae36bf253cb348004363bd260a50506f2b18
+SHA1 (patch-v8_tools_run.py) = dc86c4fdcd285140923467be40d6d18d832b68d6
diff --git a/chromium/options.mk b/chromium/options.mk
index 7160760dd7..c8d5dde95c 100644
--- a/chromium/options.mk
+++ b/chromium/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2025/02/06 09:57:38 wiz Exp $
+# $NetBSD: options.mk,v 1.32 2016/08/20 11:17:32 ryoon Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.chromium
 PKG_OPTIONS_REQUIRED_GROUPS=	audio
diff --git a/chromium/patches/patch-.gn b/chromium/patches/patch-.gn
deleted file mode 100644
index 07fa34535e..0000000000
--- a/chromium/patches/patch-.gn
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- .gn.orig	2024-12-17 17:58:49.000000000 +0000
-+++ .gn
-@@ -172,4 +172,6 @@ exec_script_whitelist =
- 
-       "//tools/grit/grit_rule.gni",
-       "//tools/gritsettings/BUILD.gn",
-+
-+      "//third_party/icu/BUILD.gn",
-     ]
diff --git a/chromium/patches/patch-BUILD.gn b/chromium/patches/patch-BUILD.gn
index 0454a0b7e6..358a7a2c05 100644
--- a/chromium/patches/patch-BUILD.gn
+++ b/chromium/patches/patch-BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ BUILD.gn
-@@ -66,7 +66,7 @@ declare_args() {
+@@ -71,7 +71,7 @@ declare_args() {
    root_extra_deps = []
  }
  
@@ -15,7 +15,7 @@ $NetBSD: patch-BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
    # An official (maximally optimized!) component (optimized for build times)
    # build doesn't make sense and usually doesn't work.
    assert(!is_component_build)
-@@ -98,7 +98,6 @@ group("gn_all") {
+@@ -103,7 +103,6 @@ group("gn_all") {
        "//codelabs",
        "//components:components_unittests",
        "//components/gwp_asan:gwp_asan_unittests",
@@ -23,7 +23,7 @@ $NetBSD: patch-BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
        "//net:net_unittests",
        "//sandbox:sandbox_unittests",
        "//services:services_unittests",
-@@ -444,7 +443,7 @@ group("gn_all") {
+@@ -449,7 +448,7 @@ group("gn_all") {
        }
      }
  
@@ -32,7 +32,7 @@ $NetBSD: patch-BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
        deps += [
          "//third_party/breakpad:breakpad_unittests",
          "//third_party/breakpad:core-2-minidump",
-@@ -634,6 +633,15 @@ group("gn_all") {
+@@ -636,6 +635,15 @@ group("gn_all") {
        }
      }
  
@@ -48,7 +48,7 @@ $NetBSD: patch-BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)",
-@@ -682,7 +690,7 @@ group("gn_all") {
+@@ -684,7 +692,7 @@ group("gn_all") {
        }
      }
  
@@ -57,16 +57,25 @@ $NetBSD: patch-BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
        # The official builders use this binary from the default toolchain's
        # output directory after building in order to upload the symbols of that
        # binary. They build the binary like `ninja symupload` which requires the
-@@ -1168,7 +1176,7 @@ if (use_blink && !is_cronet_build) {
+@@ -719,7 +727,7 @@ group("gn_all") {
+       ]
+     }
+ 
+-    if (is_mac || is_win || is_android || is_linux || is_chromeos) {
++    if (!is_bsd && (is_mac || is_win || is_android || is_linux || is_chromeos)) {
+       deps += [
+         "//third_party/crashpad/crashpad:crashpad_tests",
+         "//third_party/crashpad/crashpad/handler:crashpad_handler",
+@@ -1128,7 +1136,7 @@ if (use_blink && !is_cronet_build) {
+       "//third_party/blink/public:all_blink",
      ]
-   }
  
--  if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) {
-+  if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
-     script_test("chrome_wpt_tests") {
-       script = "//third_party/blink/tools/run_wpt_tests.py"
-       args = _common_web_test_options + [ "--product=chrome" ]
-@@ -1261,7 +1269,7 @@ if (use_blink && !is_cronet_build) {
+-    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos) {
++    if (!is_chromeos && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
+       deps += [
+         ":chrome_wpt_tests",
+         ":headless_shell_wpt",
+@@ -1275,7 +1283,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
  
@@ -75,7 +84,7 @@ $NetBSD: patch-BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
        # Using the default toolchain for this tool, as it's run during tests not
        # during the build. This places a symlink in the root_build_dir for scrips
        # to use.
-@@ -1275,7 +1283,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1289,7 +1297,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//third_party/breakpad:dump_syms" ]
      }
  
@@ -84,7 +93,7 @@ $NetBSD: patch-BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
        # Using the default toolchain for this tool, as it's run during tests not
        # during the build. This places a symlink in the root_build_dir for scrips
        # to use.
-@@ -1739,7 +1747,7 @@ group("chromium_builder_perf") {
+@@ -1760,7 +1768,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
  
diff --git a/chromium/patches/patch-apps_ui_views_app__window__frame__view.cc b/chromium/patches/patch-apps_ui_views_app__window__frame__view.cc
index d62b8e358b..a51cdf7df3 100644
--- a/chromium/patches/patch-apps_ui_views_app__window__frame__view.cc
+++ b/chromium/patches/patch-apps_ui_views_app__window__frame__view.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-apps_ui_views_app__window__frame__view.cc,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- apps/ui/views/app_window_frame_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- apps/ui/views/app_window_frame_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ apps/ui/views/app_window_frame_view.cc
-@@ -149,7 +149,7 @@ gfx::Rect AppWindowFrameView::GetWindowB
+@@ -146,7 +146,7 @@ gfx::Rect AppWindowFrameView::GetBoundsF
+ gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
+     const gfx::Rect& client_bounds) const {
    gfx::Rect window_bounds = client_bounds;
- // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Get the difference between the widget's client area bounds and window
    // bounds, and grow |window_bounds| by that amount.
    gfx::Insets native_frame_insets =
diff --git a/chromium/patches/patch-ash_display_mirror__window__controller.cc b/chromium/patches/patch-ash_display_mirror__window__controller.cc
index c008792f63..0ffff694cc 100644
--- a/chromium/patches/patch-ash_display_mirror__window__controller.cc
+++ b/chromium/patches/patch-ash_display_mirror__window__controller.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ash_display_mirror__window__controller.cc,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ash/display/mirror_window_controller.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ash/display/mirror_window_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ash/display/mirror_window_controller.cc
 @@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindo
        if (!base::Contains(display_info_list, iter->first,
diff --git a/chromium/patches/patch-base_BUILD.gn b/chromium/patches/patch-base_BUILD.gn
index c3eea7d1f2..122c133d67 100644
--- a/chromium/patches/patch-base_BUILD.gn
+++ b/chromium/patches/patch-base_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/BUILD.gn
-@@ -940,7 +940,7 @@ component("base") {
+@@ -944,7 +944,7 @@ component("base") {
      #"system/sys_info_openbsd.cc",
    ]
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
      sources += [
        "posix/sysctl.cc",
        "posix/sysctl.h",
-@@ -1097,11 +1097,26 @@ component("base") {
+@@ -1104,11 +1104,26 @@ component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -43,7 +43,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
    if (use_allocator_shim) {
      if (is_apple) {
        sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1121,7 +1136,7 @@ component("base") {
+@@ -1128,7 +1143,7 @@ component("base") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -52,7 +52,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -2113,6 +2128,29 @@ component("base") {
+@@ -2152,6 +2167,29 @@ component("base") {
      ]
    }
  
@@ -82,7 +82,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
    # iOS
    if (is_ios) {
      sources += [
-@@ -2257,6 +2295,33 @@ component("base") {
+@@ -2312,6 +2350,33 @@ component("base") {
      }
    }
  
@@ -116,7 +116,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
    if (use_blink) {
      sources += [
        "files/file_path_watcher.cc",
-@@ -2583,7 +2648,7 @@ buildflag_header("protected_memory_build
+@@ -2690,7 +2755,7 @@ buildflag_header("protected_memory_build
    header = "protected_memory_buildflags.h"
    header_dir = "base/memory"
  
@@ -125,7 +125,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
                               (is_win || is_linux || is_android || is_mac)
  
    flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ]
-@@ -3068,7 +3133,7 @@ if (is_apple) {
+@@ -3163,7 +3228,7 @@ if (is_apple) {
    }
  }
  
@@ -134,7 +134,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
    # This test must compile with -fstack-protector-all
    source_set("stack_canary_linux_unittests") {
      testonly = true
-@@ -3744,7 +3809,7 @@ test("base_unittests") {
+@@ -3851,7 +3916,7 @@ test("base_unittests") {
      ]
    }
  
@@ -143,7 +143,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3771,7 +3836,7 @@ test("base_unittests") {
+@@ -3879,7 +3944,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -152,7 +152,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3782,7 +3847,7 @@ test("base_unittests") {
+@@ -3890,7 +3955,7 @@ test("base_unittests") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -161,7 +161,7 @@ $NetBSD: patch-base_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -3972,7 +4037,7 @@ test("base_unittests") {
+@@ -4080,7 +4145,7 @@ test("base_unittests") {
      deps += [ ":base_profiler_test_support_library" ]
    }
  
diff --git a/chromium/patches/patch-base_allocator_dispatcher_tls.h b/chromium/patches/patch-base_allocator_dispatcher_tls.h
index 7817326226..ccaf5fde55 100644
--- a/chromium/patches/patch-base_allocator_dispatcher_tls.h
+++ b/chromium/patches/patch-base_allocator_dispatcher_tls.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_allocator_dispatcher_tls.h,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/dispatcher/tls.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/dispatcher/tls.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/dispatcher/tls.h
-@@ -77,7 +77,7 @@ struct BASE_EXPORT MMapAllocator {
+@@ -81,7 +81,7 @@ struct BASE_EXPORT MMapAllocator {
    constexpr static size_t AllocationChunkSize = 16384;
  #elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)
    constexpr static size_t AllocationChunkSize = 16384;
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_partition__alloc.gni b/chromium/patches/patch-base_allocator_partition__allocator_partition__alloc.gni
index 80ca3dcce1..c9a60256dd 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/chromium/patches/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,21 +1,30 @@
-$NetBSD: patch-base_allocator_partition__allocator_partition__alloc.gni,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -38,7 +38,7 @@ if (is_nacl) {
+@@ -89,7 +89,7 @@ if (is_nacl) {
+ # TODO(crbug.com/329199197): Clean this up when experiments are complete.
  use_large_empty_slot_span_ring = true
  
- has_memory_tagging =
--    current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
-+    current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android)
+-has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan &&
++has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && !is_bsd &&
+                      !is_hwasan && (is_linux || is_android)
  
  declare_args() {
-   # Causes all the allocations to be routed via allocator_shim.cc. Usually,
-@@ -432,7 +432,7 @@ assert(!use_asan_backup_ref_ptr || use_r
+@@ -348,7 +348,7 @@ declare_args() {
+ declare_args() {
+   # Shadow metadata is still under development and only supports Linux
+   # for now.
+-  enable_shadow_metadata = is_linux && has_64_bit_pointers
++  enable_shadow_metadata = !is_bsd && is_linux && has_64_bit_pointers
+ }
+ 
+ declare_args() {
+@@ -491,7 +491,7 @@ assert(!use_asan_backup_ref_ptr || use_r
  # dependencies that use partition_allocator are compiled in AOSP against a
  # version of glibc that does not include pkeys syscall numbers.
  is_pkeys_available =
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
index 803a396cdb..a363f502f0 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -863,7 +863,7 @@ if (is_clang_or_gcc) {
+@@ -886,7 +886,7 @@ if (is_clang_or_gcc) {
          configs -= [ partition_alloc_enable_arc_config ]
        }
      }
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
index 35c5106dee..4e53297665 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
 @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
  
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
index 1fd5978dca..f11e14c65e 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h
 @@ -269,7 +269,7 @@ bool DecommitAndZeroSystemPages(void* ad
  // recommitted. Do not assume that this will not change over time.
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
index b0588076b0..b24cb9b3db 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
@@ -1,18 +1,18 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
 @@ -26,8 +26,8 @@
  #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
  
  #elif (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \
--    (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \
+-    (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) ||       \
 -    (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64))
-+    ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \
++    ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) ||       \
 +    ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64))
  // This should work for all POSIX (if needed), but currently all other
  // supported OS/architecture combinations use either hard-coded values
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
index 87cc806620..f055e0421a 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc
-@@ -38,7 +38,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTas
- #endif  // PA_BUILDFLAG(IS_MAC)
+@@ -39,7 +39,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTas
  
- #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \
--    (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1))
-+    (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && !PA_BUILDFLAG(IS_BSD))
+ #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) ||                                        \
+     (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && \
+-     __has_include(<sys/ifunc.h>))
++     __has_include(<sys/ifunc.h>) && !PA_BUILDFLAG(IS_BSD))
  struct __ifunc_arg_t;
  
  #include "partition_alloc/aarch64_support.h"
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
index 6d9db9cedd..3c2d62a88d 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
-@@ -302,8 +302,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -309,8 +309,12 @@ bool TryRecommitSystemPagesInternal(
  
  void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
    void* ptr = reinterpret_cast<void*>(address);
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
index a3fc6996d2..3d42307b0c 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc
 @@ -19,7 +19,7 @@
  #include "partition_alloc/partition_alloc_check.h"
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
index dd271e27d4..d6119b9bbb 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:38 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
 @@ -13,11 +13,11 @@
  #include "partition_alloc/partition_alloc_base/posix/eintr_wrapper.h"
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
index 75444cdc82..af00fd3d6f 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc
 @@ -102,6 +102,10 @@ void RandBytes(void* output, size_t outp
    if (getentropy(output, output_length) == 0) {
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
index b70f4f5124..d5c481540c 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h
 @@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId;
  typedef zx_handle_t PlatformThreadId;
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
index 6b3b70130b..8830d5b587 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__internal__posix.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h
 @@ -10,7 +10,7 @@
  
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
index b4bc7185be..305ca61a3a 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
 @@ -18,7 +18,7 @@
  #include "partition_alloc/partition_alloc_base/logging.h"
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
index 91e81449d9..cc36a40f15 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2024-12-17 18:58:49.000000000 +0100
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
 @@ -51,8 +51,8 @@ static_assert(sizeof(void*) != 8, "");
  // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
index 94a0f5e097..d67d170abb 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
-@@ -329,7 +329,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandle
+@@ -327,7 +327,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandle
  // 8GB for each of the glued pools).
  #if PA_BUILDFLAG(HAS_64_BIT_POINTERS)
  #if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_IOS) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partitio
  constexpr size_t kPoolMaxSize = 8 * kGiB;
  #else
  constexpr size_t kPoolMaxSize = 16 * kGiB;
-@@ -446,7 +446,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDir
+@@ -444,7 +444,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDir
  // TODO(casey.smalley%arm.com@localhost): under 64k pages we can end up in a situation
  // where a normal slot span will be large enough to contain multiple items,
  // but the address will go over the final partition page after being aligned.
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
index f1042cce35..34ddd94717 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__forward.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_forward.h
 @@ -28,9 +28,13 @@ namespace internal {
  // the second one 16. We could technically return something different for
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
index f024238a84..734fb8b7c2 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
 @@ -44,7 +44,7 @@
  #include "wow64apiset.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partitio
  #include <pthread.h>
  #if PA_CONFIG(ENABLE_SHADOW_METADATA)
  #include <sys/mman.h>
-@@ -293,7 +293,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -297,7 +297,7 @@ void PartitionAllocMallocInitOnce() {
      return;
    }
  
@@ -24,7 +24,7 @@ $NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_partitio
    // When fork() is called, only the current thread continues to execute in the
    // child process. If the lock is held, but *not* by this thread when fork() is
    // called, we have a deadlock.
-@@ -1113,7 +1113,7 @@ void PartitionRoot::Init(PartitionOption
+@@ -1117,7 +1117,7 @@ void PartitionRoot::Init(PartitionOption
      // apple OSes.
      PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
               (internal::SystemPageSize() == (size_t{1} << 14)));
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
index 0f188c87ba..70d1124ab5 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc
 @@ -17,7 +17,16 @@
  #endif
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
index fb1ae5b26a..d15565b4d6 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc
 @@ -18,6 +18,10 @@
  #include <pthread.h>
diff --git a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
index 4ced0f8b45..8e591bae6d 100644
--- a/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
+++ b/chromium/patches/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc
 @@ -16,7 +16,7 @@
  #include "partition_alloc/partition_alloc_check.h"
diff --git a/chromium/patches/patch-base_atomicops.h b/chromium/patches/patch-base_atomicops.h
index 22df65eb21..f9606f027f 100644
--- a/chromium/patches/patch-base_atomicops.h
+++ b/chromium/patches/patch-base_atomicops.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_atomicops.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/atomicops.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/atomicops.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/atomicops.h
-@@ -71,7 +71,11 @@ typedef intptr_t Atomic64;
+@@ -74,7 +74,11 @@ typedef intptr_t Atomic64;
  
  // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
  // Atomic64 routines below, depending on your architecture.
diff --git a/chromium/patches/patch-base_base__paths__posix.cc b/chromium/patches/patch-base_base__paths__posix.cc
index 64df16342c..090736136d 100644
--- a/chromium/patches/patch-base_base__paths__posix.cc
+++ b/chromium/patches/patch-base_base__paths__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_base__paths__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/base_paths_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/base_paths_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/base_paths_posix.cc
 @@ -15,6 +15,7 @@
  #include <ostream>
@@ -33,7 +33,7 @@ $NetBSD: patch-base_base__paths__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
        *result = bin_dir;
        return true;
  #elif BUILDFLAG(IS_FREEBSD)
--      int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+-      int name[] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
 -      std::optional<std::string> bin_dir = StringSysctl(name, std::size(name));
 +      std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 });
        if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
@@ -44,7 +44,7 @@ $NetBSD: patch-base_base__paths__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
 +#elif BUILDFLAG(IS_NETBSD)
 +      std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_PATHNAME });
 +      if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
-+        NOTREACHED_IN_MIGRATION() << "Unable to resolve path.";
++        NOTREACHED() << "Unable to resolve path.";
 +        return false;
 +      }
 +      *result = FilePath(bin_dir.value());
@@ -53,17 +53,16 @@ $NetBSD: patch-base_base__paths__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
  #elif BUILDFLAG(IS_SOLARIS)
        char bin_dir[PATH_MAX + 1];
        if (realpath(getexecname(), bin_dir) == NULL) {
-@@ -62,13 +75,65 @@ bool PathProviderPosix(int key, FilePath
+@@ -62,14 +75,65 @@ bool PathProviderPosix(int key, FilePath
        *result = FilePath(bin_dir);
        return true;
  #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)
 -      // There is currently no way to get the executable path on OpenBSD
 -      char* cpath;
--      if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
+-      if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) {
 -        *result = FilePath(cpath);
--      else
+-      } else {
 -        *result = FilePath("/usr/local/chrome/chrome");
--      return true;
 +      char *cpath;
 +#if !BUILDFLAG(IS_AIX)
 +      struct kinfo_file *files;
@@ -91,7 +90,8 @@ $NetBSD: patch-base_base__paths__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
 +        *result = FilePath(retval);
 +        VLOG(1) << "PathProviderPosix (sandbox) result: " << retval;
 +        goto out;
-+      }
+       }
+-      return true;
 +
 +      if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES, errbuf)) == NULL)
 +        goto out;
diff --git a/chromium/patches/patch-base_compiler__specific.h b/chromium/patches/patch-base_compiler__specific.h
index 481706ac33..0d92c069f9 100644
--- a/chromium/patches/patch-base_compiler__specific.h
+++ b/chromium/patches/patch-base_compiler__specific.h
@@ -1,17 +1,16 @@
-$NetBSD: patch-base_compiler__specific.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/compiler_specific.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/compiler_specific.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/compiler_specific.h
-@@ -683,7 +683,7 @@ inline constexpr bool AnalyzerAssumeTrue
+@@ -729,6 +729,7 @@ inline constexpr bool AnalyzerAssumeTrue
  #if __has_cpp_attribute(clang::preserve_most) &&             \
      (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \
      !defined(COMPONENT_BUILD) &&                             \
--    !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64))
-+    !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64))
++    !BUILDFLAG(IS_OPENBSD) &&                                \
+     !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64))
  #define PRESERVE_MOST [[clang::preserve_most]]
  #else
- #define PRESERVE_MOST
diff --git a/chromium/patches/patch-base_debug_debugger__posix.cc b/chromium/patches/patch-base_debug_debugger__posix.cc
index 1535b74505..7ef89446e1 100644
--- a/chromium/patches/patch-base_debug_debugger__posix.cc
+++ b/chromium/patches/patch-base_debug_debugger__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_debug_debugger__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/debug/debugger_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/debug/debugger_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/debug/debugger_posix.cc
 @@ -41,6 +41,10 @@
  #include <sys/sysctl.h>
@@ -22,21 +22,20 @@ $NetBSD: patch-base_debug_debugger__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
    // Initialize mib, which tells sysctl what info we want.  In this case,
    // we're looking for information about a specific process ID.
 +#if !BUILDFLAG(IS_NETBSD)
-   int mib[] = {
-     CTL_KERN,
-     KERN_PROC,
-@@ -97,36 +102,75 @@ bool BeingDebugged() {
-     0
+   int mib[] = {CTL_KERN,
+                KERN_PROC,
+                KERN_PROC_PID,
+@@ -96,37 +101,75 @@ bool BeingDebugged() {
+                0
  #endif
    };
 +#else
-+  int mib[] = {
-+    CTL_KERN,
-+    KERN_PROC2,
-+    KERN_PROC_PID,
-+    getpid(),
-+    sizeof(struct kinfo_proc2),
-+    1
++  int mib[] = {CTL_KERN,
++               KERN_PROC2,
++               KERN_PROC_PID,
++               getpid(),
++               sizeof(struct kinfo_proc2),
++               1
 +  };
 +#endif
  
@@ -54,8 +53,9 @@ $NetBSD: patch-base_debug_debugger__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
 +#endif
  
  #if BUILDFLAG(IS_OPENBSD)
-   if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
+   if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) {
      return -1;
+   }
  
 -  mib[5] = (info_size / sizeof(struct kinfo_proc));
 +  mib[5] = static_cast<int>((info_size / sizeof(struct kinfo_proc)));
diff --git a/chromium/patches/patch-base_debug_elf__reader.cc b/chromium/patches/patch-base_debug_elf__reader.cc
index 113d63d754..d8fed16c01 100644
--- a/chromium/patches/patch-base_debug_elf__reader.cc
+++ b/chromium/patches/patch-base_debug_elf__reader.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_debug_elf__reader.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/debug/elf_reader.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/debug/elf_reader.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/debug/elf_reader.cc
-@@ -50,6 +50,10 @@ using Xword = Elf64_Xword;
+@@ -49,6 +49,10 @@ using Xword = Elf64_Xword;
  
  constexpr char kGnuNoteName[] = "GNU";
  
diff --git a/chromium/patches/patch-base_debug_proc__maps__linux.cc b/chromium/patches/patch-base_debug_proc__maps__linux.cc
index 21d1d4f024..d489e27cb4 100644
--- a/chromium/patches/patch-base_debug_proc__maps__linux.cc
+++ b/chromium/patches/patch-base_debug_proc__maps__linux.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_debug_proc__maps__linux.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/debug/proc_maps_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/debug/proc_maps_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/debug/proc_maps_linux.cc
-@@ -18,7 +18,7 @@
+@@ -22,7 +22,7 @@
  #include "base/strings/string_split.h"
  #include "build/build_config.h"
  
diff --git a/chromium/patches/patch-base_debug_stack__trace.cc b/chromium/patches/patch-base_debug_stack__trace.cc
index 3be714e26a..b88849de2d 100644
--- a/chromium/patches/patch-base_debug_stack__trace.cc
+++ b/chromium/patches/patch-base_debug_stack__trace.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_debug_stack__trace.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/debug/stack_trace.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/debug/stack_trace.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/debug/stack_trace.cc
-@@ -258,7 +258,7 @@ bool StackTrace::WillSymbolizeToStreamFo
+@@ -268,7 +268,7 @@ bool StackTrace::WillSymbolizeToStreamFo
    // Symbols are not expected to be reliable when gn args specifies
    // symbol_level=0.
    return false;
@@ -15,7 +15,17 @@ $NetBSD: patch-base_debug_stack__trace.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
    // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
    // See https://crbug.com/706728
    return false;
-@@ -320,7 +320,7 @@ std::string StackTrace::ToString() const
+@@ -321,7 +321,9 @@ void StackTrace::OutputToStreamWithPrefi
+     }
+     return;
+   }
++#if !BUILDFLAG(IS_BSD)
+   OutputToStreamWithPrefixImpl(os, prefix_string);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -330,7 +332,7 @@ std::string StackTrace::ToString() const
  
  std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const {
    std::stringstream stream;
@@ -24,7 +34,7 @@ $NetBSD: patch-base_debug_stack__trace.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
    OutputToStreamWithPrefix(&stream, prefix_string);
  #endif
    return stream.str();
-@@ -344,7 +344,7 @@ bool StackTrace::ShouldSuppressOutput() 
+@@ -354,7 +356,7 @@ bool StackTrace::ShouldSuppressOutput() 
  }
  
  std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
diff --git a/chromium/patches/patch-base_debug_stack__trace__posix.cc b/chromium/patches/patch-base_debug_stack__trace__posix.cc
index 5d5bd4ce80..0698f8e85a 100644
--- a/chromium/patches/patch-base_debug_stack__trace__posix.cc
+++ b/chromium/patches/patch-base_debug_stack__trace__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/debug/stack_trace_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/debug/stack_trace_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/debug/stack_trace_posix.cc
-@@ -45,8 +45,8 @@
+@@ -50,8 +50,8 @@
  // Surprisingly, uClibc defines __GLIBC__ in some build configs, but
  // execinfo.h and backtrace(3) are really only present in glibc and in macOS
  // libc.
@@ -17,7 +17,7 @@ $NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz E
  #define HAVE_BACKTRACE
  #include <execinfo.h>
  #endif
-@@ -64,8 +64,10 @@
+@@ -69,8 +69,10 @@
  #include <AvailabilityMacros.h>
  #endif
  
@@ -29,7 +29,7 @@ $NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz E
  
  #include "base/debug/proc_maps_linux.h"
  #endif
-@@ -322,7 +324,7 @@ void PrintToStderr(const char* output) {
+@@ -329,7 +331,7 @@ void PrintToStderr(const char* output) {
    std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
  }
  
@@ -38,7 +38,7 @@ $NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz E
  void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) {
    // We have seen rare cases on AMD linux where the default signal handler
    // either does not run or a thread (Probably an AMD driver thread) prevents
-@@ -339,7 +341,11 @@ void AlarmSignalHandler(int signal, sigi
+@@ -346,7 +348,11 @@ void AlarmSignalHandler(int signal, sigi
        "Warning: Default signal handler failed to terminate process.\n");
    PrintToStderr("Calling exit_group() directly to prevent timeout.\n");
    // See: https://man7.org/linux/man-pages/man2/exit_group.2.html
@@ -50,7 +50,7 @@ $NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz E
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -537,7 +543,7 @@ void StackDumpSignalHandler(int signal, 
+@@ -552,7 +558,7 @@ void StackDumpSignalHandler(int signal, 
      _exit(EXIT_FAILURE);
    }
  
@@ -59,7 +59,7 @@ $NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz E
    // Set an alarm to trigger in case the default handler does not terminate
    // the process. See 'AlarmSignalHandler' for more details.
    struct sigaction action;
-@@ -562,6 +568,7 @@ void StackDumpSignalHandler(int signal, 
+@@ -577,6 +583,7 @@ void StackDumpSignalHandler(int signal, 
    // signals that do not re-raise autonomously), such as signals delivered via
    // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
    // otherwise be lost when re-raising the signal via raise().
@@ -67,7 +67,7 @@ $NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz E
    long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
                          info->si_signo, info);
    if (retval == 0) {
-@@ -576,6 +583,7 @@ void StackDumpSignalHandler(int signal, 
+@@ -591,6 +598,7 @@ void StackDumpSignalHandler(int signal, 
    if (errno != EPERM) {
      _exit(EXIT_FAILURE);
    }
@@ -75,7 +75,7 @@ $NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz E
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
          // BUILDFLAG(IS_CHROMEOS)
  
-@@ -772,6 +780,7 @@ class SandboxSymbolizeHelper {
+@@ -783,6 +791,7 @@ class SandboxSymbolizeHelper {
      return -1;
    }
  
@@ -83,7 +83,7 @@ $NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz E
    // This class is copied from
    // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h.
    // It aims at ensuring the process is dumpable before opening /proc/self/mem.
-@@ -864,11 +873,15 @@ class SandboxSymbolizeHelper {
+@@ -875,11 +884,15 @@ class SandboxSymbolizeHelper {
        r.base = cur_base;
      }
    }
@@ -99,7 +99,7 @@ $NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.1 2025/02/06 09:57:39 wiz E
      // Reads /proc/self/maps.
      std::string contents;
      if (!ReadProcMaps(&contents)) {
-@@ -886,6 +899,7 @@ class SandboxSymbolizeHelper {
+@@ -897,6 +910,7 @@ class SandboxSymbolizeHelper {
  
      is_initialized_ = true;
      return true;
diff --git a/chromium/patches/patch-base_files_dir__reader__linux.h b/chromium/patches/patch-base_files_dir__reader__linux.h
index c34e43bec9..059e11c35c 100644
--- a/chromium/patches/patch-base_files_dir__reader__linux.h
+++ b/chromium/patches/patch-base_files_dir__reader__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_files_dir__reader__linux.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/dir_reader_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/dir_reader_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/dir_reader_linux.h
 @@ -21,10 +21,16 @@
  #include "base/logging.h"
@@ -21,25 +21,25 @@ $NetBSD: patch-base_files_dir__reader__linux.h,v 1.1 2025/02/06 09:57:39 wiz Exp
 +typedef struct dirent linux_dirent;
 +#else
  struct linux_dirent {
-   uint64_t        d_ino;
-   int64_t         d_off;
+   uint64_t d_ino;
+   int64_t d_off;
 @@ -32,6 +38,7 @@ struct linux_dirent {
-   unsigned char   d_type;
-   char            d_name[0];
+   unsigned char d_type;
+   char d_name[0];
  };
 +#endif
  
  class DirReaderLinux {
   public:
 @@ -66,7 +73,11 @@ class DirReaderLinux {
-     if (offset_ != size_)
        return true;
+     }
  
 +#if BUILDFLAG(IS_BSD)
 +    const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_));
 +#else
      const long r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
 +#endif
-     if (r == 0)
+     if (r == 0) {
        return false;
-     if (r < 0) {
+     }
diff --git a/chromium/patches/patch-base_files_dir__reader__posix.h b/chromium/patches/patch-base_files_dir__reader__posix.h
index ec58a1b1d7..524ed2d622 100644
--- a/chromium/patches/patch-base_files_dir__reader__posix.h
+++ b/chromium/patches/patch-base_files_dir__reader__posix.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_files_dir__reader__posix.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/dir_reader_posix.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/dir_reader_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/dir_reader_posix.h
 @@ -17,7 +17,7 @@
  // seems worse than falling back to enumerating all file descriptors so we will
diff --git a/chromium/patches/patch-base_files_drive__info.h b/chromium/patches/patch-base_files_drive__info.h
index 3af5b07757..abaed8e3c3 100644
--- a/chromium/patches/patch-base_files_drive__info.h
+++ b/chromium/patches/patch-base_files_drive__info.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_files_drive__info.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/drive_info.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/drive_info.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/drive_info.h
-@@ -40,7 +40,7 @@ class BASE_EXPORT DriveInfo {
+@@ -48,7 +48,7 @@ struct BASE_EXPORT DriveInfo {
    std::optional<bool> has_seek_penalty;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-base_files_drive__info__posix.cc b/chromium/patches/patch-base_files_drive__info__posix.cc
index a8a9f1ca80..f72a8eb28a 100644
--- a/chromium/patches/patch-base_files_drive__info__posix.cc
+++ b/chromium/patches/patch-base_files_drive__info__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_files_drive__info__posix.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/drive_info_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/drive_info_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/drive_info_posix.cc
-@@ -28,7 +28,7 @@ DriveInfo& DriveInfo::operator=(DriveInf
+@@ -24,7 +24,7 @@ namespace base {
  
  std::optional<DriveInfo> GetFileDriveInfo(const FilePath& file_path) {
    DriveInfo drive_info;
diff --git a/chromium/patches/patch-base_files_file__path__watcher.h b/chromium/patches/patch-base_files_file__path__watcher.h
index 7ac8663751..b13848746d 100644
--- a/chromium/patches/patch-base_files_file__path__watcher.h
+++ b/chromium/patches/patch-base_files_file__path__watcher.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_files_file__path__watcher.h,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/file_path_watcher.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/file_path_watcher.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/file_path_watcher.h
 @@ -105,7 +105,7 @@ class BASE_EXPORT FilePathWatcher {
      Type type = Type::kNonRecursive;
diff --git a/chromium/patches/patch-base_files_file__path__watcher__bsd.cc b/chromium/patches/patch-base_files_file__path__watcher__bsd.cc
index 7c31acf37f..057d90c03e 100644
--- a/chromium/patches/patch-base_files_file__path__watcher__bsd.cc
+++ b/chromium/patches/patch-base_files_file__path__watcher__bsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_files_file__path__watcher__bsd.cc,v 1.1 2025/02/06 09:57:39 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/file_path_watcher_bsd.cc.orig	2024-12-21 10:25:09.571560110 +0000
+--- base/files/file_path_watcher_bsd.cc.orig	2025-05-08 12:01:57.631260751 +0000
 +++ base/files/file_path_watcher_bsd.cc
 @@ -0,0 +1,54 @@
 +// Copyright 2021 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-base_files_file__path__watcher__kqueue.cc b/chromium/patches/patch-base_files_file__path__watcher__kqueue.cc
deleted file mode 100644
index 3113984834..0000000000
--- a/chromium/patches/patch-base_files_file__path__watcher__kqueue.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-base_files_file__path__watcher__kqueue.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/files/file_path_watcher_kqueue.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ base/files/file_path_watcher_kqueue.cc
-@@ -81,9 +81,15 @@ size_t FilePathWatcherKQueue::EventsForP
-     FilePath::StringType subdir = (i != (components.end() - 1)) ? *(i + 1) : "";
-     EventData* data = new EventData(built_path, subdir);
-     struct kevent event;
-+#if defined(__NetBSD__) && __NetBSD_Version__ < 999000000
-+    EV_SET(&event, fd, EVFILT_VNODE, (EV_ADD | EV_CLEAR | EV_RECEIPT),
-+           (NOTE_DELETE | NOTE_WRITE | NOTE_ATTRIB |
-+            NOTE_RENAME | NOTE_REVOKE | NOTE_EXTEND), 0, reinterpret_cast<intptr_t>(data));
-+#else
-     EV_SET(&event, fd, EVFILT_VNODE, (EV_ADD | EV_CLEAR | EV_RECEIPT),
-            (NOTE_DELETE | NOTE_WRITE | NOTE_ATTRIB |
-             NOTE_RENAME | NOTE_REVOKE | NOTE_EXTEND), 0, data);
-+#endif
-     events->push_back(event);
-   }
-   return last_existing_entry;
diff --git a/chromium/patches/patch-base_files_file__path__watcher__kqueue.h b/chromium/patches/patch-base_files_file__path__watcher__kqueue.h
index 3e8c8736c6..67092b4171 100644
--- a/chromium/patches/patch-base_files_file__path__watcher__kqueue.h
+++ b/chromium/patches/patch-base_files_file__path__watcher__kqueue.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_files_file__path__watcher__kqueue.h,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/file_path_watcher_kqueue.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/file_path_watcher_kqueue.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/file_path_watcher_kqueue.h
 @@ -5,6 +5,7 @@
  #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
diff --git a/chromium/patches/patch-base_files_file__path__watcher__unittest.cc b/chromium/patches/patch-base_files_file__path__watcher__unittest.cc
index 6cfd9748b9..9825694850 100644
--- a/chromium/patches/patch-base_files_file__path__watcher__unittest.cc
+++ b/chromium/patches/patch-base_files_file__path__watcher__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_files_file__path__watcher__unittest.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/file_path_watcher_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/file_path_watcher_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/file_path_watcher_unittest.cc
 @@ -902,7 +902,7 @@ TEST_F(FilePathWatcherTest, WatchDirecto
    }
diff --git a/chromium/patches/patch-base_files_file__util__posix.cc b/chromium/patches/patch-base_files_file__util__posix.cc
index f18513d188..f6af01fd04 100644
--- a/chromium/patches/patch-base_files_file__util__posix.cc
+++ b/chromium/patches/patch-base_files_file__util__posix.cc
@@ -1,37 +1,35 @@
-$NetBSD: patch-base_files_file__util__posix.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/file_util_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/file_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/file_util_posix.cc
-@@ -897,36 +897,33 @@ bool CreateNewTempDirectory(const FilePa
+@@ -934,6 +934,7 @@ bool CreateNewTempDirectory(const FilePa
  bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) {
    ScopedBlockingCall scoped_blocking_call(
        FROM_HERE, BlockingType::MAY_BLOCK);  // For call to mkdir().
 +  const FilePath kFileSystemRoot("/");
-   std::vector<FilePath> subpaths;
  
-   // Collect a list of all parent directories.
+   // Avoid checking subdirs if directory already exists.
+   if (DirectoryExists(full_path)) {
+@@ -943,8 +944,8 @@ bool CreateDirectoryAndGetError(const Fi
+   // Collect a list of all missing directories.
+   std::vector<FilePath> missing_subpaths({full_path});
    FilePath last_path = full_path;
--  subpaths.push_back(full_path);
 -  for (FilePath path = full_path.DirName(); path.value() != last_path.value();
 -       path = path.DirName()) {
-+  if (full_path != kFileSystemRoot)
-+    subpaths.push_back(full_path);
 +  for (FilePath path = full_path.DirName(); (path.value() != last_path.value() &&
 +       (path != kFileSystemRoot)); path = path.DirName()) {
-     subpaths.push_back(path);
-     last_path = path;
-   }
+     if (DirectoryExists(path)) {
+       break;
+     }
+@@ -962,21 +963,14 @@ bool CreateDirectoryAndGetError(const Fi
+     }
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
-   // Iterate through the parents and create the missing ones.
-   for (const FilePath& subpath : base::Reversed(subpaths)) {
--    if (DirectoryExists(subpath)) {
--      continue;
--    }
--    if (mkdir(subpath.value().c_str(), 0700) == 0) {
+-    if (mkdir(subpath.value().c_str(), mode) == 0) {
 -      continue;
 -    }
 -    // Mkdir failed, but it might have failed with EEXIST, or some other error
@@ -41,21 +39,16 @@ $NetBSD: patch-base_files_file__util__posix.cc,v 1.1 2025/02/06 09:57:40 wiz Exp
 -    int saved_errno = errno;
 -    if (!DirectoryExists(subpath)) {
 -      if (error) {
--        *error = File::OSErrorToFileError(saved_errno);
-+    if (!PathExists(subpath)) {
-+      if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
-+          ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
-+        int saved_errno = errno;
-+        if (error)
-+          *error = File::OSErrorToFileError(saved_errno);
-+        return false;
-       }
++    if ((mkdir(subpath.value().c_str(), mode) == -1) &&
++        ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
++      int saved_errno = errno;
++      if (error)
+         *error = File::OSErrorToFileError(saved_errno);
+-      }
 -      errno = saved_errno;
--      return false;
-+    } else if (!DirectoryExists(subpath)) {
-+        if (error)
-+          *error = File::OSErrorToFileError(ENOTDIR);
-+        return false;
+       return false;
      }
++    errno = 0;
    }
    return true;
+ }
diff --git a/chromium/patches/patch-base_files_file__util__unittest.cc b/chromium/patches/patch-base_files_file__util__unittest.cc
index 378728334a..4d7af1f3c1 100644
--- a/chromium/patches/patch-base_files_file__util__unittest.cc
+++ b/chromium/patches/patch-base_files_file__util__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_files_file__util__unittest.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/file_util_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/file_util_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/file_util_unittest.cc
-@@ -3928,7 +3928,7 @@ TEST_F(FileUtilTest, ReadFileToStringWit
+@@ -3920,7 +3920,7 @@ TEST_F(FileUtilTest, ReadFileToStringWit
  }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -15,7 +15,27 @@ $NetBSD: patch-base_files_file__util__unittest.cc,v 1.1 2025/02/06 09:57:40 wiz
  TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
    FilePath file_path("/proc/cpuinfo");
    std::string data = "temp";
-@@ -4665,7 +4665,7 @@ TEST(FileUtilMultiThreadedTest, MultiThr
+@@ -4505,6 +4505,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnly
+ 
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
++#if BUILDFLAG(IS_OPENBSD)
++TEST_F(FileUtilTest, CreateDirectoryInUnveiledPath) {
++  FilePath dir = PathService::CheckedGet(DIR_GEN_TEST_DATA_ROOT);
++  dir = dir.Append(FILE_PATH_LITERAL("base"));
++  dir = dir.Append(FILE_PATH_LITERAL("test"));
++  dir = dir.Append(FILE_PATH_LITERAL("unveil"));
++  unveil(dir.value().c_str(), "rwc");
++  EXPECT_TRUE(CreateDirectory(dir));
++  dir = dir.Append(FILE_PATH_LITERAL("test"));
++  EXPECT_FALSE(CreateDirectory(dir));
++}
++#endif
++
+ #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
+     defined(ARCH_CPU_32_BITS)
+ // TODO(crbug.com/327582285): Re-enable these tests. They may be failing due to
+@@ -4671,7 +4684,7 @@ TEST(FileUtilMultiThreadedTest, MultiThr
                  NULL);
  #else
      size_t bytes_written =
diff --git a/chromium/patches/patch-base_files_important__file__writer__cleaner.cc b/chromium/patches/patch-base_files_important__file__writer__cleaner.cc
index a03b181bff..ef37736be1 100644
--- a/chromium/patches/patch-base_files_important__file__writer__cleaner.cc
+++ b/chromium/patches/patch-base_files_important__file__writer__cleaner.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_files_important__file__writer__cleaner.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/important_file_writer_cleaner.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/important_file_writer_cleaner.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/important_file_writer_cleaner.cc
 @@ -25,7 +25,8 @@ namespace base {
  namespace {
diff --git a/chromium/patches/patch-base_files_scoped__file.cc b/chromium/patches/patch-base_files_scoped__file.cc
index eb4133ff12..af0515291c 100644
--- a/chromium/patches/patch-base_files_scoped__file.cc
+++ b/chromium/patches/patch-base_files_scoped__file.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_files_scoped__file.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/files/scoped_file.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/files/scoped_file.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/files/scoped_file.cc
 @@ -32,7 +32,7 @@ void ScopedFDCloseTraits::Free(int fd) {
    int ret = IGNORE_EINTR(close(fd));
diff --git a/chromium/patches/patch-base_functional_unretained__traits.h b/chromium/patches/patch-base_functional_unretained__traits.h
index 0516304b77..70c9f733bf 100644
--- a/chromium/patches/patch-base_functional_unretained__traits.h
+++ b/chromium/patches/patch-base_functional_unretained__traits.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_functional_unretained__traits.h,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/functional/unretained_traits.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/functional/unretained_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/functional/unretained_traits.h
-@@ -93,7 +93,7 @@ struct SupportsUnretainedImpl {
+@@ -90,7 +90,7 @@ struct SupportsUnretainedImpl {
  // official builds, and then in non-test code as well.
  #if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \
      (!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) &&        \
diff --git a/chromium/patches/patch-base_i18n_icu__util.cc b/chromium/patches/patch-base_i18n_icu__util.cc
index a7a3ccfc87..78e26a5be7 100644
--- a/chromium/patches/patch-base_i18n_icu__util.cc
+++ b/chromium/patches/patch-base_i18n_icu__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_i18n_icu__util.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/i18n/icu_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/i18n/icu_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/i18n/icu_util.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_i18n_icu__util.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
      BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  #endif
-@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() {
+@@ -329,7 +329,7 @@ void InitializeIcuTimeZone() {
        FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
    icu::TimeZone::adoptDefault(
        icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
diff --git a/chromium/patches/patch-base_linux__util.cc b/chromium/patches/patch-base_linux__util.cc
index 046e5e4fa7..398a92eaea 100644
--- a/chromium/patches/patch-base_linux__util.cc
+++ b/chromium/patches/patch-base_linux__util.cc
@@ -1,19 +1,19 @@
-$NetBSD: patch-base_linux__util.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/linux_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/linux_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/linux_util.cc
-@@ -154,10 +154,14 @@ void SetLinuxDistro(const std::string& d
+@@ -163,10 +163,14 @@ void SetLinuxDistro(const std::string& d
  }
  
  bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {
 +#if BUILDFLAG(IS_BSD)
 +  return false;
 +#else
-   // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22
+   // 25 > strlen("/proc//task") + strlen(base::NumberToString(INT_MAX)) + 1 = 22
    char buf[25];
    strings::SafeSPrintf(buf, "/proc/%d/task", pid);
    return GetThreadsFromProcessDir(buf, tids);
diff --git a/chromium/patches/patch-base_logging__unittest.cc b/chromium/patches/patch-base_logging__unittest.cc
index 4ce4eb9feb..e50cfd4ab3 100644
--- a/chromium/patches/patch-base_logging__unittest.cc
+++ b/chromium/patches/patch-base_logging__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_logging__unittest.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/logging_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/logging_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/logging_unittest.cc
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
  #include "base/posix/eintr_wrapper.h"
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_logging__unittest.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
  #include <ucontext.h>
  #endif
  
-@@ -585,14 +585,18 @@ void CheckCrashTestSighandler(int, sigin
+@@ -586,14 +586,18 @@ void CheckCrashTestSighandler(int, sigin
    // need the arch-specific boilerplate below, which is inspired by breakpad.
    // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
    uintptr_t crash_addr = 0;
diff --git a/chromium/patches/patch-base_memory_discardable__memory.cc b/chromium/patches/patch-base_memory_discardable__memory.cc
index 8e7e95ffef..a0b3aa7d6e 100644
--- a/chromium/patches/patch-base_memory_discardable__memory.cc
+++ b/chromium/patches/patch-base_memory_discardable__memory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_memory_discardable__memory.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/memory/discardable_memory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/memory/discardable_memory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/memory/discardable_memory.cc
 @@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory,
               base::FEATURE_DISABLED_BY_DEFAULT);
@@ -15,7 +15,7 @@ $NetBSD: patch-base_memory_discardable__memory.cc,v 1.1 2025/02/06 09:57:40 wiz
  BASE_FEATURE(kDiscardableMemoryBackingTrial,
               "DiscardableMemoryBackingTrial",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -39,7 +39,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTr
+@@ -44,7 +44,7 @@ BASE_FEATURE_ENUM_PARAM(DiscardableMemor
  
  namespace {
  
@@ -24,7 +24,7 @@ $NetBSD: patch-base_memory_discardable__memory.cc,v 1.1 2025/02/06 09:57:40 wiz
  
  DiscardableMemoryBacking GetBackingForFieldTrial() {
    DiscardableMemoryTrialGroup trial_group =
-@@ -58,7 +58,7 @@ DiscardableMemoryBacking GetBackingForFi
+@@ -63,7 +63,7 @@ DiscardableMemoryBacking GetBackingForFi
  
  }  // namespace
  
@@ -33,7 +33,7 @@ $NetBSD: patch-base_memory_discardable__memory.cc,v 1.1 2025/02/06 09:57:40 wiz
  
  // Probe capabilities of this device to determine whether we should participate
  // in the discardable memory backing trial.
-@@ -88,7 +88,7 @@ DiscardableMemory::DiscardableMemory() =
+@@ -95,7 +95,7 @@ DiscardableMemory::DiscardableMemory() =
  DiscardableMemory::~DiscardableMemory() = default;
  
  DiscardableMemoryBacking GetDiscardableMemoryBacking() {
diff --git a/chromium/patches/patch-base_memory_discardable__memory__internal.h b/chromium/patches/patch-base_memory_discardable__memory__internal.h
index 1a234274f9..507bcfd171 100644
--- a/chromium/patches/patch-base_memory_discardable__memory__internal.h
+++ b/chromium/patches/patch-base_memory_discardable__memory__internal.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_memory_discardable__memory__internal.h,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/memory/discardable_memory_internal.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/memory/discardable_memory_internal.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/memory/discardable_memory_internal.h
 @@ -12,7 +12,7 @@
  #include "base/metrics/field_trial_params.h"
diff --git a/chromium/patches/patch-base_memory_madv__free__discardable__memory__posix.cc b/chromium/patches/patch-base_memory_madv__free__discardable__memory__posix.cc
index a9ba196e6d..7a0da2171a 100644
--- a/chromium/patches/patch-base_memory_madv__free__discardable__memory__posix.cc
+++ b/chromium/patches/patch-base_memory_madv__free__discardable__memory__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_memory_madv__free__discardable__memory__posix.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/memory/madv_free_discardable_memory_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/memory/madv_free_discardable_memory_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/memory/madv_free_discardable_memory_posix.cc
-@@ -310,6 +310,10 @@ void MadvFreeDiscardableMemoryPosix::Set
+@@ -305,6 +305,10 @@ void MadvFreeDiscardableMemoryPosix::Set
  
  bool MadvFreeDiscardableMemoryPosix::IsResident() const {
    DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
@@ -17,8 +17,8 @@ $NetBSD: patch-base_memory_madv__free__discardable__memory__posix.cc,v 1.1 2025/
  #if BUILDFLAG(IS_APPLE)
    std::vector<char> vec(allocated_pages_);
  #else
-@@ -325,6 +329,7 @@ bool MadvFreeDiscardableMemoryPosix::IsR
-       return false;
+@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsR
+     }
    }
    return true;
 +#endif
diff --git a/chromium/patches/patch-base_memory_platform__shared__memory__region.h b/chromium/patches/patch-base_memory_platform__shared__memory__region.h
index 9367c37d17..8fd4aea91b 100644
--- a/chromium/patches/patch-base_memory_platform__shared__memory__region.h
+++ b/chromium/patches/patch-base_memory_platform__shared__memory__region.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_memory_platform__shared__memory__region.h,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/memory/platform_shared_memory_region.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/memory/platform_shared_memory_region.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/memory/platform_shared_memory_region.h
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
  #include "base/unguessable_token.h"
  #include "build/build_config.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_memory_platform__shared__memory__region.h,v 1.1 2025/02/06 0
  namespace content {
  class SandboxIPCHandler;
  }
-@@ -84,7 +84,7 @@ class BASE_EXPORT PlatformSharedMemoryRe
+@@ -85,7 +85,7 @@ class BASE_EXPORT PlatformSharedMemoryRe
      kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
    };
  
@@ -24,7 +24,7 @@ $NetBSD: patch-base_memory_platform__shared__memory__region.h,v 1.1 2025/02/06 0
    // Structure to limit access to executable region creation.
    struct ExecutableRegion {
     private:
-@@ -216,7 +216,7 @@ class BASE_EXPORT PlatformSharedMemoryRe
+@@ -217,7 +217,7 @@ class BASE_EXPORT PlatformSharedMemoryRe
                             CheckPlatformHandlePermissionsCorrespondToMode);
    static PlatformSharedMemoryRegion Create(Mode mode,
                                             size_t size
diff --git a/chromium/patches/patch-base_memory_platform__shared__memory__region__posix.cc b/chromium/patches/patch-base_memory_platform__shared__memory__region__posix.cc
index 6bdead0e17..50657466e3 100644
--- a/chromium/patches/patch-base_memory_platform__shared__memory__region__posix.cc
+++ b/chromium/patches/patch-base_memory_platform__shared__memory__region__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_memory_platform__shared__memory__region__posix.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/memory/platform_shared_memory_region_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/memory/platform_shared_memory_region_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/memory/platform_shared_memory_region_posix.cc
 @@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expec
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_memory_platform__shared__memory__region__posix.cc,v 1.1 2025
  // static
  ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
    PlatformSharedMemoryRegion region =
-@@ -168,7 +168,7 @@ bool PlatformSharedMemoryRegion::Convert
+@@ -175,7 +175,7 @@ bool PlatformSharedMemoryRegion::Convert
  // static
  PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
                                                                size_t size
@@ -24,7 +24,7 @@ $NetBSD: patch-base_memory_platform__shared__memory__region__posix.cc,v 1.1 2025
                                                                ,
                                                                bool executable
  #endif
-@@ -197,7 +197,7 @@ PlatformSharedMemoryRegion PlatformShare
+@@ -204,7 +204,7 @@ PlatformSharedMemoryRegion PlatformShare
    // flag.
    FilePath directory;
    if (!GetShmemTempDir(
diff --git a/chromium/patches/patch-base_memory_protected__memory.h b/chromium/patches/patch-base_memory_protected__memory.h
index 0d950a8931..55cc71b8a0 100644
--- a/chromium/patches/patch-base_memory_protected__memory.h
+++ b/chromium/patches/patch-base_memory_protected__memory.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_memory_protected__memory.h,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/memory/protected_memory.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/memory/protected_memory.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/memory/protected_memory.h
-@@ -119,12 +119,12 @@ __declspec(selectany) char __stop_protec
+@@ -120,12 +120,12 @@ __declspec(selectany) char __stop_protec
  
  #define DECLARE_PROTECTED_DATA constinit
  #define DEFINE_PROTECTED_DATA constinit __declspec(allocate("prot$mem"))
@@ -21,7 +21,7 @@ $NetBSD: patch-base_memory_protected__memory.h,v 1.1 2025/02/06 09:57:40 wiz Exp
  // arm64 supports 4kb, 16kb, and 64kb pages. Set to the largest of 64kb as that
  // will guarantee the section is page aligned regardless of the choice.
  inline constexpr int kProtectedMemoryAlignment = 65536;
-@@ -339,7 +339,7 @@ class BASE_EXPORT AutoWritableMemoryBase
+@@ -340,7 +340,7 @@ class BASE_EXPORT AutoWritableMemoryBase
      // where an attacker could overwrite it with a large value and invoke code
      // that constructs and destructs an AutoWritableMemory. After such a call
      // protected memory would still be set writable because writers > 0.
@@ -30,7 +30,7 @@ $NetBSD: patch-base_memory_protected__memory.h,v 1.1 2025/02/06 09:57:40 wiz Exp
      // On Linux, the protected memory section is not automatically page aligned.
      // This means that attempts to reset the protected memory region to readonly
      // will set some of the preceding section that is on the same page readonly
-@@ -353,7 +353,7 @@ class BASE_EXPORT AutoWritableMemoryBase
+@@ -354,7 +354,7 @@ class BASE_EXPORT AutoWritableMemoryBase
  #endif
      static inline size_t writers GUARDED_BY(writers_lock()) = 0;
  
@@ -39,7 +39,7 @@ $NetBSD: patch-base_memory_protected__memory.h,v 1.1 2025/02/06 09:57:40 wiz Exp
      // On Linux, there is no guarantee the section following the protected
      // memory section is page aligned. This can result in attempts to change
      // the access permissions of the end of the protected memory section
-@@ -411,7 +411,7 @@ class BASE_EXPORT AutoWritableMemoryInit
+@@ -412,7 +412,7 @@ class BASE_EXPORT AutoWritableMemoryInit
      // the variable to something large before the section was read-only.
      WriterData::writers = 0;
      CHECK(SetProtectedSectionReadOnly());
diff --git a/chromium/patches/patch-base_memory_protected__memory__posix.cc b/chromium/patches/patch-base_memory_protected__memory__posix.cc
index 4ea2f69511..f8b5a275e4 100644
--- a/chromium/patches/patch-base_memory_protected__memory__posix.cc
+++ b/chromium/patches/patch-base_memory_protected__memory__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_memory_protected__memory__posix.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/memory/protected_memory_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/memory/protected_memory_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/memory/protected_memory_posix.cc
 @@ -6,7 +6,7 @@
  
diff --git a/chromium/patches/patch-base_message__loop_message__pump__epoll.cc b/chromium/patches/patch-base_message__loop_message__pump__epoll.cc
index 1a96154700..ab55f850df 100644
--- a/chromium/patches/patch-base_message__loop_message__pump__epoll.cc
+++ b/chromium/patches/patch-base_message__loop_message__pump__epoll.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_message__loop_message__pump__epoll.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/message_loop/message_pump_epoll.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/message_loop/message_pump_epoll.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/message_loop/message_pump_epoll.cc
-@@ -42,7 +42,7 @@ std::atomic_bool g_use_batched_version =
+@@ -47,7 +47,7 @@ std::atomic_bool g_use_batched_version =
  std::atomic_bool g_use_poll = false;
  
  constexpr std::pair<uint32_t, short int> kEpollToPollEvents[] = {
diff --git a/chromium/patches/patch-base_message__loop_message__pump__epoll.h b/chromium/patches/patch-base_message__loop_message__pump__epoll.h
index 4b733fa539..af5753f4d0 100644
--- a/chromium/patches/patch-base_message__loop_message__pump__epoll.h
+++ b/chromium/patches/patch-base_message__loop_message__pump__epoll.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_message__loop_message__pump__epoll.h,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/message_loop/message_pump_epoll.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/message_loop/message_pump_epoll.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/message_loop/message_pump_epoll.h
 @@ -51,7 +51,11 @@ namespace base {
  // every call, don't do it when we have too many FDs.
diff --git a/chromium/patches/patch-base_message__loop_message__pump__glib.cc b/chromium/patches/patch-base_message__loop_message__pump__glib.cc
index cc4df02a11..679ec01788 100644
--- a/chromium/patches/patch-base_message__loop_message__pump__glib.cc
+++ b/chromium/patches/patch-base_message__loop_message__pump__glib.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_message__loop_message__pump__glib.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/message_loop/message_pump_glib.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/message_loop/message_pump_glib.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/message_loop/message_pump_glib.cc
 @@ -8,6 +8,15 @@
  #include <glib.h>
@@ -22,7 +22,7 @@ $NetBSD: patch-base_message__loop_message__pump__glib.cc,v 1.1 2025/02/06 09:57:
  #include "base/logging.h"
  #include "base/memory/raw_ptr.h"
  #include "base/notreached.h"
-@@ -51,9 +60,19 @@ int GetTimeIntervalMilliseconds(TimeTick
+@@ -52,9 +61,19 @@ int GetTimeIntervalMilliseconds(TimeTick
  }
  
  bool RunningOnMainThread() {
@@ -36,7 +36,7 @@ $NetBSD: patch-base_message__loop_message__pump__glib.cc,v 1.1 2025/02/06 09:57:
 +#endif
 +#else
    auto pid = getpid();
-   auto tid = PlatformThread::CurrentId();
+   auto tid = PlatformThread::CurrentId().raw();
    return pid > 0 && tid > 0 && pid == tid;
 +#endif
  }
diff --git a/chromium/patches/patch-base_native__library__posix.cc b/chromium/patches/patch-base_native__library__posix.cc
index c6cfd6007d..e6d08b51b3 100644
--- a/chromium/patches/patch-base_native__library__posix.cc
+++ b/chromium/patches/patch-base_native__library__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_native__library__posix.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/native_library_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/native_library_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/native_library_posix.cc
 @@ -34,7 +34,7 @@ NativeLibrary LoadNativeLibraryWithOptio
    // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
diff --git a/chromium/patches/patch-base_native__library__unittest.cc b/chromium/patches/patch-base_native__library__unittest.cc
index 3e4c68304c..7fe5da0044 100644
--- a/chromium/patches/patch-base_native__library__unittest.cc
+++ b/chromium/patches/patch-base_native__library__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_native__library__unittest.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/native_library_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/native_library_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/native_library_unittest.cc
 @@ -135,7 +135,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
  // versions with respect to symbol resolution scope.
diff --git a/chromium/patches/patch-base_posix_can__lower__nice__to.cc b/chromium/patches/patch-base_posix_can__lower__nice__to.cc
index 32bb2c2669..5515f9f161 100644
--- a/chromium/patches/patch-base_posix_can__lower__nice__to.cc
+++ b/chromium/patches/patch-base_posix_can__lower__nice__to.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_posix_can__lower__nice__to.cc,v 1.1 2025/02/06 09:57:40 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/posix/can_lower_nice_to.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/posix/can_lower_nice_to.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/posix/can_lower_nice_to.cc
 @@ -11,8 +11,12 @@
  
diff --git a/chromium/patches/patch-base_posix_file__descriptor__shuffle.h b/chromium/patches/patch-base_posix_file__descriptor__shuffle.h
index efdb2d5dca..762eabf8cd 100644
--- a/chromium/patches/patch-base_posix_file__descriptor__shuffle.h
+++ b/chromium/patches/patch-base_posix_file__descriptor__shuffle.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_posix_file__descriptor__shuffle.h,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/posix/file_descriptor_shuffle.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/posix/file_descriptor_shuffle.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/posix/file_descriptor_shuffle.h
 @@ -26,6 +26,8 @@
  #include "base/base_export.h"
diff --git a/chromium/patches/patch-base_posix_sysctl.cc b/chromium/patches/patch-base_posix_sysctl.cc
index 8a5a464f67..031863dfa1 100644
--- a/chromium/patches/patch-base_posix_sysctl.cc
+++ b/chromium/patches/patch-base_posix_sysctl.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_posix_sysctl.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/posix/sysctl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/posix/sysctl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/posix/sysctl.cc
 @@ -4,6 +4,7 @@
  
diff --git a/chromium/patches/patch-base_posix_unix__domain__socket.cc b/chromium/patches/patch-base_posix_unix__domain__socket.cc
index 90334eb6bc..42a3c9cbd6 100644
--- a/chromium/patches/patch-base_posix_unix__domain__socket.cc
+++ b/chromium/patches/patch-base_posix_unix__domain__socket.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_posix_unix__domain__socket.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/posix/unix_domain_socket.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/posix/unix_domain_socket.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/posix/unix_domain_socket.cc
-@@ -56,7 +56,7 @@ bool CreateSocketPair(ScopedFD* one, Sco
+@@ -47,7 +47,7 @@ bool CreateSocketPair(ScopedFD* one, Sco
  
  // static
  bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
@@ -15,7 +15,7 @@ $NetBSD: patch-base_posix_unix__domain__socket.cc,v 1.1 2025/02/06 09:57:41 wiz
    const int enable = 1;
    return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
  #else
-@@ -82,7 +82,7 @@ bool UnixDomainSocket::SendMsg(int fd,
+@@ -73,7 +73,7 @@ bool UnixDomainSocket::SendMsg(int fd,
  
      struct cmsghdr* cmsg;
      msg.msg_control = control_buffer;
@@ -24,7 +24,7 @@ $NetBSD: patch-base_posix_unix__domain__socket.cc,v 1.1 2025/02/06 09:57:41 wiz
      msg.msg_controllen = checked_cast<socklen_t>(control_len);
  #else
      msg.msg_controllen = control_len;
-@@ -90,7 +90,7 @@ bool UnixDomainSocket::SendMsg(int fd,
+@@ -81,7 +81,7 @@ bool UnixDomainSocket::SendMsg(int fd,
      cmsg = CMSG_FIRSTHDR(&msg);
      cmsg->cmsg_level = SOL_SOCKET;
      cmsg->cmsg_type = SCM_RIGHTS;
@@ -33,7 +33,7 @@ $NetBSD: patch-base_posix_unix__domain__socket.cc,v 1.1 2025/02/06 09:57:41 wiz
      cmsg->cmsg_len = checked_cast<u_int>(CMSG_LEN(sizeof(int) * fds.size()));
  #else
      cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size());
-@@ -154,7 +154,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
+@@ -133,7 +133,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
  
    const size_t kControlBufferSize =
        CMSG_SPACE(sizeof(int) * kMaxFileDescriptors)
@@ -42,7 +42,7 @@ $NetBSD: patch-base_posix_unix__domain__socket.cc,v 1.1 2025/02/06 09:57:41 wiz
        // macOS does not support ucred.
        // macOS supports xucred, but this structure is insufficient.
        + CMSG_SPACE(sizeof(struct ucred))
-@@ -182,7 +182,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
+@@ -162,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
          wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
          wire_fds_len = payload_len / sizeof(int);
        }
@@ -51,10 +51,10 @@ $NetBSD: patch-base_posix_unix__domain__socket.cc,v 1.1 2025/02/06 09:57:41 wiz
        // macOS does not support SCM_CREDENTIALS.
        if (cmsg->cmsg_level == SOL_SOCKET &&
            cmsg->cmsg_type == SCM_CREDENTIALS) {
-@@ -216,6 +216,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
-     socklen_t pid_size = sizeof(pid);
-     if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0)
+@@ -199,6 +199,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
+     if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0) {
        pid = -1;
+     }
 +#elif BUILDFLAG(IS_BSD)
 +    NOTIMPLEMENTED();
 +    pid = -1;
diff --git a/chromium/patches/patch-base_posix_unix__domain__socket__unittest.cc b/chromium/patches/patch-base_posix_unix__domain__socket__unittest.cc
index bf84008a26..e7d4bd78f9 100644
--- a/chromium/patches/patch-base_posix_unix__domain__socket__unittest.cc
+++ b/chromium/patches/patch-base_posix_unix__domain__socket__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_posix_unix__domain__socket__unittest.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/posix/unix_domain_socket_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/posix/unix_domain_socket_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/posix/unix_domain_socket_unittest.cc
 @@ -15,6 +15,8 @@
  #include <sys/types.h>
diff --git a/chromium/patches/patch-base_process_internal__linux.h b/chromium/patches/patch-base_process_internal__linux.h
index 04a97d4f71..60ea7e8cde 100644
--- a/chromium/patches/patch-base_process_internal__linux.h
+++ b/chromium/patches/patch-base_process_internal__linux.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_internal__linux.h,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/internal_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/internal_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/internal_linux.h
-@@ -140,6 +140,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t 
+@@ -144,6 +144,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t 
  // arguments to the lambda.
  template <typename Lambda>
  void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) {
@@ -16,7 +16,7 @@ $NetBSD: patch-base_process_internal__linux.h,v 1.1 2025/02/06 09:57:41 wiz Exp
    // Iterate through the different threads tracked in /proc/<pid>/task.
    FilePath fd_path = GetProcPidDir(process).Append("task");
  
-@@ -159,6 +162,7 @@ void ForEachProcessTask(base::ProcessHan
+@@ -167,6 +170,7 @@ void ForEachProcessTask(base::ProcessHan
      FilePath task_path = fd_path.Append(tid_str);
      lambda(tid, task_path);
    }
diff --git a/chromium/patches/patch-base_process_kill.h b/chromium/patches/patch-base_process_kill.h
index dd7da26f5f..3571d020ef 100644
--- a/chromium/patches/patch-base_process_kill.h
+++ b/chromium/patches/patch-base_process_kill.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-base_process_kill.h,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/kill.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/kill.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/kill.h
 @@ -123,7 +123,7 @@ BASE_EXPORT TerminationStatus GetTermina
- BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
-     ProcessHandle handle, int* exit_code);
+ BASE_EXPORT TerminationStatus
+ GetKnownDeadTerminationStatus(ProcessHandle handle, int* exit_code);
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-base_process_kill__posix.cc b/chromium/patches/patch-base_process_kill__posix.cc
index 097cbb3d3a..55c27df169 100644
--- a/chromium/patches/patch-base_process_kill__posix.cc
+++ b/chromium/patches/patch-base_process_kill__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_kill__posix.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/kill_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/kill_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/kill_posix.cc
-@@ -157,7 +157,7 @@ void EnsureProcessTerminated(Process pro
+@@ -161,7 +161,7 @@ void EnsureProcessTerminated(Process pro
        0, new BackgroundReaper(std::move(process), Seconds(2)));
  }
  
diff --git a/chromium/patches/patch-base_process_launch.h b/chromium/patches/patch-base_process_launch.h
index 0d8c6b21ac..5276ec8a1d 100644
--- a/chromium/patches/patch-base_process_launch.h
+++ b/chromium/patches/patch-base_process_launch.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_process_launch.h,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/launch.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/launch.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/launch.h
 @@ -7,6 +7,13 @@
  #ifndef BASE_PROCESS_LAUNCH_H_
diff --git a/chromium/patches/patch-base_process_launch__posix.cc b/chromium/patches/patch-base_process_launch__posix.cc
index 6a40f795c9..9b0ddabfbf 100644
--- a/chromium/patches/patch-base_process_launch__posix.cc
+++ b/chromium/patches/patch-base_process_launch__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_launch__posix.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/launch_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/launch_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/launch_posix.cc
-@@ -67,6 +67,9 @@
+@@ -62,6 +62,9 @@
  #error "macOS should use launch_mac.cc"
  #endif
  
@@ -16,7 +16,7 @@ $NetBSD: patch-base_process_launch__posix.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
  extern char** environ;
  
  namespace base {
-@@ -223,6 +226,8 @@ static const char kFDDir[] = "/dev/fd";
+@@ -219,6 +222,8 @@ static const char kFDDir[] = "/dev/fd";
  static const char kFDDir[] = "/dev/fd";
  #elif BUILDFLAG(IS_OPENBSD)
  static const char kFDDir[] = "/dev/fd";
diff --git a/chromium/patches/patch-base_process_memory__linux.cc b/chromium/patches/patch-base_process_memory__linux.cc
index cc8d24eed4..48fc21d4bf 100644
--- a/chromium/patches/patch-base_process_memory__linux.cc
+++ b/chromium/patches/patch-base_process_memory__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_process_memory__linux.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/memory_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/memory_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/memory_linux.cc
 @@ -28,6 +28,7 @@ void __libc_free(void*);
  
@@ -14,7 +14,7 @@ $NetBSD: patch-base_process_memory__linux.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
  namespace {
  
  void ReleaseReservationOrTerminate() {
-@@ -37,12 +38,14 @@ void ReleaseReservationOrTerminate() {
+@@ -38,12 +39,14 @@ void ReleaseReservationOrTerminate() {
  }
  
  }  // namespace
@@ -29,7 +29,7 @@ $NetBSD: patch-base_process_memory__linux.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
    // Set the new-out of memory handler.
    std::set_new_handler(&ReleaseReservationOrTerminate);
    // If we're using glibc's allocator, the above functions will override
-@@ -51,8 +54,10 @@ void EnableTerminationOnOutOfMemory() {
+@@ -52,8 +55,10 @@ void EnableTerminationOnOutOfMemory() {
  #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
    allocator_shim::SetCallNewHandlerOnMallocFailure(true);
  #endif
@@ -40,7 +40,7 @@ $NetBSD: patch-base_process_memory__linux.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
  // ScopedAllowBlocking() has private constructor and it can only be used in
  // friend classes/functions. Declaring a class is easier in this situation to
  // avoid adding more dependency to thread_restrictions.h because of the
-@@ -110,6 +115,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScor
+@@ -111,6 +116,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScor
  bool AdjustOOMScore(ProcessId process, int score) {
    return AdjustOOMScoreHelper::AdjustOOMScore(process, score);
  }
diff --git a/chromium/patches/patch-base_process_process__handle.cc b/chromium/patches/patch-base_process_process__handle.cc
index 8c7c2c0748..3401fa7ff1 100644
--- a/chromium/patches/patch-base_process_process__handle.cc
+++ b/chromium/patches/patch-base_process_process__handle.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_process_process__handle.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_handle.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_handle.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_handle.cc
 @@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() {
               : UniqueProcId(GetCurrentProcId());
diff --git a/chromium/patches/patch-base_process_process__handle.h b/chromium/patches/patch-base_process_process__handle.h
index 748b221e69..009d240d15 100644
--- a/chromium/patches/patch-base_process_process__handle.h
+++ b/chromium/patches/patch-base_process_process__handle.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_process_process__handle.h,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_handle.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_handle.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_handle.h
 @@ -86,7 +86,7 @@ BASE_EXPORT ProcessId GetCurrentProcId()
  // processes may be reused.
diff --git a/chromium/patches/patch-base_process_process__handle__freebsd.cc b/chromium/patches/patch-base_process_process__handle__freebsd.cc
index ba5a950c7a..02e320284a 100644
--- a/chromium/patches/patch-base_process_process__handle__freebsd.cc
+++ b/chromium/patches/patch-base_process_process__handle__freebsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_process_process__handle__freebsd.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_handle_freebsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_handle_freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_handle_freebsd.cc
 @@ -3,6 +3,7 @@
  // found in the LICENSE file.
@@ -14,20 +14,19 @@ $NetBSD: patch-base_process_process__handle__freebsd.cc,v 1.1 2025/02/06 09:57:4
  
  #include <limits.h>
  #include <stddef.h>
-@@ -20,12 +21,15 @@ namespace base {
+@@ -20,11 +21,14 @@ namespace base {
  
  ProcessId GetParentProcessId(ProcessHandle process) {
    struct kinfo_proc info;
 -  size_t length;
 +  size_t length = sizeof(struct kinfo_proc);
-   int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
+   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process};
  
-   if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
+   if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
      return -1;
- 
++
 +  if (length < sizeof(struct kinfo_proc))
 +    return -1;
-+
-   return info.ki_ppid;
- }
+   }
  
+   return info.ki_ppid;
diff --git a/chromium/patches/patch-base_process_process__handle__netbsd.cc b/chromium/patches/patch-base_process_process__handle__netbsd.cc
index b05a8bbea0..cb7914cdbb 100644
--- a/chromium/patches/patch-base_process_process__handle__netbsd.cc
+++ b/chromium/patches/patch-base_process_process__handle__netbsd.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_process__handle__netbsd.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_handle_netbsd.cc.orig	2024-12-21 10:25:09.614530232 +0000
+--- base/process/process_handle_netbsd.cc.orig	2025-05-08 12:01:57.636629943 +0000
 +++ base/process/process_handle_netbsd.cc
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,56 @@
 +// Copyright 2011 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -35,8 +35,9 @@ $NetBSD: patch-base_process_process__handle__netbsd.cc,v 1.1 2025/02/06 09:57:41
 +  int mib[] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, process,
 +                sizeof(struct kinfo_proc2), 1 };
 +
-+  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
++  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
 +    return -1;
++  }
 +
 +  info = (struct kinfo_proc2 *)malloc(length);
 +
diff --git a/chromium/patches/patch-base_process_process__handle__openbsd.cc b/chromium/patches/patch-base_process_process__handle__openbsd.cc
index 18f63509b5..6b17ebe5a6 100644
--- a/chromium/patches/patch-base_process_process__handle__openbsd.cc
+++ b/chromium/patches/patch-base_process_process__handle__openbsd.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_process__handle__openbsd.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_handle_openbsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_handle_openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_handle_openbsd.cc
-@@ -3,48 +3,112 @@
+@@ -3,17 +3,25 @@
  // found in the LICENSE file.
  
  #include "base/process/process_handle.h"
@@ -30,27 +30,28 @@ $NetBSD: patch-base_process_process__handle__openbsd.cc,v 1.1 2025/02/06 09:57:4
 +  struct kinfo_proc *info;
    size_t length;
 +  pid_t ppid;
-   int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
-                 sizeof(struct kinfo_proc), 0 };
- 
-   if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
+   int mib[] = {
+       CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc),
+       0};
+@@ -22,37 +30,87 @@ ProcessId GetParentProcessId(ProcessHand
      return -1;
+   }
  
 -  mib[5] = (length / sizeof(struct kinfo_proc));
 +  info = (struct kinfo_proc *)malloc(length);
  
--  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
+-  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
 -    return -1;
 +  mib[5] = static_cast<int>((length / sizeof(struct kinfo_proc)));
 +
 +  if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) {
 +    ppid = -1;
 +    goto out;
-+  }
-+
-+  ppid = info->p_ppid;
+   }
  
 -  return info.p_ppid;
++  ppid = info->p_ppid;
++
 +out:
 +  free(info);
 +  return ppid;
@@ -64,17 +65,21 @@ $NetBSD: patch-base_process_process__handle__openbsd.cc,v 1.1 2025/02/06 09:57:4
 +  char **retvalargs, *cpath, retval[PATH_MAX];
 +  int cnt;
    size_t len;
--  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
--                sizeof(struct kinfo_proc), 0 };
+-  int mib[] = {
+-      CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc),
+-      0};
 -
--  if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1)
+-  if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1) {
 -    return FilePath();
+-  }
 -  mib[5] = (len / sizeof(struct kinfo_proc));
--  if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0)
+-  if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0) {
 -    return FilePath();
--  if ((kp.p_flag & P_SYSTEM) != 0)
+-  }
+-  if ((kp.p_flag & P_SYSTEM) != 0) {
 -    return FilePath();
--  if (strcmp(kp.p_comm, "chrome") == 0)
+-  }
+-  if (strcmp(kp.p_comm, "chrome") == 0) {
 -    return FilePath(kp.p_comm);
 +  char *tokens[2];
 +  struct stat sb;
@@ -131,7 +136,7 @@ $NetBSD: patch-base_process_process__handle__openbsd.cc,v 1.1 2025/02/06 09:57:4
 +            result = FilePath(retval);
 +      }
 +    }
-+  }
+   }
  
 -  return FilePath();
 +  return result;
diff --git a/chromium/patches/patch-base_process_process__iterator.h b/chromium/patches/patch-base_process_process__iterator.h
index 48de865f05..9704f805b4 100644
--- a/chromium/patches/patch-base_process_process__iterator.h
+++ b/chromium/patches/patch-base_process_process__iterator.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_process__iterator.h,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_iterator.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_iterator.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_iterator.h
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
  #include <windows.h>
  
  #include <tlhelp32.h>
@@ -15,7 +15,7 @@ $NetBSD: patch-base_process_process__iterator.h,v 1.1 2025/02/06 09:57:41 wiz Ex
  #include <sys/sysctl.h>
  #elif BUILDFLAG(IS_FREEBSD)
  #include <sys/user.h>
-@@ -116,7 +116,11 @@ class BASE_EXPORT ProcessIterator {
+@@ -117,7 +117,11 @@ class BASE_EXPORT ProcessIterator {
    HANDLE snapshot_;
    bool started_iteration_ = false;
  #elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-base_process_process__iterator__freebsd.cc b/chromium/patches/patch-base_process_process__iterator__freebsd.cc
index 9c1b59440b..8ed35a00e1 100644
--- a/chromium/patches/patch-base_process_process__iterator__freebsd.cc
+++ b/chromium/patches/patch-base_process_process__iterator__freebsd.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-base_process_process__iterator__freebsd.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_iterator_freebsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_iterator_freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_iterator_freebsd.cc
 @@ -18,7 +18,7 @@ namespace base {
  
  ProcessIterator::ProcessIterator(const ProcessFilter* filter)
      : filter_(filter) {
--  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid() };
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid() };
+-  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid()};
++  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid()};
  
    bool done = false;
    int try_num = 1;
@@ -29,19 +29,20 @@ $NetBSD: patch-base_process_process__iterator__freebsd.cc,v 1.1 2025/02/06 09:57
        } else {
          // Got the list, just make sure we're sized exactly right
 -        size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+	num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
++        num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
          kinfo_procs_.resize(num_of_kinfo_proc);
          done = true;
        }
-@@ -68,18 +68,13 @@ bool ProcessIterator::CheckForNextProces
+@@ -68,19 +68,14 @@ bool ProcessIterator::CheckForNextProces
    for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
      size_t length;
      struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
--    int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid };
+-    int mib[] = {CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid};
 +    int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid };
  
-     if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB))
+     if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB)) {
        continue;
+     }
  
 -    length = 0;
 -    if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
diff --git a/chromium/patches/patch-base_process_process__iterator__netbsd.cc b/chromium/patches/patch-base_process_process__iterator__netbsd.cc
index 79c5ce7892..12ef185400 100644
--- a/chromium/patches/patch-base_process_process__iterator__netbsd.cc
+++ b/chromium/patches/patch-base_process_process__iterator__netbsd.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_process__iterator__netbsd.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_iterator_netbsd.cc.orig	2024-12-21 10:25:09.617721988 +0000
+--- base/process/process_iterator_netbsd.cc.orig	2025-05-08 12:01:57.637133193 +0000
 +++ base/process/process_iterator_netbsd.cc
-@@ -0,0 +1,132 @@
+@@ -0,0 +1,134 @@
 +// Copyright 2013 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -80,8 +80,9 @@ $NetBSD: patch-base_process_process__iterator__netbsd.cc,v 1.1 2025/02/06 09:57:
 +    kinfo_proc2& kinfo = kinfo_procs_[index_of_kinfo_proc_];
 +
 +    // Skip processes just awaiting collection
-+    if ((kinfo.p_pid > 0) && (kinfo.p_stat == SZOMB))
++    if ((kinfo.p_pid > 0) && (kinfo.p_stat == SZOMB)) {
 +      continue;
++    }
 +
 +    int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.p_pid };
 +
@@ -120,11 +121,12 @@ $NetBSD: patch-base_process_process__iterator__netbsd.cc,v 1.1 2025/02/06 09:57:
 +    entry_.ppid_ = kinfo.p_ppid;
 +    entry_.gid_ = kinfo.p__pgid;
 +    size_t last_slash = data.rfind('/', exec_name_end);
-+    if (last_slash == std::string::npos)
++    if (last_slash == std::string::npos) {
 +      entry_.exe_file_.assign(data, 0, exec_name_end);
-+    else
++    } else {
 +      entry_.exe_file_.assign(data, last_slash + 1,
 +                              exec_name_end - last_slash - 1);
++    }
 +    // Start w/ the next entry next time through
 +    ++index_of_kinfo_proc_;
 +    // Done
diff --git a/chromium/patches/patch-base_process_process__iterator__openbsd.cc b/chromium/patches/patch-base_process_process__iterator__openbsd.cc
index 03fabf1dc0..1a3ca609e5 100644
--- a/chromium/patches/patch-base_process_process__iterator__openbsd.cc
+++ b/chromium/patches/patch-base_process_process__iterator__openbsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_process_process__iterator__openbsd.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_iterator_openbsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_iterator_openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_iterator_openbsd.cc
 @@ -6,6 +6,9 @@
  
@@ -16,13 +16,14 @@ $NetBSD: patch-base_process_process__iterator__openbsd.cc,v 1.1 2025/02/06 09:57
  #include <sys/sysctl.h>
  
  #include "base/logging.h"
-@@ -16,12 +19,13 @@ namespace base {
- 
+@@ -17,12 +20,13 @@ namespace base {
  ProcessIterator::ProcessIterator(const ProcessFilter* filter)
      : filter_(filter) {
--  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid(),
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, static_cast<int>(getuid()),
-                 sizeof(struct kinfo_proc), 0 };
+   int mib[] = {
+-      CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc),
+-      0};
++      CTL_KERN, KERN_PROC, KERN_PROC_UID, static_cast<int>(getuid()),
++      sizeof(struct kinfo_proc), 0 };
  
    bool done = false;
    int try_num = 1;
@@ -31,7 +32,7 @@ $NetBSD: patch-base_process_process__iterator__openbsd.cc,v 1.1 2025/02/06 09:57
  
    do {
      size_t len = 0;
-@@ -30,7 +34,7 @@ ProcessIterator::ProcessIterator(const P
+@@ -31,7 +35,7 @@ ProcessIterator::ProcessIterator(const P
        kinfo_procs_.resize(0);
        done = true;
      } else {
@@ -40,7 +41,7 @@ $NetBSD: patch-base_process_process__iterator__openbsd.cc,v 1.1 2025/02/06 09:57
        // Leave some spare room for process table growth (more could show up
        // between when we check and now)
        num_of_kinfo_proc += 16;
-@@ -46,7 +50,7 @@ ProcessIterator::ProcessIterator(const P
+@@ -47,7 +51,7 @@ ProcessIterator::ProcessIterator(const P
          }
        } else {
          // Got the list, just make sure we're sized exactly right
diff --git a/chromium/patches/patch-base_process_process__metrics.cc b/chromium/patches/patch-base_process_process__metrics.cc
index a4651e4a8a..2b5eed7e5f 100644
--- a/chromium/patches/patch-base_process_process__metrics.cc
+++ b/chromium/patches/patch-base_process_process__metrics.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_process_process__metrics.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_metrics.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_metrics.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_metrics.cc
 @@ -17,7 +17,7 @@ namespace base {
  namespace {
@@ -41,7 +41,7 @@ $NetBSD: patch-base_process_process__metrics.cc,v 1.1 2025/02/06 09:57:41 wiz Ex
  double ProcessMetrics::GetPlatformIndependentCPUUsage(
      TimeDelta cumulative_cpu) {
    TimeTicks time = TimeTicks::Now();
-@@ -129,10 +128,9 @@ ProcessMetrics::GetPlatformIndependentCP
+@@ -130,10 +129,9 @@ ProcessMetrics::GetPlatformIndependentCP
      return GetPlatformIndependentCPUUsage(cpu_usage);
    });
  }
diff --git a/chromium/patches/patch-base_process_process__metrics.h b/chromium/patches/patch-base_process_process__metrics.h
index d0fb10a3e4..f89c197933 100644
--- a/chromium/patches/patch-base_process_process__metrics.h
+++ b/chromium/patches/patch-base_process_process__metrics.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_metrics.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_metrics.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_metrics.h
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp
  #include <string>
  #include <utility>
  #include <vector>
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@
  
  namespace base {
  
@@ -24,16 +24,7 @@ $NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp
  // Minor and major page fault counts since the process creation.
  // Both counts are process-wide, and exclude child processes.
  //
-@@ -113,7 +113,7 @@ class BASE_EXPORT ProcessMetrics {
-   // convenience wrapper for CreateProcessMetrics().
-   static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   // Resident Set Size is a Linux/Android specific memory concept. Do not
-   // attempt to extend this to other platforms.
-   BASE_EXPORT size_t GetResidentSetSize() const;
-@@ -147,7 +147,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -179,7 +179,7 @@ class BASE_EXPORT ProcessMetrics {
    base::expected<TimeDelta, ProcessCPUUsageError> GetCumulativeCPUUsage();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -42,16 +33,16 @@ $NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp
    // Emits the cumulative CPU usage for all currently active threads since they
    // were started into the output parameter (replacing its current contents).
    // Threads that have already terminated will not be reported. Thus, the sum of
-@@ -192,7 +192,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -224,7 +224,7 @@ class BASE_EXPORT ProcessMetrics {
    int GetOpenFdSoftLimit() const;
  #endif  // BUILDFLAG(IS_POSIX)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   // Bytes of swap as reported by /proc/[pid]/status.
-   uint64_t GetVmSwapBytes() const;
- 
-@@ -213,7 +213,7 @@ class BASE_EXPORT ProcessMetrics {
+   // Minor and major page fault count as reported by /proc/[pid]/stat.
+   // Returns true for success.
+   bool GetPageFaultCounts(PageFaultCounts* counts) const;
+@@ -242,7 +242,7 @@ class BASE_EXPORT ProcessMetrics {
  #endif  // !BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -60,7 +51,7 @@ $NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp
    int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
  #endif
  #if BUILDFLAG(IS_APPLE)
-@@ -235,12 +235,10 @@ class BASE_EXPORT ProcessMetrics {
+@@ -264,12 +264,10 @@ class BASE_EXPORT ProcessMetrics {
    // Used to store the previous times and CPU usage counts so we can
    // compute the CPU usage between calls.
    TimeTicks last_cpu_time_;
@@ -74,7 +65,7 @@ $NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp
    // Same thing for idle wakeups.
    TimeTicks last_idle_wakeups_time_;
    uint64_t last_absolute_idle_wakeups_;
-@@ -281,7 +279,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsig
+@@ -310,7 +308,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsig
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||      \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@@ -83,7 +74,7 @@ $NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp
  // Data about system-wide memory consumption. Values are in KB. Available on
  // Windows, Mac, Linux, Android and Chrome OS.
  //
-@@ -316,7 +314,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -345,7 +343,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -92,7 +83,7 @@ $NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp
    // This provides an estimate of available memory as described here:
    // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
    // NOTE: this is ONLY valid in kernels 3.14 and up.  Its value will always
-@@ -331,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -360,7 +358,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  #endif
  
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -101,7 +92,7 @@ $NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp
    int buffers = 0;
    int cached = 0;
    int active_anon = 0;
-@@ -368,7 +366,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
+@@ -397,7 +395,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
          // BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -110,7 +101,7 @@ $NetBSD: patch-base_process_process__metrics.h,v 1.1 2025/02/06 09:57:41 wiz Exp
  // Parse the data found in /proc/<pid>/stat and return the sum of the
  // CPU-related ticks.  Returns -1 on parse error.
  // Exposed for testing.
-@@ -563,7 +561,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics {
    FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
  
    size_t committed_memory_;
diff --git a/chromium/patches/patch-base_process_process__metrics__freebsd.cc b/chromium/patches/patch-base_process_process__metrics__freebsd.cc
index 12496a1aed..d7daa41cdc 100644
--- a/chromium/patches/patch-base_process_process__metrics__freebsd.cc
+++ b/chromium/patches/patch-base_process_process__metrics__freebsd.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_process__metrics__freebsd.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_metrics_freebsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_metrics_freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_metrics_freebsd.cc
-@@ -3,19 +3,37 @@
+@@ -3,18 +3,37 @@
  // found in the LICENSE file.
  
  #include "base/process/process_metrics.h"
@@ -41,44 +41,77 @@ $NetBSD: patch-base_process_process__metrics__freebsd.cc,v 1.1 2025/02/06 09:57:
 +}
  
 -ProcessMetrics::ProcessMetrics(ProcessHandle process)
--    : process_(process),
--      last_cpu_(0) {}
+-    : process_(process), last_cpu_(0) {}
 +ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
  
  // static
  std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-@@ -23,21 +41,18 @@ std::unique_ptr<ProcessMetrics> ProcessM
+@@ -22,22 +41,54 @@ std::unique_ptr<ProcessMetrics> ProcessM
    return WrapUnique(new ProcessMetrics(process));
  }
  
 -base::expected<double, ProcessCPUUsageError>
 -ProcessMetrics::GetPlatformIndependentCPUUsage() {
-+base::expected<TimeDelta, ProcessCPUUsageError>
-+ProcessMetrics::GetCumulativeCPUUsage() {
-   struct kinfo_proc info;
+-  struct kinfo_proc info;
 -  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_};
 -  size_t length = sizeof(info);
-+  size_t length = sizeof(struct kinfo_proc);
-+  struct timeval tv;
-+
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
++base::expected<ProcessMemoryInfo, ProcessUsageError>
++ProcessMetrics::GetMemoryInfo() const {
++  ProcessMemoryInfo memory_info;
++  kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open");
++  struct kinfo_proc *pp;
++  int nproc;
  
-   if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
+-  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
 -    return base::unexpected(ProcessCPUUsageError::kSystemError);
-+    return base::ok(TimeDelta());
++  if (kd == nullptr) {
++    return base::unexpected(ProcessUsageError::kSystemError);
++  }
++
++  if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) {
++    kvm_close(kd);
++    return base::unexpected(ProcessUsageError::kProcessNotFound);
++  }
++
++  if (nproc > 0) {
++    memory_info.resident_set_bytes = pp->ki_rssize << GetPageShift();
++  } else {
++    kvm_close(kd);
++    return base::unexpected(ProcessUsageError::kProcessNotFound);
+   }
  
 -  return base::ok(double{info.ki_pctcpu} / FSCALE * 100.0);
--}
--
--base::expected<TimeDelta, ProcessCPUUsageError>
--ProcessMetrics::GetCumulativeCPUUsage() {
++  kvm_close(kd);
++  return memory_info;
+ }
+ 
+ base::expected<TimeDelta, ProcessCPUUsageError>
+ ProcessMetrics::GetCumulativeCPUUsage() {
 -  NOTREACHED();
++  struct kinfo_proc info;
++  size_t length = sizeof(struct kinfo_proc);
++  struct timeval tv;
++
++  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
++
++  if (process_ == 0) {
++    return base::unexpected(ProcessCPUUsageError::kSystemError);
++  }
++
++  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
++    return base::unexpected(ProcessCPUUsageError::kSystemError);
++  }
++
++  if (length == 0) {
++    return base::unexpected(ProcessCPUUsageError::kProcessNotFound);
++  }
++
 +  return base::ok(Microseconds(info.ki_runtime));
  }
  
  size_t GetSystemCommitCharge() {
-@@ -63,4 +78,228 @@ size_t GetSystemCommitCharge() {
-   return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
+@@ -66,4 +117,174 @@ size_t GetSystemCommitCharge() {
+   return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize);
  }
  
 +int64_t GetNumberOfThreads(ProcessHandle process) {
@@ -161,60 +194,6 @@ $NetBSD: patch-base_process_process__metrics__freebsd.cc,v 1.1 2025/02/06 09:57:
 +  return total_count;
 +}
 +
-+size_t ProcessMetrics::GetResidentSetSize() const {
-+  kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open");
-+
-+  if (kd == nullptr)
-+    return 0;
-+
-+  struct kinfo_proc *pp;
-+  int nproc;
-+
-+  if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) {
-+    kvm_close(kd);
-+    return 0;
-+  }
-+
-+  size_t rss;
-+
-+  if (nproc > 0) {
-+    rss = pp->ki_rssize << GetPageShift();
-+  } else {
-+    rss = 0;
-+  }
-+
-+  kvm_close(kd);
-+  return rss;
-+}
-+
-+uint64_t ProcessMetrics::GetVmSwapBytes() const {
-+  kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open");
-+
-+  if (kd == nullptr)
-+    return 0;
-+
-+  struct kinfo_proc *pp;
-+  int nproc;
-+
-+  if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) {
-+    kvm_close(kd);
-+    return 0;
-+  }
-+
-+  size_t swrss;
-+
-+  if (nproc > 0) {
-+    swrss = pp->ki_swrss > pp->ki_rssize
-+      ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift()
-+      : 0;
-+  } else {
-+    swrss = 0;
-+  }
-+
-+  kvm_close(kd);
-+  return swrss;
-+}
-+
 +int ProcessMetrics::GetIdleWakeupsPerSecond() {
 +  NOTIMPLEMENTED();
 +  return 0;
diff --git a/chromium/patches/patch-base_process_process__metrics__netbsd.cc b/chromium/patches/patch-base_process_process__metrics__netbsd.cc
index a52642c60c..02f25c8b3d 100644
--- a/chromium/patches/patch-base_process_process__metrics__netbsd.cc
+++ b/chromium/patches/patch-base_process_process__metrics__netbsd.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_process__metrics__netbsd.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_metrics_netbsd.cc.orig	2024-12-21 10:25:09.621647360 +0000
+--- base/process/process_metrics_netbsd.cc.orig	2025-05-08 12:01:57.637816950 +0000
 +++ base/process/process_metrics_netbsd.cc
-@@ -0,0 +1,175 @@
+@@ -0,0 +1,228 @@
 +// Copyright 2013 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -20,6 +20,8 @@ $NetBSD: patch-base_process_process__metrics__netbsd.cc,v 1.1 2025/02/06 09:57:4
 +#include <sys/sysctl.h>
 +#include <sys/vmmeter.h>
 +
++#include "base/files/dir_reader_posix.h" // DirReaderPosix
++#include "base/process/internal_linux.h" // GetProcPidDir()
 +#include "base/memory/ptr_util.h"
 +#include "base/types/expected.h"
 +#include "base/values.h"
@@ -29,6 +31,33 @@ $NetBSD: patch-base_process_process__metrics__netbsd.cc,v 1.1 2025/02/06 09:57:4
 +
 +ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
 +
++base::expected<ProcessMemoryInfo, ProcessUsageError>
++ProcessMetrics::GetMemoryInfo() const {
++  ProcessMemoryInfo memory_info;
++  struct kinfo_proc2 info;
++  size_t length = sizeof(struct kinfo_proc2);
++
++  int mib[] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, process_,
++                sizeof(struct kinfo_proc2), 1 };
++
++  if (process_ == 0) {
++    return base::unexpected(ProcessUsageError::kSystemError);
++  }
++
++  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
++    return base::unexpected(ProcessUsageError::kSystemError);
++  }
++
++  if (length == 0) {
++    return base::unexpected(ProcessUsageError::kProcessNotFound);
++  }
++
++  memory_info.resident_set_bytes =
++    checked_cast<uint64_t>(info.p_vm_rssize * getpagesize());
++
++  return memory_info;
++}
++
 +base::expected<TimeDelta, ProcessCPUUsageError>
 +ProcessMetrics::GetCumulativeCPUUsage() {
 +  struct kinfo_proc2 info;
@@ -38,10 +67,18 @@ $NetBSD: patch-base_process_process__metrics__netbsd.cc,v 1.1 2025/02/06 09:57:4
 +  int mib[] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, process_,
 +                sizeof(struct kinfo_proc2), 1 };
 +
++  if (process_ == 0) {
++    return base::unexpected(ProcessCPUUsageError::kSystemError);
++  }
++
 +  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
 +    return base::unexpected(ProcessCPUUsageError::kSystemError);
 +  }
 +
++  if (length == 0) {
++    return base::unexpected(ProcessCPUUsageError::kProcessNotFound);
++  }
++
 +  tv.tv_sec = info.p_rtime_sec;
 +  tv.tv_usec = info.p_rtime_usec;
 +
@@ -71,11 +108,27 @@ $NetBSD: patch-base_process_process__metrics__netbsd.cc,v 1.1 2025/02/06 09:57:4
 +
 +  pagesize = checked_cast<size_t>(getpagesize());
 +
-+  return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
++  return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize);
 +}
 +
 +int ProcessMetrics::GetOpenFdCount() const {
-+  return -1;
++  // Use /proc/<pid>/fd to count the number of entries there.
++  FilePath fd_path = internal::GetProcPidDir(process_).Append("fd");
++
++  DirReaderPosix dir_reader(fd_path.value().c_str());
++  if (!dir_reader.IsValid()) {
++    return -1;
++  }
++
++  int total_count = 0;
++  for (; dir_reader.Next();) {
++    const char* name = dir_reader.name();
++    if (strcmp(name, ".") != 0 && strcmp(name, "..") != 0) {
++      ++total_count;
++    }
++  }
++
++  return total_count;
 +}
 +
 +int ProcessMetrics::GetOpenFdSoftLimit() const {
@@ -83,9 +136,9 @@ $NetBSD: patch-base_process_process__metrics__netbsd.cc,v 1.1 2025/02/06 09:57:4
 +//  return GetMaxFds();
 +}
 +
-+uint64_t ProcessMetrics::GetVmSwapBytes() const {
++bool ProcessMetrics::GetPageFaultCounts(PageFaultCounts* counts) const {
 +  NOTIMPLEMENTED();
-+  return 0;
++  return false;
 +}
 +
 +bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
diff --git a/chromium/patches/patch-base_process_process__metrics__openbsd.cc b/chromium/patches/patch-base_process_process__metrics__openbsd.cc
index 7a890bb9ed..4128de2816 100644
--- a/chromium/patches/patch-base_process_process__metrics__openbsd.cc
+++ b/chromium/patches/patch-base_process_process__metrics__openbsd.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_process__metrics__openbsd.cc,v 1.1 2025/02/06 09:57:41 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_metrics_openbsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_metrics_openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_metrics_openbsd.cc
-@@ -6,36 +6,40 @@
+@@ -6,73 +6,85 @@
  
  #include <stddef.h>
  #include <stdint.h>
@@ -28,119 +28,127 @@ $NetBSD: patch-base_process_process__metrics__openbsd.cc,v 1.1 2025/02/06 09:57:
 +ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
  
 -base::expected<int, ProcessCPUUsageError> GetProcessCPU(pid_t pid) {
-+base::expected<TimeDelta, ProcessCPUUsageError>
-+ProcessMetrics::GetCumulativeCPUUsage() {
++base::expected<ProcessMemoryInfo, ProcessUsageError>
++ProcessMetrics::GetMemoryInfo() const {
++  ProcessMemoryInfo memory_info;
    struct kinfo_proc info;
 -  size_t length;
--  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
--                sizeof(struct kinfo_proc), 0 };
--
+-  int mib[] = {
+-      CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, sizeof(struct kinfo_proc), 0};
++  size_t length = sizeof(struct kinfo_proc);
+ 
 -  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
 -    return base::unexpected(ProcessCPUUsageError::kSystemError);
 -  }
-+  size_t length = sizeof(struct kinfo_proc);
-+  struct timeval tv;
- 
--  mib[5] = (length / sizeof(struct kinfo_proc));
 +  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
 +                sizeof(struct kinfo_proc), 1 };
  
+-  mib[5] = (length / sizeof(struct kinfo_proc));
++  if (process_ == 0) {
++    return base::unexpected(ProcessUsageError::kSystemError);
++  }
+ 
    if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
-     return base::unexpected(ProcessCPUUsageError::kSystemError);
+-    return base::unexpected(ProcessCPUUsageError::kSystemError);
++    return base::unexpected(ProcessUsageError::kSystemError);
    }
  
 -  return base::ok(info.p_pctcpu);
 -}
-+  tv.tv_sec = info.p_rtime_sec;
-+  tv.tv_usec = info.p_rtime_usec;
++  if (length == 0) {
++    return base::unexpected(ProcessUsageError::kProcessNotFound);
++  }
  
 -}  // namespace
-+  return base::ok(Microseconds(TimeValToMicroseconds(tv)));
-+}
++  memory_info.resident_set_bytes =
++    checked_cast<uint64_t>(info.p_vm_rssize * getpagesize());
  
- // static
- std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-@@ -43,37 +47,9 @@ std::unique_ptr<ProcessMetrics> ProcessM
-   return WrapUnique(new ProcessMetrics(process));
+-// static
+-std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
+-    ProcessHandle process) {
+-  return WrapUnique(new ProcessMetrics(process));
++  return memory_info;
  }
  
 -base::expected<double, ProcessCPUUsageError>
 -ProcessMetrics::GetPlatformIndependentCPUUsage() {
 -  TimeTicks time = TimeTicks::Now();
--
++base::expected<TimeDelta, ProcessCPUUsageError>
++ProcessMetrics::GetCumulativeCPUUsage() {
++  struct kinfo_proc info;
++  size_t length = sizeof(struct kinfo_proc);
++  struct timeval tv;
++
++  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
++                sizeof(struct kinfo_proc), 1 };
+ 
 -  if (last_cpu_time_.is_zero()) {
 -    // First call, just set the last values.
 -    last_cpu_time_ = time;
 -    return base::ok(0.0);
--  }
--
++  if (process_ == 0) {
++    return base::unexpected(ProcessCPUUsageError::kSystemError);
+   }
+ 
 -  const base::expected<int, ProcessCPUUsageError> cpu = GetProcessCPU(process_);
 -  if (!cpu.has_value()) {
 -    return base::unexpected(cpu.error());
--  }
--
++  if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
++    return base::unexpected(ProcessCPUUsageError::kSystemError);
+   }
+ 
 -  last_cpu_time_ = time;
 -  return base::ok(double{cpu.value()} / FSCALE * 100.0);
 -}
--
++  if (length == 0) {
++    return base::unexpected(ProcessCPUUsageError::kProcessNotFound);
++  }
+ 
 -base::expected<TimeDelta, ProcessCPUUsageError>
 -ProcessMetrics::GetCumulativeCPUUsage() {
 -  NOTREACHED();
--}
--
++  tv.tv_sec = info.p_rtime_sec;
++  tv.tv_usec = info.p_rtime_usec;
++
++  return base::ok(Microseconds(TimeValToMicroseconds(tv)));
+ }
+ 
 -ProcessMetrics::ProcessMetrics(ProcessHandle process)
--    : process_(process),
--      last_cpu_(0) {}
--
+-    : process_(process), last_cpu_(0) {}
++// static
++std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
++    ProcessHandle process) {
++  return WrapUnique(new ProcessMetrics(process));
++}
+ 
  size_t GetSystemCommitCharge() {
-   int mib[] = { CTL_VM, VM_METER };
+   int mib[] = {CTL_VM, VM_METER};
 -  int pagesize;
 +  size_t pagesize;
    struct vmtotal vmtotal;
    unsigned long mem_total, mem_free, mem_inactive;
    size_t len = sizeof(vmtotal);
-@@ -85,9 +61,136 @@ size_t GetSystemCommitCharge() {
+@@ -85,9 +97,115 @@ size_t GetSystemCommitCharge() {
    mem_free = vmtotal.t_free;
    mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
  
 -  pagesize = getpagesize();
 +  pagesize = checked_cast<size_t>(getpagesize());
  
-   return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
+   return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize);
  }
  
 +int ProcessMetrics::GetOpenFdCount() const {
-+#if 0
-+  struct kinfo_file *files;
-+  kvm_t *kd = NULL;
-+  int total_count = 0;
-+  char errbuf[_POSIX2_LINE_MAX];
-+
-+  if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL)
-+    goto out;
-+  
-+  if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process_,  
-+        sizeof(struct kinfo_file), &total_count)) == NULL) {
-+	  total_count = 0;
-+	  goto out;
-+  }
-+
-+  kvm_close(kd);
-+
-+out:
-+  return total_count;
-+#endif
-+  return getdtablecount();
++  return (process_ == getpid()) ? getdtablecount() : -1;
 +}
 +
 +int ProcessMetrics::GetOpenFdSoftLimit() const {
 +  return getdtablesize();
-+//  return GetMaxFds();
 +}
 +
-+uint64_t ProcessMetrics::GetVmSwapBytes() const {
++bool ProcessMetrics::GetPageFaultCounts(PageFaultCounts* counts) const {
 +  NOTIMPLEMENTED();
-+  return 0;
++  return false;
 +}
 +
 +bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
@@ -170,14 +178,14 @@ $NetBSD: patch-base_process_process__metrics__openbsd.cc,v 1.1 2025/02/06 09:57:
 +  res.Set("available", available);
 +  res.Set("buffers", buffers);
 +  res.Set("cached", cached);
-+  res.Set("active_anon", active_anon);   
++  res.Set("active_anon", active_anon);
 +  res.Set("inactive_anon", inactive_anon);
 +  res.Set("active_file", active_file);
 +  res.Set("inactive_file", inactive_file);
 +  res.Set("swap_total", swap_total);
 +  res.Set("swap_free", swap_free);
 +  res.Set("swap_used", swap_total - swap_free);
-+  res.Set("dirty", dirty);   
++  res.Set("dirty", dirty);
 +  res.Set("reclaimable", reclaimable);
 +
 +  NOTIMPLEMENTED();
@@ -194,7 +202,7 @@ $NetBSD: patch-base_process_process__metrics__openbsd.cc,v 1.1 2025/02/06 09:57:
 +  NOTIMPLEMENTED();
 +
 +  return res;
-+}   
++}
 +
 +SystemDiskInfo::SystemDiskInfo() {
 +  reads = 0;
@@ -216,7 +224,7 @@ $NetBSD: patch-base_process_process__metrics__openbsd.cc,v 1.1 2025/02/06 09:57:
 +
 +Value::Dict SystemDiskInfo::ToDict() const {
 +  Value::Dict res;
-+ 
++
 +  // Write out uint64_t variables as doubles.
 +  // Note: this may discard some precision, but for JS there's no other option.
 +  res.Set("reads", static_cast<double>(reads));
diff --git a/chromium/patches/patch-base_process_process__metrics__posix.cc b/chromium/patches/patch-base_process_process__metrics__posix.cc
index 1ec02ca721..c4d4b6ffea 100644
--- a/chromium/patches/patch-base_process_process__metrics__posix.cc
+++ b/chromium/patches/patch-base_process_process__metrics__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_process_process__metrics__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_metrics_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_metrics_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_metrics_posix.cc
 @@ -21,6 +21,8 @@
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_process_process__metrics__posix.cc,v 1.1 2025/02/06 09:57:42
  #else
  #include <malloc.h>
  #endif
-@@ -134,7 +136,7 @@ size_t ProcessMetrics::GetMallocUsage() 
+@@ -136,7 +138,7 @@ size_t ProcessMetrics::GetMallocUsage() 
    return stats.size_in_use;
  #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
    return GetMallocUsageMallinfo();
diff --git a/chromium/patches/patch-base_process_process__metrics__unittest.cc b/chromium/patches/patch-base_process_process__metrics__unittest.cc
index 5d1149c5b1..13d6045e55 100644
--- a/chromium/patches/patch-base_process_process__metrics__unittest.cc
+++ b/chromium/patches/patch-base_process_process__metrics__unittest.cc
@@ -1,15 +1,15 @@
-$NetBSD: patch-base_process_process__metrics__unittest.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_metrics_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_metrics_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_metrics_unittest.cc
-@@ -62,7 +62,8 @@
+@@ -61,7 +61,8 @@
+ #endif
  
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||      \
-     BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
 -    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE)
 +    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || \
 +    BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-base_process_process__posix.cc b/chromium/patches/patch-base_process_process__posix.cc
index 879143ec76..524de90f26 100644
--- a/chromium/patches/patch-base_process_process__posix.cc
+++ b/chromium/patches/patch-base_process_process__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_process_process__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_posix.cc
 @@ -23,10 +23,15 @@
  #include "base/trace_event/base_tracing.h"
@@ -23,7 +23,7 @@ $NetBSD: patch-base_process_process__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp
  #if BUILDFLAG(CLANG_PROFILING)
  #include "base/test/clang_profiling.h"
  #endif
-@@ -99,7 +104,7 @@ bool WaitpidWithTimeout(base::ProcessHan
+@@ -100,7 +105,7 @@ bool WaitpidWithTimeout(base::ProcessHan
  }
  #endif
  
@@ -32,7 +32,7 @@ $NetBSD: patch-base_process_process__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp
  // Using kqueue on Mac so that we can wait on non-child processes.
  // We can't use kqueues on child processes because we need to reap
  // our own children using wait.
-@@ -376,7 +381,7 @@ bool Process::WaitForExitWithTimeoutImpl
+@@ -379,7 +384,7 @@ bool Process::WaitForExitWithTimeoutImpl
    const bool exited = (parent_pid < 0);
  
    if (!exited && parent_pid != our_pid) {
@@ -41,7 +41,7 @@ $NetBSD: patch-base_process_process__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp
      // On Mac we can wait on non child processes.
      return WaitForSingleNonChildProcess(handle, timeout);
  #else
-@@ -413,7 +418,56 @@ void Process::Exited(int exit_code) cons
+@@ -416,7 +421,56 @@ void Process::Exited(int exit_code) cons
  
  int Process::GetOSPriority() const {
    DCHECK(IsValid());
diff --git a/chromium/patches/patch-base_process_process__unittest.cc b/chromium/patches/patch-base_process_process__unittest.cc
index bb75961f10..9262be5469 100644
--- a/chromium/patches/patch-base_process_process__unittest.cc
+++ b/chromium/patches/patch-base_process_process__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_process_process__unittest.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/process/process_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/process/process_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/process/process_unittest.cc
-@@ -203,7 +203,7 @@ TEST_F(ProcessTest, CreationTimeOtherPro
+@@ -202,7 +202,7 @@ TEST_F(ProcessTest, CreationTimeOtherPro
    // was spawned and a time recorded after it was spawned. However, since the
    // base::Time and process creation clocks don't match, tolerate some error.
    constexpr base::TimeDelta kTolerance =
diff --git a/chromium/patches/patch-base_profiler_module__cache.cc b/chromium/patches/patch-base_profiler_module__cache.cc
index c0114586d6..8da4f55f63 100644
--- a/chromium/patches/patch-base_profiler_module__cache.cc
+++ b/chromium/patches/patch-base_profiler_module__cache.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_profiler_module__cache.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/profiler/module_cache.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/profiler/module_cache.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/profiler/module_cache.cc
 @@ -38,7 +38,7 @@ std::string TransformModuleIDToSymbolSer
    // Android and Linux Chrome builds use the "breakpad" format to index their
diff --git a/chromium/patches/patch-base_profiler_sampling__profiler__thread__token.cc b/chromium/patches/patch-base_profiler_sampling__profiler__thread__token.cc
index 9fad58dd82..c32ee112d7 100644
--- a/chromium/patches/patch-base_profiler_sampling__profiler__thread__token.cc
+++ b/chromium/patches/patch-base_profiler_sampling__profiler__thread__token.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_profiler_sampling__profiler__thread__token.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/profiler/sampling_profiler_thread_token.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/profiler/sampling_profiler_thread_token.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/profiler/sampling_profiler_thread_token.cc
 @@ -6,7 +6,7 @@
  
@@ -17,7 +17,7 @@ $NetBSD: patch-base_profiler_sampling__profiler__thread__token.cc,v 1.1 2025/02/
  #include "base/profiler/stack_base_address_posix.h"
 @@ -18,7 +18,7 @@ SamplingProfilerThreadToken GetSamplingP
    PlatformThreadId id = PlatformThread::CurrentId();
- #if BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
    return {id, pthread_self()};
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-base_profiler_sampling__profiler__thread__token.h b/chromium/patches/patch-base_profiler_sampling__profiler__thread__token.h
index ae39c1fefc..2da56f6c89 100644
--- a/chromium/patches/patch-base_profiler_sampling__profiler__thread__token.h
+++ b/chromium/patches/patch-base_profiler_sampling__profiler__thread__token.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-base_profiler_sampling__profiler__thread__token.h,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/profiler/sampling_profiler_thread_token.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/profiler/sampling_profiler_thread_token.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/profiler/sampling_profiler_thread_token.h
 @@ -13,7 +13,7 @@
  
- #if BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
  #include <pthread.h>
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -17,7 +17,7 @@ $NetBSD: patch-base_profiler_sampling__profiler__thread__token.h,v 1.1 2025/02/0
  
 @@ -27,7 +27,7 @@ struct SamplingProfilerThreadToken {
    PlatformThreadId id;
- #if BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
    pthread_t pthread_id;
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-base_profiler_stack__base__address__posix.cc b/chromium/patches/patch-base_profiler_stack__base__address__posix.cc
index c79a9261f5..ea99ded9c1 100644
--- a/chromium/patches/patch-base_profiler_stack__base__address__posix.cc
+++ b/chromium/patches/patch-base_profiler_stack__base__address__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_profiler_stack__base__address__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/profiler/stack_base_address_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/profiler/stack_base_address_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/profiler/stack_base_address_posix.cc
-@@ -17,6 +17,14 @@
+@@ -18,6 +18,14 @@
  #include "base/files/scoped_file.h"
  #endif
  
@@ -21,7 +21,7 @@ $NetBSD: patch-base_profiler_stack__base__address__posix.cc,v 1.1 2025/02/06 09:
  #if BUILDFLAG(IS_CHROMEOS)
  extern "C" void* __libc_stack_end;
  #endif
-@@ -45,7 +53,21 @@ std::optional<uintptr_t> GetAndroidMainT
+@@ -49,7 +57,21 @@ std::optional<uintptr_t> GetAndroidMainT
  
  #if !BUILDFLAG(IS_LINUX)
  uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) {
@@ -43,7 +43,7 @@ $NetBSD: patch-base_profiler_stack__base__address__posix.cc,v 1.1 2025/02/06 09:
    // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox
    // and pthread_id refers to a different thread, due to the use of
    // sched_getaffinity().
-@@ -58,12 +80,14 @@ uintptr_t GetThreadStackBaseAddressImpl(
+@@ -62,12 +84,14 @@ uintptr_t GetThreadStackBaseAddressImpl(
                        << logging::SystemErrorCodeToString(result);
    // See crbug.com/617730 for limitations of this approach on Linux-like
    // systems.
@@ -58,12 +58,12 @@ $NetBSD: patch-base_profiler_stack__base__address__posix.cc,v 1.1 2025/02/06 09:
    const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
    return base_address;
  }
-@@ -80,7 +104,7 @@ std::optional<uintptr_t> GetThreadStackB
+@@ -84,7 +108,7 @@ std::optional<uintptr_t> GetThreadStackB
    // trying to work around the problem.
    return std::nullopt;
  #else
--  const bool is_main_thread = id == GetCurrentProcId();
-+  const bool is_main_thread = id == checked_cast<PlatformThreadId>(GetCurrentProcId());
+-  const bool is_main_thread = id.raw() == GetCurrentProcId();
++  const bool is_main_thread = id.raw() == (checked_cast<uint64_t>(GetCurrentProcId()));
    if (is_main_thread) {
  #if BUILDFLAG(IS_ANDROID)
      // The implementation of pthread_getattr_np() in Bionic reads proc/self/maps
diff --git a/chromium/patches/patch-base_profiler_stack__sampling__profiler__test__util.cc b/chromium/patches/patch-base_profiler_stack__sampling__profiler__test__util.cc
index 9073e0f252..c37aecee26 100644
--- a/chromium/patches/patch-base_profiler_stack__sampling__profiler__test__util.cc
+++ b/chromium/patches/patch-base_profiler_stack__sampling__profiler__test__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_profiler_stack__sampling__profiler__test__util.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/profiler/stack_sampling_profiler_test_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/profiler/stack_sampling_profiler_test_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/profiler/stack_sampling_profiler_test_util.cc
-@@ -42,7 +42,7 @@
+@@ -50,7 +50,7 @@
  // Fortunately, it provides _alloca, which functions identically.
  #include <malloc.h>
  #define alloca _alloca
diff --git a/chromium/patches/patch-base_profiler_stack__sampling__profiler__unittest.cc b/chromium/patches/patch-base_profiler_stack__sampling__profiler__unittest.cc
index 0135a28128..e098757f28 100644
--- a/chromium/patches/patch-base_profiler_stack__sampling__profiler__unittest.cc
+++ b/chromium/patches/patch-base_profiler_stack__sampling__profiler__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_profiler_stack__sampling__profiler__unittest.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/profiler/stack_sampling_profiler_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/profiler/stack_sampling_profiler_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/profiler/stack_sampling_profiler_unittest.cc
-@@ -45,7 +45,7 @@
+@@ -47,7 +47,7 @@
  
  #include <intrin.h>
  #include <malloc.h>
diff --git a/chromium/patches/patch-base_profiler_thread__delegate__posix.cc b/chromium/patches/patch-base_profiler_thread__delegate__posix.cc
index 6da7df384b..97e1b6e29e 100644
--- a/chromium/patches/patch-base_profiler_thread__delegate__posix.cc
+++ b/chromium/patches/patch-base_profiler_thread__delegate__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_profiler_thread__delegate__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/profiler/thread_delegate_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/profiler/thread_delegate_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/profiler/thread_delegate_posix.cc
-@@ -19,7 +19,7 @@
+@@ -15,7 +15,7 @@
  #include "base/process/process_handle.h"
  #include "build/build_config.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_profiler_thread__delegate__posix.cc,v 1.1 2025/02/06 09:57:4
  #include "base/profiler/stack_base_address_posix.h"
  #endif
  
-@@ -28,7 +28,7 @@ namespace base {
+@@ -24,7 +24,7 @@ namespace base {
  std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create(
      SamplingProfilerThreadToken thread_token) {
    std::optional<uintptr_t> base_address;
diff --git a/chromium/patches/patch-base_rand__util.h b/chromium/patches/patch-base_rand__util.h
index ccfcab0786..9ffbc0e897 100644
--- a/chromium/patches/patch-base_rand__util.h
+++ b/chromium/patches/patch-base_rand__util.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_rand__util.h,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/rand_util.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/rand_util.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/rand_util.h
-@@ -147,7 +147,7 @@ void RandomShuffle(Itr first, Itr last) 
+@@ -213,7 +213,7 @@ void RandomShuffle(Itr first, Itr last) 
    std::shuffle(first, last, RandomBitGenerator());
  }
  
diff --git a/chromium/patches/patch-base_rand__util__posix.cc b/chromium/patches/patch-base_rand__util__posix.cc
index 95aa385b93..baa54af747 100644
--- a/chromium/patches/patch-base_rand__util__posix.cc
+++ b/chromium/patches/patch-base_rand__util__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_rand__util__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/rand_util_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/rand_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/rand_util_posix.cc
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
  #include "base/time/time.h"
  #include "build/build_config.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_rand__util__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
  #include "third_party/lss/linux_syscall_support.h"
  #elif BUILDFLAG(IS_MAC)
  // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK.
-@@ -44,6 +44,7 @@ namespace base {
+@@ -45,6 +45,7 @@ namespace base {
  
  namespace {
  
@@ -23,7 +23,7 @@ $NetBSD: patch-base_rand__util__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
  #if BUILDFLAG(IS_AIX)
  // AIX has no 64-bit support for O_CLOEXEC.
  static constexpr int kOpenFlags = O_RDONLY;
-@@ -68,10 +69,11 @@ class URandomFd {
+@@ -69,10 +70,11 @@ class URandomFd {
   private:
    const int fd_;
  };
@@ -33,10 +33,10 @@ $NetBSD: patch-base_rand__util__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
       BUILDFLAG(IS_ANDROID)) &&                        \
 -    !BUILDFLAG(IS_NACL)
 +    !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- // TODO(pasko): Unify reading kernel version numbers in:
- // mojo/core/channel_linux.cc
- // chrome/browser/android/seccomp_support_detector.cc
-@@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() {
+ 
+ bool KernelSupportsGetRandom() {
+   return base::SysInfo::KernelVersionNumber::Current() >=
+@@ -129,6 +131,7 @@ bool UseBoringSSLForRandBytes() {
  namespace {
  
  void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) {
@@ -44,7 +44,7 @@ $NetBSD: patch-base_rand__util__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
  #if !BUILDFLAG(IS_NACL)
    // The BoringSSL experiment takes priority over everything else.
    if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
-@@ -213,6 +216,9 @@ void RandBytesInternal(span<uint8_t> out
+@@ -163,6 +166,9 @@ void RandBytesInternal(span<uint8_t> out
    const int urandom_fd = GetUrandomFD();
    const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
    CHECK(success);
@@ -54,7 +54,7 @@ $NetBSD: patch-base_rand__util__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
  }
  
  }  // namespace
-@@ -232,9 +238,11 @@ void RandBytes(span<uint8_t> output) {
+@@ -182,9 +188,11 @@ void RandBytes(span<uint8_t> output) {
    RandBytesInternal(output, /*avoid_allocation=*/false);
  }
  
diff --git a/chromium/patches/patch-base_strings_safe__sprintf__unittest.cc b/chromium/patches/patch-base_strings_safe__sprintf__unittest.cc
index 0550f54180..0eaaf29156 100644
--- a/chromium/patches/patch-base_strings_safe__sprintf__unittest.cc
+++ b/chromium/patches/patch-base_strings_safe__sprintf__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_strings_safe__sprintf__unittest.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/strings/safe_sprintf_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/strings/safe_sprintf_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/strings/safe_sprintf_unittest.cc
-@@ -740,6 +740,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
+@@ -743,6 +743,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
  #endif
  }
  
@@ -14,7 +14,7 @@ $NetBSD: patch-base_strings_safe__sprintf__unittest.cc,v 1.1 2025/02/06 09:57:42
  TEST(SafeSPrintfTest, EmitNULL) {
    char buf[40];
  #if defined(__GNUC__)
-@@ -756,6 +757,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
+@@ -759,6 +760,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
  #pragma GCC diagnostic pop
  #endif
  }
diff --git a/chromium/patches/patch-base_synchronization_cancelable__event.h b/chromium/patches/patch-base_synchronization_cancelable__event.h
new file mode 100644
index 0000000000..0fbdd61af9
--- /dev/null
+++ b/chromium/patches/patch-base_synchronization_cancelable__event.h
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- base/synchronization/cancelable_event.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ base/synchronization/cancelable_event.h
+@@ -11,7 +11,7 @@
+ 
+ #if BUILDFLAG(IS_WIN)
+ #include <windows.h>
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include <semaphore.h>
+ #else
+ #include "base/synchronization/waitable_event.h"
+@@ -49,7 +49,7 @@ class BASE_EXPORT CancelableEvent {
+ 
+ #if BUILDFLAG(IS_WIN)
+   using NativeHandle = HANDLE;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   using NativeHandle = sem_t;
+ #else
+   using NativeHandle = WaitableEvent;
diff --git a/chromium/patches/patch-base_synchronization_lock__impl.h b/chromium/patches/patch-base_synchronization_lock__impl.h
index 48f5d700b8..a83e9fd81f 100644
--- a/chromium/patches/patch-base_synchronization_lock__impl.h
+++ b/chromium/patches/patch-base_synchronization_lock__impl.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_synchronization_lock__impl.h,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/synchronization/lock_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/synchronization/lock_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/synchronization/lock_impl.h
-@@ -109,6 +109,10 @@ void LockImpl::Unlock() {
+@@ -110,6 +110,10 @@ void LockImpl::Unlock() {
  }
  
  #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -17,7 +17,7 @@ $NetBSD: patch-base_synchronization_lock__impl.h,v 1.1 2025/02/06 09:57:42 wiz E
  
  #if DCHECK_IS_ON()
  BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -129,6 +133,9 @@ void LockImpl::Unlock() {
+@@ -130,6 +134,9 @@ void LockImpl::Unlock() {
    dcheck_unlock_result(rv);
  #endif
  }
diff --git a/chromium/patches/patch-base_syslog__logging.cc b/chromium/patches/patch-base_syslog__logging.cc
index 97303ba039..becb819abf 100644
--- a/chromium/patches/patch-base_syslog__logging.cc
+++ b/chromium/patches/patch-base_syslog__logging.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_syslog__logging.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/syslog_logging.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/syslog_logging.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/syslog_logging.cc
 @@ -17,7 +17,7 @@
  #include "base/strings/string_util.h"
@@ -15,10 +15,10 @@ $NetBSD: patch-base_syslog__logging.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
  // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
  // base::LOG_INFO, base::LOG_WARNING.
  #include <syslog.h>
-@@ -149,7 +149,7 @@ EventLogMessage::~EventLogMessage() {
- 
-   if (user_sid != nullptr)
+@@ -151,7 +151,7 @@ EventLogMessage::~EventLogMessage() {
+   if (user_sid != nullptr) {
      ::LocalFree(user_sid);
+   }
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    const char kEventSource[] = "chrome";
diff --git a/chromium/patches/patch-base_system_sys__info.cc b/chromium/patches/patch-base_system_sys__info.cc
index 370f876170..242cd01d35 100644
--- a/chromium/patches/patch-base_system_sys__info.cc
+++ b/chromium/patches/patch-base_system_sys__info.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_system_sys__info.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/system/sys_info.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/system/sys_info.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/system/sys_info.cc
-@@ -229,7 +229,7 @@ std::string SysInfo::SocManufacturer() {
+@@ -224,7 +224,7 @@ std::string SysInfo::SocManufacturer() {
  #endif
  
  void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
diff --git a/chromium/patches/patch-base_system_sys__info.h b/chromium/patches/patch-base_system_sys__info.h
index 2404e66297..f425ce7a19 100644
--- a/chromium/patches/patch-base_system_sys__info.h
+++ b/chromium/patches/patch-base_system_sys__info.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_system_sys__info.h,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/system/sys_info.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/system/sys_info.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/system/sys_info.h
-@@ -331,6 +331,8 @@ class BASE_EXPORT SysInfo {
+@@ -355,6 +355,8 @@ class BASE_EXPORT SysInfo {
    static void ResetCpuSecurityMitigationsEnabledForTesting();
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_system_sys__info.h,v 1.1 2025/02/06 09:57:42 wiz Exp $
   private:
    friend class test::ScopedAmountOfPhysicalMemoryOverride;
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-@@ -343,7 +345,7 @@ class BASE_EXPORT SysInfo {
+@@ -367,7 +369,7 @@ class BASE_EXPORT SysInfo {
    static HardwareInfo GetHardwareInfoSync();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/chromium/patches/patch-base_system_sys__info__freebsd.cc b/chromium/patches/patch-base_system_sys__info__freebsd.cc
index 2fef0d7839..81ff181583 100644
--- a/chromium/patches/patch-base_system_sys__info__freebsd.cc
+++ b/chromium/patches/patch-base_system_sys__info__freebsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_system_sys__info__freebsd.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/system/sys_info_freebsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/system/sys_info_freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/system/sys_info_freebsd.cc
 @@ -9,28 +9,103 @@
  #include <sys/sysctl.h>
diff --git a/chromium/patches/patch-base_system_sys__info__netbsd.cc b/chromium/patches/patch-base_system_sys__info__netbsd.cc
index 3937b4a90e..843181338d 100644
--- a/chromium/patches/patch-base_system_sys__info__netbsd.cc
+++ b/chromium/patches/patch-base_system_sys__info__netbsd.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_system_sys__info__netbsd.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/system/sys_info_netbsd.cc.orig	2024-12-21 10:25:09.641329812 +0000
+--- base/system/sys_info_netbsd.cc.orig	2025-05-08 12:01:57.641212361 +0000
 +++ base/system/sys_info_netbsd.cc
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,89 @@
 +// Copyright 2011 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -28,8 +28,9 @@ $NetBSD: patch-base_system_sys__info__netbsd.cc,v 1.1 2025/02/06 09:57:42 wiz Ex
 +uint64_t AmountOfMemory(int pages_name) {
 +  long pages = sysconf(pages_name);
 +  long page_size = sysconf(_SC_PAGESIZE);
-+  if (pages < 0 || page_size < 0)
++  if (pages < 0 || page_size < 0) {
 +    return 0;
++  }
 +  return static_cast<uint64_t>(pages) * static_cast<uint64_t>(page_size);
 +}
 +
diff --git a/chromium/patches/patch-base_system_sys__info__openbsd.cc b/chromium/patches/patch-base_system_sys__info__openbsd.cc
index 24646d3732..ed13af98dd 100644
--- a/chromium/patches/patch-base_system_sys__info__openbsd.cc
+++ b/chromium/patches/patch-base_system_sys__info__openbsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_system_sys__info__openbsd.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/system/sys_info_openbsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/system/sys_info_openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/system/sys_info_openbsd.cc
 @@ -12,6 +12,7 @@
  
@@ -14,7 +14,7 @@ $NetBSD: patch-base_system_sys__info__openbsd.cc,v 1.1 2025/02/06 09:57:42 wiz E
  
  namespace {
  
-@@ -27,9 +28,14 @@ uint64_t AmountOfMemory(int pages_name) 
+@@ -28,9 +29,14 @@ uint64_t AmountOfMemory(int pages_name) 
  
  namespace base {
  
@@ -30,7 +30,7 @@ $NetBSD: patch-base_system_sys__info__openbsd.cc,v 1.1 2025/02/06 09:57:42 wiz E
    int ncpu;
    size_t size = sizeof(ncpu);
    if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
-@@ -40,7 +46,23 @@ int SysInfo::NumberOfProcessors() {
+@@ -41,7 +47,23 @@ int SysInfo::NumberOfProcessors() {
  
  // static
  uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@@ -55,7 +55,7 @@ $NetBSD: patch-base_system_sys__info__openbsd.cc,v 1.1 2025/02/06 09:57:42 wiz E
  }
  
  // static
-@@ -55,15 +77,27 @@ uint64_t SysInfo::MaxSharedMemorySize() 
+@@ -56,15 +78,27 @@ uint64_t SysInfo::MaxSharedMemorySize() 
    int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX};
    size_t limit;
    size_t size = sizeof(limit);
diff --git a/chromium/patches/patch-base_system_sys__info__posix.cc b/chromium/patches/patch-base_system_sys__info__posix.cc
index 85ba87be0a..a06b85a564 100644
--- a/chromium/patches/patch-base_system_sys__info__posix.cc
+++ b/chromium/patches/patch-base_system_sys__info__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_system_sys__info__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/system/sys_info_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/system/sys_info_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/system/sys_info_posix.cc
-@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePa
+@@ -143,7 +143,7 @@ void GetKernelVersionNumbers(int32_t* ma
  
  namespace base {
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_system_sys__info__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp
  // static
  int SysInfo::NumberOfProcessors() {
  #if BUILDFLAG(IS_MAC)
-@@ -173,7 +173,7 @@ int SysInfo::NumberOfProcessors() {
+@@ -199,7 +199,7 @@ int SysInfo::NumberOfProcessors() {
  
    return cached_num_cpus;
  }
@@ -24,7 +24,7 @@ $NetBSD: patch-base_system_sys__info__posix.cc,v 1.1 2025/02/06 09:57:42 wiz Exp
  
  // static
  uint64_t SysInfo::AmountOfVirtualMemory() {
-@@ -256,6 +256,8 @@ std::string SysInfo::OperatingSystemArch
+@@ -285,6 +285,8 @@ std::string SysInfo::OperatingSystemArch
      arch = "x86";
    } else if (arch == "amd64") {
      arch = "x86_64";
diff --git a/chromium/patches/patch-base_system_sys__info__unittest.cc b/chromium/patches/patch-base_system_sys__info__unittest.cc
index 409548fde7..eb784c39e8 100644
--- a/chromium/patches/patch-base_system_sys__info__unittest.cc
+++ b/chromium/patches/patch-base_system_sys__info__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_system_sys__info__unittest.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/system/sys_info_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/system/sys_info_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/system/sys_info_unittest.cc
 @@ -265,12 +265,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
    EXPECT_TRUE(IsStringUTF8(hardware_info->model));
diff --git a/chromium/patches/patch-base_task_thread__pool_environment__config__unittest.cc b/chromium/patches/patch-base_task_thread__pool_environment__config__unittest.cc
index 96f1f0c81e..58d6b5e9ea 100644
--- a/chromium/patches/patch-base_task_thread__pool_environment__config__unittest.cc
+++ b/chromium/patches/patch-base_task_thread__pool_environment__config__unittest.cc
@@ -1,21 +1,21 @@
-$NetBSD: patch-base_task_thread__pool_environment__config__unittest.cc,v 1.1 2025/02/06 09:57:42 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/task/thread_pool/environment_config_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/task/thread_pool/environment_config_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/task/thread_pool/environment_config_unittest.cc
-@@ -15,7 +15,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUse
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE)
-   EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread());
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+@@ -21,7 +21,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUse
+             base::FeatureList::IsEnabled(
+                 FeatureControllingBackgroundPriorityWorkerThreads()));
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
    EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread());
  #else
  #error Platform doesn't match any block
-@@ -24,7 +24,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUse
+@@ -30,7 +30,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUse
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID)
    EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread());
  #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \
diff --git a/chromium/patches/patch-base_test_launcher_test__launcher.cc b/chromium/patches/patch-base_test_launcher_test__launcher.cc
index 0e39aeabdb..85ff065094 100644
--- a/chromium/patches/patch-base_test_launcher_test__launcher.cc
+++ b/chromium/patches/patch-base_test_launcher_test__launcher.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_test_launcher_test__launcher.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/test/launcher/test_launcher.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/test/launcher/test_launcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/test/launcher/test_launcher.cc
-@@ -74,6 +74,7 @@
+@@ -73,6 +73,7 @@
  #include "testing/gtest/include/gtest/gtest.h"
  
  #if BUILDFLAG(IS_POSIX)
@@ -14,7 +14,7 @@ $NetBSD: patch-base_test_launcher_test__launcher.cc,v 1.1 2025/02/06 09:57:43 wi
  #include <fcntl.h>
  
  #include "base/files/file_descriptor_watcher_posix.h"
-@@ -1807,6 +1808,10 @@ bool TestLauncher::Init(CommandLine* com
+@@ -1836,6 +1837,10 @@ bool TestLauncher::Init(CommandLine* com
    results_tracker_.AddGlobalTag("OS_OPENBSD");
  #endif
  
diff --git a/chromium/patches/patch-base_test_test__file__util__linux.cc b/chromium/patches/patch-base_test_test__file__util__linux.cc
index 9c3252a5b8..3967037f95 100644
--- a/chromium/patches/patch-base_test_test__file__util__linux.cc
+++ b/chromium/patches/patch-base_test_test__file__util__linux.cc
@@ -1,18 +1,19 @@
-$NetBSD: patch-base_test_test__file__util__linux.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/test/test_file_util_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/test/test_file_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/test/test_file_util_linux.cc
-@@ -54,8 +54,10 @@ bool EvictFileFromSystemCache(const File
-     return false;
-   if (fdatasync(fd.get()) != 0)
+@@ -56,9 +56,11 @@ bool EvictFileFromSystemCache(const File
+   if (fdatasync(fd.get()) != 0) {
      return false;
+   }
 +#if !BUILDFLAG(IS_BSD)
-   if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0)
+   if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) {
      return false;
+   }
 +#endif
    return true;
  }
diff --git a/chromium/patches/patch-base_test_test__file__util__posix.cc b/chromium/patches/patch-base_test_test__file__util__posix.cc
index 63fcda9c6d..500e9bd1d6 100644
--- a/chromium/patches/patch-base_test_test__file__util__posix.cc
+++ b/chromium/patches/patch-base_test_test__file__util__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_test_test__file__util__posix.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/test/test_file_util_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/test/test_file_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/test/test_file_util_posix.cc
-@@ -91,7 +91,7 @@ void SyncPageCacheToDisk() {
+@@ -93,7 +93,7 @@ void SyncPageCacheToDisk() {
  }
  
  #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
diff --git a/chromium/patches/patch-base_threading_hang__watcher.cc b/chromium/patches/patch-base_threading_hang__watcher.cc
deleted file mode 100644
index 765448bce3..0000000000
--- a/chromium/patches/patch-base_threading_hang__watcher.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-base_threading_hang__watcher.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- base/threading/hang_watcher.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ base/threading/hang_watcher.cc
-@@ -352,7 +352,7 @@ void HangWatcher::InitializeOnMainThread
- 
-   bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
-   if (is_zygote_child) {
-     enable_hang_watcher =
-         enable_hang_watcher &&
diff --git a/chromium/patches/patch-base_threading_platform__thread.h b/chromium/patches/patch-base_threading_platform__thread.h
index 095589dd71..42754e5b3e 100644
--- a/chromium/patches/patch-base_threading_platform__thread.h
+++ b/chromium/patches/patch-base_threading_platform__thread.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-base_threading_platform__thread.h,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/threading/platform_thread.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/threading/platform_thread.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/threading/platform_thread.h
-@@ -49,6 +49,8 @@ typedef DWORD PlatformThreadId;
- typedef zx_koid_t PlatformThreadId;
+@@ -55,6 +55,8 @@ class BASE_EXPORT PlatformThreadId {
+   using UnderlyingType = zx_koid_t;
  #elif BUILDFLAG(IS_APPLE)
- typedef mach_port_t PlatformThreadId;
+   using UnderlyingType = uint64_t;
 +#elif BUILDFLAG(IS_BSD)
-+typedef uint64_t PlatformThreadId;
++  using UnderlyingType = uint64_t;
  #elif BUILDFLAG(IS_POSIX)
- typedef pid_t PlatformThreadId;
+   using UnderlyingType = pid_t;
  #endif
diff --git a/chromium/patches/patch-base_threading_platform__thread__bsd.cc b/chromium/patches/patch-base_threading_platform__thread__bsd.cc
index 23978a0763..6b6c3a391f 100644
--- a/chromium/patches/patch-base_threading_platform__thread__bsd.cc
+++ b/chromium/patches/patch-base_threading_platform__thread__bsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_threading_platform__thread__bsd.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/threading/platform_thread_bsd.cc.orig	2024-12-21 10:25:09.653322994 +0000
+--- base/threading/platform_thread_bsd.cc.orig	2025-05-08 12:01:57.642507726 +0000
 +++ base/threading/platform_thread_bsd.cc
 @@ -0,0 +1,31 @@
 +// Copyright 2023 The Chromium Authors
diff --git a/chromium/patches/patch-base_threading_platform__thread__internal__posix.cc b/chromium/patches/patch-base_threading_platform__thread__internal__posix.cc
index 8d2393be2d..9f51e151e1 100644
--- a/chromium/patches/patch-base_threading_platform__thread__internal__posix.cc
+++ b/chromium/patches/patch-base_threading_platform__thread__internal__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_threading_platform__thread__internal__posix.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/threading/platform_thread_internal_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/threading/platform_thread_internal_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/threading/platform_thread_internal_posix.cc
 @@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadP
  }
diff --git a/chromium/patches/patch-base_threading_platform__thread__posix.cc b/chromium/patches/patch-base_threading_platform__thread__posix.cc
index edca6a8358..62487415a5 100644
--- a/chromium/patches/patch-base_threading_platform__thread__posix.cc
+++ b/chromium/patches/patch-base_threading_platform__thread__posix.cc
@@ -1,14 +1,14 @@
-$NetBSD: patch-base_threading_platform__thread__posix.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/threading/platform_thread_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/threading/platform_thread_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/threading/platform_thread_posix.cc
-@@ -77,11 +77,11 @@ void* ThreadFunc(void* params) {
-     if (!thread_params->joinable)
+@@ -79,11 +79,11 @@ void* ThreadFunc(void* params) {
        base::DisallowSingleton();
+     }
  
 -#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
 +#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD)
@@ -20,16 +20,16 @@ $NetBSD: patch-base_threading_platform__thread__posix.cc,v 1.1 2025/02/06 09:57:
  #if BUILDFLAG(IS_APPLE)
      PlatformThread::SetCurrentThreadRealtimePeriodValue(
          delegate->GetRealtimePeriod());
-@@ -265,6 +265,8 @@ PlatformThreadId PlatformThreadBase::Cur
-   return reinterpret_cast<int32_t>(pthread_self());
+@@ -272,6 +272,8 @@ PlatformThreadId PlatformThreadBase::Cur
+   return PlatformThreadId(reinterpret_cast<int32_t>(pthread_self()));
  #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX)
-   return pthread_self();
+   return PlatformThreadId(pthread_self());
 +#elif BUILDFLAG(IS_BSD)
-+  return reinterpret_cast<uint64_t>(pthread_self());
++  return PlatformThreadId(reinterpret_cast<uint64_t>(pthread_self()));
  #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX)
-   return reinterpret_cast<int64_t>(pthread_self());
+   return PlatformThreadId(reinterpret_cast<int64_t>(pthread_self()));
  #endif
-@@ -355,7 +357,7 @@ void PlatformThreadBase::Detach(Platform
+@@ -365,7 +367,7 @@ void PlatformThreadBase::Detach(Platform
  
  // static
  bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
@@ -38,7 +38,7 @@ $NetBSD: patch-base_threading_platform__thread__posix.cc,v 1.1 2025/02/06 09:57:
    return false;
  #else
    if (from >= to) {
-@@ -376,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType
+@@ -386,6 +388,9 @@ void SetCurrentThreadTypeImpl(ThreadType
                                MessagePumpType pump_type_hint) {
  #if BUILDFLAG(IS_NACL)
    NOTIMPLEMENTED();
@@ -46,9 +46,9 @@ $NetBSD: patch-base_threading_platform__thread__posix.cc,v 1.1 2025/02/06 09:57:
 +#elif BUILDFLAG(IS_BSD)
 +   NOTIMPLEMENTED();
  #else
-   if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
+   if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) {
      return;
-@@ -398,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType
+@@ -409,7 +414,7 @@ void SetCurrentThreadTypeImpl(ThreadType
  
  // static
  ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {
diff --git a/chromium/patches/patch-base_threading_platform__thread__unittest.cc b/chromium/patches/patch-base_threading_platform__thread__unittest.cc
index f3eb57c030..09d7a47da3 100644
--- a/chromium/patches/patch-base_threading_platform__thread__unittest.cc
+++ b/chromium/patches/patch-base_threading_platform__thread__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_threading_platform__thread__unittest.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/threading/platform_thread_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/threading/platform_thread_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/threading/platform_thread_unittest.cc
-@@ -38,7 +38,7 @@
+@@ -36,7 +36,7 @@
  #include "base/time/time.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-base_threading_platform__thread__unittest.cc,v 1.1 2025/02/06 09:
  #include <pthread.h>
  #include <sys/syscall.h>
  #include <sys/types.h>
-@@ -362,7 +362,7 @@ TEST(PlatformThreadTest,
+@@ -370,7 +370,7 @@ TEST(PlatformThreadTest,
  // and hardcodes what we know. Please inform scheduler-dev%chromium.org@localhost if this
  // proprerty changes for a given platform.
  TEST(PlatformThreadTest, CanChangeThreadType) {
@@ -24,7 +24,16 @@ $NetBSD: patch-base_threading_platform__thread__unittest.cc,v 1.1 2025/02/06 09:
    // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
    // able to increase priority to any level unless we are root (euid == 0).
    bool kCanIncreasePriority = false;
-@@ -616,12 +616,16 @@ INSTANTIATE_TEST_SUITE_P(
+@@ -435,7 +435,7 @@ TEST(PlatformThreadTest, SetCurrentThrea
+ #if BUILDFLAG(IS_APPLE)
+   TestPriorityResultingFromThreadType(ThreadType::kResourceEfficient,
+                                       ThreadPriorityForTest::kUtility);
+-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   TestPriorityResultingFromThreadType(
+       ThreadType::kResourceEfficient,
+       ThreadPriorityForTest::kResourceEfficient);
+@@ -624,12 +624,16 @@ INSTANTIATE_TEST_SUITE_P(
  
  #endif  // BUILDFLAG(IS_APPLE)
  
@@ -35,9 +44,9 @@ $NetBSD: patch-base_threading_platform__thread__unittest.cc,v 1.1 2025/02/06 09:
  
  bool IsTidCacheCorrect() {
 +#if BUILDFLAG(IS_BSD)
-+  return PlatformThread::CurrentId() == reinterpret_cast<int64_t>(pthread_self());
++  return PlatformThread::CurrentId().raw() == reinterpret_cast<int64_t>(pthread_self());
 +#else
-   return PlatformThread::CurrentId() == syscall(__NR_gettid);
+   return PlatformThread::CurrentId().raw() == syscall(__NR_gettid);
 +#endif
  }
  
diff --git a/chromium/patches/patch-base_time_time__now__posix.cc b/chromium/patches/patch-base_time_time__now__posix.cc
new file mode 100644
index 0000000000..4f21aabaea
--- /dev/null
+++ b/chromium/patches/patch-base_time_time__now__posix.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- base/time/time_now_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ base/time/time_now_posix.cc
+@@ -27,7 +27,7 @@
+ #endif
+ 
+ // NaCl doesn't support CLOCK_MONOTONIC_COARSE.
+-#if BUILDFLAG(IS_NACL)
++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
+ #define TIMETICKS_LOW_RESOLUTION_CLOCK CLOCK_MONOTONIC
+ #else
+ #define TIMETICKS_LOW_RESOLUTION_CLOCK CLOCK_MONOTONIC_COARSE
diff --git a/chromium/patches/patch-base_trace__event_malloc__dump__provider.cc b/chromium/patches/patch-base_trace__event_malloc__dump__provider.cc
index 6531e80cbd..f667ffb266 100644
--- a/chromium/patches/patch-base_trace__event_malloc__dump__provider.cc
+++ b/chromium/patches/patch-base_trace__event_malloc__dump__provider.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_trace__event_malloc__dump__provider.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/trace_event/malloc_dump_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/trace_event/malloc_dump_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/trace_event/malloc_dump_provider.cc
-@@ -28,6 +28,8 @@
+@@ -31,6 +31,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -15,7 +15,7 @@ $NetBSD: patch-base_trace__event_malloc__dump__provider.cc,v 1.1 2025/02/06 09:5
  #else
  #include <malloc.h>
  #endif
-@@ -178,7 +180,7 @@ void ReportAppleAllocStats(size_t* total
+@@ -180,7 +182,7 @@ void ReportAppleAllocStats(size_t* total
  
  #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
      (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) &&    \
@@ -24,7 +24,7 @@ $NetBSD: patch-base_trace__event_malloc__dump__provider.cc,v 1.1 2025/02/06 09:5
  void ReportMallinfoStats(ProcessMemoryDump* pmd,
                           size_t* total_virtual_size,
                           size_t* resident_size,
-@@ -368,6 +370,9 @@ bool MallocDumpProvider::OnMemoryDump(co
+@@ -370,6 +372,9 @@ bool MallocDumpProvider::OnMemoryDump(co
                       &allocated_objects_count);
  #elif BUILDFLAG(IS_FUCHSIA)
  // TODO(fuchsia): Port, see https://crbug.com/706592.
diff --git a/chromium/patches/patch-base_trace__event_memory__dump__manager.cc b/chromium/patches/patch-base_trace__event_memory__dump__manager.cc
index b08f0f73ac..e69f5d425f 100644
--- a/chromium/patches/patch-base_trace__event_memory__dump__manager.cc
+++ b/chromium/patches/patch-base_trace__event_memory__dump__manager.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_trace__event_memory__dump__manager.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/trace_event/memory_dump_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/trace_event/memory_dump_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/trace_event/memory_dump_manager.cc
-@@ -83,7 +83,7 @@ const char* const MemoryDumpManager::kSy
+@@ -78,7 +78,7 @@ const char* const MemoryDumpManager::kSy
  #if defined(MALLOC_MEMORY_TRACING_SUPPORTED)
      MallocDumpProvider::kAllocatedObjects;
  #else
diff --git a/chromium/patches/patch-base_trace__event_process__memory__dump.cc b/chromium/patches/patch-base_trace__event_process__memory__dump.cc
index 784c8419f8..20a9bf11ce 100644
--- a/chromium/patches/patch-base_trace__event_process__memory__dump.cc
+++ b/chromium/patches/patch-base_trace__event_process__memory__dump.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_trace__event_process__memory__dump.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/trace_event/process_memory_dump.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/trace_event/process_memory_dump.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/trace_event/process_memory_dump.cc
-@@ -120,7 +120,7 @@ std::optional<size_t> ProcessMemoryDump:
+@@ -119,7 +119,7 @@ std::optional<size_t> ProcessMemoryDump:
  #if BUILDFLAG(IS_WIN)
    auto vec =
        base::HeapArray<PSAPI_WORKING_SET_EX_INFORMATION>::WithSize(max_vec_size);
@@ -16,9 +16,9 @@ $NetBSD: patch-base_trace__event_process__memory__dump.cc,v 1.1 2025/02/06 09:57
  #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
    auto vec = base::HeapArray<unsigned char>::WithSize(max_vec_size);
 @@ -143,7 +143,7 @@ std::optional<size_t> ProcessMemoryDump:
- 
-     for (size_t i = 0; i < page_count; i++)
+     for (size_t i = 0; i < page_count; i++) {
        resident_page_count += vec[i].VirtualAttributes.Valid;
+     }
 -#elif BUILDFLAG(IS_FUCHSIA)
 +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
      // TODO(crbug.com/42050620): Implement counting resident bytes.
diff --git a/chromium/patches/patch-base_tracing_trace__time.cc b/chromium/patches/patch-base_tracing_trace__time.cc
index 540da71976..facd8815c1 100644
--- a/chromium/patches/patch-base_tracing_trace__time.cc
+++ b/chromium/patches/patch-base_tracing_trace__time.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-base_tracing_trace__time.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/tracing/trace_time.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/tracing/trace_time.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/tracing/trace_time.cc
-@@ -8,13 +8,19 @@
+@@ -8,12 +8,18 @@
  #include "build/build_config.h"
  #include "third_party/perfetto/include/perfetto/base/time.h"
  
@@ -16,8 +16,7 @@ $NetBSD: patch-base_tracing_trace__time.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
 +#define CLOCK_BOOTTIME CLOCK_MONOTONIC
 +#endif
 +
- namespace base {
- namespace tracing {
+ namespace base::tracing {
  
  int64_t TraceBootTicksNow() {
    // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already.
@@ -26,11 +25,4 @@ $NetBSD: patch-base_tracing_trace__time.cc,v 1.1 2025/02/06 09:57:43 wiz Exp $
 +    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
    struct timespec ts;
    int res = clock_gettime(CLOCK_BOOTTIME, &ts);
-   if (res != -1)
-@@ -24,4 +30,4 @@ int64_t TraceBootTicksNow() {
- }
- 
- }  // namespace tracing
--}  // namespace base
-\ No newline at end of file
-+}  // namespace base
+   if (res != -1) {
diff --git a/chromium/patches/patch-base_tracing_trace__time.h b/chromium/patches/patch-base_tracing_trace__time.h
index 5dc6d92bf1..fa7dfe11bd 100644
--- a/chromium/patches/patch-base_tracing_trace__time.h
+++ b/chromium/patches/patch-base_tracing_trace__time.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_tracing_trace__time.h,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/tracing/trace_time.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/tracing/trace_time.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/tracing/trace_time.h
 @@ -12,7 +12,7 @@ namespace base {
  namespace tracing {
diff --git a/chromium/patches/patch-base_version__info_version__info.h b/chromium/patches/patch-base_version__info_version__info.h
index fae6254cb3..1e5b28d0c9 100644
--- a/chromium/patches/patch-base_version__info_version__info.h
+++ b/chromium/patches/patch-base_version__info_version__info.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_version__info_version__info.h,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- base/version_info/version_info.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- base/version_info/version_info.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ base/version_info/version_info.h
 @@ -74,6 +74,8 @@ constexpr std::string_view GetOSType() {
    return "FreeBSD";
diff --git a/chromium/patches/patch-build_config_BUILD.gn b/chromium/patches/patch-build_config_BUILD.gn
index c9103ebefb..6f94119c90 100644
--- a/chromium/patches/patch-build_config_BUILD.gn
+++ b/chromium/patches/patch-build_config_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-build_config_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/config/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/config/BUILD.gn
-@@ -213,6 +213,10 @@ config("default_libs") {
+@@ -215,6 +215,10 @@ config("default_libs") {
      # Targets should choose to explicitly link frameworks they require. Since
      # linking can have run-time side effects, nothing should be listed here.
      libs = []
diff --git a/chromium/patches/patch-build_config_BUILDCONFIG.gn b/chromium/patches/patch-build_config_BUILDCONFIG.gn
index a34459b487..c0eb432e52 100644
--- a/chromium/patches/patch-build_config_BUILDCONFIG.gn
+++ b/chromium/patches/patch-build_config_BUILDCONFIG.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_config_BUILDCONFIG.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/BUILDCONFIG.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/config/BUILDCONFIG.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/config/BUILDCONFIG.gn
 @@ -136,7 +136,8 @@ declare_args() {
    is_official_build = false
@@ -16,7 +16,7 @@ $NetBSD: patch-build_config_BUILDCONFIG.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
               (current_cpu != "s390x" && current_cpu != "s390" &&
                current_cpu != "ppc64" && current_cpu != "ppc" &&
                current_cpu != "mips" && current_cpu != "mips64" &&
-@@ -231,6 +232,12 @@ if (host_toolchain == "") {
+@@ -235,6 +236,12 @@ if (host_toolchain == "") {
      host_toolchain = "//build/toolchain/aix:$host_cpu"
    } else if (host_os == "zos") {
      host_toolchain = "//build/toolchain/zos:$host_cpu"
@@ -29,7 +29,7 @@ $NetBSD: patch-build_config_BUILDCONFIG.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
    } else {
      assert(false, "Unsupported host_os: $host_os")
    }
-@@ -274,6 +281,8 @@ if (target_os == "android") {
+@@ -279,6 +286,8 @@ if (target_os == "android") {
    _default_toolchain = "//build/toolchain/aix:$target_cpu"
  } else if (target_os == "zos") {
    _default_toolchain = "//build/toolchain/zos:$target_cpu"
@@ -38,7 +38,7 @@ $NetBSD: patch-build_config_BUILDCONFIG.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
  } else {
    assert(false, "Unsupported target_os: $target_os")
  }
-@@ -308,7 +317,12 @@ is_android = current_os == "android"
+@@ -313,7 +322,12 @@ is_android = current_os == "android"
  is_chromeos = current_os == "chromeos"
  is_fuchsia = current_os == "fuchsia"
  is_ios = current_os == "ios"
@@ -51,4 +51,4 @@ $NetBSD: patch-build_config_BUILDCONFIG.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
 +is_bsd = current_os == "openbsd" || current_os == "freebsd" || current_os == "netbsd"
  is_mac = current_os == "mac"
  is_nacl = current_os == "nacl"
- is_win = current_os == "win" || current_os == "winuwp"
+ is_wasm = current_os == "emscripten"
diff --git a/chromium/patches/patch-build_config_clang_BUILD.gn b/chromium/patches/patch-build_config_clang_BUILD.gn
index c06775e1c3..88c6880359 100644
--- a/chromium/patches/patch-build_config_clang_BUILD.gn
+++ b/chromium/patches/patch-build_config_clang_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-build_config_clang_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/clang/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/config/clang/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/config/clang/BUILD.gn
-@@ -210,7 +210,12 @@ template("clang_lib") {
+@@ -252,7 +252,12 @@ template("clang_lib") {
  
  # Adds a dependency on the Clang runtime library clang_rt.builtins.
  clang_lib("compiler_builtins") {
@@ -19,4 +19,4 @@ $NetBSD: patch-build_config_clang_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
 +  } else if (is_mac) {
      libname = "osx"
    } else if (is_ios) {
-     if (target_environment == "simulator") {
+     if (target_platform == "iphoneos") {
diff --git a/chromium/patches/patch-build_config_compiler_BUILD.gn b/chromium/patches/patch-build_config_compiler_BUILD.gn
index a6db16af9a..cb9ccb053f 100644
--- a/chromium/patches/patch-build_config_compiler_BUILD.gn
+++ b/chromium/patches/patch-build_config_compiler_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-build_config_compiler_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/compiler/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/config/compiler/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/config/compiler/BUILD.gn
-@@ -199,7 +199,7 @@ declare_args() {
+@@ -197,7 +197,7 @@ declare_args() {
    # This greatly reduces the size of debug builds, at the cost of
    # debugging information which is required by some specialized
    # debugging tools.
@@ -15,7 +15,7 @@ $NetBSD: patch-build_config_compiler_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp
  }
  
  declare_args() {
-@@ -256,13 +256,16 @@ config("default_include_dirs") {
+@@ -254,13 +254,16 @@ config("default_include_dirs") {
  # Compiler instrumentation can introduce dependencies in DSOs to symbols in
  # the executable they are loaded into, so they are unresolved at link-time.
  config("no_unresolved_symbols") {
@@ -44,7 +44,7 @@ $NetBSD: patch-build_config_compiler_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp
    # Linux-specific compiler flags setup.
    # ------------------------------------
    if (use_icf && (!is_apple || use_lld)) {
-@@ -561,7 +568,7 @@ config("compiler") {
+@@ -567,7 +574,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -53,25 +53,25 @@ $NetBSD: patch-build_config_compiler_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp
      cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
      if (save_reproducers_on_lld_crash && use_lld) {
        ldflags += [
-@@ -1220,7 +1227,7 @@ config("compiler_cpu_abi") {
+@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
--      if (is_clang && !is_android && !is_nacl &&
-+      if (is_clang && !is_android && !is_nacl && !is_bsd &&
-           !(is_chromeos_lacros && is_chromeos_device)) {
+-      if (is_clang && !is_android && !is_nacl && !is_chromeos_device) {
++      if (is_clang && !is_android && !is_nacl && !is_chromeos_device && !is_bsd) {
          cflags += [ "--target=arm-linux-gnueabihf" ]
          ldflags += [ "--target=arm-linux-gnueabihf" ]
-@@ -1235,7 +1242,7 @@ config("compiler_cpu_abi") {
-         cflags += [ "-mtune=$arm_tune" ]
+       }
+@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm64") {
--      if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
-+      if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd &&
-           !(is_chromeos_lacros && is_chromeos_device)) {
+       if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
+-          !is_chromeos_device) {
++          !is_chromeos_device && !is_bsd) {
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
-@@ -1570,7 +1577,7 @@ config("compiler_deterministic") {
+       }
+@@ -1561,7 +1568,7 @@ config("compiler_deterministic") {
      # different build directory like "out/feature_a" and "out/feature_b" if
      # we build same files with same compile flag.
      # Other paths are already given in relative, no need to normalize them.
@@ -80,7 +80,7 @@ $NetBSD: patch-build_config_compiler_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp
        # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
        cflags += [
          "-Xclang",
-@@ -1628,7 +1635,7 @@ config("compiler_deterministic") {
+@@ -1619,7 +1626,7 @@ config("compiler_deterministic") {
  }
  
  config("clang_revision") {
@@ -89,37 +89,44 @@ $NetBSD: patch-build_config_compiler_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp
        current_os != "zos") {
      update_args = [
        "--print-revision",
-@@ -1952,9 +1959,6 @@ config("default_warnings") {
-       cflags += [
-         # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now.
-         "-Wno-cast-function-type",
+@@ -1652,7 +1659,7 @@ config("clang_revision") {
+ # e.g. by setting in the the project's .gn file.
+ config("clang_warning_suppression") {
+   # Some build configs use older versions of clang that don't support WSMs
+-  if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
++  if (!is_bsd && !is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
+       !llvm_android_mainline && is_clang &&
+       clang_warning_suppression_file != "") {
+     from_build_root =
+@@ -1965,7 +1972,7 @@ config("default_warnings") {
+       "-Wno-unneeded-internal-declaration",
+     ]
+ 
+-    if (!is_nacl || is_nacl_saigo) {
++    if (!is_bsd && !is_nacl || is_nacl_saigo) {
+       if (is_win) {
+         # TODO(thakis): https://crbug.com/617318
+         # Currently RBE can not handle case sensitiveness for windows well.
+@@ -1985,9 +1992,6 @@ config("default_warnings") {
+ 
+         # TODO(crbug.com/40284799): Fix and re-enable.
+         "-Wno-thread-safety-reference-return",
 -
--        # TODO(crbug.com/40284799): Fix and re-enable.
--        "-Wno-thread-safety-reference-return",
+-        # TODO(crbug.com/376641662): Fix and re-enable.
+-        "-Wno-nontrivial-memcall",
        ]
  
        cflags_cc += [
-@@ -1962,18 +1966,12 @@ config("default_warnings") {
-         "-Wenum-compare-conditional",
-       ]
- 
--      if (!is_nacl) {
-+      if (!is_nacl && !is_openbsd) {
-         cflags_cc += [
-           # TODO(crbug.com/41486292): Fix and re-enable.
-           "-Wno-c++11-narrowing-const-reference",
-         ]
- 
--        # TODO(crbug.com/344680447): Fix and re-enable.
--        cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ]
--
--        # TODO(crbug.com/356172342): Fix and re-enable.
--        cflags_cc += [ "-Wno-dangling-assignment-gsl" ]
--
-         if (llvm_force_head_revision) {
-           # TODO(crbug.com/373130005): Fix and re-enable.
-           cflags_cc += [ "-Wno-deprecated-literal-operator" ]
-@@ -2711,7 +2709,7 @@ config("afdo_optimize_size") {
+@@ -2326,7 +2330,7 @@ config("export_dynamic") {
+ # 2. Remove the thin_archive config, so that the .a file actually contains all
+ #    .o files, instead of just references to .o files in the build directoy
+ config("thin_archive") {
+-  if ((is_apple && use_lld) || (is_linux && !is_clang) || current_os == "aix") {
++  if ((is_apple && use_lld) || (is_linux && !is_clang) || current_os == "aix" || (is_netbsd)) {
+     # The macOS and iOS linker ld64.ldd doesn't support thin archive without
+     # symbol table, gcc on linux also throws the error `archive has no index`.
+     # AIX does support -s option, not -S option.
+@@ -2776,7 +2780,7 @@ config("afdo_optimize_size") {
  # There are some targeted places that AFDO regresses, so we provide a separate
  # config to allow AFDO to be disabled per-target.
  config("afdo") {
@@ -128,7 +135,7 @@ $NetBSD: patch-build_config_compiler_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp
      cflags = []
      if (clang_emit_debug_info_for_profiling) {
        # Add the following flags to generate debug info for profiling.
-@@ -2738,7 +2736,7 @@ config("afdo") {
+@@ -2803,7 +2807,7 @@ config("afdo") {
        cflags += [ "-Wno-backend-plugin" ]
        inputs = [ _clang_sample_profile ]
      }
@@ -137,7 +144,7 @@ $NetBSD: patch-build_config_compiler_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp
      cflags = [ "-fauto-profile=${auto_profile_path}" ]
      inputs = [ auto_profile_path ]
    }
-@@ -2915,7 +2913,7 @@ config("symbols") {
+@@ -2980,7 +2984,7 @@ config("symbols") {
      cflags += [ "-gomit-unreferenced-methods" ]
    }
  
diff --git a/chromium/patches/patch-build_config_gcc_BUILD.gn b/chromium/patches/patch-build_config_gcc_BUILD.gn
new file mode 100644
index 0000000000..92bf43d4fa
--- /dev/null
+++ b/chromium/patches/patch-build_config_gcc_BUILD.gn
@@ -0,0 +1,19 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- build/config/gcc/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ build/config/gcc/BUILD.gn
+@@ -32,7 +32,9 @@ declare_args() {
+ # See http://gcc.gnu.org/wiki/Visibility
+ config("symbol_visibility_hidden") {
+   cflags = [ "-fvisibility=hidden" ]
+-  rustflags = [ "-Zdefault-visibility=hidden" ]
++  if (!is_bsd) {
++    rustflags = [ "-Zdefault-visibility=hidden" ]
++  }
+ 
+   # Visibility attribute is not supported on AIX.
+   if (current_os != "aix") {
diff --git a/chromium/patches/patch-build_config_linux_BUILD.gn b/chromium/patches/patch-build_config_linux_BUILD.gn
index 6b82e217eb..568e98e2b6 100644
--- a/chromium/patches/patch-build_config_linux_BUILD.gn
+++ b/chromium/patches/patch-build_config_linux_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_config_linux_BUILD.gn,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/linux/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/config/linux/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/config/linux/BUILD.gn
 @@ -41,7 +41,7 @@ config("runtime_library") {
    }
diff --git a/chromium/patches/patch-build_config_linux_libdrm_BUILD.gn b/chromium/patches/patch-build_config_linux_libdrm_BUILD.gn
new file mode 100644
index 0000000000..22292f4328
--- /dev/null
+++ b/chromium/patches/patch-build_config_linux_libdrm_BUILD.gn
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- build/config/linux/libdrm/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ build/config/linux/libdrm/BUILD.gn
+@@ -15,7 +15,7 @@ declare_args() {
+ }
+ 
+ if (use_system_libdrm) {
+-  assert(!is_linux, "System libdrm is not supported in linux")
++#  assert(!is_linux, "System libdrm is not supported in linux")
+   pkg_config("libdrm_config") {
+     packages = [ "libdrm" ]
+   }
diff --git a/chromium/patches/patch-build_config_linux_pkg-config.py b/chromium/patches/patch-build_config_linux_pkg-config.py
index c80be7fe65..6314c68b3d 100644
--- a/chromium/patches/patch-build_config_linux_pkg-config.py
+++ b/chromium/patches/patch-build_config_linux_pkg-config.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_config_linux_pkg-config.py,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/linux/pkg-config.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/config/linux/pkg-config.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/config/linux/pkg-config.py
 @@ -108,7 +108,7 @@ def main():
    # If this is run on non-Linux platforms, just return nothing and indicate
diff --git a/chromium/patches/patch-build_config_ozone.gni b/chromium/patches/patch-build_config_ozone.gni
index fbbe451015..81371efbdc 100644
--- a/chromium/patches/patch-build_config_ozone.gni
+++ b/chromium/patches/patch-build_config_ozone.gni
@@ -1,15 +1,15 @@
-$NetBSD: patch-build_config_ozone.gni,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/ozone.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/config/ozone.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/config/ozone.gni
-@@ -84,7 +84,19 @@ declare_args() {
-     } else if (is_chromeos_lacros) {
-       ozone_platform = "wayland"
-       ozone_platform_wayland = true
+@@ -80,7 +80,19 @@ declare_args() {
+       ozone_platform = "x11"
+       ozone_platform_drm = true
+       ozone_platform_x11 = true
 -    } else if (is_linux) {
 +    } else if (is_linux && !is_bsd) {
 +      ozone_platform = "x11"
diff --git a/chromium/patches/patch-build_config_rust.gni b/chromium/patches/patch-build_config_rust.gni
index be938fcfb2..6f8fe51732 100644
--- a/chromium/patches/patch-build_config_rust.gni
+++ b/chromium/patches/patch-build_config_rust.gni
@@ -1,12 +1,12 @@
-$NetBSD: patch-build_config_rust.gni,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/rust.gni.orig	2024-12-17 18:58:49.000000000 +0100
+--- build/config/rust.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/config/rust.gni
-@@ -201,7 +201,7 @@ if (is_linux || is_chromeos) {
+@@ -178,7 +178,7 @@ if (is_linux || is_chromeos) {
      rust_abi_target = "aarch64-unknown-linux-gnu"
      cargo_target_abi = ""
    } else if (current_cpu == "x86") {
@@ -15,7 +15,7 @@ $NetBSD: patch-build_config_rust.gni,v 1.1 2025/02/06 09:57:43 wiz Exp $
      cargo_target_abi = ""
    } else if (current_cpu == "x64") {
      rust_abi_target = "x86_64-unknown-linux-gnu"
-@@ -321,6 +321,10 @@ if (is_linux || is_chromeos) {
+@@ -346,6 +346,10 @@ if (is_linux || is_chromeos) {
    }
  }
  
diff --git a/chromium/patches/patch-build_config_v8__target__cpu.gni b/chromium/patches/patch-build_config_v8__target__cpu.gni
index ecce52b945..4fc4114a2f 100644
--- a/chromium/patches/patch-build_config_v8__target__cpu.gni
+++ b/chromium/patches/patch-build_config_v8__target__cpu.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_config_v8__target__cpu.gni,v 1.1 2025/02/06 09:57:43 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/config/v8_target_cpu.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/config/v8_target_cpu.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/config/v8_target_cpu.gni
 @@ -36,6 +36,10 @@ declare_args() {
  if (v8_target_cpu == "") {
diff --git a/chromium/patches/patch-build_detect__host__arch.py b/chromium/patches/patch-build_detect__host__arch.py
index 2b14f46286..7e0d26ddf7 100644
--- a/chromium/patches/patch-build_detect__host__arch.py
+++ b/chromium/patches/patch-build_detect__host__arch.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_detect__host__arch.py,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/detect_host_arch.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/detect_host_arch.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/detect_host_arch.py
 @@ -20,6 +20,8 @@ def HostArch():
      host_arch = 'ia32'
diff --git a/chromium/patches/patch-build_gn__run__binary.py b/chromium/patches/patch-build_gn__run__binary.py
index 48a8256bdc..7d417b2527 100644
--- a/chromium/patches/patch-build_gn__run__binary.py
+++ b/chromium/patches/patch-build_gn__run__binary.py
@@ -1,17 +1,17 @@
-$NetBSD: patch-build_gn__run__binary.py,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/gn_run_binary.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/gn_run_binary.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/gn_run_binary.py
 @@ -23,7 +23,7 @@ if not os.path.isabs(path):
  # The rest of the arguments are passed directly to the executable.
  args = [path] + sys.argv[2:]
  
 -ret = subprocess.call(args)
-+ret = subprocess.call(args, env={"CHROME_EXE_PATH":"${WRKSRC}/out/Release/chrome","LD_LIBRARY_PATH":"${WRKSRC}/out/Release"})
++ret = subprocess.call(args, env={"CHROME_EXE_PATH":"@WRKSRC@/out/Release/chrome","LD_LIBRARY_PATH":"@WRKSRC@/out/Release"})
  if ret != 0:
    if ret <= -100:
      # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to
diff --git a/chromium/patches/patch-build_linux_chrome.map b/chromium/patches/patch-build_linux_chrome.map
index afd48b9da1..f13cd05183 100644
--- a/chromium/patches/patch-build_linux_chrome.map
+++ b/chromium/patches/patch-build_linux_chrome.map
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_linux_chrome.map,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/linux/chrome.map.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/linux/chrome.map.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/linux/chrome.map
 @@ -20,6 +20,10 @@ global:
    # Program entry point.
diff --git a/chromium/patches/patch-build_linux_strip__binary.py b/chromium/patches/patch-build_linux_strip__binary.py
index 7f94a1f4de..6657eb90bc 100644
--- a/chromium/patches/patch-build_linux_strip__binary.py
+++ b/chromium/patches/patch-build_linux_strip__binary.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_linux_strip__binary.py,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/linux/strip_binary.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/linux/strip_binary.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/linux/strip_binary.py
 @@ -10,6 +10,7 @@ import sys
  
diff --git a/chromium/patches/patch-build_linux_unbundle_icu.gn b/chromium/patches/patch-build_linux_unbundle_icu.gn
index 5b01f2aad1..2fb9ea598e 100644
--- a/chromium/patches/patch-build_linux_unbundle_icu.gn
+++ b/chromium/patches/patch-build_linux_unbundle_icu.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_linux_unbundle_icu.gn,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/linux/unbundle/icu.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/linux/unbundle/icu.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/linux/unbundle/icu.gn
 @@ -17,6 +17,15 @@ config("icu_config") {
      "USING_SYSTEM_ICU=1",
@@ -22,26 +22,17 @@ $NetBSD: patch-build_linux_unbundle_icu.gn,v 1.1 2025/02/06 09:57:44 wiz Exp $
      # U_EXPORT (defined in unicode/platform.h) is used to set public visibility
      # on classes through the U_COMMON_API and U_I18N_API macros (among others).
      # When linking against the system ICU library, we want its symbols to have
-@@ -35,6 +44,18 @@ config("icu_config") {
+@@ -34,6 +43,9 @@ config("icu_config") {
+     # to define U_IMPORT to have the same value as U_EXPORT. For more details,
      # please see: https://crbug.com/822820
      "U_IMPORT=U_EXPORT",
-   ]
-+
-+  _icu_version = exec_script(pkg_config_script,
-+                              common_pkg_config_args + pkg_config_args + [
-+                                    "icu-i18n",
-+                                    "--version-as-components",
-+                                  ],
-+                              "value")
 +
-+  # Unbreak with icu 76 where private symbols are picked up
-+  if (_icu_version[0] >= 76) {
-+    defines += [ "U_HIDE_DRAFT_API" ]
-+  }
++    # Unbreak with icu 76 where private symbols are picked up
++    "U_HIDE_DRAFT_API",
+   ]
  }
  
- pkg_config("system_icui18n") {
-@@ -53,6 +74,14 @@ source_set("icui18n") {
+@@ -53,6 +65,14 @@ source_set("icui18n") {
    ]
  }
  
diff --git a/chromium/patches/patch-build_linux_unbundle_libevent.gn b/chromium/patches/patch-build_linux_unbundle_libevent.gn
deleted file mode 100644
index 602087d5ec..0000000000
--- a/chromium/patches/patch-build_linux_unbundle_libevent.gn
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-build_linux_unbundle_libevent.gn,v 1.1 2025/02/06 09:57:44 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- build/linux/unbundle/libevent.gn.orig	2024-12-17 17:58:49.000000000 +0000
-+++ build/linux/unbundle/libevent.gn
-@@ -9,7 +9,12 @@ shim_headers("libevent_shim") {
-   headers = [ "event.h" ]
- }
- 
-+config("system_libevent") {
-+  defines = [ "USE_SYSTEM_LIBEVENT=1" ]
-+}
-+
- source_set("libevent") {
-   deps = [ ":libevent_shim" ]
-   libs = [ "event" ]
-+  public_configs = [ ":system_libevent" ]
- }
diff --git a/chromium/patches/patch-build_linux_unbundle_libusb.gn b/chromium/patches/patch-build_linux_unbundle_libusb.gn
index 790b8fea74..b3a242896f 100644
--- a/chromium/patches/patch-build_linux_unbundle_libusb.gn
+++ b/chromium/patches/patch-build_linux_unbundle_libusb.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_linux_unbundle_libusb.gn,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/linux/unbundle/libusb.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/linux/unbundle/libusb.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/linux/unbundle/libusb.gn
 @@ -1,3 +1,27 @@
 +# Copyright 2016 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-build_nocompile.gni b/chromium/patches/patch-build_nocompile.gni
new file mode 100644
index 0000000000..23e21789ec
--- /dev/null
+++ b/chromium/patches/patch-build_nocompile.gni
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- build/nocompile.gni.orig	2025-05-05 19:21:24.000000000 +0000
++++ build/nocompile.gni
+@@ -55,7 +55,7 @@ if (is_win) {
+ }
+ 
+ declare_args() {
+-  enable_nocompile_tests = is_clang && !is_nacl
++  enable_nocompile_tests = is_clang && !is_nacl && !is_bsd
+ }
+ 
+ if (enable_nocompile_tests) {
diff --git a/chromium/patches/patch-build_rust_rust__bindgen.gni b/chromium/patches/patch-build_rust_rust__bindgen.gni
index 6a1ccd7921..1014a3b101 100644
--- a/chromium/patches/patch-build_rust_rust__bindgen.gni
+++ b/chromium/patches/patch-build_rust_rust__bindgen.gni
@@ -1,12 +1,12 @@
-$NetBSD: patch-build_rust_rust__bindgen.gni,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/rust/rust_bindgen.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/rust/rust_bindgen.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/rust/rust_bindgen.gni
-@@ -11,14 +11,14 @@ if (is_win) {
+@@ -12,14 +12,14 @@ if (is_win) {
    import("//build/toolchain/win/win_toolchain_data.gni")
  }
  
diff --git a/chromium/patches/patch-build_rust_rust__bindgen__generator.gni b/chromium/patches/patch-build_rust_rust__bindgen__generator.gni
new file mode 100644
index 0000000000..61319393cc
--- /dev/null
+++ b/chromium/patches/patch-build_rust_rust__bindgen__generator.gni
@@ -0,0 +1,25 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- build/rust/rust_bindgen_generator.gni.orig	2025-05-05 19:21:24.000000000 +0000
++++ build/rust/rust_bindgen_generator.gni
+@@ -11,14 +11,14 @@ if (is_win) {
+   import("//build/toolchain/win/win_toolchain_data.gni")
+ }
+ 
+-_bindgen_path = "${rust_bindgen_root}/bin/bindgen"
++_bindgen_path = "@PREFIX@/bin/bindgen"
+ if (host_os == "win") {
+   _bindgen_path = "${_bindgen_path}.exe"
+ }
+ 
+ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
+ # ../lib.
+-_libclang_path = rust_bindgen_root
++_libclang_path = "@PREFIX@"
+ if (host_os == "win") {
+   _libclang_path += "/bin"
+ } else {
diff --git a/chromium/patches/patch-build_rust_std_BUILD.gn b/chromium/patches/patch-build_rust_std_BUILD.gn
index 71ea3b7bd4..746356ecf3 100644
--- a/chromium/patches/patch-build_rust_std_BUILD.gn
+++ b/chromium/patches/patch-build_rust_std_BUILD.gn
@@ -1,12 +1,34 @@
-$NetBSD: patch-build_rust_std_BUILD.gn,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/rust/std/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/rust/std/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/rust/std/BUILD.gn
-@@ -100,7 +100,6 @@ if (toolchain_has_rust) {
+@@ -89,13 +89,20 @@ if (toolchain_has_rust) {
+     # These are no longer present in the Windows toolchain.
+     stdlib_files += [
+       "addr2line",
+-      "adler2",
+       "gimli",
+       "libc",
+       "memchr",
+       "miniz_oxide",
+       "object",
+     ]
++
++    rust_revision_pieces = string_split(rustc_revision, " ")
++    rust_version_pieces = string_split(rust_revision_pieces[1], ".")
++    if (rust_version_pieces[1] == "85") {
++      stdlib_files += [ "adler" ]
++    } else {
++      stdlib_files += [ "adler2" ]
++    }
+   }
+ 
+   if (toolchain_for_rust_host_build_tools) {
+@@ -115,7 +122,6 @@ if (toolchain_has_rust) {
    # don't need to pass to the C++ linker because they're used for specialized
    # purposes.
    skip_stdlib_files = [
diff --git a/chromium/patches/patch-build_toolchain_freebsd_BUILD.gn b/chromium/patches/patch-build_toolchain_freebsd_BUILD.gn
index 82c9c6c21c..e7186df8a4 100644
--- a/chromium/patches/patch-build_toolchain_freebsd_BUILD.gn
+++ b/chromium/patches/patch-build_toolchain_freebsd_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_toolchain_freebsd_BUILD.gn,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/toolchain/freebsd/BUILD.gn.orig	2024-12-21 10:25:09.679847957 +0000
+--- build/toolchain/freebsd/BUILD.gn.orig	2025-05-08 12:01:57.646767031 +0000
 +++ build/toolchain/freebsd/BUILD.gn
 @@ -0,0 +1,66 @@
 +# Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-build_toolchain_gcc__solink__wrapper.py b/chromium/patches/patch-build_toolchain_gcc__solink__wrapper.py
index 69cd5d7ec8..9f737d0033 100644
--- a/chromium/patches/patch-build_toolchain_gcc__solink__wrapper.py
+++ b/chromium/patches/patch-build_toolchain_gcc__solink__wrapper.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_toolchain_gcc__solink__wrapper.py,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/toolchain/gcc_solink_wrapper.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/toolchain/gcc_solink_wrapper.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/toolchain/gcc_solink_wrapper.py
 @@ -39,7 +39,7 @@ def CollectDynSym(args):
    """Replaces: nm --format=posix -g -D -p $sofile | cut -f1-2 -d' '"""
diff --git a/chromium/patches/patch-build_toolchain_gcc__toolchain.gni b/chromium/patches/patch-build_toolchain_gcc__toolchain.gni
index 88730e3b84..07ff8737b6 100644
--- a/chromium/patches/patch-build_toolchain_gcc__toolchain.gni
+++ b/chromium/patches/patch-build_toolchain_gcc__toolchain.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_toolchain_gcc__toolchain.gni,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/toolchain/gcc_toolchain.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/toolchain/gcc_toolchain.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/toolchain/gcc_toolchain.gni
 @@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation
        "enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@@ -20,7 +20,7 @@ $NetBSD: patch-build_toolchain_gcc__toolchain.gni,v 1.1 2025/02/06 09:57:44 wiz
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -617,7 +624,7 @@ template("single_gcc_toolchain") {
+@@ -609,7 +616,7 @@ template("single_gcc_toolchain") {
        # We need to specify link groups, at least, for single pass linkers. I.e.
        # Rust libraries are alpha-sorted instead of by dependencies so they fail
        # to link if not properly ordered or grouped.
@@ -29,7 +29,7 @@ $NetBSD: patch-build_toolchain_gcc__toolchain.gni,v 1.1 2025/02/06 09:57:44 wiz
  
        # Generate a map file to be used for binary size analysis.
        # Map file adds ~10% to the link time on a z620.
-@@ -904,22 +911,12 @@ template("gcc_toolchain") {
+@@ -896,22 +903,12 @@ template("gcc_toolchain") {
  # actually just be doing a native compile.
  template("clang_toolchain") {
    gcc_toolchain(target_name) {
diff --git a/chromium/patches/patch-build_toolchain_netbsd_BUILD.gn b/chromium/patches/patch-build_toolchain_netbsd_BUILD.gn
index 5b26602e85..c9e04ce605 100644
--- a/chromium/patches/patch-build_toolchain_netbsd_BUILD.gn
+++ b/chromium/patches/patch-build_toolchain_netbsd_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_toolchain_netbsd_BUILD.gn,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/toolchain/netbsd/BUILD.gn.orig	2024-12-21 10:25:09.682613681 +0000
+--- build/toolchain/netbsd/BUILD.gn.orig	2025-05-08 12:01:57.647255101 +0000
 +++ build/toolchain/netbsd/BUILD.gn
 @@ -0,0 +1,66 @@
 +# Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-build_toolchain_openbsd_BUILD.gn b/chromium/patches/patch-build_toolchain_openbsd_BUILD.gn
index 9c242c1df9..0a4e630ec9 100644
--- a/chromium/patches/patch-build_toolchain_openbsd_BUILD.gn
+++ b/chromium/patches/patch-build_toolchain_openbsd_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_toolchain_openbsd_BUILD.gn,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/toolchain/openbsd/BUILD.gn.orig	2024-12-21 10:25:09.683434179 +0000
+--- build/toolchain/openbsd/BUILD.gn.orig	2025-05-08 12:01:57.647441991 +0000
 +++ build/toolchain/openbsd/BUILD.gn
 @@ -0,0 +1,66 @@
 +# Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-build_toolchain_toolchain.gni b/chromium/patches/patch-build_toolchain_toolchain.gni
index de12bbc94a..b44d4d829d 100644
--- a/chromium/patches/patch-build_toolchain_toolchain.gni
+++ b/chromium/patches/patch-build_toolchain_toolchain.gni
@@ -1,12 +1,12 @@
-$NetBSD: patch-build_toolchain_toolchain.gni,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- build/toolchain/toolchain.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- build/toolchain/toolchain.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ build/toolchain/toolchain.gni
-@@ -72,7 +72,7 @@ if (host_os == "mac") {
+@@ -75,7 +75,7 @@ if (host_os == "mac") {
    host_shlib_extension = ".dylib"
  } else if (host_os == "win") {
    host_shlib_extension = ".dll"
diff --git a/chromium/patches/patch-cc_base_features.cc b/chromium/patches/patch-cc_base_features.cc
index 8f7b794f8e..2d87ee3277 100644
--- a/chromium/patches/patch-cc_base_features.cc
+++ b/chromium/patches/patch-cc_base_features.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-cc_base_features.cc,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- cc/base/features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- cc/base/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ cc/base/features.cc
-@@ -85,7 +85,7 @@ const base::FeatureParam<int> kDeferImpl
+@@ -48,7 +48,7 @@ const base::FeatureParam<int> kDeferImpl
  // be using a separate flag to control the launch on GL.
  BASE_FEATURE(kUseDMSAAForTiles,
               "UseDMSAAForTiles",
diff --git a/chromium/patches/patch-chrome_app_chrome__command__ids.h b/chromium/patches/patch-chrome_app_chrome__command__ids.h
index ba275a5395..306c86ba88 100644
--- a/chromium/patches/patch-chrome_app_chrome__command__ids.h
+++ b/chromium/patches/patch-chrome_app_chrome__command__ids.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_app_chrome__command__ids.h,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/app/chrome_command_ids.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/app/chrome_command_ids.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/app/chrome_command_ids.h
-@@ -68,12 +68,12 @@
+@@ -72,11 +72,11 @@
  #define IDC_TOGGLE_MULTITASK_MENU       34050
  #endif
  
@@ -15,9 +15,8 @@ $NetBSD: patch-chrome_app_chrome__command__ids.h,v 1.1 2025/02/06 09:57:44 wiz E
  #define IDC_USE_SYSTEM_TITLE_BAR        34051
  #endif
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #define IDC_RESTORE_WINDOW              34052
  #endif
  
diff --git a/chromium/patches/patch-chrome_app_chrome__main.cc b/chromium/patches/patch-chrome_app_chrome__main.cc
index ed68216434..8efda13ca4 100644
--- a/chromium/patches/patch-chrome_app_chrome__main.cc
+++ b/chromium/patches/patch-chrome_app_chrome__main.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_app_chrome__main.cc,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/app/chrome_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/app/chrome_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/app/chrome_main.cc
-@@ -30,11 +30,11 @@
+@@ -28,11 +28,11 @@
  #include "chrome/app/chrome_main_mac.h"
  #endif
  
@@ -20,16 +20,16 @@ $NetBSD: patch-chrome_app_chrome__main.cc,v 1.1 2025/02/06 09:57:44 wiz Exp $
  #include "chrome/app/chrome_main_linux.h"
  #endif
  
-@@ -55,7 +55,7 @@
- #endif  // BUILDFLAG(IS_WIN)
- 
+@@ -57,7 +57,7 @@
+ // sometime after old headless code is removed from Chrome.
+ // See https://crbug.com/373672160.
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #define ENABLE_OLD_HEADLESS
+ #define ENABLE_OLD_HEADLESS_INFO
  #endif
  
-@@ -120,7 +120,7 @@ int ChromeMain(int argc, const char** ar
+@@ -115,7 +115,7 @@ int ChromeMain(int argc, const char** ar
  #error Unknown platform.
  #endif
  
@@ -38,7 +38,7 @@ $NetBSD: patch-chrome_app_chrome__main.cc,v 1.1 2025/02/06 09:57:44 wiz Exp $
    PossiblyDetermineFallbackChromeChannel(argv[0]);
  #endif
  
-@@ -186,7 +186,7 @@ int ChromeMain(int argc, const char** ar
+@@ -181,7 +181,7 @@ int ChromeMain(int argc, const char** ar
    SetUpBundleOverrides();
  #endif
  
diff --git a/chromium/patches/patch-chrome_app_chrome__main__delegate.cc b/chromium/patches/patch-chrome_app_chrome__main__delegate.cc
index cd329620e6..27c72246cf 100644
--- a/chromium/patches/patch-chrome_app_chrome__main__delegate.cc
+++ b/chromium/patches/patch-chrome_app_chrome__main__delegate.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/app/chrome_main_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/app/chrome_main_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/app/chrome_main_delegate.cc
-@@ -145,7 +145,7 @@
- #include "components/about_ui/credit_utils.h"
+@@ -147,7 +147,7 @@
+ #include "components/webui/about/credit_utils.h"
  #endif
  
 -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
  #include "components/nacl/common/nacl_paths.h"
  #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
  #endif
-@@ -189,17 +189,17 @@
+@@ -188,17 +188,17 @@
  #include "v8/include/v8.h"
  #endif
  
@@ -36,7 +36,7 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
  #include "chrome/browser/policy/policy_path_parser.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -342,7 +342,7 @@ void AdjustLinuxOOMScore(const std::stri
+@@ -316,7 +316,7 @@ void AdjustLinuxOOMScore(const std::stri
  // and resources loaded.
  bool SubprocessNeedsResourceBundle(const std::string& process_type) {
    return
@@ -45,25 +45,25 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -427,7 +427,7 @@ bool HandleVersionSwitches(const base::C
+@@ -399,7 +399,7 @@ bool HandleVersionSwitches(const base::C
+   return false;
+ }
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Show the man page if --help or -h is on the command line.
  void HandleHelpSwitches(const base::CommandLine& command_line) {
    if (command_line.HasSwitch(switches::kHelp) ||
-@@ -439,7 +439,7 @@ void HandleHelpSwitches(const base::Comm
+@@ -411,7 +411,7 @@ void HandleHelpSwitches(const base::Comm
  }
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ #endif  // BUILDFLAG(IS_LINUX)
  
 -#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
 +#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
  void SIGTERMProfilingShutdown(int signal) {
    content::Profiling::Stop();
    struct sigaction sigact;
-@@ -521,7 +521,7 @@ std::optional<int> AcquireProcessSinglet
+@@ -493,7 +493,7 @@ std::optional<int> AcquireProcessSinglet
    // process can be exited.
    ChromeProcessSingleton::CreateInstance(user_data_dir);
  
@@ -72,7 +72,7 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
    // Read the xdg-activation token and set it in the command line for the
    // duration of the notification in order to ensure this is propagated to an
    // already running browser process if it exists.
-@@ -605,7 +605,7 @@ void InitializeUserDataDir(base::Command
+@@ -571,7 +571,7 @@ void InitializeUserDataDir(base::Command
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -81,7 +81,7 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
    // On Linux, Chrome does not support running multiple copies under different
    // DISPLAYs, so the profile directory can be specified in the environment to
    // support the virtual desktop use-case.
-@@ -698,7 +698,7 @@ void RecordMainStartupMetrics(const Star
+@@ -667,7 +667,7 @@ void RecordMainStartupMetrics(const Star
  #endif
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -90,7 +90,7 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
    // Record the startup process creation time on supported platforms. On Android
    // this is recorded in ChromeMainDelegateAndroid.
    startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
-@@ -887,7 +887,7 @@ std::optional<int> ChromeMainDelegate::P
+@@ -826,7 +826,7 @@ std::optional<int> ChromeMainDelegate::P
  #if BUILDFLAG(IS_OZONE)
    // Initialize Ozone platform and add required feature flags as per platform's
    // properties.
@@ -99,7 +99,7 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
    ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess());
  #endif
    ui::OzonePlatform::PreEarlyInitialization();
-@@ -1091,7 +1091,7 @@ void ChromeMainDelegate::CommonEarlyInit
+@@ -983,7 +983,7 @@ void ChromeMainDelegate::CommonEarlyInit
    const bool is_canary_dev = IsCanaryDev();
    const bool emit_crashes =
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -108,17 +108,17 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
        is_canary_dev;
  #else
        false;
-@@ -1241,7 +1241,7 @@ std::optional<int> ChromeMainDelegate::B
+@@ -1131,7 +1131,7 @@ std::optional<int> ChromeMainDelegate::B
+     return 0;  // Got a --credits switch; exit with a success error code.
+   }
  
-   // TODO(crbug.com/40118868): Revisit the macro expression once build flag
-   // switch of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // This will directly exit if the user asked for help.
    HandleHelpSwitches(command_line);
  #endif
-@@ -1271,7 +1271,7 @@ std::optional<int> ChromeMainDelegate::B
- #if BUILDFLAG(IS_CHROMEOS)
+@@ -1156,7 +1156,7 @@ std::optional<int> ChromeMainDelegate::B
+   ash::RegisterPathProvider();
    chromeos::dbus_paths::RegisterPathProvider();
  #endif
 -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
@@ -126,7 +126,7 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
    nacl::RegisterPathProvider();
  #endif
  
-@@ -1634,7 +1634,7 @@ void ChromeMainDelegate::PreSandboxStart
+@@ -1444,7 +1444,7 @@ void ChromeMainDelegate::PreSandboxStart
      CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
    }
  
@@ -135,7 +135,7 @@ $NetBSD: patch-chrome_app_chrome__main__delegate.cc,v 1.1 2025/02/06 09:57:44 wi
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess &&
        !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) {
-@@ -1723,13 +1723,13 @@ absl::variant<int, content::MainFunction
+@@ -1532,13 +1532,13 @@ std::variant<int, content::MainFunctionP
  #else
  
  #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \
diff --git a/chromium/patches/patch-chrome_browser_BUILD.gn b/chromium/patches/patch-chrome_browser_BUILD.gn
index e0f52934ff..fc51e05802 100644
--- a/chromium/patches/patch-chrome_browser_BUILD.gn
+++ b/chromium/patches/patch-chrome_browser_BUILD.gn
@@ -1,22 +1,22 @@
-$NetBSD: patch-chrome_browser_BUILD.gn,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/BUILD.gn
-@@ -6980,6 +6980,13 @@ static_library("browser") {
+@@ -6866,6 +6866,13 @@ static_library("browser") {
+           [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ]
      }
-   }
  
-+  if (is_bsd) {
-+    sources -= [
-+      "metrics/bluetooth_metrics_provider.cc",
-+      "metrics/bluetooth_metrics_provider.h",
-+    ]
-+  }
++    if (is_bsd) {
++      sources -= [
++        "metrics/bluetooth_metrics_provider.cc",
++        "metrics/bluetooth_metrics_provider.h",
++      ]
++    }
 +
-   if (is_linux && use_dbus) {
-     sources += [
-       "dbus_memory_pressure_evaluator_linux.cc",
+     if (use_dbus) {
+       sources += [
+         "dbus_memory_pressure_evaluator_linux.cc",
diff --git a/chromium/patches/patch-chrome_browser_about__flags.cc b/chromium/patches/patch-chrome_browser_about__flags.cc
index 1f676ad13c..eb0dc186b0 100644
--- a/chromium/patches/patch-chrome_browser_about__flags.cc
+++ b/chromium/patches/patch-chrome_browser_about__flags.cc
@@ -1,39 +1,39 @@
-$NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/about_flags.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/about_flags.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/about_flags.cc
-@@ -246,7 +246,7 @@
- #include "ui/ui_features.h"
- #include "url/url_features.h"
+@@ -260,7 +260,7 @@
+ #include "extensions/common/extension_features.h"
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)  
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -341,7 +341,7 @@
- #include "device/vr/public/cpp/features.h"
+@@ -349,7 +349,7 @@
+ #include "device/vr/public/cpp/switches.h"
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "ui/ozone/public/ozone_switches.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -350,7 +350,7 @@
+@@ -359,7 +359,7 @@
  #include "chrome/browser/win/mica_titlebar.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/contextual_cueing/contextual_cueing_features.h"  // nogncheck
  #include "chrome/browser/enterprise/profile_management/profile_management_features.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
- 
-@@ -360,7 +360,7 @@
+ #include "chrome/browser/enterprise/webstore/features.h"
+@@ -371,7 +371,7 @@
  #include "components/user_education/common/user_education_features.h"  // nogncheck
  #endif
  
@@ -42,7 +42,16 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
  #include "chrome/browser/ui/ui_features.h"
  #include "ui/base/ui_base_features.h"
  #endif
-@@ -506,7 +506,7 @@ const FeatureEntry::FeatureVariation kDX
+@@ -423,7 +423,7 @@ const FeatureEntry::Choice kPullToRefres
+ #endif  // USE_AURA
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ 
+ const FeatureEntry::FeatureParam kLocalNetworkAccessChecksBlock[] = {
+     {"LocalNetworkAccessChecksWarn", "false"}};
+@@ -539,7 +539,7 @@ const FeatureEntry::FeatureVariation kDX
      {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
  #endif
  
@@ -51,7 +60,7 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
  const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
      {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
      {flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -783,6 +783,31 @@ const FeatureEntry::FeatureVariation
+@@ -852,6 +852,31 @@ const FeatureEntry::FeatureVariation
           std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam),
           nullptr}};
  
@@ -83,8 +92,8 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
  const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = {
      {"UIClipboardMaximumAge", "60"}};
  const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = {
-@@ -1224,7 +1249,7 @@ const FeatureEntry::FeatureVariation kPa
- };
+@@ -1227,7 +1252,7 @@ constexpr FeatureEntry::FeatureVariation
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
@@ -92,26 +101,17 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
  const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
      {"AtKeywordAcceleration", "true"},
  };
-@@ -1268,7 +1293,7 @@ const FeatureEntry::FeatureVariation
+@@ -1265,7 +1290,7 @@ const FeatureEntry::FeatureVariation kRe
  };
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
-     {"ShortcutBoostSearchScore", "0"},
-     {"ShortcutBoostNonTopHitThreshold", "0"},
-@@ -1886,7 +1911,7 @@ const FeatureEntry::FeatureVariation kTa
- #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const FeatureEntry::FeatureParam kTabstripDeclutterQuickModeParams[] = {
-     {"stale_threshold_duration", "10s"},
-     {"declutter_timer_interval", "10s"},
-@@ -3635,7 +3660,7 @@ const flags_ui::FeatureEntry::FeatureVar
- };
+ // A limited number of combinations of the rich autocompletion params.
+ const FeatureEntry::FeatureParam kOmniboxRichAutocompletionAggressive1[] = {
+@@ -3555,7 +3580,7 @@ const FeatureEntry::FeatureVariation
+ #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
 -    BUILDFLAG(IS_CHROMEOS)
@@ -119,16 +119,25 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
  const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] =
      {{"link_capturing_state", "on_by_default"}};
  const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] =
-@@ -4159,7 +4184,7 @@ const FeatureEntry::FeatureVariation
-          std::size(kSecurePaymentConfirmationNetworkAndIssuerIcons_Rows),
-          nullptr}};
+@@ -4059,7 +4084,7 @@ const FeatureEntry::FeatureVariation kSk
+      std::size(kSkiaGraphite_DebugLabelsEnabled), nullptr},
+ };
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = {
      {"TranslationAPIAcceptLanguagesCheck", "false"},
      {"TranslationAPILimitLanguagePackCount", "false"}};
-@@ -4905,7 +4930,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4125,7 +4150,7 @@ const FeatureEntry::FeatureVariation
+          1, nullptr},
+ };
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const FeatureEntry::FeatureParam kContextualCueingEnabledNoEngagementCap[] = {
+     {"BackoffTime", "0h"},
+     {"BackoffMultiplierBase", "0.0"},
+@@ -4992,7 +5017,7 @@ const FeatureEntry kFeatureEntries[] = {
      },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -137,16 +146,16 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
      {
          "fluent-overlay-scrollbars",
          flag_descriptions::kFluentOverlayScrollbarsName,
-@@ -5314,7 +5339,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kDesktopPWAsSyncChangesDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kWebAppDontAddExistingAppsToSync)},
- #endif  // !BUILDFLAG(IS_ANDROID)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
-      flag_descriptions::kShortcutsNotAppsDescription,
-      kOsMac | kOsWin | kOsLinux,
-@@ -5469,7 +5494,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5279,7 +5304,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableIsolatedWebAppDevModeName,
+      flag_descriptions::kEnableIsolatedWebAppDevModeDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(features::kIsolatedWebAppDevMode)},
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"enable-iwa-key-distribution-component",
+      flag_descriptions::kEnableIwaKeyDistributionComponentName,
+      flag_descriptions::kEnableIwaKeyDistributionComponentDescription,
+@@ -5500,7 +5525,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kWebShare)},
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
  
@@ -155,10 +164,11 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
      {"pulseaudio-loopback-for-cast",
       flag_descriptions::kPulseaudioLoopbackForCastName,
       flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
-@@ -5500,9 +5525,18 @@ const FeatureEntry kFeatureEntries[] = {
-     {"wayland-ui-scaling", flag_descriptions::kWaylandUiScalingName,
-      flag_descriptions::kWaylandUiScalingDescription, kOsLinux,
-      FEATURE_VALUE_TYPE(features::kWaylandUiScale)},
+@@ -5541,6 +5566,16 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWaylandSessionManagementName,
+      flag_descriptions::kWaylandSessionManagementDescription, kOsLinux,
+      FEATURE_VALUE_TYPE(features::kWaylandSessionManagement)},
++
 +#if BUILDFLAG(IS_BSD)
 +    {"audio-backend",
 +     flag_descriptions::kAudioBackendName,
@@ -170,12 +180,8 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
 +#endif
  #endif  // BUILDFLAG(IS_LINUX)
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     {"skip-undecryptable-passwords",
-      flag_descriptions::kSkipUndecryptablePasswordsName,
-      flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -6414,7 +6448,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #if BUILDFLAG(ENABLE_VR)
+@@ -6427,7 +6462,7 @@ const FeatureEntry kFeatureEntries[] = {
                                      "MlUrlScoring")},
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -184,16 +190,16 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
      {"omnibox-domain-suggestions",
       flag_descriptions::kOmniboxDomainSuggestionsName,
       flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
-@@ -6620,7 +6654,7 @@ const FeatureEntry kFeatureEntries[] = {
-                                     "OrganicRepeatableQueries")},
- 
+@@ -6697,7 +6732,7 @@ const FeatureEntry kFeatureEntries[] = {
+                                     kNumSrpZpsRelatedSearches,
+                                     "PowerTools")},
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
      {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
       flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
       FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
-@@ -7235,7 +7269,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7189,7 +7224,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)},
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -202,43 +208,43 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
      {"cups-ipp-printing-backend",
       flag_descriptions::kCupsIppPrintingBackendName,
       flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop,
-@@ -8239,7 +8273,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kCooperativeSchedulingDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kCooperativeScheduling)},
+@@ -7437,7 +7472,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kSupportToolScreenshotDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(features::kSupportToolScreenshot)},
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+     {"wasm-tts-component-updater-enabled",
+      flag_descriptions::kWasmTtsComponentUpdaterEnabledName,
+      flag_descriptions::kWasmTtsComponentUpdaterEnabledDescription, kOsDesktop,
+@@ -8109,7 +8144,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(media::kGlobalMediaControlsUpdatedUI)},
+ #endif  // !BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      {"enable-network-service-sandbox",
       flag_descriptions::kEnableNetworkServiceSandboxName,
       flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -8255,7 +8289,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(media::kUseOutOfProcessVideoDecoding)},
- #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     {"enable-family-link-extensions-permissions",
-      flag_descriptions::
-          kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
-@@ -9069,7 +9103,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8774,7 +8809,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)},
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
-      flag_descriptions::kGetAllScreensMediaDescription,
-      kOsCrOS | kOsLacros | kOsLinux,
-@@ -9102,7 +9136,7 @@ const FeatureEntry kFeatureEntries[] = {
- 
- #if BUILDFLAG(IS_WIN) ||                                      \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+      flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux,
+      FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)},
+@@ -8799,7 +8834,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kGlobalVaapiLockDescription, kOsCrOS | kOsLinux,
+      FEATURE_VALUE_TYPE(media::kGlobalVaapiLock)},
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
      {
          "ui-debug-tools",
          flag_descriptions::kUIDebugToolsName,
-@@ -9603,7 +9637,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9275,7 +9310,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -247,7 +253,7 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
      {"media-session-enter-picture-in-picture",
       flag_descriptions::kMediaSessionEnterPictureInPictureName,
       flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
-@@ -10390,7 +10424,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9924,7 +9959,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsDesktop | kOsAndroid,
       FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
  
@@ -256,25 +262,16 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
      {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
       flag_descriptions::kCameraMicEffectsDescription,
       static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10421,7 +10455,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"site-search-settings-policy",
-      flag_descriptions::kSiteSearchSettingsPolicyName,
-      flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
-@@ -10546,7 +10580,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll,
-      FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)},
+@@ -10048,7 +10083,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)},
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
      {"third-party-profile-management",
       flag_descriptions::kThirdPartyProfileManagementName,
       flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -10588,7 +10622,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10077,7 +10112,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -283,52 +280,34 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
      {"enable-user-navigation-capturing-pwa",
       flag_descriptions::kPwaNavigationCapturingName,
       flag_descriptions::kPwaNavigationCapturingDescription,
-@@ -11476,7 +11510,7 @@ const FeatureEntry kFeatureEntries[] = {
-                             kAuthenticateUsingUserConsentVerifierInteropApi)},
- #endif
+@@ -10817,7 +10852,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kCanvasHibernationDescription, kOsAll,
+      FEATURE_VALUE_TYPE(blink::features::kCanvas2DHibernation)},
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"sync-enable-bookmarks-in-transport-mode",
-      flag_descriptions::kSyncEnableBookmarksInTransportModeName,
-      flag_descriptions::kSyncEnableBookmarksInTransportModeDescription,
-@@ -11575,7 +11609,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif
- 
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     {"classify-url-on-process-response-event",
-      flag_descriptions::kClassifyUrlOnProcessResponseEventName,
-      flag_descriptions::kClassifyUrlOnProcessResponseEventDescription,
-@@ -11584,7 +11618,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"tab-organization", flag_descriptions::kTabOrganizationName,
-      flag_descriptions::kTabOrganizationDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kTabOrganization)},
-@@ -11629,7 +11663,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kLanguageDetectionAPIDescription, kOsAll,
-      FEATURE_VALUE_TYPE(blink::features::kLanguageDetectionAPI)},
+     {"enable-history-sync-optin",
+      flag_descriptions::kEnableHistorySyncOptinName,
+      flag_descriptions::kEnableHistorySyncOptinDescription,
+@@ -10920,7 +10955,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)},
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     {"supervised-profile-hide-guest",
-      flag_descriptions::kSupervisedProfileHideGuestName,
-      flag_descriptions::kSupervisedProfileHideGuestDescription,
-@@ -11882,7 +11916,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"supervised-profile-safe-search",
+      flag_descriptions::kSupervisedProfileSafeSearchName,
+      flag_descriptions::kSupervisedProfileSafeSearchDescription,
+@@ -11167,7 +11202,7 @@ const FeatureEntry kFeatureEntries[] = {
           segmentation_platform::features::kSegmentationSurveyPage)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"autofill-enable-buy-now-pay-later-for-affirm",
-      flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmName,
-      flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmDescription,
-@@ -12017,7 +12051,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"autofill-enable-buy-now-pay-later",
+      flag_descriptions::kAutofillEnableBuyNowPayLaterName,
+      flag_descriptions::kAutofillEnableBuyNowPayLaterDescription, kOsDesktop,
+@@ -11282,7 +11317,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)},
  
@@ -336,4 +315,76 @@ $NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2025/02/06 09:57:44 wiz Exp
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      {"translation-api", flag_descriptions::kTranslationAPIName,
       flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux,
-      FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kEnableTranslationAPI,
+      FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI,
+@@ -11319,7 +11354,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(
+          password_manager::features::kPasswordFormClientsideClassifier)},
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"contextual-cueing", flag_descriptions::kContextualCueingName,
+      flag_descriptions::kContextualCueingDescription,
+      kOsLinux | kOsMac | kOsWin,
+@@ -11653,7 +11688,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(ui::kUseNewEtc1Encoder)},
+ #endif  // !BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"automatic-usb-detach", flag_descriptions::kAutomaticUsbDetachName,
+      flag_descriptions::kAutomaticUsbDetachDescription, kOsAndroid | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kAutomaticUsbDetach)},
+@@ -11703,7 +11738,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // !BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"autofill-enable-amount-extraction-desktop",
+      flag_descriptions::kAutofillEnableAmountExtractionDesktopName,
+      flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription,
+@@ -11723,7 +11758,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(blink::features::kClipboardContentsId)},
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"autofill-enable-amount-extraction-allowlist-desktop",
+      flag_descriptions::kAutofillEnableAmountExtractionAllowlistDesktopName,
+      flag_descriptions::
+@@ -11834,7 +11869,7 @@ const FeatureEntry kFeatureEntries[] = {
+          apps::chrome_app_deprecation::kAllowUserInstalledChromeApps)},
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     {"chrome-web-store-navigation-throttle",
+      flag_descriptions::kChromeWebStoreNavigationThrottleName,
+      flag_descriptions::kChromeWebStoreNavigationThrottleDescription,
+@@ -11869,7 +11904,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"autofill-enable-amount-extraction-desktop-logging",
+      flag_descriptions::kAutofillEnableAmountExtractionDesktopLoggingName,
+      flag_descriptions::
+@@ -11899,7 +11934,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableWebAppUpdateTokenParsingDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kWebAppEnableUpdateTokenParsing)},
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"root-scrollbar-follows-browser-theme",
+      flag_descriptions::kRootScrollbarFollowsTheme,
+      flag_descriptions::kRootScrollbarFollowsThemeDescription,
+@@ -11921,7 +11956,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     {"local-network-access-check",
+      flag_descriptions::kLocalNetworkAccessChecksName,
+      flag_descriptions::kLocalNetworkAccessChecksDescription, kOsDesktop,
diff --git a/chromium/patches/patch-chrome_browser_accessibility_page__colors.cc b/chromium/patches/patch-chrome_browser_accessibility_page__colors.cc
index 3a6289c409..ba8b09d89e 100644
--- a/chromium/patches/patch-chrome_browser_accessibility_page__colors.cc
+++ b/chromium/patches/patch-chrome_browser_accessibility_page__colors.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_accessibility_page__colors.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/accessibility/page_colors.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/accessibility/page_colors.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/accessibility/page_colors.cc
 @@ -12,7 +12,7 @@
  #include "components/sync_preferences/pref_service_syncable.h"
diff --git a/chromium/patches/patch-chrome_browser_after__startup__task__utils.cc b/chromium/patches/patch-chrome_browser_after__startup__task__utils.cc
index b8e54e91fb..3ecedad904 100644
--- a/chromium/patches/patch-chrome_browser_after__startup__task__utils.cc
+++ b/chromium/patches/patch-chrome_browser_after__startup__task__utils.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_after__startup__task__utils.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/after_startup_task_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/after_startup_task_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/after_startup_task_utils.cc
-@@ -117,7 +117,7 @@ void SetBrowserStartupIsComplete() {
+@@ -112,7 +112,7 @@ void SetBrowserStartupIsComplete() {
                         TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count);
    GetStartupCompleteFlag().Set();
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc b/chromium/patches/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
index 270420aaa9..1093aa1ea6 100644
--- a/chromium/patches/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
+++ b/chromium/patches/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_apps_app__service_publishers_extension__apps.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/apps/app_service/publishers/extension_apps.cc
 @@ -23,7 +23,7 @@ ExtensionApps::ExtensionApps(AppServiceP
  ExtensionApps::~ExtensionApps() = default;
diff --git a/chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
index 82cdab7607..c543435c9f 100644
--- a/chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
+++ b/chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_apps_platform__apps_platform__app__launch.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/apps/platform_apps/platform_app_launch.cc
 @@ -19,7 +19,7 @@
  #include "extensions/common/constants.h"
diff --git a/chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
index 0f77665ca1..5c02d83be7 100644
--- a/chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
+++ b/chromium/patches/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_apps_platform__apps_platform__app__launch.h,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/apps/platform_apps/platform_app_launch.h
 @@ -38,7 +38,7 @@ bool OpenExtensionApplicationWindow(Prof
  content::WebContents* OpenExtensionApplicationTab(Profile* profile,
diff --git a/chromium/patches/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/chromium/patches/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
index 6f8b96fa97..98a3d81bb9 100644
--- a/chromium/patches/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
+++ b/chromium/patches/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 @@ -88,7 +88,7 @@ ChromeAutocompleteSchemeClassifier::GetI
        return metrics::OmniboxInputType::QUERY;
diff --git a/chromium/patches/patch-chrome_browser_background_background__mode__manager.cc b/chromium/patches/patch-chrome_browser_background_background__mode__manager.cc
deleted file mode 100644
index 3593808ad8..0000000000
--- a/chromium/patches/patch-chrome_browser_background_background__mode__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-chrome_browser_background_background__mode__manager.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/background/background_mode_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/background/background_mode_manager.cc
-@@ -872,7 +872,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
-     return gfx::ImageSkia();
- 
-   return family->CreateExact(size).AsImageSkia();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-       IDR_PRODUCT_LOGO_128);
- #elif BUILDFLAG(IS_MAC)
diff --git a/chromium/patches/patch-chrome_browser_background_background__mode__optimizer.cc b/chromium/patches/patch-chrome_browser_background_background__mode__optimizer.cc
deleted file mode 100644
index c020c6650c..0000000000
--- a/chromium/patches/patch-chrome_browser_background_background__mode__optimizer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-chrome_browser_background_background__mode__optimizer.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/background/background_mode_optimizer.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/background/background_mode_optimizer.cc
-@@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer>
-     return nullptr;
-   }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) {
-     // Private ctor.
-     return base::WrapUnique(new BackgroundModeOptimizer());
diff --git a/chromium/patches/patch-chrome_browser_background_extensions_background__mode__manager.cc b/chromium/patches/patch-chrome_browser_background_extensions_background__mode__manager.cc
new file mode 100644
index 0000000000..88504da4de
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_background_extensions_background__mode__manager.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/background/extensions/background_mode_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/background/extensions/background_mode_manager.cc
+@@ -893,7 +893,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
+   }
+ 
+   return family->CreateExact(size).AsImageSkia();
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+       IDR_PRODUCT_LOGO_128);
+ #elif BUILDFLAG(IS_MAC)
diff --git a/chromium/patches/patch-chrome_browser_background_extensions_background__mode__optimizer.cc b/chromium/patches/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
new file mode 100644
index 0000000000..4f323c5413
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_background_extensions_background__mode__optimizer.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/background/extensions/background_mode_optimizer.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/background/extensions/background_mode_optimizer.cc
+@@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer>
+     return nullptr;
+   }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) {
+     // Private ctor.
+     return base::WrapUnique(new BackgroundModeOptimizer());
diff --git a/chromium/patches/patch-chrome_browser_background_glic_glic__status__icon.cc b/chromium/patches/patch-chrome_browser_background_glic_glic__status__icon.cc
new file mode 100644
index 0000000000..2bfd565bcd
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_background_glic_glic__status__icon.cc
@@ -0,0 +1,44 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/background/glic/glic_status_icon.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/background/glic/glic_status_icon.cc
+@@ -86,7 +86,7 @@ GlicStatusIcon::GlicStatusIcon(GlicContr
+   if (!status_icon_) {
+     return;
+   }
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   //  Set a vector icon for proper themeing on Linux.
+   status_icon_->SetIcon(
+       GlicVectorIconManager::GetVectorIcon(IDR_GLIC_BUTTON_VECTOR_ICON));
+@@ -128,7 +128,7 @@ GlicStatusIcon::~GlicStatusIcon() {
+ 
+   context_menu_ = nullptr;
+   if (status_icon_) {
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+     status_icon_->RemoveObserver(this);
+ #endif
+     std::unique_ptr<StatusIcon> removed_icon =
+@@ -234,7 +234,7 @@ void GlicStatusIcon::UpdateHotkey(const 
+ }
+ 
+ void GlicStatusIcon::UpdateVisibilityOfExitInContextMenu() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (context_menu_) {
+     context_menu_->SetCommandIdVisible(IDC_GLIC_STATUS_ICON_MENU_EXIT,
+                                        BrowserList::GetInstance()->empty());
+@@ -272,7 +272,7 @@ std::unique_ptr<StatusIconMenuModel> Gli
+   menu->AddItem(
+       IDC_GLIC_STATUS_ICON_MENU_REMOVE_ICON,
+       l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_REMOVE_ICON));
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   menu->AddItem(IDC_GLIC_STATUS_ICON_MENU_EXIT,
+                 l10n_util::GetStringUTF16(IDS_GLIC_STATUS_ICON_MENU_EXIT));
+ #endif
diff --git a/chromium/patches/patch-chrome_browser_browser__features.cc b/chromium/patches/patch-chrome_browser_browser__features.cc
index bf6bc27ae0..7654493288 100644
--- a/chromium/patches/patch-chrome_browser_browser__features.cc
+++ b/chromium/patches/patch-chrome_browser_browser__features.cc
@@ -1,30 +1,30 @@
-$NetBSD: patch-chrome_browser_browser__features.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/browser_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/browser_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/browser_features.cc
-@@ -71,7 +71,7 @@ BASE_FEATURE(kClosedTabCache,
-              "ClosedTabCache",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -75,7 +75,7 @@ BASE_FEATURE(kClearUserDataUponProfileDe
+              "ClearUserDataUponProfileDestruction",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Enables usage of os_crypt_async::SecretPortalKeyProvider.  Once
  // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be
  // disabled without losing data.
-@@ -87,7 +87,7 @@ BASE_FEATURE(kDbusSecretPortal,
+@@ -94,7 +94,7 @@ BASE_FEATURE(kUseFreedesktopSecretKeyPro
+ // the browser exits.
  BASE_FEATURE(kDestroyProfileOnBrowserClose,
               "DestroyProfileOnBrowserClose",
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
               base::FEATURE_ENABLED_BY_DEFAULT);
  #else
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -268,7 +268,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlo
+@@ -227,7 +227,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlo
               "SandboxExternalProtocolBlockedWarning",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/chromium/patches/patch-chrome_browser_browser__features.h b/chromium/patches/patch-chrome_browser_browser__features.h
index ed12091b8e..6a986c89f3 100644
--- a/chromium/patches/patch-chrome_browser_browser__features.h
+++ b/chromium/patches/patch-chrome_browser_browser__features.h
@@ -1,26 +1,26 @@
-$NetBSD: patch-chrome_browser_browser__features.h,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/browser_features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/browser_features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/browser_features.h
 @@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTranspa
  BASE_DECLARE_FEATURE(kCertVerificationNetworkTime);
- BASE_DECLARE_FEATURE(kClosedTabCache);
+ BASE_DECLARE_FEATURE(kClearUserDataUponProfileDestruction);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_DECLARE_FEATURE(kDbusSecretPortal);
+ BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProvider);
  #endif
- 
-@@ -117,7 +117,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServ
+@@ -100,7 +100,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServ
  BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked);
  BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_DECLARE_FEATURE(kSecretPortalKeyProviderUseForEncryption);
+ BASE_DECLARE_FEATURE(kUseFreedesktopSecretKeyProviderForEncryption);
  #endif
- 
diff --git a/chromium/patches/patch-chrome_browser_browser__process__impl.cc b/chromium/patches/patch-chrome_browser_browser__process__impl.cc
index eafff15893..ed17757a7d 100644
--- a/chromium/patches/patch-chrome_browser_browser__process__impl.cc
+++ b/chromium/patches/patch-chrome_browser_browser__process__impl.cc
@@ -1,30 +1,30 @@
-$NetBSD: patch-chrome_browser_browser__process__impl.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/browser_process_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/browser_process_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/browser_process_impl.cc
-@@ -236,7 +236,7 @@
- #include "chrome/browser/ui/profiles/profile_picker.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h"  // nogncheck
- #endif
- 
-@@ -257,7 +257,7 @@
+@@ -259,7 +259,7 @@
  #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/browser_features.h"
- #include "components/os_crypt/async/browser/secret_portal_key_provider.h"
+ #include "components/os_crypt/async/browser/fallback_linux_key_provider.h"
+ #include "components/os_crypt/async/browser/freedesktop_secret_key_provider.h"
+@@ -271,7 +271,7 @@
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #endif
-@@ -1125,7 +1125,7 @@ void BrowserProcessImpl::RegisterPrefs(P
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // How often to check if the persistent instance of Chrome needs to restart
+ // to install an update.
+ static const int kUpdateCheckIntervalHours = 6;
+@@ -1145,7 +1145,7 @@ void BrowserProcessImpl::RegisterPrefs(P
                                  GoogleUpdateSettings::GetCollectStatsConsent());
    registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
  
@@ -33,30 +33,21 @@ $NetBSD: patch-chrome_browser_browser__process__impl.cc,v 1.1 2025/02/06 09:57:4
    os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry);
  #endif
  }
-@@ -1308,7 +1308,7 @@ void BrowserProcessImpl::PreMainMessageL
- 
-   ApplyMetricsReportingPolicy();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   ChromeJsErrorReportProcessor::Create();
- #endif
- 
-@@ -1398,7 +1398,7 @@ void BrowserProcessImpl::PreMainMessageL
-               features::kUseAppBoundEncryptionProviderForEncryption))));
+@@ -1413,7 +1413,7 @@ void BrowserProcessImpl::PreMainMessageL
+           local_state())));
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(features::kDbusSecretPortal)) {
-     providers.emplace_back(
-         /*precedence=*/10u,
-@@ -1648,7 +1648,7 @@ void BrowserProcessImpl::Unpin() {
+   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+   if (cmd_line->GetSwitchValueASCII(password_manager::kPasswordStore) !=
+       "basic") {
+@@ -1682,7 +1682,7 @@ void BrowserProcessImpl::Unpin() {
+ }
+ 
  // Mac is currently not supported.
- // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  
  bool BrowserProcessImpl::IsRunningInBackground() const {
    // Check if browser is in the background.
diff --git a/chromium/patches/patch-chrome_browser_browser__process__impl.h b/chromium/patches/patch-chrome_browser_browser__process__impl.h
index 6fd30f9049..5e1f0b6108 100644
--- a/chromium/patches/patch-chrome_browser_browser__process__impl.h
+++ b/chromium/patches/patch-chrome_browser_browser__process__impl.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_browser__process__impl.h,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/browser_process_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/browser_process_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/browser_process_impl.h
-@@ -405,7 +405,7 @@ class BrowserProcessImpl : public Browse
+@@ -408,7 +408,7 @@ class BrowserProcessImpl : public Browse
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<BatteryMetrics> battery_metrics_;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    base::RepeatingTimer autoupdate_timer_;
  
    // Gets called by autoupdate timer to see if browser needs restart and can be
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__field__trials.cc b/chromium/patches/patch-chrome_browser_chrome__browser__field__trials.cc
index 92c13bf06e..6d39fa8db3 100644
--- a/chromium/patches/patch-chrome_browser_chrome__browser__field__trials.cc
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__field__trials.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_chrome__browser__field__trials.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_browser_field_trials.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_browser_field_trials.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_browser_field_trials.cc
-@@ -49,7 +49,7 @@
- #include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h"
+@@ -37,7 +37,7 @@
+ #include "chromeos/ash/services/multidevice_setup/public/cpp/first_run_field_trial.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
@@ -15,8 +15,8 @@ $NetBSD: patch-chrome_browser_chrome__browser__field__trials.cc,v 1.1 2025/02/06
  #include "base/nix/xdg_util.h"
  #include "ui/base/ui_base_features.h"
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -135,7 +135,7 @@ void ChromeBrowserFieldTrials::RegisterS
- #endif
+@@ -117,7 +117,7 @@ void ChromeBrowserFieldTrials::RegisterS
+ #endif  // BUILDFLAG(IS_ANDROID)
  }
  
 -#if BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__field__trials.h b/chromium/patches/patch-chrome_browser_chrome__browser__field__trials.h
index 2f136418a6..51118fd20a 100644
--- a/chromium/patches/patch-chrome_browser_chrome__browser__field__trials.h
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__field__trials.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_chrome__browser__field__trials.h,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_browser_field_trials.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_browser_field_trials.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_browser_field_trials.h
 @@ -33,7 +33,7 @@ class ChromeBrowserFieldTrials : public 
        const variations::EntropyProviders& entropy_providers,
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__interface__binders.cc b/chromium/patches/patch-chrome_browser_chrome__browser__interface__binders.cc
index 0d38a92ba9..4d4a3daf01 100644
--- a/chromium/patches/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__interface__binders.cc
@@ -1,28 +1,13 @@
-$NetBSD: patch-chrome_browser_chrome__browser__interface__binders.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_browser_interface_binders.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_browser_interface_binders.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -129,12 +129,12 @@
- #endif  // BUILDFLAG(FULL_SAFE_BROWSING)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
- #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
- #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
- #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
-@@ -224,7 +224,7 @@
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -77,7 +77,7 @@
+ #endif  // BUILDFLAG(ENABLE_UNHANDLED_TAP)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
@@ -30,16 +15,7 @@ $NetBSD: patch-chrome_browser_chrome__browser__interface__binders.cc,v 1.1 2025/
  #include "chrome/browser/screen_ai/screen_ai_service_router.h"
  #include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
  #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
-@@ -234,7 +234,7 @@
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -865,7 +865,7 @@ void BindMediaFoundationPreferences(
+@@ -358,7 +358,7 @@ void BindMediaFoundationPreferences(
  #endif  // BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -48,7 +24,7 @@ $NetBSD: patch-chrome_browser_chrome__browser__interface__binders.cc,v 1.1 2025/
  void BindScreenAIAnnotator(
      content::RenderFrameHost* frame_host,
      mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) {
-@@ -1078,7 +1078,7 @@ void PopulateChromeFrameBinders(
+@@ -500,7 +500,7 @@ void PopulateChromeFrameBinders(
  #endif  // BUILDFLAG(ENABLE_SPEECH_SERVICE)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -57,47 +33,3 @@ $NetBSD: patch-chrome_browser_chrome__browser__interface__binders.cc,v 1.1 2025/
    if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
        !render_frame_host->GetParentOrOuterDocument()) {
      // The service binder will reject non-primary main frames, but we still need
-@@ -1168,7 +1168,7 @@ void PopulateChromeWebUIFrameBinders(
-       DataSharingInternalsUI>(map);
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-   RegisterWebUIControllerInterfaceBinder<
-       connectors_internals::mojom::PageHandler,
-       enterprise_connectors::ConnectorsInternalsUI>(map);
-@@ -1179,7 +1179,7 @@ void PopulateChromeWebUIFrameBinders(
-                                          policy::DlpInternalsUI>(map);
- #endif
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   RegisterWebUIControllerInterfaceBinder<
-       app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
- 
-@@ -1278,14 +1278,14 @@ void PopulateChromeWebUIFrameBinders(
-       page_image_service::mojom::PageImageServiceHandler, HistoryUI,
-       HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   RegisterWebUIControllerInterfaceBinder<whats_new::mojom::PageHandlerFactory,
-                                          WhatsNewUI>(map);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-   RegisterWebUIControllerInterfaceBinder<
-       browser_command::mojom::CommandHandlerFactory,
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       WhatsNewUI,
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-       NewTabPageUI>(map);
-@@ -1794,7 +1794,7 @@ void PopulateChromeWebUIFrameBinders(
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider,
-                                          DiscardsUI>(map);
- 
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__interface__binders__webui.cc b/chromium/patches/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
new file mode 100644
index 0000000000..854499b7e7
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__interface__binders__webui.cc
@@ -0,0 +1,70 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/chrome_browser_interface_binders_webui.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/chrome_browser_interface_binders_webui.cc
+@@ -47,7 +47,7 @@
+ #include "content/public/browser/web_ui_controller_interface_binder.h"
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
+ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
+ #include "chrome/browser/ui/webui/discards/discards.mojom.h"
+@@ -56,7 +56,7 @@
+ #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
+ #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
+ #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin.mojom.h"
+@@ -445,7 +445,7 @@ void PopulateChromeWebUIFrameBinders(
+ #endif
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   RegisterWebUIControllerInterfaceBinder<
+       connectors_internals::mojom::PageHandler,
+       enterprise_connectors::ConnectorsInternalsUI>(map);
+@@ -456,7 +456,7 @@ void PopulateChromeWebUIFrameBinders(
+                                          policy::DlpInternalsUI>(map);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   RegisterWebUIControllerInterfaceBinder<
+       app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
+ 
+@@ -583,14 +583,14 @@ void PopulateChromeWebUIFrameBinders(
+         HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map);
+   }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   RegisterWebUIControllerInterfaceBinder<whats_new::mojom::PageHandlerFactory,
+                                          WhatsNewUI>(map);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
+   RegisterWebUIControllerInterfaceBinder<
+       browser_command::mojom::CommandHandlerFactory,
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       WhatsNewUI,
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+       NewTabPageUI>(map);
+@@ -1123,7 +1123,7 @@ void PopulateChromeWebUIFrameBinders(
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider,
+                                          DiscardsUI>(map);
+ 
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__main.cc b/chromium/patches/patch-chrome_browser_chrome__browser__main.cc
index 9392939bfb..d27c96874a 100644
--- a/chromium/patches/patch-chrome_browser_chrome__browser__main.cc
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__main.cc
@@ -1,65 +1,62 @@
-$NetBSD: patch-chrome_browser_chrome__browser__main.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_browser_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_browser_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_browser_main.cc
-@@ -249,15 +249,15 @@
- 
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/first_run/upgrade_util_linux.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -149,7 +149,7 @@
+ #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/crash/core/app/crashpad.h"
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "sql/database.h"
  #endif
  
+@@ -175,11 +175,11 @@
+ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/nix/xdg_util.h"
+ #include "chrome/browser/first_run/upgrade_util_linux.h"
  #endif
  
-@@ -290,14 +290,14 @@
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/headless/headless_mode_metrics.h"  // nogncheck
+ #include "chrome/browser/headless/headless_mode_util.h"     // nogncheck
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
- #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
- #include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
- #include "ui/base/pointer/touch_ui_controller.h"
+@@ -190,7 +190,7 @@
+ #include "ui/gfx/switches.h"
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/headless/headless_mode_metrics.h"  // nogncheck
- #include "chrome/browser/headless/headless_mode_util.h"     // nogncheck
- #include "components/headless/select_file_dialog/headless_select_file_dialog.h"
-@@ -365,14 +365,14 @@
- #endif  // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/first_run/upgrade_util.h"
+ #endif
  
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "sql/database.h"
- #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
-         // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+@@ -268,7 +268,7 @@
+ #include "chrome/browser/chrome_process_singleton.h"
+ #include "chrome/browser/ui/startup/startup_browser_creator.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/nix/xdg_util.h"
+ #endif
+ #endif  // BUILDFLAG(ENABLE_PROCESS_SINGLETON)
+@@ -291,7 +291,7 @@
  
  namespace {
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
      FILE_PATH_LITERAL("Media History");
  
-@@ -537,7 +537,7 @@ void ProcessSingletonNotificationCallbac
+@@ -442,7 +442,7 @@ void ProcessSingletonNotificationCallbac
    }
  #endif
  
@@ -68,57 +65,57 @@ $NetBSD: patch-chrome_browser_chrome__browser__main.cc,v 1.1 2025/02/06 09:57:45
    // Set the global activation token sent as a command line switch by another
    // browser process. This also removes the switch after use to prevent any side
    // effects of leaving it in the command line after this point.
-@@ -1114,7 +1114,7 @@ int ChromeBrowserMainParts::PreCreateThr
+@@ -1016,7 +1016,7 @@ int ChromeBrowserMainParts::PreCreateThr
        browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
      }
  
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
      // 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 .
-@@ -1162,7 +1162,7 @@ int ChromeBrowserMainParts::PreCreateThr
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+@@ -1061,7 +1061,7 @@ int ChromeBrowserMainParts::PreCreateThr
+ 
+ #endif  // BUILDFLAG(IS_MAC)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    metrics::DesktopSessionDurationTracker::Initialize();
    ProfileActivityMetricsRecorder::Initialize();
    TouchModeStatsTracker::Initialize(
-@@ -1358,7 +1358,7 @@ void ChromeBrowserMainParts::PostProfile
+@@ -1257,7 +1257,7 @@ void ChromeBrowserMainParts::PostProfile
  #endif  // BUILDFLAG(IS_WIN)
  
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    // Delete the media history database if it still exists.
    // TODO(crbug.com/40177301): Remove this.
    base::ThreadPool::PostTask(
-@@ -1407,7 +1407,7 @@ void ChromeBrowserMainParts::PostProfile
+@@ -1305,7 +1305,7 @@ void ChromeBrowserMainParts::PostProfile
        *UrlLanguageHistogramFactory::GetForBrowserContext(profile));
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    if (headless::IsHeadlessMode()) {
      headless::ReportHeadlessActionMetrics();
    }
-@@ -1516,7 +1516,7 @@ int ChromeBrowserMainParts::PreMainMessa
+@@ -1414,7 +1414,7 @@ int ChromeBrowserMainParts::PreMainMessa
    // In headless mode provide alternate SelectFileDialog factory overriding
    // any platform specific SelectFileDialog implementation that may have been
    // set.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    if (headless::IsHeadlessMode()) {
      headless::HeadlessSelectFileDialogFactory::SetUp();
    }
-@@ -2073,7 +2073,7 @@ bool ChromeBrowserMainParts::ProcessSing
+@@ -1959,7 +1959,7 @@ bool ChromeBrowserMainParts::ProcessSing
  
    // Drop the request if headless mode is in effect or the request is from
    // a headless Chrome process.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    if (headless::IsHeadlessMode() ||
        command_line.HasSwitch(switches::kHeadless)) {
      return false;
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
index 500dc80e4a..f3bbca0147 100644
--- a/chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
 @@ -58,7 +58,7 @@ void ChromeBrowserMainExtraPartsLinux::P
  
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc b/chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
index 0848ee0bd9..a10a219ac1 100644
--- a/chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc
-@@ -27,7 +27,7 @@ void ChromeBrowserMainExtraPartsOzone::P
+@@ -28,7 +28,7 @@ void ChromeBrowserMainExtraPartsOzone::P
  }
  
  void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() {
--#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   // Lacros's `PostMainMessageLoopRun` must be called at the very end of
-   // `PostMainMessageLoopRun` in
-   // `ChromeBrowserMainPartsLacros::PostMainMessageLoopRun`.
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+   ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
+ #endif
+ }
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__main__linux.cc b/chromium/patches/patch-chrome_browser_chrome__browser__main__linux.cc
index d3bf44c475..5a66809f1f 100644
--- a/chromium/patches/patch-chrome_browser_chrome__browser__main__linux.cc
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__main__linux.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_chrome__browser__main__linux.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_browser_main_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -25,7 +25,7 @@
+@@ -24,7 +24,7 @@
  #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_chrome__browser__main__linux.cc,v 1.1 2025/02/06 0
  #include "ui/ozone/public/ozone_platform.h"
  #endif
  
-@@ -72,7 +72,9 @@ void ChromeBrowserMainPartsLinux::PostCr
+@@ -65,7 +65,9 @@ void ChromeBrowserMainPartsLinux::PostCr
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if !BUILDFLAG(IS_CHROMEOS)
@@ -25,7 +25,7 @@ $NetBSD: patch-chrome_browser_chrome__browser__main__linux.cc,v 1.1 2025/02/06 0
  
    // Set up crypt config. This needs to be done before anything starts the
    // network service, as the raw encryption key needs to be shared with the
-@@ -98,7 +100,7 @@ void ChromeBrowserMainPartsLinux::PostCr
+@@ -91,7 +93,7 @@ void ChromeBrowserMainPartsLinux::PostCr
    ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
  }
  
@@ -34,8 +34,8 @@ $NetBSD: patch-chrome_browser_chrome__browser__main__linux.cc,v 1.1 2025/02/06 0
  void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
    ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
    ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
-@@ -136,7 +138,7 @@ void ChromeBrowserMainPartsLinux::PostBr
- #endif  // (defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS))
+@@ -129,7 +131,7 @@ void ChromeBrowserMainPartsLinux::PostBr
+ #endif  // BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
 -#if BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__main__linux.h b/chromium/patches/patch-chrome_browser_chrome__browser__main__linux.h
index b3bb60fb24..25fe51e030 100644
--- a/chromium/patches/patch-chrome_browser_chrome__browser__main__linux.h
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__main__linux.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_chrome__browser__main__linux.h,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_browser_main_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_browser_main_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_browser_main_linux.h
-@@ -30,7 +30,7 @@ class ChromeBrowserMainPartsLinux : publ
+@@ -31,7 +31,7 @@ class ChromeBrowserMainPartsLinux : publ
  
    // ChromeBrowserMainPartsPosix overrides.
    void PostCreateMainMessageLoop() override;
diff --git a/chromium/patches/patch-chrome_browser_chrome__browser__main__posix.cc b/chromium/patches/patch-chrome_browser_chrome__browser__main__posix.cc
index 891b76592a..be864d3668 100644
--- a/chromium/patches/patch-chrome_browser_chrome__browser__main__posix.cc
+++ b/chromium/patches/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_chrome__browser__main__posix.cc,v 1.1 2025/02/06 09:57:45 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_browser_main_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_browser_main_posix.cc
-@@ -79,7 +79,7 @@ void ExitHandler::ExitWhenPossibleOnUITh
+@@ -81,7 +81,7 @@ void ExitHandler::ExitWhenPossibleOnUITh
+     // ExitHandler takes care of deleting itself.
+     new ExitHandler();
    } else {
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      switch (signal) {
        case SIGINT:
        case SIGHUP:
diff --git a/chromium/patches/patch-chrome_browser_chrome__content__browser__client.cc b/chromium/patches/patch-chrome_browser_chrome__content__browser__client.cc
index 60797a05a2..8e61bf210e 100644
--- a/chromium/patches/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/chromium/patches/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,27 +1,26 @@
-$NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_content_browser_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_content_browser_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -498,7 +498,7 @@
+@@ -506,7 +506,7 @@
+ #include "components/user_manager/user_manager.h"
+ #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
  #include "storage/browser/file_system/external_mount_points.h"
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/chrome_browser_main_linux.h"
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #elif BUILDFLAG(IS_ANDROID)
-@@ -615,12 +615,12 @@
+@@ -622,11 +622,11 @@
+ #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
+ #endif  //  !BUILDFLAG(IS_ANDROID)
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
  #endif
  
@@ -30,7 +29,7 @@ $NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/
  #include "components/crash/core/app/crash_switches.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -631,7 +631,7 @@
+@@ -637,7 +637,7 @@
  #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
  #endif
  
@@ -39,17 +38,17 @@ $NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/
  #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
  #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
  #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
-@@ -640,7 +640,7 @@
+@@ -646,7 +646,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
-         // BUILDFLAG(IS_CHROMEOS_ASH)
+         // BUILDFLAG(IS_CHROMEOS)
 @@ -655,7 +655,7 @@
- #include "chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.h"
+ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
@@ -57,35 +56,35 @@ $NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/
  #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
  #elif BUILDFLAG(IS_OZONE)
  #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1572,7 +1572,7 @@ void ChromeContentBrowserClient::Registe
- #if BUILDFLAG(IS_CHROMEOS)
-   registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
+@@ -1549,7 +1549,7 @@ void ChromeContentBrowserClient::Registe
+   registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache,
+                                 false);
  #endif  // BUILDFLAG(IS_CHROMEOS)
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
                                  true);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1774,7 +1774,7 @@ ChromeContentBrowserClient::CreateBrowse
- #elif BUILDFLAG(IS_CHROMEOS_LACROS)
-   main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
+@@ -1758,7 +1758,7 @@ ChromeContentBrowserClient::CreateBrowse
+ #elif BUILDFLAG(IS_CHROMEOS)
+   main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>(
        is_integration_test, &startup_data_);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
        is_integration_test, &startup_data_);
  #elif BUILDFLAG(IS_ANDROID)
-@@ -1808,7 +1808,7 @@ ChromeContentBrowserClient::CreateBrowse
-       std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+@@ -1787,7 +1787,7 @@ ChromeContentBrowserClient::CreateBrowse
+     // Construct additional browser parts. Stages are called in the order in
+     // which they are added.
+ #if defined(TOOLKIT_VIEWS)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    main_parts->AddParts(
        std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
  #else
-@@ -1829,7 +1829,7 @@ ChromeContentBrowserClient::CreateBrowse
-   main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
+@@ -1804,7 +1804,7 @@ ChromeContentBrowserClient::CreateBrowse
+   main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>());
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
@@ -93,7 +92,7 @@ $NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
  #elif BUILDFLAG(IS_OZONE)
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1848,7 +1848,7 @@ ChromeContentBrowserClient::CreateBrowse
+@@ -1823,7 +1823,7 @@ ChromeContentBrowserClient::CreateBrowse
  
    chrome::AddMetricsExtraParts(main_parts.get());
  
@@ -102,7 +101,7 @@ $NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/
    main_parts->AddParts(
        std::make_unique<
            enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2721,7 +2721,9 @@ void MaybeAppendBlinkSettingsSwitchForFi
+@@ -2706,7 +2706,9 @@ void MaybeAppendBlinkSettingsSwitchForFi
  void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
      base::CommandLine* command_line,
      int child_process_id) {
@@ -112,7 +111,7 @@ $NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/
  #if BUILDFLAG(IS_MAC)
    std::unique_ptr<metrics::ClientInfo> client_info =
        GoogleUpdateSettings::LoadMetricsClientInfo();
-@@ -2730,7 +2732,7 @@ void ChromeContentBrowserClient::AppendE
+@@ -2715,7 +2717,7 @@ void ChromeContentBrowserClient::AppendE
                                      client_info->client_id);
    }
  #elif BUILDFLAG(IS_POSIX)
@@ -121,16 +120,34 @@ $NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/
    pid_t pid;
    if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
      command_line->AppendSwitchASCII(
-@@ -3095,7 +3097,7 @@ void ChromeContentBrowserClient::AppendE
+@@ -3080,7 +3082,7 @@ void ChromeContentBrowserClient::AppendE
      }
    }
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && !BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
    // Opt into a hardened stack canary mitigation if it hasn't already been
    // force-disabled.
    if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4946,7 +4948,7 @@ void ChromeContentBrowserClient::GetAddi
+@@ -4030,7 +4032,7 @@ bool UpdatePreferredColorScheme(WebPrefe
+   return old_preferred_color_scheme != web_prefs->preferred_color_scheme;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Sets the `root_scrollbar_theme_color` web pref if the user has enabled a
+ // custom colored frame for the UI.
+ void UpdateRootScrollbarThemeColor(Profile* profile,
+@@ -4657,7 +4659,7 @@ void ChromeContentBrowserClient::Overrid
+ 
+   UpdatePreferredColorScheme(web_prefs, main_frame_site.GetSiteURL(),
+                              web_contents, GetWebTheme());
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   UpdateRootScrollbarThemeColor(profile, web_contents, web_prefs);
+ #endif  //  BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+ 
+@@ -4973,7 +4975,7 @@ void ChromeContentBrowserClient::GetAddi
    }
  }
  
@@ -139,25 +156,7 @@ $NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -5067,7 +5069,7 @@ std::wstring ChromeContentBrowserClient:
-     case sandbox::mojom::Sandbox::kPrintCompositor:
-     case sandbox::mojom::Sandbox::kAudio:
-     case sandbox::mojom::Sandbox::kScreenAI:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     case sandbox::mojom::Sandbox::kVideoEffects:
- #endif
-     case sandbox::mojom::Sandbox::kSpeechRecognition:
-@@ -5172,7 +5174,7 @@ bool ChromeContentBrowserClient::PreSpaw
- #if !BUILDFLAG(IS_ANDROID)
-     case sandbox::mojom::Sandbox::kScreenAI:
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     case sandbox::mojom::Sandbox::kVideoEffects:
- #endif
-     case sandbox::mojom::Sandbox::kAudio:
-@@ -5531,7 +5533,7 @@ ChromeContentBrowserClient::CreateThrott
+@@ -5485,7 +5487,7 @@ ChromeContentBrowserClient::CreateThrott
          &throttles);
    }
  
@@ -166,25 +165,25 @@ $NetBSD: patch-chrome_browser_chrome__content__browser__client.cc,v 1.1 2025/02/
    MaybeAddThrottle(
        WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
        &throttles);
-@@ -5548,7 +5550,7 @@ ChromeContentBrowserClient::CreateThrott
+@@ -5502,7 +5504,7 @@ ChromeContentBrowserClient::CreateThrott
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -5587,7 +5589,7 @@ ChromeContentBrowserClient::CreateThrott
-             handle));
+@@ -5543,7 +5545,7 @@ ChromeContentBrowserClient::CreateThrott
    }
+ #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -7552,7 +7554,7 @@ bool ChromeContentBrowserClient::ShouldS
+@@ -7496,7 +7498,7 @@ bool ChromeContentBrowserClient::ShouldS
  bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
  // This enterprise policy is supported on Android, but the feature will not be
  // launched there.
diff --git a/chromium/patches/patch-chrome_browser_chrome__content__browser__client.h b/chromium/patches/patch-chrome_browser_chrome__content__browser__client.h
index e85e7e7f32..d2dd4807de 100644
--- a/chromium/patches/patch-chrome_browser_chrome__content__browser__client.h
+++ b/chromium/patches/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_chrome__content__browser__client.h,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/chrome_content_browser_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/chrome_content_browser_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -531,7 +531,7 @@ class ChromeContentBrowserClient : publi
+@@ -555,7 +555,7 @@ class ChromeContentBrowserClient : publi
    bool IsPluginAllowedToUseDevChannelAPIs(
        content::BrowserContext* browser_context,
        const GURL& url) override;
diff --git a/chromium/patches/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc b/chromium/patches/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
new file mode 100644
index 0000000000..1d7f8ad832
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc
+@@ -102,7 +102,7 @@ MessagingBackendServiceFactory::BuildSer
+   // This configuration object allows us to control platform specific behavior.
+   MessagingBackendConfiguration configuration;
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   configuration.clear_chip_on_tab_selection = false;
+ #endif
+ 
diff --git a/chromium/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc b/chromium/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
new file mode 100644
index 0000000000..d8d1669c7b
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/component_updater/iwa_key_distribution_component_installer.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/component_updater/iwa_key_distribution_component_installer.cc
+@@ -64,7 +64,7 @@ component_updater::OnDemandUpdater::Prio
+ 
+ namespace component_updater {
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kIwaKeyDistributionComponent,
+              "IwaKeyDistributionComponent",
+ #if BUILDFLAG(IS_CHROMEOS)
+@@ -89,7 +89,7 @@ bool IwaKeyDistributionComponentInstalle
+   // the main IWA feature.
+ #if BUILDFLAG(IS_WIN)
+   return base::FeatureList::IsEnabled(features::kIsolatedWebApps);
+-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return base::FeatureList::IsEnabled(kIwaKeyDistributionComponent);
+ #else
+   return false;
diff --git a/chromium/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h b/chromium/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h
new file mode 100644
index 0000000000..4cb79886ef
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_component__updater_iwa__key__distribution__component__installer.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/component_updater/iwa_key_distribution_component_installer.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/component_updater/iwa_key_distribution_component_installer.h
+@@ -27,7 +27,7 @@ class IwaKeyDistributionInfoProvider;
+ 
+ namespace component_updater {
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kIwaKeyDistributionComponent);
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/chromium/patches/patch-chrome_browser_component__updater_registration.cc b/chromium/patches/patch-chrome_browser_component__updater_registration.cc
index 72c66d867c..9ddd443c0e 100644
--- a/chromium/patches/patch-chrome_browser_component__updater_registration.cc
+++ b/chromium/patches/patch-chrome_browser_component__updater_registration.cc
@@ -1,26 +1,41 @@
-$NetBSD: patch-chrome_browser_component__updater_registration.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/component_updater/registration.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/component_updater/registration.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/component_updater/registration.cc
-@@ -82,7 +82,7 @@
- #include "media/base/media_switches.h"
- #endif  // !BUILDFLAG(IS_ANDROID)
+@@ -101,7 +101,7 @@
+ #endif  // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "components/component_updater/installer_policies/amount_extraction_heuristic_regexes_component_installer.h"
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_CHROMEOS)
+@@ -114,7 +114,7 @@
+ #include "chrome/browser/component_updater/lacros_component_remover.h"
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/component_updater/translate_kit_component_installer.h"
- #include "chrome/browser/component_updater/translate_kit_language_pack_component_installer.h"
+ #include "chrome/browser/component_updater/wasm_tts_engine_component_installer.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -232,7 +232,7 @@ void RegisterComponentsForUpdate() {
  
-   RegisterPlusAddressBlocklistComponent(cus);
+@@ -261,12 +261,12 @@ void RegisterComponentsForUpdate() {
+   RegisterCookieReadinessListComponent(cus);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   RegisterAmountExtractionHeuristicRegexesComponent(cus);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(crbug.com/364795294): Support other platforms.
-   RegisterTranslateKitComponent(cus, g_browser_process->local_state(),
-                                 /*force_install=*/false,
+   if (features::IsWasmTtsComponentUpdaterEnabled()) {
+     RegisterWasmTtsEngineComponent(cus);
+   }
diff --git a/chromium/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc b/chromium/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
new file mode 100644
index 0000000000..97dc371da1
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.cc
@@ -0,0 +1,35 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/component_updater/wasm_tts_engine_component_installer.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/component_updater/wasm_tts_engine_component_installer.cc
+@@ -8,7 +8,7 @@
+ #include "base/functional/callback.h"
+ #include "base/logging.h"
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/accessibility/embedded_a11y_extension_loader.h"
+ #include "chrome/common/extensions/extension_constants.h"
+ #include "components/crx_file/id_util.h"
+@@ -70,7 +70,7 @@ void WasmTtsEngineComponentInstallerPoli
+   VLOG(1) << "Component ready, version " << version.GetString() << " in "
+           << install_dir.value();
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (features::IsWasmTtsComponentUpdaterEnabled() &&
+       !features::IsWasmTtsEngineAutoInstallDisabled()) {
+     EmbeddedA11yExtensionLoader::GetInstance()->Init();
+@@ -121,7 +121,7 @@ void RegisterWasmTtsEngineComponent(Comp
+   installer->Register(cus, base::OnceClosure());
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::string WasmTtsEngineComponentInstallerPolicy::GetId() {
+   return crx_file::id_util::GenerateIdFromHash((kWasmTtsEnginePublicKeySHA256));
+ }
diff --git a/chromium/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h b/chromium/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
new file mode 100644
index 0000000000..e9d2337f42
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_component__updater_wasm__tts__engine__component__installer.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/component_updater/wasm_tts_engine_component_installer.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/component_updater/wasm_tts_engine_component_installer.h
+@@ -27,7 +27,7 @@ class WasmTtsEngineComponentInstallerPol
+   WasmTtsEngineComponentInstallerPolicy& operator=(
+       const WasmTtsEngineComponentInstallerPolicy&) = delete;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   static std::string GetId();
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/chromium/patches/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/chromium/patches/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
index 3874fd84eb..0dfa75336e 100644
--- a/chromium/patches/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
+++ b/chromium/patches/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
 @@ -41,7 +41,7 @@
  #include "third_party/widevine/cdm/buildflags.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_component__updater_widevine__cdm__component__insta
  #include "base/path_service.h"
  #include "chrome/common/chrome_paths.h"
  #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
-@@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Has
+@@ -73,7 +73,7 @@ static_assert(std::size(kWidevineSha2Has
  const char ImageLoaderComponentName[] = "WidevineCdm";
  #endif
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_component__updater_widevine__cdm__component__insta
  // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
  // zygote is locked down. As a result there is no need to register the CDM
  // with Chrome as it can't be used until Chrome is restarted.
-@@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const
+@@ -101,7 +101,7 @@ void RegisterWidevineCdmWithChrome(const
  }
  #endif  // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
@@ -33,12 +33,12 @@ $NetBSD: patch-chrome_browser_component__updater_widevine__cdm__component__insta
  // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
  // zygote is locked down. To locate the Widevine CDM at startup, a hint file
  // is used. Update the hint file with the new Widevine CDM path.
-@@ -398,7 +398,7 @@ void WidevineCdmComponentInstallerPolicy
+@@ -392,7 +392,7 @@ void WidevineCdmComponentInstallerPolicy
      return;
    }
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    VLOG(1) << "Updating hint file with Widevine CDM " << cdm_version;
  
    // This is running on a thread that allows IO, so simply update the hint file.
diff --git a/chromium/patches/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc b/chromium/patches/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
index 9085a4e475..2ddaa5f187 100644
--- a/chromium/patches/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
+++ b/chromium/patches/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc
 @@ -68,7 +68,7 @@ void ChromeProtocolHandlerRegistryDelega
  // If true default protocol handlers will be removed if the OS level
diff --git a/chromium/patches/patch-chrome_browser_defaults.cc b/chromium/patches/patch-chrome_browser_defaults.cc
index 86c8ebcdcc..3de3b46767 100644
--- a/chromium/patches/patch-chrome_browser_defaults.cc
+++ b/chromium/patches/patch-chrome_browser_defaults.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_defaults.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/defaults.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/defaults.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/defaults.cc
-@@ -44,7 +44,7 @@ const bool kShowHelpMenuItemIcon = true;
+@@ -31,7 +31,7 @@ const bool kAlwaysCreateTabbedBrowserOnS
  const bool kShowHelpMenuItemIcon = false;
  #endif
  
diff --git a/chromium/patches/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/chromium/patches/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
index 9b5e23f5d8..5c18161caa 100644
--- a/chromium/patches/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
-@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> 
+@@ -26,7 +26,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> 
+ #if BUILDFLAG(IS_CHROMEOS)
    return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
        local_state);
- #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);
  #else
-   NOTREACHED_IN_MIGRATION();
+   NOTREACHED();
diff --git a/chromium/patches/patch-chrome_browser_devtools_features.cc b/chromium/patches/patch-chrome_browser_devtools_features.cc
new file mode 100644
index 0000000000..d58cd12383
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_devtools_features.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/devtools/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/devtools/features.cc
+@@ -157,7 +157,7 @@ BASE_FEATURE(kDevToolsAiGeneratedTimelin
+              "DevToolsAiGeneratedTimelineLabels",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If enabled, DevTools does not accept remote debugging connections unless
+ // using a non-default user data dir via the --user-data-dir switch.
+ BASE_FEATURE(kDevToolsDebuggingRestrictions,
diff --git a/chromium/patches/patch-chrome_browser_devtools_features.h b/chromium/patches/patch-chrome_browser_devtools_features.h
new file mode 100644
index 0000000000..acbae5b433
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_devtools_features.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/devtools/features.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/devtools/features.h
+@@ -89,7 +89,7 @@ BASE_DECLARE_FEATURE(kDevToolsCssValueTr
+ 
+ BASE_DECLARE_FEATURE(kDevToolsAiGeneratedTimelineLabels);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kDevToolsDebuggingRestrictions);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/chromium/patches/patch-chrome_browser_devtools_remote__debugging__server.cc b/chromium/patches/patch-chrome_browser_devtools_remote__debugging__server.cc
new file mode 100644
index 0000000000..6d68c578ec
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_devtools_remote__debugging__server.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/devtools/remote_debugging_server.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/devtools/remote_debugging_server.cc
+@@ -109,7 +109,7 @@ IsRemoteDebuggingAllowed(const std::opti
+         RemoteDebuggingServer::NotStartedReason::kDisabledByPolicy);
+   }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kDevToolsDebuggingRestrictions) &&
+       is_default_user_data_dir.value_or(true)) {
+     return base::unexpected(
diff --git a/chromium/patches/patch-chrome_browser_diagnostics_diagnostics__writer.h b/chromium/patches/patch-chrome_browser_diagnostics_diagnostics__writer.h
index 35f4f2f234..d5d8bfa7af 100644
--- a/chromium/patches/patch-chrome_browser_diagnostics_diagnostics__writer.h
+++ b/chromium/patches/patch-chrome_browser_diagnostics_diagnostics__writer.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_diagnostics_diagnostics__writer.h,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/diagnostics/diagnostics_writer.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/diagnostics/diagnostics_writer.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/diagnostics/diagnostics_writer.h
-@@ -14,6 +14,8 @@ namespace diagnostics {
+@@ -16,6 +16,8 @@ namespace diagnostics {
  // Console base class used internally.
  class SimpleConsole;
  
diff --git a/chromium/patches/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/chromium/patches/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index dab3a28bed..f4f2646c57 100644
--- a/chromium/patches/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/chromium/patches/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_download_chrome__download__manager__delegate.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1851,7 +1851,7 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -1864,7 +1864,7 @@ void ChromeDownloadManagerDelegate::OnDo
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
      const base::FilePath& path) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_download_chrome__download__manager__delegate.cc,v
    if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
      return !download_prefs_->ShouldOpenPdfInSystemReader();
    }
-@@ -1994,7 +1994,7 @@ void ChromeDownloadManagerDelegate::Chec
+@@ -2000,7 +2000,7 @@ void ChromeDownloadManagerDelegate::Chec
      content::CheckDownloadAllowedCallback check_download_allowed_cb) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -24,12 +24,12 @@ $NetBSD: patch-chrome_browser_download_chrome__download__manager__delegate.cc,v
    // Don't download pdf if it is a file URL, as that might cause an infinite
    // download loop if Chrome is not the system pdf viewer.
    if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
-@@ -2076,7 +2076,7 @@ void ChromeDownloadManagerDelegate::Chec
+@@ -2082,7 +2082,7 @@ void ChromeDownloadManagerDelegate::Chec
    DCHECK(download_item->IsSavePackageDownload());
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-     BUILDFLAG(IS_MAC)) &&                                                 \
++     BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) &&                                                 \
+     BUILDFLAG(SAFE_BROWSING_AVAILABLE)
    std::optional<enterprise_connectors::AnalysisSettings> settings =
-       safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item);
- 
+       safe_browsing::ShouldUploadBinaryForDeepScanning(download_item);
diff --git a/chromium/patches/patch-chrome_browser_download_download__commands.cc b/chromium/patches/patch-chrome_browser_download_download__commands.cc
index 9ed2669ffd..f80800d40b 100644
--- a/chromium/patches/patch-chrome_browser_download_download__commands.cc
+++ b/chromium/patches/patch-chrome_browser_download_download__commands.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_download_download__commands.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/download/download_commands.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/download/download_commands.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/download/download_commands.cc
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
  #include "ui/base/clipboard/scoped_clipboard_writer.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_download_download__commands.cc,v 1.1 2025/02/06 09
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
  #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
-@@ -166,7 +166,7 @@ void DownloadCommands::ExecuteCommand(Co
+@@ -177,7 +177,7 @@ void DownloadCommands::ExecuteCommand(Co
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-chrome_browser_download_download__commands.h b/chromium/patches/patch-chrome_browser_download_download__commands.h
index 06abc54b73..4472c60dc3 100644
--- a/chromium/patches/patch-chrome_browser_download_download__commands.h
+++ b/chromium/patches/patch-chrome_browser_download_download__commands.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_download_download__commands.h,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/download/download_commands.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/download/download_commands.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/download/download_commands.h
 @@ -66,7 +66,7 @@ class DownloadCommands {
    void ExecuteCommand(Command command);
diff --git a/chromium/patches/patch-chrome_browser_download_download__file__picker.cc b/chromium/patches/patch-chrome_browser_download_download__file__picker.cc
index 2f44c42c94..ff8931bd80 100644
--- a/chromium/patches/patch-chrome_browser_download_download__file__picker.cc
+++ b/chromium/patches/patch-chrome_browser_download_download__file__picker.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_download_download__file__picker.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/download/download_file_picker.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/download/download_file_picker.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/download/download_file_picker.cc
 @@ -18,7 +18,7 @@
  #include "content/public/browser/web_contents.h"
  #include "ui/shell_dialogs/selected_file_info.h"
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/browser_list.h"
  #include "chrome/browser/ui/browser_window.h"
  #include "ui/aura/window.h"
@@ -19,8 +19,8 @@ $NetBSD: patch-chrome_browser_download_download__file__picker.cc,v 1.1 2025/02/0
    // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc).
    // and windows.Here we make owning_window host to browser current active
    // window if it is null. https://crbug.com/1301898
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    if (!owning_window || !owning_window->GetHost()) {
      owning_window = BrowserList::GetInstance()
                          ->GetLastActive()
diff --git a/chromium/patches/patch-chrome_browser_download_download__item__model.cc b/chromium/patches/patch-chrome_browser_download_download__item__model.cc
index 0568bbb059..a6eb7f9e85 100644
--- a/chromium/patches/patch-chrome_browser_download_download__item__model.cc
+++ b/chromium/patches/patch-chrome_browser_download_download__item__model.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_download_download__item__model.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/download/download_item_model.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/download/download_item_model.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/download/download_item_model.cc
-@@ -760,7 +760,7 @@ bool DownloadItemModel::IsCommandChecked
+@@ -772,7 +772,7 @@ bool DownloadItemModel::IsCommandChecked
               download_crx_util::IsExtensionDownload(*download_);
      case DownloadCommands::ALWAYS_OPEN_TYPE:
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_download_download__item__model.cc,v 1.1 2025/02/06
        if (download_commands->CanOpenPdfInSystemViewer()) {
          DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
          return prefs->ShouldOpenPdfInSystemReader();
-@@ -808,7 +808,7 @@ void DownloadItemModel::ExecuteCommand(D
+@@ -820,7 +820,7 @@ void DownloadItemModel::ExecuteCommand(D
                                           DownloadCommands::ALWAYS_OPEN_TYPE);
        DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_download_download__item__model.cc,v 1.1 2025/02/06
        if (download_commands->CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1195,7 +1195,7 @@ void DownloadItemModel::DetermineAndSetS
+@@ -1206,7 +1206,7 @@ void DownloadItemModel::DetermineAndSetS
      return;
    }
  
diff --git a/chromium/patches/patch-chrome_browser_download_download__prefs.cc b/chromium/patches/patch-chrome_browser_download_download__prefs.cc
index d55c3ba1e1..4e2a842fe9 100644
--- a/chromium/patches/patch-chrome_browser_download_download__prefs.cc
+++ b/chromium/patches/patch-chrome_browser_download_download__prefs.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_download_download__prefs.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/download/download_prefs.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/download/download_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/download/download_prefs.cc
 @@ -11,6 +11,7 @@
  #include <vector>
@@ -14,8 +14,8 @@ $NetBSD: patch-chrome_browser_download_download__prefs.cc,v 1.1 2025/02/06 09:57
  #include "base/feature_list.h"
  #include "base/files/file_util.h"
  #include "base/functional/bind.h"
-@@ -60,6 +61,10 @@
- #include "chrome/browser/flags/android/chrome_feature_list.h"
+@@ -61,6 +62,10 @@
+ #include "components/safe_browsing/content/common/file_type_policies.h"
  #endif
  
 +#if BUILDFLAG(IS_BSD)
@@ -25,7 +25,7 @@ $NetBSD: patch-chrome_browser_download_download__prefs.cc,v 1.1 2025/02/06 09:57
  using content::BrowserContext;
  using content::BrowserThread;
  using content::DownloadManager;
-@@ -70,7 +75,7 @@ namespace {
+@@ -74,7 +79,7 @@ namespace {
  // Consider downloads 'dangerous' if they go to the home directory on Linux and
  // to the desktop on any platform.
  bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@@ -34,8 +34,8 @@ $NetBSD: patch-chrome_browser_download_download__prefs.cc,v 1.1 2025/02/06 09:57
    base::FilePath home_dir = base::GetHomeDir();
    if (download_path == home_dir) {
      return true;
-@@ -176,7 +181,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_MAC)
@@ -43,7 +43,7 @@ $NetBSD: patch-chrome_browser_download_download__prefs.cc,v 1.1 2025/02/06 09:57
    should_open_pdf_in_system_reader_ =
        prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
  #endif
-@@ -300,7 +305,7 @@ void DownloadPrefs::RegisterProfilePrefs
+@@ -307,7 +312,7 @@ void DownloadPrefs::RegisterProfilePrefs
    registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
                                   default_download_path);
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -52,7 +52,7 @@ $NetBSD: patch-chrome_browser_download_download__prefs.cc,v 1.1 2025/02/06 09:57
    registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
  #endif
  #if BUILDFLAG(IS_ANDROID)
-@@ -467,7 +472,7 @@ void DownloadPrefs::DisableAutoOpenByUse
+@@ -480,7 +485,7 @@ void DownloadPrefs::DisableAutoOpenByUse
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -61,7 +61,7 @@ $NetBSD: patch-chrome_browser_download_download__prefs.cc,v 1.1 2025/02/06 09:57
  void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
    if (should_open_pdf_in_system_reader_ == should_open)
      return;
-@@ -493,7 +498,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste
+@@ -506,7 +511,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste
  
  void DownloadPrefs::ResetAutoOpenByUser() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -70,7 +70,7 @@ $NetBSD: patch-chrome_browser_download_download__prefs.cc,v 1.1 2025/02/06 09:57
    SetShouldOpenPdfInSystemReader(false);
  #endif
    auto_open_by_user_.clear();
-@@ -530,7 +535,7 @@ void DownloadPrefs::SaveAutoOpenState() 
+@@ -543,7 +548,7 @@ void DownloadPrefs::SaveAutoOpenState() 
  bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
  #if BUILDFLAG(IS_CHROMEOS)
    return false;  // There is no UI for auto-open on ChromeOS.
@@ -79,7 +79,7 @@ $NetBSD: patch-chrome_browser_download_download__prefs.cc,v 1.1 2025/02/06 09:57
    return ShouldOpenPdfInSystemReader();
  #else
    return false;
-@@ -682,7 +687,14 @@ base::FilePath DownloadPrefs::SanitizeDo
+@@ -625,7 +630,14 @@ base::FilePath DownloadPrefs::SanitizeDo
  #else
    // If the stored download directory is an absolute path, we presume it's
    // correct; there's not really much more validation we can do here.
diff --git a/chromium/patches/patch-chrome_browser_download_download__prefs.h b/chromium/patches/patch-chrome_browser_download_download__prefs.h
index 099b792256..ad35a1c108 100644
--- a/chromium/patches/patch-chrome_browser_download_download__prefs.h
+++ b/chromium/patches/patch-chrome_browser_download_download__prefs.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_download_download__prefs.h,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/download/download_prefs.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/download/download_prefs.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/download/download_prefs.h
-@@ -115,7 +115,7 @@ class DownloadPrefs {
+@@ -107,7 +107,7 @@ class DownloadPrefs {
    void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_download_download__prefs.h,v 1.1 2025/02/06 09:57:
    // Store the user preference to disk. If |should_open| is true, also disable
    // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
    void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -179,7 +179,7 @@ class DownloadPrefs {
+@@ -171,7 +171,7 @@ class DownloadPrefs {
    std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
index 4bec788cfb..5f1ff4793a 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
-@@ -150,7 +150,7 @@ AnalysisServiceSettings::AnalysisService
+@@ -151,7 +151,7 @@ AnalysisServiceSettings::AnalysisService
    const char* verification_key = kKeyWindowsVerification;
  #elif BUILDFLAG(IS_MAC)
    const char* verification_key = kKeyMacVerification;
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_common.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_common.cc
index 79eb92c73f..f758934a6b 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_common.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_common.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_common.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/common.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/common.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/common.cc
-@@ -23,7 +23,7 @@
- #include "components/policy/core/common/policy_loader_lacros.h"
+@@ -17,7 +17,7 @@
+ #include "components/user_manager/user.h"
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_enterprise_connectors_common.cc,v 1.1 2025/02/06 0
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "components/prefs/pref_service.h"
  #endif
-@@ -266,7 +266,7 @@ std::string GetProfileEmail(Profile* pro
+@@ -192,7 +192,7 @@ std::string GetProfileEmail(Profile* pro
    std::string email =
        GetProfileEmail(IdentityManagerFactory::GetForProfile(profile));
  
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_connectors__service.cc
index e15bf7cb7b..374f7c294d 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_connectors__service.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_connectors__service.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_connectors__service.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -510,7 +510,7 @@ bool ConnectorsService::ConnectorsEnable
- 
+@@ -476,7 +476,7 @@ policy::PolicyScope ConnectorsService::G
+ bool ConnectorsService::ConnectorsEnabled() const {
    Profile* profile = Profile::FromBrowserContext(context_);
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
index 27fea1b94f..3bba2533eb 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc
 @@ -10,7 +10,7 @@
  #include "chrome/browser/profiles/profile.h"
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
index 60a5bb0a11..6ce40a829b 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
-@@ -23,7 +23,7 @@
+@@ -22,7 +22,7 @@
  #include "components/policy/core/common/management/management_service.h"
  #include "content/public/browser/browser_context.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_enterprise_connectors_device__trust_device__trust_
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/browser_attestation_service.h"
  #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/device_attester.h"
-@@ -54,7 +54,7 @@ bool IsProfileManaged(Profile* profile) 
+@@ -53,7 +53,7 @@ bool IsProfileManaged(Profile* profile) 
    return management_service && management_service->IsManaged();
  }
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_enterprise_connectors_device__trust_device__trust_
  policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) {
    policy::CloudPolicyManager* user_policy_manager =
        profile->GetCloudPolicyManager();
-@@ -106,7 +106,7 @@ DeviceTrustServiceFactory::DeviceTrustSe
+@@ -105,7 +105,7 @@ DeviceTrustServiceFactory::DeviceTrustSe
    DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
    DependsOn(policy::ManagementServiceFactory::GetInstance());
  
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
index 65ce3313b8..0d75581cbf 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc
 @@ -19,7 +19,7 @@
  
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
index c59601df7b..f036e8f183 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc,v 1.1 2025/02/06 09:57:46 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc
 @@ -13,7 +13,7 @@
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h"
@@ -23,4 +23,4 @@ $NetBSD: patch-chrome_browser_enterprise_connectors_device__trust_key__managemen
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return std::make_unique<LinuxKeyPersistenceDelegate>();
  #else
-   NOTREACHED_IN_MIGRATION();
+   NOTREACHED();
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
index 9ef939e9c4..669b9250ab 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
@@ -1,23 +1,23 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
-@@ -21,7 +21,7 @@
- #include "chrome/browser/profiles/profile.h"
- #include "components/policy/core/common/management/management_service.h"
+@@ -23,7 +23,7 @@
+ #include "chrome/browser/enterprise/connectors/connectors_service.h"
+ #endif  // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  #include "base/check.h"
  #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
  #include "chrome/browser/enterprise/core/dependency_factory_impl.h"
-@@ -58,7 +58,7 @@ std::unique_ptr<SignalsService> CreateSi
-       enterprise_signals::ContextInfoFetcher::CreateInstance(
+@@ -63,7 +63,7 @@ std::unique_ptr<SignalsService> CreateSi
            profile, ConnectorsServiceFactory::GetForBrowserContext(profile))));
+ #endif  // BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
index 197d90718c..b22cc0ebe9 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
 @@ -13,7 +13,7 @@ namespace enterprise_connectors {
  
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
index 7be0edb740..021798f5e8 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
 @@ -20,7 +20,7 @@
  
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
index c3dbe36187..cb57c70356 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
-@@ -58,7 +58,7 @@
+@@ -53,7 +53,7 @@
  #include "base/strings/utf_string_conversions.h"
  #endif
  
@@ -15,17 +15,8 @@ $NetBSD: patch-chrome_browser_enterprise_connectors_reporting_realtime__reportin
  #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "components/device_signals/core/browser/signals_aggregator.h"
-@@ -143,7 +143,7 @@ void UploadSecurityEventReport(base::Val
-       std::move(upload_callback));
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void PopulateSignals(base::Value::Dict event,
-                      policy::CloudPolicyClient* client,
-                      std::string name,
-@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPast
-                            /*include_profile_user_name=*/false);
+@@ -158,7 +158,7 @@ void RealtimeReportingClient::ReportPast
+                                      /*include_profile_user_name=*/false);
  }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -33,21 +24,21 @@ $NetBSD: patch-chrome_browser_enterprise_connectors_reporting_realtime__reportin
  
  void AddCrowdstrikeSignalsToEvent(
      base::Value::Dict& event,
-@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEven
-   if (include_profile_user_name) {
-     event.Set(kKeyProfileUserName, GetProfileUserName());
-   }
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   Profile* profile = Profile::FromBrowserContext(context_);
-   device_signals::SignalsAggregator* signals_aggregator =
-       enterprise_signals::SignalsAggregatorFactory::GetForProfile(profile);
-@@ -503,7 +503,7 @@ std::string RealtimeReportingClient::Get
-   std::string username =
+@@ -194,7 +194,7 @@ std::string RealtimeReportingClient::Get
+   username_ =
        identity_manager_ ? GetProfileEmail(identity_manager_) : std::string();
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (username.empty()) {
-     username = Profile::FromBrowserContext(context_)->GetPrefs()->GetString(
+   if (username_.empty()) {
+     username_ = Profile::FromBrowserContext(context_)->GetPrefs()->GetString(
          enterprise_signin::prefs::kProfileUserEmail);
+@@ -246,7 +246,7 @@ std::string RealtimeReportingClient::Get
+   return client_id;
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet)
+ void RealtimeReportingClient::MaybeCollectDeviceSignalsAndReportEvent(
+     ::chrome::cros::reporting::proto::Event event,
+     policy::CloudPolicyClient* client,
diff --git a/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
index 5bdec97939..fee9de026b 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
+++ b/chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
-@@ -17,7 +17,7 @@
+@@ -19,7 +19,7 @@
  #include "components/keyed_service/core/keyed_service.h"
  #include "components/policy/core/common/cloud/cloud_policy_client.h"
  
@@ -15,7 +15,16 @@ $NetBSD: patch-chrome_browser_enterprise_connectors_reporting_realtime__reportin
  #include "components/device_signals/core/browser/signals_types.h"
  #endif
  
-@@ -165,7 +165,7 @@ class RealtimeReportingClient : public K
+@@ -113,7 +113,7 @@ class RealtimeReportingClient : public R
+       const std::string& dm_token) override;
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet)
+   // DEPRECATED: Use MaybeCollectDeviceSignalsAndReportEvent(Event, ...).
+   void MaybeCollectDeviceSignalsAndReportEventDeprecated(
+       base::Value::Dict event,
+@@ -163,7 +163,7 @@ class RealtimeReportingClient : public R
    base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this};
  };
  
diff --git a/chromium/patches/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc b/chromium/patches/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc
deleted file mode 100644
index cf46892130..0000000000
--- a/chromium/patches/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc
-@@ -13,7 +13,7 @@
- #include "components/enterprise/browser/identifiers/identifiers_prefs.h"
- #include "components/prefs/pref_service.h"
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "components/enterprise/browser/controller/browser_dm_token_storage.h"
- #if BUILDFLAG(IS_WIN)
- #include "base/strings/utf_string_conversions.h"
-@@ -94,7 +94,7 @@ std::string ProfileIdDelegateImpl::GetDe
- }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- // Gets the device ID from the BrowserDMTokenStorage.
- std::string ProfileIdDelegateImpl::GetId() {
-   std::string device_id =
diff --git a/chromium/patches/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc b/chromium/patches/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
index deefcd31ea..e5a75a64af 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
 @@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileA
    // TODO(crbug.com/40267996): Add actual domains with attribute names.
diff --git a/chromium/patches/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc b/chromium/patches/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
index 9fa8a0a27a..8ad69fc26b 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc
 @@ -11,7 +11,7 @@
  #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chromium/patches/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc b/chromium/patches/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
new file mode 100644
index 0000000000..4d6c142175
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_enterprise_signals_context__info__fetcher.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/enterprise/signals/context_info_fetcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/enterprise/signals/context_info_fetcher.cc
+@@ -179,6 +179,8 @@ std::vector<std::string> ContextInfoFetc
+ SettingValue ContextInfoFetcher::GetOSFirewall() {
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+   return device_signals::GetOSFirewall();
++#elif BUILDFLAG(IS_OPENBSD)
++  return SettingValue::ENABLED;
+ #elif BUILDFLAG(IS_CHROMEOS)
+   return GetChromeosFirewall();
+ #else
+@@ -198,7 +200,7 @@ ScopedUfwConfigPathForTesting::~ScopedUf
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+ std::vector<std::string> ContextInfoFetcher::GetDnsServers() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   return device_signals::GetSystemDnsServers();
+ #else
+   return std::vector<std::string>();
diff --git a/chromium/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/chromium/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
index ede3e3f5ee..95f94aaea2 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
+++ b/chromium/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_enterprise_signals_device__info__fetcher.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/signals/device_info_fetcher.cc
 @@ -10,7 +10,7 @@
  #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_enterprise_signals_device__info__fetcher.cc,v 1.1
  #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
  #endif
  
-@@ -67,7 +67,7 @@ std::unique_ptr<DeviceInfoFetcher> Devic
+@@ -76,7 +76,7 @@ std::unique_ptr<DeviceInfoFetcher> Devic
    return CreateInstanceInternal();
  }
  
diff --git a/chromium/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc b/chromium/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc
deleted file mode 100644
index 5900f86819..0000000000
--- a/chromium/patches/patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-chrome_browser_enterprise_signals_device__info__fetcher__linux.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc
-@@ -4,11 +4,22 @@
- 
- #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h"
- 
-+#include "build/build_config.h"
-+
- #if defined(USE_GIO)
- #include <gio/gio.h>
- #endif  // defined(USE_GIO)
- #include <sys/stat.h>
-+#if !BUILDFLAG(IS_BSD)
- #include <sys/sysmacros.h>
-+#endif
-+
-+#if BUILDFLAG(IS_BSD)
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <ifaddrs.h>
-+#include <net/if_dl.h>
-+#endif
- 
- #include <string>
- 
-@@ -117,6 +128,7 @@ SettingValue GetScreenlockSecured() {
- // Implements the logic from the native host installation script. First find the
- // root device identifier, then locate its parent and get its type.
- SettingValue GetDiskEncrypted() {
-+#if !BUILDFLAG(IS_BSD)
-   struct stat info;
-   // First figure out the device identifier. Fail fast if this fails.
-   if (stat("/", &info) != 0)
-@@ -138,11 +150,35 @@ SettingValue GetDiskEncrypted() {
-     }
-     return SettingValue::UNKNOWN;
-   }
-+#endif
-   return SettingValue::DISABLED;
- }
- 
- std::vector<std::string> GetMacAddresses() {
-   std::vector<std::string> result;
-+#if BUILDFLAG(IS_BSD)
-+  struct ifaddrs* ifa = nullptr;
-+
-+  if (getifaddrs(&ifa) != 0)
-+    return result;
-+
-+  struct ifaddrs* interface = ifa;
-+  for (; interface != nullptr; interface = interface->ifa_next) {
-+    if (interface->ifa_addr == nullptr ||
-+        interface->ifa_addr->sa_family != AF_LINK) {
-+      continue;
-+    }
-+    struct sockaddr_dl* sdl =
-+        reinterpret_cast<struct sockaddr_dl*>(interface->ifa_addr);
-+    if (!sdl || sdl->sdl_alen != 6)
-+      continue;
-+    char* link_address = static_cast<char*>(LLADDR(sdl));
-+    result.push_back(base::StringPrintf(
-+        "%02x:%02x:%02x:%02x:%02x:%02x", link_address[0] & 0xff,
-+        link_address[1] & 0xff, link_address[2] & 0xff, link_address[3] & 0xff,
-+        link_address[4] & 0xff, link_address[5] & 0xff));
-+  }
-+#else
-   base::DirReaderPosix reader("/sys/class/net");
-   if (!reader.IsValid())
-     return result;
-@@ -165,6 +201,7 @@ std::vector<std::string> GetMacAddresses
-                               &address);
-     result.push_back(address);
-   }
-+#endif
-   return result;
- }
- 
diff --git a/chromium/patches/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h b/chromium/patches/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
index 7b58d3f28e..aaf22e9fd5 100644
--- a/chromium/patches/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
+++ b/chromium/patches/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_enterprise_signin_enterprise__signin__service.h,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/enterprise/signin/enterprise_signin_service.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/enterprise/signin/enterprise_signin_service.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/enterprise/signin/enterprise_signin_service.h
 @@ -9,7 +9,7 @@
  
diff --git a/chromium/patches/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc b/chromium/patches/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
new file mode 100644
index 0000000000..c2062b8ff2
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc
+@@ -94,7 +94,7 @@ void ManagedProfileRequiredPage::Command
+ 
+   switch (cmd) {
+     case security_interstitials::CMD_DONT_PROCEED:
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       if (ManagedProfileRequiredNavigationThrottle::IsBlockingNavigations(
+               web_contents()->GetBrowserContext())) {
+         ManagedProfileRequiredNavigationThrottle::ShowBlockedWindow(
diff --git a/chromium/patches/patch-chrome_browser_enterprise_util_managed__browser__utils.cc b/chromium/patches/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
new file mode 100644
index 0000000000..cbc5b1622e
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_enterprise_util_managed__browser__utils.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/enterprise/util/managed_browser_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/enterprise/util/managed_browser_utils.cc
+@@ -222,7 +222,7 @@ void SetUserAcceptedAccountManagement(Pr
+       profile_manager->GetProfileAttributesStorage()
+           .GetProfileAttributesWithPath(profile->GetPath());
+   if (entry) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     SetEnterpriseProfileLabel(profile);
+ #endif
+     entry->SetUserAcceptedAccountManagement(accepted);
diff --git a/chromium/patches/patch-chrome_browser_extensions_BUILD.gn b/chromium/patches/patch-chrome_browser_extensions_BUILD.gn
index c16ab925f5..f18568daa4 100644
--- a/chromium/patches/patch-chrome_browser_extensions_BUILD.gn
+++ b/chromium/patches/patch-chrome_browser_extensions_BUILD.gn
@@ -1,19 +1,19 @@
-$NetBSD: patch-chrome_browser_extensions_BUILD.gn,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1439,6 +1439,10 @@ source_set("extensions") {
-     deps += [ "//chrome/services/printing/public/mojom" ]
-   }
+@@ -1464,6 +1464,10 @@ source_set("extensions") {
+       deps += [ "//chrome/services/printing/public/mojom" ]
+     }
  
-+  if (is_bsd) {
-+    sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ]
-+  }
++    if (is_bsd) {
++      sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ]
++    }
 +
-   if (enable_pdf) {
-     deps += [
-       "//chrome/browser/pdf",
+     if (enable_pdf) {
+       deps += [
+         "//chrome/browser/pdf",
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/chromium/patches/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
deleted file mode 100644
index ca19973cbf..0000000000
--- a/chromium/patches/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
-@@ -42,7 +42,7 @@
- #include "pdf/buildflags.h"
- #include "printing/buildflags/buildflags.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
- #endif
- 
-@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedService
-   extensions::SettingsPrivateEventRouterFactory::GetInstance();
-   extensions::SettingsOverridesAPI::GetFactoryInstance();
-   extensions::SidePanelService::GetFactoryInstance();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   extensions::SystemIndicatorManagerFactory::GetInstance();
- #endif
-   extensions::TabGroupsEventRouterFactory::GetInstance();
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
index f91280253f..88ff230284 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
 @@ -24,7 +24,7 @@
  #include "base/win/registry.h"
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
index f32690afcc..610242deb3 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc
 @@ -8,7 +8,7 @@
  
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
index 5d0cd2f0d8..8785c2872c 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
+++ b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h
 @@ -7,7 +7,7 @@
  
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
index 6f057291f9..52e2511c40 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
-@@ -42,7 +42,7 @@
+@@ -40,7 +40,7 @@
  #include "components/reporting/util/statusor.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_extensions_api_enterprise__reporting__private_ente
  #include <optional>
  
  #include "base/strings/string_util.h"
-@@ -160,7 +160,7 @@ api::enterprise_reporting_private::Conte
+@@ -156,7 +156,7 @@ api::enterprise_reporting_private::Conte
  }
  
  bool AllowClientCertificateReportingForUsers() {
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_extensions_api_enterprise__reporting__private_ente
    return base::FeatureList::IsEnabled(
        enterprise_signals::features::kAllowClientCertificateReportingForUsers);
  #else
-@@ -173,7 +173,7 @@ bool IsProfilePrefManaged(Profile* profi
+@@ -169,7 +169,7 @@ bool IsProfilePrefManaged(Profile* profi
    return pref && pref->IsManaged();
  }
  
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_extensions_api_enterprise__reporting__private_ente
  
  device_signals::SignalsAggregationRequest CreateAggregationRequest(
      device_signals::SignalName signal_name) {
-@@ -235,7 +235,7 @@ EnterpriseReportingPrivateGetDeviceIdFun
+@@ -231,7 +231,7 @@ EnterpriseReportingPrivateGetDeviceIdFun
  
  // getPersistentSecret
  
@@ -42,7 +42,7 @@ $NetBSD: patch-chrome_browser_extensions_api_enterprise__reporting__private_ente
  
  EnterpriseReportingPrivateGetPersistentSecretFunction::
      EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
-@@ -673,7 +673,7 @@ void EnterpriseReportingPrivateEnqueueRe
+@@ -671,7 +671,7 @@ void EnterpriseReportingPrivateEnqueueRe
  }
  #endif
  
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
index a156732638..40b3a3abe9 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
+++ b/chromium/patches/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
 @@ -20,7 +20,7 @@
  #include "components/reporting/proto/synced/record.pb.h"
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/chromium/patches/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
index 5bea8b5369..c38c63a00e 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
 @@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<
  
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/chromium/patches/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
index 6b97947c50..4c08779aec 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
-@@ -417,7 +417,7 @@ bool ChromeManagementAPIDelegate::Launch
+@@ -410,7 +410,7 @@ bool ChromeManagementAPIDelegate::Launch
    apps::LaunchContainer launch_container =
        GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
    Profile* profile = Profile::FromBrowserContext(context);
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc b/chromium/patches/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
index a74a8e2c4d..a32b0c479a 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/messaging/launch_context_posix.cc
 @@ -84,7 +84,7 @@ std::optional<LaunchContext::ProcessStat
  
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/chromium/patches/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
index 9c8925981f..9584db9b1b 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
-@@ -652,7 +652,7 @@ void PasswordsPrivateDelegateImpl::OnFet
+@@ -634,7 +634,7 @@ void PasswordsPrivateDelegateImpl::OnFet
  }
  
  void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
index d025d90c8c..862596fe83 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -288,7 +288,11 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
+@@ -292,7 +292,11 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
    } else if (strcmp(os, "linux") == 0) {
      info->os = extensions::api::runtime::PlatformOs::kLinux;
    } else if (strcmp(os, "openbsd") == 0) {
@@ -17,5 +17,5 @@ $NetBSD: patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__deleg
 +  } else if (strcmp(os, "netbsd") == 0) {
 +    info->os = extensions::api::runtime::PlatformOs::kLinux;
    } else {
-     NOTREACHED_IN_MIGRATION() << "Platform not supported: " << os;
-     return false;
+     NOTREACHED() << "Platform not supported: " << os;
+   }
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/chromium/patches/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
index b032f25021..9b00f361a2 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,21 +1,21 @@
-$NetBSD: patch-chrome_browser_extensions_api_settings__private_prefs__util.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
    (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] =
        settings_api::PrefType::kBoolean;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] =
+   (*s_allowlist)[autofill::prefs::kAutofillBnplEnabled] =
        settings_api::PrefType::kBoolean;
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -214,7 +214,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
    (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] =
        settings_api::PrefType::kBoolean;
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_extensions_api_settings__private_prefs__util.cc,v
    (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
        settings_api::PrefType::kBoolean;
  #endif
-@@ -218,7 +218,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -226,7 +226,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
    (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
    (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList;
    (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
index e2fa78677b..56032b7ddc 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_extensions_api_tabs_tabs__api.cc,v 1.1 2025/02/06 09:57:47 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/tabs/tabs_api.cc
-@@ -896,7 +896,7 @@ ExtensionFunction::ResponseAction Window
+@@ -932,7 +932,7 @@ ExtensionFunction::ResponseAction Window
  // created as minimized.
  // TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
  // TODO(crbug.com/40254339): Find a fix for wayland as well.
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/chromium/patches/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
index eaa62c53d3..c021a856e0 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
 @@ -28,7 +28,7 @@
  #include "extensions/browser/process_manager.h"
diff --git a/chromium/patches/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/chromium/patches/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
index 4aaf33570c..630f611bf9 100644
--- a/chromium/patches/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -914,7 +914,7 @@ void WebstorePrivateBeginInstallWithMani
+@@ -916,7 +916,7 @@ void WebstorePrivateBeginInstallWithMani
  #if BUILDFLAG(IS_CHROMEOS)
        RequestExtensionApproval(contents);
        return;
diff --git a/chromium/patches/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc b/chromium/patches/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc
new file mode 100644
index 0000000000..ae3ba33d2e
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
+@@ -48,7 +48,7 @@ bool IsComponentExtensionAllowlisted(con
+ #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+       extension_misc::kReadingModeGDocsHelperExtensionId,
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+       extension_misc::kTTSEngineExtensionId,
+       extension_misc::kComponentUpdaterTTSEngineExtensionId,
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+@@ -85,7 +85,7 @@ bool IsComponentExtensionAllowlisted(int
+     case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST:
+     case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST_MV3:
+     case IDR_READING_MODE_GDOCS_HELPER_MANIFEST:
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+     case IDR_TTS_ENGINE_MANIFEST:
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+     case IDR_WEBSTORE_MANIFEST:
diff --git a/chromium/patches/patch-chrome_browser_extensions_external__provider__impl.cc b/chromium/patches/patch-chrome_browser_extensions_external__provider__impl.cc
index c09a453808..53fdccc5d2 100644
--- a/chromium/patches/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/chromium/patches/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_extensions_external__provider__impl.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/extensions/external_provider_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -792,7 +792,7 @@ void ExternalProviderImpl::CreateExterna
+@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExterna
  
  #endif  // BUILDFLAG(IS_CHROMEOS)
    if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_extensions_external__provider__impl.cc,v 1.1 2025/
      provider_list->push_back(std::make_unique<ExternalProviderImpl>(
          service,
          base::MakeRefCounted<ExternalPrefLoader>(
-@@ -820,7 +820,7 @@ void ExternalProviderImpl::CreateExterna
+@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExterna
          bundled_extension_creation_flags));
  
      // Define a per-user source of external extensions.
diff --git a/chromium/patches/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc b/chromium/patches/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
new file mode 100644
index 0000000000..9b0e835a48
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_feedback_system__logs_about__system__logs__fetcher.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/feedback/system_logs/about_system_logs_fetcher.cc
+@@ -37,7 +37,7 @@
+ #include "chrome/browser/ash/system_logs/ui_hierarchy_log_source.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
+ #endif
+ 
+@@ -84,7 +84,7 @@ SystemLogsFetcher* BuildAboutSystemLogsF
+   fetcher->AddSource(std::make_unique<KeyboardInfoLogSource>());
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   fetcher->AddSource(std::make_unique<OzonePlatformStateDumpSource>());
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
diff --git a/chromium/patches/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc b/chromium/patches/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
new file mode 100644
index 0000000000..0318ded4a9
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_feedback_system__logs_chrome__system__logs__fetcher.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/feedback/system_logs/chrome_system_logs_fetcher.cc
+@@ -44,7 +44,7 @@
+ #include "services/network/public/cpp/shared_url_loader_factory.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/feedback/system_logs/log_sources/ozone_platform_state_dump_source.h"
+ #endif
+ 
+@@ -101,7 +101,7 @@ SystemLogsFetcher* BuildChromeSystemLogs
+   fetcher->AddSource(std::make_unique<UiHierarchyLogSource>(scrub_data));
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   fetcher->AddSource(std::make_unique<OzonePlatformStateDumpSource>());
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
diff --git a/chromium/patches/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/chromium/patches/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
index 59ec659408..1de4fdbdef 100644
--- a/chromium/patches/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
+++ b/chromium/patches/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -336,7 +336,7 @@ const struct {
+@@ -357,7 +357,7 @@ const struct {
       FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
       kDontBlockChildren},
  #endif
diff --git a/chromium/patches/patch-chrome_browser_first__run_first__run__dialog.h b/chromium/patches/patch-chrome_browser_first__run_first__run__dialog.h
index f3d9fb24da..654ee94533 100644
--- a/chromium/patches/patch-chrome_browser_first__run_first__run__dialog.h
+++ b/chromium/patches/patch-chrome_browser_first__run_first__run__dialog.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_first__run_first__run__dialog.h,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/first_run/first_run_dialog.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/first_run/first_run_dialog.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/first_run/first_run_dialog.h
-@@ -12,7 +12,7 @@
+@@ -9,7 +9,7 @@
+ #include "build/build_config.h"
+ 
  // Hide this function on platforms where the dialog does not exist.
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  
  namespace first_run {
  
diff --git a/chromium/patches/patch-chrome_browser_first__run_first__run__internal.h b/chromium/patches/patch-chrome_browser_first__run_first__run__internal.h
index 5024c455ec..a167f6e3af 100644
--- a/chromium/patches/patch-chrome_browser_first__run_first__run__internal.h
+++ b/chromium/patches/patch-chrome_browser_first__run_first__run__internal.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_first__run_first__run__internal.h,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/first_run/first_run_internal.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/first_run/first_run_internal.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/first_run/first_run_internal.h
-@@ -54,7 +54,7 @@ FirstRunState DetermineFirstRunState(boo
+@@ -53,7 +53,7 @@ FirstRunState DetermineFirstRunState(boo
                                       bool force_first_run,
                                       bool no_first_run);
  
diff --git a/chromium/patches/patch-chrome_browser_flag__descriptions.cc b/chromium/patches/patch-chrome_browser_flag__descriptions.cc
index 356b460a3c..f06a838951 100644
--- a/chromium/patches/patch-chrome_browser_flag__descriptions.cc
+++ b/chromium/patches/patch-chrome_browser_flag__descriptions.cc
@@ -1,30 +1,30 @@
-$NetBSD: patch-chrome_browser_flag__descriptions.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/flag_descriptions.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/flag_descriptions.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/flag_descriptions.cc
-@@ -475,7 +475,7 @@ const char kIsolatedSandboxedIframesDesc
-     "grouping when enabled is per-site.";
+@@ -602,7 +602,7 @@ const char kAutofillEnableAllowlistForBm
+     "Autofill suggestions on the allowlisted merchant websites.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kAutofillEnableAmountExtractionDesktopName[] =
-     "Enable checkout amount extraction on Chrome desktop";
- const char kAutofillEnableAmountExtractionDesktopDescription[] =
-@@ -490,7 +490,7 @@ const char kAutofillEnableAndroidNKeyFor
-     "authentication when autofilling server credit cards.";
+ const char kAutofillEnableAmountExtractionAllowlistDesktopName[] =
+     "Enable loading and querying the checkout amount extraction allowlist on "
+     "Chrome Desktop";
+@@ -626,7 +626,7 @@ const char kAutofillEnableAmountExtracti
+         // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kAutofillEnableBuyNowPayLaterForAffirmName[] =
-     "Enable buy now pay later on Autofill for Affirm";
- const char kAutofillEnableBuyNowPayLaterForAffirmDescription[] =
-@@ -997,7 +997,7 @@ const char kDevicePostureDescription[] =
+ const char kAutofillEnableBuyNowPayLaterName[] =
+     "Enable buy now pay later on Autofill";
+ const char kAutofillEnableBuyNowPayLaterDescription[] =
+@@ -1031,7 +1031,7 @@ const char kDevicePostureDescription[] =
      "Enables Device Posture API (foldable devices)";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -33,43 +33,70 @@ $NetBSD: patch-chrome_browser_flag__descriptions.cc,v 1.1 2025/02/06 09:57:48 wi
  const char kDocumentPictureInPictureAnimateResizeName[] =
      "Document Picture-in-Picture Animate Resize";
  const char kDocumentPictureInPictureAnimateResizeDescription[] =
-@@ -3515,7 +3515,7 @@ const char kShowAutofillTypePredictionsD
-     "text.";
+@@ -1123,7 +1123,7 @@ const char kContextMenuEmptySpaceDescrip
+     "space, a context menu containing page-related items will be shown.";
+ #endif  // BUILDFLAG(IS_ANDROID)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kShowFeaturedEnterpriseSiteSearchName[] =
-     "Show featured Enterprise site search engines in Omnibox";
- const char kShowFeaturedEnterpriseSiteSearchDescription[] =
-@@ -3547,7 +3547,7 @@ const char kSiteInstanceGroupsForDataUrl
-     "but in the same SiteInstanceGroup, and thus the same process.";
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ const char kContextualCueingName[] = "Contextual cueing";
+ const char kContextualCueingDescription[] =
+     "Enables the contextual cueing system to support showing actions.";
+@@ -1563,7 +1563,7 @@ const char kEnableIsolatedWebAppDevModeN
+ const char kEnableIsolatedWebAppDevModeDescription[] =
+     "Enables the installation of unverified Isolated Web Apps";
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kEnableIwaKeyDistributionComponentName[] =
+     "Enable the Iwa Key Distribution component";
+ const char kEnableIwaKeyDistributionComponentDescription[] =
+@@ -3430,7 +3430,7 @@ const char kRetainOmniboxOnFocusDescript
+     "exhibit a change in behavior.";
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kRootScrollbarFollowsTheme[] = "Make scrollbar follow theme";
+ const char kRootScrollbarFollowsThemeDescription[] =
+     "If enabled makes the root scrollbar follow the browser's theme color.";
+@@ -3648,7 +3648,7 @@ const char kDefaultSiteInstanceGroupsDes
+     "SiteInstance.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
- const char kSiteSearchSettingsPolicyDescription[] =
-     "Allow site search engines to be defined by the SiteSearchSettings policy.";
-@@ -3763,7 +3763,7 @@ const char kTranslateForceTriggerOnEngli
+ const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing";
+ const char kPwaNavigationCapturingDescription[] =
+     "Enables opening links from Chrome in an installed PWA. Currently under "
+@@ -3863,7 +3863,7 @@ const char kTranslateForceTriggerOnEngli
      "Force the Translate Triggering on English pages experiment to be enabled "
      "with the selected language model active.";
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kTranslationAPIName[] = "Experimental translation API";
- const char kTranslationAPIDescription[] =
-     "Eables the on-device language translation API. "
-@@ -7824,7 +7824,7 @@ const char kBlinkExtensionDiagnosticsDes
-     "Enable the experimental Diagnostics Blink Extension.";
- #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
+ const char kEnableHistorySyncOptinName[] = "History Sync Opt-in";
+ const char kEnableHistorySyncOptinDescription[] =
+     "Enables the History Sync Opt-in screen on Desktop platforms. The screen "
+@@ -5451,7 +5451,7 @@ const char kTranslateOpenSettingsDescrip
+     "Add an option to the translate bubble menu to open language settings.";
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ const char kWasmTtsComponentUpdaterEnabledName[] =
+     "Enable Wasm TTS Extension Component";
+ const char kWasmTtsComponentUpdaterEnabledDescription[] =
+@@ -7459,7 +7459,7 @@ const char kTetheringExperimentalFunctio
+ 
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
  const char kGetAllScreensMediaDescription[] =
      "When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -8058,7 +8058,7 @@ const char kEnableArmHwdrmDescription[] 
+@@ -7688,7 +7688,7 @@ const char kEnableArmHwdrmDescription[] 
  
  // Linux -----------------------------------------------------------------------
  
@@ -78,7 +105,7 @@ $NetBSD: patch-chrome_browser_flag__descriptions.cc,v 1.1 2025/02/06 09:57:48 wi
  const char kOzonePlatformHintChoiceDefault[] = "Default";
  const char kOzonePlatformHintChoiceAuto[] = "Auto";
  const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -8098,6 +8098,20 @@ const char kWaylandUiScalingDescription[
+@@ -7738,6 +7738,20 @@ const char kWaylandUiScalingDescription[
      "Enable experimental support for text scaling in the Wayland backend "
      "backed by full UI scaling. Requires #wayland-per-window-scaling to be "
      "enabled too.";
@@ -99,8 +126,8 @@ $NetBSD: patch-chrome_browser_flag__descriptions.cc,v 1.1 2025/02/06 09:57:48 wi
  #endif  // BUILDFLAG(IS_LINUX)
  
  // Random platform combinations -----------------------------------------------
-@@ -8110,7 +8124,7 @@ const char kZeroCopyVideoCaptureDescript
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+@@ -7750,7 +7764,7 @@ const char kZeroCopyVideoCaptureDescript
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
@@ -108,34 +135,34 @@ $NetBSD: patch-chrome_browser_flag__descriptions.cc,v 1.1 2025/02/06 09:57:48 wi
  const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
  const char kFollowingFeedSidepanelDescription[] =
      "Enables the following feed in the sidepanel.";
-@@ -8127,7 +8141,7 @@ const char kTaskManagerDesktopRefreshDes
-     "Enables a refreshed design for the Task Manager on Desktop platforms.";
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -7793,7 +7807,7 @@ const char kGroupPromoPrototypeName[] = 
+ const char kGroupPromoPrototypeDescription[] =
+     "Enables prototype for group promo.";
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  const char kEnableNetworkServiceSandboxName[] =
      "Enable the network service sandbox.";
  const char kEnableNetworkServiceSandboxDescription[] =
-@@ -8159,7 +8173,7 @@ const char kWebBluetoothConfirmPairingSu
+@@ -7825,7 +7839,7 @@ const char kWebBluetoothConfirmPairingSu
      "Bluetooth";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- const char kSkipUndecryptablePasswordsName[] =
-     "Skip undecryptable passwords to use the available decryptable "
-     "passwords.";
-@@ -8314,7 +8328,7 @@ const char kElementCaptureDescription[] 
- 
- #if BUILDFLAG(IS_WIN) ||                                      \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(ENABLE_PRINTING)
+ const char kCupsIppPrintingBackendName[] = "CUPS IPP Printing Backend";
+ const char kCupsIppPrintingBackendDescription[] =
+@@ -7967,7 +7981,7 @@ const char kElementCaptureDescription[] 
+     "media track into a track capturing just a specific DOM element.";
+ #endif  // !BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  const char kUIDebugToolsName[] = "Debugging tools for UI";
  const char kUIDebugToolsDescription[] =
      "Enables additional keyboard shortcuts to help debugging.";
-@@ -8386,7 +8400,7 @@ const char kComposeUpfrontInputModesDesc
+@@ -8018,7 +8032,7 @@ const char kComposeUpfrontInputModesDesc
      "Enables upfront input modes in the Compose dialog";
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
@@ -144,9 +171,9 @@ $NetBSD: patch-chrome_browser_flag__descriptions.cc,v 1.1 2025/02/06 09:57:48 wi
  const char kThirdPartyProfileManagementName[] =
      "Third party profile management";
  const char kThirdPartyProfileManagementDescription[] =
-@@ -8489,7 +8503,7 @@ const char kOverlayScrollbarsOSSettingsD
-     "Enable the os settings for overlay scrollbars on ChromeOS.";
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -8154,7 +8168,7 @@ const char kSupervisedUserBlockInterstit
+ const char kSupervisedUserBlockInterstitialV3Description[] =
+     "Enables URL filter interstitial V3 for Family Link users.";
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_flag__descriptions.h b/chromium/patches/patch-chrome_browser_flag__descriptions.h
index a5f5d8a8e6..7451a82428 100644
--- a/chromium/patches/patch-chrome_browser_flag__descriptions.h
+++ b/chromium/patches/patch-chrome_browser_flag__descriptions.h
@@ -1,30 +1,39 @@
-$NetBSD: patch-chrome_browser_flag__descriptions.h,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/flag_descriptions.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/flag_descriptions.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/flag_descriptions.h
-@@ -293,7 +293,7 @@ extern const char kImprovedSigninUIOnDes
- extern const char kImprovedSigninUIOnDesktopDescription[];
+@@ -373,7 +373,7 @@ extern const char
+     kAutofillEnableAllowlistForBmoCardCategoryBenefitsDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ extern const char kAutofillEnableAmountExtractionAllowlistDesktopName[];
+ extern const char kAutofillEnableAmountExtractionAllowlistDesktopDescription[];
  extern const char kAutofillEnableAmountExtractionDesktopName[];
- extern const char kAutofillEnableAmountExtractionDesktopDescription[];
- #endif
-@@ -302,7 +302,7 @@ extern const char kAutofillEnableAndroid
- extern const char kAutofillEnableAndroidNKeyForFidoAuthenticationDescription[];
+@@ -384,7 +384,7 @@ extern const char kAutofillEnableAmountE
+         // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kAutofillEnableBuyNowPayLaterForAffirmName[];
- extern const char kAutofillEnableBuyNowPayLaterForAffirmDescription[];
+ extern const char kAutofillEnableBuyNowPayLaterName[];
+ extern const char kAutofillEnableBuyNowPayLaterDescription[];
+ 
+@@ -602,7 +602,7 @@ extern const char kContextMenuEmptySpace
+ extern const char kContextMenuEmptySpaceDescription[];
+ #endif  // BUILDFLAG(IS_ANDROID)
  
-@@ -737,7 +737,7 @@ extern const char kDevicePostureName[];
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ extern const char kContextualCueingName[];
+ extern const char kContextualCueingDescription[];
+ extern const char kGlicZeroStateSuggestionsName[];
+@@ -786,7 +786,7 @@ extern const char kDevicePostureName[];
  extern const char kDevicePostureDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -32,44 +41,62 @@ $NetBSD: patch-chrome_browser_flag__descriptions.h,v 1.1 2025/02/06 09:57:48 wiz
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  extern const char kDocumentPictureInPictureAnimateResizeName[];
  extern const char kDocumentPictureInPictureAnimateResizeDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-@@ -1998,7 +1998,7 @@ extern const char kShowAutofillTypePredi
- extern const char kShowAutofillTypePredictionsDescription[];
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kShowFeaturedEnterpriseSiteSearchName[];
- extern const char kShowFeaturedEnterpriseSiteSearchDescription[];
+@@ -948,7 +948,7 @@ extern const char kEnableIsolatedWebAppA
+ extern const char kEnableIsolatedWebAppDevModeName[];
+ extern const char kEnableIsolatedWebAppDevModeDescription[];
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kEnableIwaKeyDistributionComponentName[];
+ extern const char kEnableIwaKeyDistributionComponentDescription[];
+ #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+@@ -1964,7 +1964,7 @@ extern const char kRetainOmniboxOnFocusN
+ extern const char kRetainOmniboxOnFocusDescription[];
+ #endif  // BUILDFLAG(IS_ANDROID)
  
-@@ -2020,7 +2020,7 @@ extern const char kSiteInstanceGroupsFor
- extern const char kSiteInstanceGroupsForDataUrlsDescription[];
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kRootScrollbarFollowsTheme[];
+ extern const char kRootScrollbarFollowsThemeDescription[];
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+@@ -2096,7 +2096,7 @@ extern const char kDefaultSiteInstanceGr
+ extern const char kDefaultSiteInstanceGroupsDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kSiteSearchSettingsPolicyName[];
- extern const char kSiteSearchSettingsPolicyDescription[];
- 
-@@ -2182,7 +2182,7 @@ extern const char kTouchTextEditingRedes
+ extern const char kPwaNavigationCapturingName[];
+ extern const char kPwaNavigationCapturingDescription[];
+ #endif
+@@ -2242,7 +2242,7 @@ extern const char kTouchTextEditingRedes
  extern const char kTranslateForceTriggerOnEnglishName[];
  extern const char kTranslateForceTriggerOnEnglishDescription[];
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kTranslationAPIName[];
- extern const char kTranslationAPIDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -4514,7 +4514,7 @@ extern const char kBlinkExtensionDiagnos
- extern const char kBlinkExtensionDiagnosticsDescription[];
- #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
+ extern const char kEnableHistorySyncOptinName[];
+ extern const char kEnableHistorySyncOptinDescription[];
+ 
+@@ -3197,7 +3197,7 @@ extern const char kTranslateOpenSettings
+ extern const char kTranslateOpenSettingsDescription[];
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ extern const char kWasmTtsComponentUpdaterEnabledName[];
+ extern const char kWasmTtsComponentUpdaterEnabledDescription[];
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+@@ -4385,7 +4385,7 @@ extern const char kTetheringExperimental
+ 
+ #endif  // #if BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  extern const char kGetAllScreensMediaName[];
  extern const char kGetAllScreensMediaDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4652,7 +4652,7 @@ extern const char kEnableArmHwdrmDescrip
+@@ -4520,7 +4520,7 @@ extern const char kEnableArmHwdrmDescrip
  
  // Linux ---------------------------------------------------------------------
  
@@ -78,7 +105,7 @@ $NetBSD: patch-chrome_browser_flag__descriptions.h,v 1.1 2025/02/06 09:57:48 wiz
  extern const char kOzonePlatformHintChoiceDefault[];
  extern const char kOzonePlatformHintChoiceAuto[];
  extern const char kOzonePlatformHintChoiceX11[];
-@@ -4677,6 +4677,9 @@ extern const char kWaylandTextInputV3Des
+@@ -4551,6 +4551,9 @@ extern const char kWaylandTextInputV3Des
  
  extern const char kWaylandUiScalingName[];
  extern const char kWaylandUiScalingDescription[];
@@ -88,25 +115,25 @@ $NetBSD: patch-chrome_browser_flag__descriptions.h,v 1.1 2025/02/06 09:57:48 wiz
  #endif  // BUILDFLAG(IS_LINUX)
  
  // Random platform combinations -----------------------------------------------
-@@ -4696,7 +4699,7 @@ extern const char kWebBluetoothConfirmPa
+@@ -4570,7 +4573,7 @@ extern const char kWebBluetoothConfirmPa
  extern const char kWebBluetoothConfirmPairingSupportDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- extern const char kSkipUndecryptablePasswordsName[];
- extern const char kSkipUndecryptablePasswordsDescription[];
- 
-@@ -4718,7 +4721,7 @@ extern const char kScreenlockReauthPromo
-         // BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(ENABLE_PRINTING)
+ extern const char kCupsIppPrintingBackendName[];
+ extern const char kCupsIppPrintingBackendDescription[];
+@@ -4583,7 +4586,7 @@ extern const char kScreenlockReauthCardD
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  extern const char kFollowingFeedSidepanelName[];
  extern const char kFollowingFeedSidepanelDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -4732,7 +4735,7 @@ extern const char kTaskManagerDesktopRef
+ 
+@@ -4600,7 +4603,7 @@ extern const char kTaskManagerDesktopRef
  extern const char kTaskManagerDesktopRefreshDescription[];
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -115,16 +142,16 @@ $NetBSD: patch-chrome_browser_flag__descriptions.h,v 1.1 2025/02/06 09:57:48 wiz
  extern const char kEnableNetworkServiceSandboxName[];
  extern const char kEnableNetworkServiceSandboxDescription[];
  
-@@ -4829,7 +4832,7 @@ extern const char kElementCaptureDescrip
+@@ -4695,7 +4698,7 @@ extern const char kElementCaptureName[];
+ extern const char kElementCaptureDescription[];
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
- #if BUILDFLAG(IS_WIN) ||                                      \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  extern const char kUIDebugToolsName[];
  extern const char kUIDebugToolsDescription[];
  #endif
-@@ -4880,7 +4883,7 @@ extern const char kComposeUpfrontInputMo
+@@ -4734,7 +4737,7 @@ extern const char kComposeUpfrontInputMo
  extern const char kComposeUpfrontInputModesDescription[];
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
@@ -133,9 +160,9 @@ $NetBSD: patch-chrome_browser_flag__descriptions.h,v 1.1 2025/02/06 09:57:48 wiz
  extern const char kThirdPartyProfileManagementName[];
  extern const char kThirdPartyProfileManagementDescription[];
  
-@@ -4946,7 +4949,7 @@ extern const char kOverlayScrollbarsOSSe
- extern const char kOverlayScrollbarsOSSettingsDescription[];
- #endif
+@@ -4814,7 +4817,7 @@ extern const char kEnablePolicyPromotion
+ extern const char kSupervisedUserBlockInterstitialV3Name[];
+ extern const char kSupervisedUserBlockInterstitialV3Description[];
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_gcm_gcm__profile__service__factory.cc b/chromium/patches/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
index 1fff0a229a..e3bc48b1bc 100644
--- a/chromium/patches/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_gcm_gcm__profile__service__factory.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_gcm_gcm__profile__service__factory.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/gcm/gcm_profile_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/gcm/gcm_profile_service_factory.cc
-@@ -89,7 +89,7 @@ GCMProfileServiceFactory::ScopedTestingF
+@@ -110,7 +110,7 @@ GCMProfileServiceFactory::ScopedTestingF
  // static
  GCMProfileService* GCMProfileServiceFactory::GetForProfile(
      content::BrowserContext* profile) {
@@ -15,8 +15,8 @@ $NetBSD: patch-chrome_browser_gcm_gcm__profile__service__factory.cc,v 1.1 2025/0
    // On desktop, incognito profiles are checked with IsIncognitoProfile().
    // It's possible for non-incognito profiles to also be off-the-record.
    bool is_profile_supported =
-@@ -132,7 +132,7 @@ GCMProfileServiceFactory::~GCMProfileSer
- KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor(
+@@ -153,7 +153,7 @@ std::unique_ptr<KeyedService>
+ GCMProfileServiceFactory::BuildServiceInstanceForBrowserContext(
      content::BrowserContext* context) const {
    Profile* profile = Profile::FromBrowserContext(context);
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc b/chromium/patches/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
index 4a8ccd4a44..20a58e9f47 100644
--- a/chromium/patches/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
 @@ -16,7 +16,7 @@ namespace instance_id {
  // static
@@ -15,8 +15,8 @@ $NetBSD: patch-chrome_browser_gcm_instance__id_instance__id__profile__service__f
    // On desktop, the guest profile is actually the primary OTR profile of
    // the "regular" guest profile.  The regular guest profile is never used
    // directly by users.  Also, user are not able to create child OTR profiles
-@@ -64,7 +64,7 @@ InstanceIDProfileServiceFactory::~Instan
- KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor(
+@@ -65,7 +65,7 @@ std::unique_ptr<KeyedService>
+ InstanceIDProfileServiceFactory::BuildServiceInstanceForBrowserContext(
      content::BrowserContext* context) const {
    Profile* profile = Profile::FromBrowserContext(context);
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-chrome_browser_global__features.cc b/chromium/patches/patch-chrome_browser_global__features.cc
index fb0b5075a5..0e35d6ef83 100644
--- a/chromium/patches/patch-chrome_browser_global__features.cc
+++ b/chromium/patches/patch-chrome_browser_global__features.cc
@@ -1,30 +1,30 @@
-$NetBSD: patch-chrome_browser_global__features.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/global_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/global_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/global_features.cc
-@@ -10,7 +10,7 @@
- #include "build/build_config.h"
- #include "chrome/browser/permissions/system/platform_handle.h"
+@@ -22,7 +22,7 @@
+ #include "chrome/browser/glic/host/glic_synthetic_trial_manager.h"  // nogncheck
+ #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // This causes a gn error on Android builds, because gn does not understand
  // buildflags, so we include it only on platforms where it is used.
- #include "components/user_education/common/user_education_features.h"  // nogncheck
-@@ -49,7 +49,7 @@ void GlobalFeatures::ReplaceGlobalFeatur
+ #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h"
+@@ -61,7 +61,7 @@ void GlobalFeatures::ReplaceGlobalFeatur
  
  void GlobalFeatures::Init() {
    system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle();
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (user_education::features::IsWhatsNewV2()) {
-     whats_new_registry_ = CreateWhatsNewRegistry();
-   }
-@@ -61,7 +61,7 @@ GlobalFeatures::CreateSystemPermissionsP
+   whats_new_registry_ = CreateWhatsNewRegistry();
+ #endif
+ 
+@@ -93,7 +93,7 @@ GlobalFeatures::CreateSystemPermissionsP
    return system_permission_settings::PlatformHandle::Create();
  }
  
diff --git a/chromium/patches/patch-chrome_browser_global__features.h b/chromium/patches/patch-chrome_browser_global__features.h
index 27ff7a209a..5609e39735 100644
--- a/chromium/patches/patch-chrome_browser_global__features.h
+++ b/chromium/patches/patch-chrome_browser_global__features.h
@@ -1,21 +1,21 @@
-$NetBSD: patch-chrome_browser_global__features.h,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/global_features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/global_features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/global_features.h
-@@ -14,7 +14,7 @@ namespace system_permission_settings {
+@@ -14,7 +14,7 @@
+ namespace system_permission_settings {
  class PlatformHandle;
  }  // namespace system_permission_settings
- namespace whats_new {
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ namespace whats_new {
  class WhatsNewRegistry;
- #endif
  }  // namespace whats_new
-@@ -45,7 +45,7 @@ class GlobalFeatures {
+@@ -56,7 +56,7 @@ class GlobalFeatures {
    system_permissions_platform_handle() {
      return system_permissions_platform_handle_.get();
    }
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_global__features.h,v 1.1 2025/02/06 09:57:48 wiz E
    whats_new::WhatsNewRegistry* whats_new_registry() {
      return whats_new_registry_.get();
    }
-@@ -60,7 +60,7 @@ class GlobalFeatures {
+@@ -85,7 +85,7 @@ class GlobalFeatures {
  
    virtual std::unique_ptr<system_permission_settings::PlatformHandle>
    CreateSystemPermissionsPlatformHandle();
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_global__features.h,v 1.1 2025/02/06 09:57:48 wiz E
    virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry();
  #endif
  
-@@ -70,7 +70,7 @@ class GlobalFeatures {
+@@ -95,7 +95,7 @@ class GlobalFeatures {
  
    std::unique_ptr<system_permission_settings::PlatformHandle>
        system_permissions_platform_handle_;
@@ -41,4 +41,4 @@ $NetBSD: patch-chrome_browser_global__features.h,v 1.1 2025/02/06 09:57:48 wiz E
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    std::unique_ptr<whats_new::WhatsNewRegistry> whats_new_registry_;
  #endif
- };
+ 
diff --git a/chromium/patches/patch-chrome_browser_headless_headless__mode__util.cc b/chromium/patches/patch-chrome_browser_headless_headless__mode__util.cc
index 1b8614286a..91abbd7d3e 100644
--- a/chromium/patches/patch-chrome_browser_headless_headless__mode__util.cc
+++ b/chromium/patches/patch-chrome_browser_headless_headless__mode__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_headless_headless__mode__util.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/headless/headless_mode_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/headless/headless_mode_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/headless/headless_mode_util.cc
 @@ -10,7 +10,7 @@
  // New headless mode is available on Linux, Windows and Mac platforms.
@@ -15,16 +15,16 @@ $NetBSD: patch-chrome_browser_headless_headless__mode__util.cc,v 1.1 2025/02/06
  
  #include "base/base_switches.h"
  #include "base/files/file_path.h"
-@@ -19,7 +19,7 @@
- #include "chrome/common/chrome_switches.h"
+@@ -20,7 +20,7 @@
  #include "content/public/common/content_switches.h"
+ #include "ui/base/ui_base_switches.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/gl/gl_switches.h"               // nogncheck
  #include "ui/ozone/public/ozone_switches.h"  // nogncheck
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -94,7 +94,7 @@ class HeadlessModeHandleImpl : public He
+@@ -95,7 +95,7 @@ class HeadlessModeHandleImpl : public He
        }
      }
  
diff --git a/chromium/patches/patch-chrome_browser_intranet__redirect__detector.h b/chromium/patches/patch-chrome_browser_intranet__redirect__detector.h
index ed17acbc54..13156965c0 100644
--- a/chromium/patches/patch-chrome_browser_intranet__redirect__detector.h
+++ b/chromium/patches/patch-chrome_browser_intranet__redirect__detector.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_intranet__redirect__detector.h,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/intranet_redirect_detector.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/intranet_redirect_detector.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/intranet_redirect_detector.h
 @@ -25,7 +25,7 @@ class SimpleURLLoader;
  class PrefRegistrySimple;
diff --git a/chromium/patches/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/chromium/patches/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
index ae3c8afa02..49dfecd929 100644
--- a/chromium/patches/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
+++ b/chromium/patches/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
 @@ -40,10 +40,12 @@ void MTPDeviceMapService::RegisterMTPFil
      // Note that this initializes the delegate asynchronously, but since
diff --git a/chromium/patches/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/chromium/patches/patch-chrome_browser_media__galleries_media__file__system__registry.cc
index 982933c1f0..d1308d62d8 100644
--- a/chromium/patches/patch-chrome_browser_media__galleries_media__file__system__registry.cc
+++ b/chromium/patches/patch-chrome_browser_media__galleries_media__file__system__registry.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_media__galleries_media__file__system__registry.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -585,7 +585,12 @@ class MediaFileSystemRegistry::MediaFile
+@@ -583,7 +583,12 @@ class MediaFileSystemRegistry::MediaFile
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl) {
diff --git a/chromium/patches/patch-chrome_browser_media_audio__service__util.cc b/chromium/patches/patch-chrome_browser_media_audio__service__util.cc
index f22752859b..5ab03e2df5 100644
--- a/chromium/patches/patch-chrome_browser_media_audio__service__util.cc
+++ b/chromium/patches/patch-chrome_browser_media_audio__service__util.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-chrome_browser_media_audio__service__util.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/audio_service_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/audio_service_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/audio_service_util.cc
-@@ -21,7 +21,7 @@
+@@ -20,7 +20,7 @@
  
  namespace {
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  const base::Value* GetPolicy(const char* policy_name) {
    const policy::PolicyMap& policies =
-@@ -43,7 +43,7 @@ bool GetPolicyOrFeature(const char* poli
+       g_browser_process->browser_policy_connector()
+@@ -39,7 +39,7 @@ bool GetPolicyOrFeature(const char* poli
+ }  // namespace
+ 
  bool IsAudioServiceSandboxEnabled() {
- // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being
- // built with OS_CHROMEOS instead of OS_LINUX.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return GetPolicyOrFeature(policy::key::kAudioSandboxEnabled,
                              features::kAudioServiceSandbox);
+ #else
diff --git a/chromium/patches/patch-chrome_browser_media_router_discovery_BUILD.gn b/chromium/patches/patch-chrome_browser_media_router_discovery_BUILD.gn
index 6e2d631cd8..7be7e48c3e 100644
--- a/chromium/patches/patch-chrome_browser_media_router_discovery_BUILD.gn
+++ b/chromium/patches/patch-chrome_browser_media_router_discovery_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_media_router_discovery_BUILD.gn,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/router/discovery/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/router/discovery/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/router/discovery/BUILD.gn
-@@ -82,7 +82,7 @@ static_library("discovery") {
+@@ -79,7 +79,7 @@ static_library("discovery") {
    ]
    configs += [ "//build/config/compiler:wexit_time_destructors" ]
  
diff --git a/chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc b/chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
index dcea70d6f2..fc6c462c6d 100644
--- a/chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
+++ b/chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc
 @@ -10,11 +10,12 @@
  #include "chrome/browser/media/router/discovery/discovery_network_list.h"
diff --git a/chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc b/chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
index 6a71b1fd94..6510afc080 100644
--- a/chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
+++ b/chromium/patches/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
@@ -1,24 +1,24 @@
-$NetBSD: patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc
 @@ -9,7 +9,11 @@
- #include <sys/socket.h>
- #include <sys/types.h>
+ 
+ #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h"
  
 +#include "build/build_config.h"
 +
 +#if !BUILDFLAG(IS_BSD)
  #include <linux/wireless.h>
 +#endif
- 
- #include "base/check.h"
- #include "base/files/scoped_file.h"
-@@ -20,6 +24,7 @@ namespace media_router {
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+@@ -24,6 +28,7 @@ namespace media_router {
  bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) {
    DCHECK(ssid_out);
  
@@ -26,7 +26,7 @@ $NetBSD: patch-chrome_browser_media_router_discovery_discovery__network__list__w
    base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
    if (!ioctl_socket.is_valid()) {
      // AF_INET is for IPv4, so it may fail for IPv6-only hosts even when there
-@@ -41,6 +46,7 @@ bool MaybeGetWifiSSID(const std::string&
+@@ -46,6 +51,7 @@ bool MaybeGetWifiSSID(const std::string&
      ssid_out->assign(ssid);
      return true;
    }
diff --git a/chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
index d2cf7d8c70..afbe6e588b 100644
--- a/chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
+++ b/chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
 @@ -21,7 +21,7 @@
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
  #include "ash/shell.h"
  #include "ui/aura/window.h"
--#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/functional/callback.h"
  #include "content/public/browser/desktop_capture.h"
  #endif
@@ -19,8 +19,8 @@ $NetBSD: patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc,v 1.1 2
      DestructorAtExit root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
  }  // namespace
  
--#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  namespace {
  base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit
      g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER;
@@ -28,8 +28,8 @@ $NetBSD: patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc,v 1.1 2
    return stream_devices_set;
  }
  
--#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  blink::mojom::StreamDevicesSetPtr EnumerateScreens(
      blink::mojom::MediaStreamType stream_type) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -37,8 +37,8 @@ $NetBSD: patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc,v 1.1 2
    root_windows_for_testing_.Get() = std::move(root_windows);
  }
  
--#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
      std::unique_ptr<webrtc::DesktopCapturer> capturer) {
    g_desktop_capturer_for_testing.Get() = std::move(capturer);
diff --git a/chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h b/chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
index 191413f822..bae4618e15 100644
--- a/chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
+++ b/chromium/patches/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
@@ -1,26 +1,26 @@
-$NetBSD: patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/webrtc/chrome_screen_enumerator.h
-@@ -20,7 +20,7 @@ namespace aura {
+@@ -18,7 +18,7 @@
+ namespace aura {
  class Window;
  }
- 
--#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  namespace webrtc {
  class DesktopCapturer;
  }
-@@ -42,7 +42,7 @@ class ChromeScreenEnumerator : public me
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -39,7 +39,7 @@ class ChromeScreenEnumerator : public me
+ #if BUILDFLAG(IS_CHROMEOS)
    static void SetRootWindowsForTesting(
        std::vector<raw_ptr<aura::Window, VectorExperimental>> root_windows);
--#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    static void SetDesktopCapturerForTesting(
        std::unique_ptr<webrtc::DesktopCapturer> capturer);
  #endif
diff --git a/chromium/patches/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc b/chromium/patches/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
index db3dac6596..caf72940c5 100644
--- a/chromium/patches/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
+++ b/chromium/patches/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/webrtc/desktop_media_picker_controller.cc
 @@ -89,7 +89,7 @@ bool DesktopMediaPickerController::IsSys
  #if BUILDFLAG(IS_MAC)
diff --git a/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
index 8d3a6a3634..1e42bd5eb5 100644
--- a/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
+++ b/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc,v 1.1 2025/02/06 09:57:48 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -106,7 +106,7 @@ std::string GetLogUploadProduct() {
+@@ -105,7 +105,7 @@ std::string GetLogUploadProduct() {
+   const char product[] = "Chrome";
+ #elif BUILDFLAG(IS_MAC)
    const char product[] = "Chrome_Mac";
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #if !defined(ADDRESS_SANITIZER)
    const char product[] = "Chrome_Linux";
  #else
diff --git a/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
index a18ea8f8d3..99086310aa 100644
--- a/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
+++ b/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
 @@ -25,10 +25,10 @@
  #include "components/webrtc_logging/browser/text_log_list.h"
@@ -19,7 +19,7 @@ $NetBSD: patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc,v 1.1
  
  using webrtc_event_logging::WebRtcEventLogManager;
  
-@@ -288,7 +288,7 @@ void WebRtcLoggingController::StartEvent
+@@ -304,7 +304,7 @@ void WebRtcLoggingController::StartEvent
        web_app_id, callback);
  }
  
@@ -28,7 +28,7 @@ $NetBSD: patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc,v 1.1
  void WebRtcLoggingController::GetLogsDirectory(
      LogsDirectoryCallback callback,
      LogsDirectoryErrorCallback error_callback) {
-@@ -334,7 +334,7 @@ void WebRtcLoggingController::GrantLogsD
+@@ -350,7 +350,7 @@ void WebRtcLoggingController::GrantLogsD
        FROM_HERE,
        base::BindOnce(std::move(callback), file_system.id(), registered_name));
  }
diff --git a/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
index 157dd403ce..85ccec2b0e 100644
--- a/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
+++ b/chromium/patches/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_media_webrtc_webrtc__logging__controller.h,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/media/webrtc/webrtc_logging_controller.h
 @@ -133,7 +133,7 @@ class WebRtcLoggingController
                           size_t web_app_id,
diff --git a/chromium/patches/patch-chrome_browser_memory__details.cc b/chromium/patches/patch-chrome_browser_memory__details.cc
index 7a110dae02..25a62ee105 100644
--- a/chromium/patches/patch-chrome_browser_memory__details.cc
+++ b/chromium/patches/patch-chrome_browser_memory__details.cc
@@ -1,20 +1,11 @@
-$NetBSD: patch-chrome_browser_memory__details.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/memory_details.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/memory_details.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/memory_details.cc
-@@ -38,7 +38,7 @@
- #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
- #include "ui/base/l10n/l10n_util.h"
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
- #include "content/public/browser/zygote_host/zygote_host_linux.h"
- #endif
- 
 @@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUI
            });
      }
diff --git a/chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index 1bd455de81..c23e4f74ae 100644
--- a/chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,42 +1,39 @@
-$NetBSD: patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -88,8 +88,10 @@
+@@ -85,7 +85,7 @@
+ #include "chrome/browser/flags/android/chrome_session_state.h"
+ #endif  // BUILDFLAG(IS_ANDROID)
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
-+#if !BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #if defined(__GLIBC__)
  #include <gnu/libc-version.h>
-+#endif
- 
- #include "base/linux_util.h"
- #include "base/strings/string_split.h"
-@@ -113,7 +115,7 @@
- #include "chromeos/crosapi/cpp/crosapi_constants.h"
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+ #endif  // defined(__GLIBC__)
+@@ -110,7 +110,7 @@
+ #include "chrome/installer/util/taskbar_util.h"
+ #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -122,7 +124,7 @@
+@@ -119,7 +119,7 @@
  #include "components/user_manager/user_manager.h"
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "components/power_metrics/system_power_monitor.h"
  #endif
  
-@@ -870,7 +872,7 @@ void RecordStartupMetrics() {
+@@ -873,7 +873,7 @@ void RecordStartupMetrics() {
  
    // Record whether Chrome is the default browser or not.
    // Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -45,8 +42,8 @@ $NetBSD: patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metri
    shell_integration::DefaultWebClientState default_state =
        shell_integration::GetDefaultBrowser();
    base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -1182,11 +1184,11 @@ void ChromeBrowserMainExtraPartsMetrics:
-   }
+@@ -1181,11 +1181,11 @@ void ChromeBrowserMainExtraPartsMetrics:
+       std::make_unique<web_app::SamplingMetricsProvider>();
  #endif  // !BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
index f89f909351..395b7cdfe1 100644
--- a/chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
+++ b/chromium/patches/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
 @@ -29,7 +29,7 @@ class PowerMetricsReporter;
  class ProcessMonitor;
@@ -15,8 +15,8 @@ $NetBSD: patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metri
  class PressureMetricsReporter;
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -119,7 +119,7 @@ class ChromeBrowserMainExtraPartsMetrics
-       performance_intervention_metrics_reporter_;
+@@ -126,7 +126,7 @@ class ChromeBrowserMainExtraPartsMetrics
+   std::unique_ptr<web_app::SamplingMetricsProvider> web_app_metrics_provider_;
  #endif  // !BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/chromium/patches/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index e96ad63318..930aa8ebac 100644
--- a/chromium/patches/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/chromium/patches/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_metrics_chrome__metrics__service__client.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -196,11 +196,11 @@
- #include "chrome/notification_helper/notification_helper_constants.h"
+@@ -197,11 +197,11 @@
+ #include "chrome/browser/metrics/google_update_metrics_provider_mac.h"
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -16,38 +16,47 @@ $NetBSD: patch-chrome_browser_metrics_chrome__metrics__service__client.cc,v 1.1
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h"
  #endif
  
-@@ -214,7 +214,7 @@
- #include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/metrics/bluetooth_metrics_provider.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -536,7 +536,7 @@ void ChromeMetricsServiceClient::Registe
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -233,7 +233,7 @@ const int kMaxHistogramGatheringWaitDura
+ // Needs to be kept in sync with the writer in
+ // third_party/crashpad/crashpad/handler/handler_main.cc.
+ const char kCrashpadHistogramAllocatorName[] = "CrashpadMetrics";
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::LazyInstance<ChromeMetricsServiceCrashReporter>::Leaky g_crash_reporter =
+     LAZY_INSTANCE_INITIALIZER;
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+@@ -537,7 +537,7 @@ void ChromeMetricsServiceClient::Registe
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_MAC)
 +    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
  
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -708,7 +708,7 @@ void ChromeMetricsServiceClient::Initial
-     RegisterUKMProviders();
+ #if !BUILDFLAG(IS_CHROMEOS)
+@@ -619,7 +619,7 @@ std::string ChromeMetricsServiceClient::
+ void ChromeMetricsServiceClient::OnEnvironmentUpdate(std::string* environment) {
+   // TODO(https://bugs.chromium.org/p/crashpad/issues/detail?id=135): call this
+   // on Mac when the Crashpad API supports it.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Register the environment with the crash reporter. Note that there is a
+   // window from startup to this point during which crash reports will not have
+   // an environment set.
+@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::Initial
+         std::make_unique<metrics::dwa::DwaService>(this, local_state);
    }
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
        base::SequencedTaskRunner::GetCurrentDefault());
  #endif
-@@ -759,7 +759,7 @@ void ChromeMetricsServiceClient::Registe
+@@ -781,7 +781,7 @@ void ChromeMetricsServiceClient::Registe
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::CPUMetricsProvider>());
  
@@ -56,16 +65,16 @@ $NetBSD: patch-chrome_browser_metrics_chrome__metrics__service__client.cc,v 1.1
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::MotherboardMetricsProvider>());
  #endif
-@@ -846,7 +846,7 @@ void ChromeMetricsServiceClient::Registe
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::Registe
+       std::make_unique<GoogleUpdateMetricsProviderMac>());
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
-@@ -954,7 +954,7 @@ void ChromeMetricsServiceClient::Registe
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+@@ -974,7 +974,7 @@ void ChromeMetricsServiceClient::Registe
        std::make_unique<PowerMetricsProvider>());
  #endif
  
@@ -74,16 +83,16 @@ $NetBSD: patch-chrome_browser_metrics_chrome__metrics__service__client.cc,v 1.1
    metrics_service_->RegisterMetricsProvider(
        metrics::CreateDesktopSessionMetricsProvider());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
-@@ -1141,7 +1141,7 @@ bool ChromeMetricsServiceClient::Registe
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+@@ -1160,7 +1160,7 @@ bool ChromeMetricsServiceClient::Registe
+   }
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // This creates the DesktopProfileSessionDurationsServices if it didn't exist
    // already.
    metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
-@@ -1475,7 +1475,7 @@ void ChromeMetricsServiceClient::CreateS
+@@ -1509,7 +1509,7 @@ void ChromeMetricsServiceClient::CreateS
    recorder =
        base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>(
            cros_system_profile_provider_.get());
diff --git a/chromium/patches/patch-chrome_browser_metrics_perf_cpu__identity.cc b/chromium/patches/patch-chrome_browser_metrics_perf_cpu__identity.cc
index abd47c8ddd..dcd9c124dc 100644
--- a/chromium/patches/patch-chrome_browser_metrics_perf_cpu__identity.cc
+++ b/chromium/patches/patch-chrome_browser_metrics_perf_cpu__identity.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_metrics_perf_cpu__identity.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/metrics/perf/cpu_identity.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/metrics/perf/cpu_identity.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/metrics/perf/cpu_identity.cc
-@@ -147,7 +147,7 @@ CPUIdentity GetCPUIdentity() {
+@@ -146,7 +146,7 @@ CPUIdentity GetCPUIdentity() {
    result.release =
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
        base::SysInfo::KernelVersion();
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
        base::SysInfo::OperatingSystemVersion();
  #else
  #error "Unsupported configuration"
diff --git a/chromium/patches/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc b/chromium/patches/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
index b28243ae44..8476b42aa4 100644
--- a/chromium/patches/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
+++ b/chromium/patches/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/metrics/power/process_metrics_recorder_util.cc
 @@ -65,7 +65,7 @@ void RecordProcessHistograms(const char*
                               const ProcessMonitor::Metrics& metrics) {
diff --git a/chromium/patches/patch-chrome_browser_metrics_power_process__monitor.cc b/chromium/patches/patch-chrome_browser_metrics_power_process__monitor.cc
index 68480eba86..b9b65c4d38 100644
--- a/chromium/patches/patch-chrome_browser_metrics_power_process__monitor.cc
+++ b/chromium/patches/patch-chrome_browser_metrics_power_process__monitor.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_metrics_power_process__monitor.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/metrics/power/process_monitor.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/metrics/power/process_monitor.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/metrics/power/process_monitor.cc
 @@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(ba
        process_metrics.GetPlatformIndependentCPUUsage());
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_metrics_power_process__monitor.cc,v 1.1 2025/02/06
    metrics->idle_wakeups *= factor;
  #endif
  
-@@ -158,7 +158,7 @@ ProcessMonitor::Metrics& operator+=(Proc
+@@ -157,7 +157,7 @@ ProcessMonitor::Metrics& operator+=(Proc
    }
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/chromium/patches/patch-chrome_browser_metrics_power_process__monitor.h b/chromium/patches/patch-chrome_browser_metrics_power_process__monitor.h
index 0c67cb11ec..ecdc47eab2 100644
--- a/chromium/patches/patch-chrome_browser_metrics_power_process__monitor.h
+++ b/chromium/patches/patch-chrome_browser_metrics_power_process__monitor.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_metrics_power_process__monitor.h,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/metrics/power/process_monitor.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/metrics/power/process_monitor.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/metrics/power/process_monitor.h
 @@ -76,7 +76,7 @@ class ProcessMonitor : public content::B
      std::optional<double> cpu_usage;
diff --git a/chromium/patches/patch-chrome_browser_net_profile__network__context__service.cc b/chromium/patches/patch-chrome_browser_net_profile__network__context__service.cc
index 1efe6f9f7c..d9da664a11 100644
--- a/chromium/patches/patch-chrome_browser_net_profile__network__context__service.cc
+++ b/chromium/patches/patch-chrome_browser_net_profile__network__context__service.cc
@@ -1,21 +1,21 @@
-$NetBSD: patch-chrome_browser_net_profile__network__context__service.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/net/profile_network_context_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/net/profile_network_context_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/net/profile_network_context_service.cc
-@@ -142,7 +142,7 @@
- #include "chromeos/startup/browser_params_proxy.h"
+@@ -135,7 +135,7 @@
+ #include "extensions/common/constants.h"
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h"
- #include "components/enterprise/client_certificates/core/client_certificates_service.h"
-@@ -269,7 +269,7 @@ void UpdateCookieSettings(Profile* profi
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
+@@ -276,7 +276,7 @@ void UpdateCookieSettings(Profile* profi
        });
  }
  
@@ -24,10 +24,10 @@ $NetBSD: patch-chrome_browser_net_profile__network__context__service.cc,v 1.1 20
  std::unique_ptr<net::ClientCertStore> GetWrappedCertStore(
      Profile* profile,
      std::unique_ptr<net::ClientCertStore> platform_store) {
-@@ -1141,7 +1141,7 @@ ProfileNetworkContextService::CreateClie
-   store = std::make_unique<ClientCertStoreLacros>(
-       std::move(certificate_provider), cert_db_initializer, std::move(store));
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -1228,7 +1228,7 @@ ProfileNetworkContextService::CreateClie
+       std::make_unique<net::ClientCertStoreNSS>(
+           base::BindRepeating(&CreateCryptoModuleBlockingPasswordDelegate,
+                               kCryptoModulePasswordClientAuth));
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return GetWrappedCertStore(profile_, std::move(store));
diff --git a/chromium/patches/patch-chrome_browser_net_profile__network__context__service__factory.cc b/chromium/patches/patch-chrome_browser_net_profile__network__context__service__factory.cc
new file mode 100644
index 0000000000..e75131a720
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_net_profile__network__context__service__factory.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/net/profile_network_context_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/net/profile_network_context_service_factory.cc
+@@ -24,7 +24,7 @@
+ #include "chrome/browser/net/server_certificate_database_service_factory.h"  // nogncheck
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
+ #endif
+ 
+@@ -68,7 +68,7 @@ ProfileNetworkContextServiceFactory::Pro
+ #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI)
+   DependsOn(net::ServerCertificateDatabaseServiceFactory::GetInstance());
+ #endif
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   DependsOn(client_certificates::CertificateProvisioningServiceFactory::
+                 GetInstance());
+ #endif
diff --git a/chromium/patches/patch-chrome_browser_net_system__network__context__manager.cc b/chromium/patches/patch-chrome_browser_net_system__network__context__manager.cc
index 3f76a8cd63..abe13829d9 100644
--- a/chromium/patches/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/chromium/patches/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,21 +1,12 @@
-$NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/net/system_network_context_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/net/system_network_context_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -102,7 +102,7 @@
- 
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "chrome/common/chrome_paths_internal.h"
- #include "chrome/grit/branded_strings.h"
- #include "ui/base/l10n/l10n_util.h"
-@@ -146,7 +146,7 @@ SystemNetworkContextManager* g_system_ne
+@@ -135,7 +135,7 @@ SystemNetworkContextManager* g_system_ne
  // received a failed launch for a sandboxed network service.
  bool g_previously_failed_to_launch_sandboxed_service = false;
  
@@ -24,7 +15,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
  // Whether kerberos library loading will work in the network service due to the
  // sandbox.
  bool g_network_service_will_allow_gssapi_library_load = false;
-@@ -154,7 +154,7 @@ bool g_network_service_will_allow_gssapi
+@@ -143,7 +143,7 @@ bool g_network_service_will_allow_gssapi
  const char* kGssapiDesiredPref =
  #if BUILDFLAG(IS_CHROMEOS)
      prefs::kKerberosEnabled;
@@ -33,7 +24,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
      prefs::kReceivedHttpAuthNegotiateHeader;
  #endif
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -200,7 +200,7 @@ network::mojom::HttpAuthDynamicParamsPtr
+@@ -189,7 +189,7 @@ network::mojom::HttpAuthDynamicParamsPtr
    auth_dynamic_params->basic_over_http_enabled =
        local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
  
@@ -42,7 +33,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
    auth_dynamic_params->delegate_by_kdc_policy =
        local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -215,7 +215,7 @@ network::mojom::HttpAuthDynamicParamsPtr
+@@ -204,7 +204,7 @@ network::mojom::HttpAuthDynamicParamsPtr
        local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -51,7 +42,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
    auth_dynamic_params->allow_gssapi_library_load =
        local_state->GetBoolean(kGssapiDesiredPref);
  #endif  // BUILDFLAG(IS_CHROMEOS)
-@@ -225,7 +225,7 @@ network::mojom::HttpAuthDynamicParamsPtr
+@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr
  
  void OnNewHttpAuthDynamicParams(
      network::mojom::HttpAuthDynamicParamsPtr& params) {
@@ -60,7 +51,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
    // The kerberos library is incompatible with the network service sandbox, so
    // if library loading is now enabled, the network service needs to be
    // restarted. It will be restarted unsandboxed because is
-@@ -267,11 +267,11 @@ NetworkSandboxState IsNetworkSandboxEnab
+@@ -256,11 +256,11 @@ NetworkSandboxState IsNetworkSandboxEnab
    if (g_previously_failed_to_launch_sandboxed_service) {
      return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
    }
@@ -74,7 +65,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
    // The network service sandbox and the kerberos library are incompatible.
    // If kerberos is enabled by policy, disable the network service sandbox.
    if (g_network_service_will_allow_gssapi_library_load ||
-@@ -287,7 +287,7 @@ NetworkSandboxState IsNetworkSandboxEnab
+@@ -276,7 +276,7 @@ NetworkSandboxState IsNetworkSandboxEnab
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -83,7 +74,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
    if (local_state &&
        local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
      return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
-@@ -517,7 +517,7 @@ void SystemNetworkContextManager::Delete
+@@ -522,7 +522,7 @@ void SystemNetworkContextManager::Delete
    g_system_network_context_manager = nullptr;
  }
  
@@ -92,7 +83,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
  SystemNetworkContextManager::GssapiLibraryLoadObserver::
      GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
      : owner_(owner) {}
-@@ -575,7 +575,7 @@ SystemNetworkContextManager::SystemNetwo
+@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetwo
    pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
                               auth_pref_callback);
  
@@ -101,7 +92,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
    pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -589,7 +589,7 @@ SystemNetworkContextManager::SystemNetwo
+@@ -594,7 +594,7 @@ SystemNetworkContextManager::SystemNetwo
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -110,16 +101,16 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
    pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  
-@@ -660,7 +660,7 @@ void SystemNetworkContextManager::Regist
-   registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -659,7 +659,7 @@ void SystemNetworkContextManager::Regist
+   registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
+                                std::string());
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
                                  false);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -685,11 +685,11 @@ void SystemNetworkContextManager::Regist
+@@ -684,11 +684,11 @@ void SystemNetworkContextManager::Regist
  
    registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
  
@@ -133,7 +124,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
    registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -742,7 +742,7 @@ void SystemNetworkContextManager::OnNetw
+@@ -741,7 +741,7 @@ void SystemNetworkContextManager::OnNetw
    OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
    network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
  
@@ -142,7 +133,7 @@ $NetBSD: patch-chrome_browser_net_system__network__context__manager.cc,v 1.1 202
    gssapi_library_loader_observer_.Install(network_service);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -965,7 +965,7 @@ bool SystemNetworkContextManager::IsNetw
+@@ -960,7 +960,7 @@ bool SystemNetworkContextManager::IsNetw
        break;
    }
  
diff --git a/chromium/patches/patch-chrome_browser_net_system__network__context__manager.h b/chromium/patches/patch-chrome_browser_net_system__network__context__manager.h
index 7f94f46328..b9e027ab2c 100644
--- a/chromium/patches/patch-chrome_browser_net_system__network__context__manager.h
+++ b/chromium/patches/patch-chrome_browser_net_system__network__context__manager.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_net_system__network__context__manager.h,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/net/system_network_context_manager.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/net/system_network_context_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/net/system_network_context_manager.h
 @@ -198,7 +198,7 @@ class SystemNetworkContextManager {
    class URLLoaderFactoryForSystem;
diff --git a/chromium/patches/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc b/chromium/patches/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
index ebfeb61a7b..5fb5b871d4 100644
--- a/chromium/patches/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
+++ b/chromium/patches/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  #include "services/network/public/cpp/resource_request.h"
  
  namespace {
diff --git a/chromium/patches/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/chromium/patches/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
index 83bb38e4f5..b5340e2f4d 100644
--- a/chromium/patches/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
+++ b/chromium/patches/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_new__tab__page_new__tab__page__util.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/new_tab_page/new_tab_page_util.cc
-@@ -25,7 +25,7 @@ bool IsOsSupportedForCart() {
+@@ -28,7 +28,7 @@ bool IsOsSupportedForCart() {
  }
  
  bool IsOsSupportedForDrive() {
diff --git a/chromium/patches/patch-chrome_browser_notifications_notification__display__service__impl.cc b/chromium/patches/patch-chrome_browser_notifications_notification__display__service__impl.cc
index e17d73a850..0f941294c0 100644
--- a/chromium/patches/patch-chrome_browser_notifications_notification__display__service__impl.cc
+++ b/chromium/patches/patch-chrome_browser_notifications_notification__display__service__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_notifications_notification__display__service__impl.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/notifications/notification_display_service_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/notifications/notification_display_service_impl.cc
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_notifications_notification__display__service__impl
  #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
  #include "chrome/browser/sharing/sharing_notification_handler.h"
  #endif
-@@ -65,7 +65,7 @@ NotificationDisplayServiceImpl* Notifica
+@@ -60,7 +60,7 @@ NotificationDisplayServiceImpl* Notifica
  // static
  void NotificationDisplayServiceImpl::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_notifications_notification__display__service__impl
    registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true);
  #endif
  }
-@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::Notifica
+@@ -76,7 +76,7 @@ NotificationDisplayServiceImpl::Notifica
                             std::make_unique<PersistentNotificationHandler>());
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -33,12 +33,12 @@ $NetBSD: patch-chrome_browser_notifications_notification__display__service__impl
      AddNotificationHandler(
          NotificationHandler::Type::SEND_TAB_TO_SELF,
          std::make_unique<send_tab_to_self::DesktopNotificationHandler>(
-@@ -89,7 +89,7 @@ NotificationDisplayServiceImpl::Notifica
+@@ -84,7 +84,7 @@ NotificationDisplayServiceImpl::Notifica
  #endif
  
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-     BUILDFLAG(IS_WIN)) &&                                                 \
++     BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) &&                            \
+     BUILDFLAG(SAFE_BROWSING_AVAILABLE)
      AddNotificationHandler(
          NotificationHandler::Type::TAILORED_SECURITY,
-         std::make_unique<safe_browsing::TailoredSecurityNotificationHandler>());
diff --git a/chromium/patches/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/chromium/patches/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
index bc2d551eaa..0e0f8b7382 100644
--- a/chromium/patches/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
+++ b/chromium/patches/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/notifications/notification_platform_bridge_delegator.cc
-@@ -56,7 +56,7 @@ bool SystemNotificationsEnabled(Profile*
+@@ -55,7 +55,7 @@ bool SystemNotificationsEnabled(Profile*
  #elif BUILDFLAG(IS_WIN)
    return NotificationPlatformBridgeWin::SystemNotificationEnabled();
  #else
diff --git a/chromium/patches/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/chromium/patches/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
index 17685549aa..b2ac382c68 100644
--- a/chromium/patches/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ b/chromium/patches/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_password__manager_chrome__password__manager__client.cc,v 1.1 2025/02/06 09:57:49 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -601,7 +601,7 @@ void ChromePasswordManagerClient::
+@@ -638,7 +638,7 @@ void ChromePasswordManagerClient::
  bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired(
      device_reauth::DeviceAuthenticator* authenticator) {
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_password__manager_chrome__password__manager__clien
    if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
      return false;
    }
-@@ -846,7 +846,7 @@ void ChromePasswordManagerClient::Notify
+@@ -916,7 +916,7 @@ void ChromePasswordManagerClient::Notify
  }
  
  void ChromePasswordManagerClient::NotifyKeychainError() {
@@ -23,4 +23,4 @@ $NetBSD: patch-chrome_browser_password__manager_chrome__password__manager__clien
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    PasswordsClientUIDelegate* manage_passwords_ui_controller =
        PasswordsClientUIDelegateFromWebContents(web_contents());
-   manage_passwords_ui_controller->OnKeychainError();
+   if (manage_passwords_ui_controller) {
diff --git a/chromium/patches/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/chromium/patches/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
index 4f72892f25..26148c3358 100644
--- a/chromium/patches/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
+++ b/chromium/patches/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_password__manager_password__reuse__manager__factory.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/password_manager/password_reuse_manager_factory.cc
-@@ -141,7 +141,7 @@ PasswordReuseManagerFactory::BuildServic
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServic
+   // Prepare password hash data for reuse detection.
+   reuse_manager->PreparePasswordHashData(GetSignInStateForMetrics(profile));
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    std::unique_ptr<password_manager::PasswordReuseManagerSigninNotifier>
        notifier = std::make_unique<
            password_manager::PasswordReuseManagerSigninNotifierImpl>(
diff --git a/chromium/patches/patch-chrome_browser_platform__util__linux.cc b/chromium/patches/patch-chrome_browser_platform__util__linux.cc
index 6bea620772..135cff8303 100644
--- a/chromium/patches/patch-chrome_browser_platform__util__linux.cc
+++ b/chromium/patches/patch-chrome_browser_platform__util__linux.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_platform__util__linux.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/platform_util_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/platform_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/platform_util_linux.cc
-@@ -300,7 +300,9 @@ void OnLaunchOptionsCreated(const std::s
+@@ -302,7 +302,9 @@ void OnLaunchOptionsCreated(const std::s
    argv.push_back(command);
    argv.push_back(arg);
    options.current_directory = working_directory;
diff --git a/chromium/patches/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/chromium/patches/patch-chrome_browser_policy_browser__signin__policy__handler.cc
index 6824883928..038f5da1e5 100644
--- a/chromium/patches/patch-chrome_browser_policy_browser__signin__policy__handler.cc
+++ b/chromium/patches/patch-chrome_browser_policy_browser__signin__policy__handler.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_policy_browser__signin__policy__handler.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/policy/browser_signin_policy_handler.cc
 @@ -45,7 +45,7 @@ void BrowserSigninPolicyHandler::ApplyPo
        policies.GetValue(policy_name(), base::Value::Type::INTEGER);
diff --git a/chromium/patches/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/chromium/patches/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
index ebc59f506f..abb3d74357 100644
--- a/chromium/patches/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
+++ b/chromium/patches/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
-@@ -53,7 +53,7 @@
+@@ -60,7 +60,7 @@
  #include "chrome/browser/policy/browser_dm_token_storage_mac.h"
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -15,16 +15,16 @@ $NetBSD: patch-chrome_browser_policy_chrome__browser__cloud__management__control
  #include "chrome/browser/policy/browser_dm_token_storage_linux.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -62,7 +62,7 @@
+@@ -69,7 +69,7 @@
  #include "chrome/install_static/install_util.h"
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/enterprise/client_certificates/browser_context_delegate.h"
+ #include "chrome/browser/enterprise/client_certificates/cert_utils.h"
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h"
- #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -93,7 +93,7 @@ void ChromeBrowserCloudManagementControl
+@@ -115,7 +115,7 @@ void ChromeBrowserCloudManagementControl
  
  #if BUILDFLAG(IS_MAC)
    storage_delegate = std::make_unique<BrowserDMTokenStorageMac>();
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_policy_chrome__browser__cloud__management__control
    storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>();
  #elif BUILDFLAG(IS_WIN)
    storage_delegate = std::make_unique<BrowserDMTokenStorageWin>();
-@@ -265,7 +265,7 @@ ChromeBrowserCloudManagementControllerDe
+@@ -286,7 +286,7 @@ ChromeBrowserCloudManagementControllerDe
  
  std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager>
  ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() {
@@ -42,3 +42,12 @@ $NetBSD: patch-chrome_browser_policy_chrome__browser__cloud__management__control
    auto* browser_dm_token_storage = BrowserDMTokenStorage::Get();
    auto* device_management_service = GetDeviceManagementService();
    auto shared_url_loader_factory = GetSharedURLLoaderFactory();
+@@ -308,7 +308,7 @@ ChromeBrowserCloudManagementControllerDe
+ std::unique_ptr<client_certificates::CertificateProvisioningService>
+ ChromeBrowserCloudManagementControllerDesktop::
+     CreateCertificateProvisioningService() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   if (!certificate_store_) {
+     certificate_store_ =
+         std::make_unique<client_certificates::PrefsCertificateStore>(
diff --git a/chromium/patches/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/chromium/patches/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index 71b0359363..5445fb44cc 100644
--- a/chromium/patches/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/chromium/patches/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -247,19 +247,19 @@
+@@ -255,19 +255,19 @@
  #include "components/spellcheck/browser/pref_names.h"
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
@@ -29,23 +29,23 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
  #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-@@ -273,13 +273,13 @@
+@@ -281,13 +281,13 @@
  #endif  // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/policy/battery_saver_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS_ASH)
+         // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "components/search_engines/enterprise/search_aggregator_policy_handler.h"
  #include "components/search_engines/enterprise/site_search_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
-@@ -565,7 +565,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -592,7 +592,7 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kDefaultDirectSocketsSetting,
      prefs::kManagedDefaultDirectSocketsSetting,
      base::Value::Type::INTEGER },
@@ -54,7 +54,7 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kDeletingUndecryptablePasswordsEnabled,
      password_manager::prefs::kDeletingUndecryptablePasswordsEnabled,
      base::Value::Type::BOOLEAN },
-@@ -910,7 +910,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -957,7 +957,7 @@ const PolicyToPreferenceMapEntry kSimple
      prefs::kManagedDefaultGeolocationSetting,
      base::Value::Type::INTEGER },
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -63,7 +63,7 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kRequireOnlineRevocationChecksForLocalAnchors,
      prefs::kCertRevocationCheckingRequiredLocalAnchors,
      base::Value::Type::BOOLEAN },
-@@ -919,7 +919,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -966,7 +966,7 @@ const PolicyToPreferenceMapEntry kSimple
      base::Value::Type::BOOLEAN },
  #endif  // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
          // || BUILDFLAG(IS_WIN)  || BUILDFLAG(IS_MAC)
@@ -72,16 +72,16 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kFullscreenAllowed,
      prefs::kFullscreenAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1753,7 +1753,7 @@ const PolicyToPreferenceMapEntry kSimple
-     base::Value::Type::BOOLEAN },
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimple
+     base::Value::Type::INTEGER},
+ #endif // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kGSSAPILibraryName,
      prefs::kGSSAPILibraryName,
      base::Value::Type::STRING },
-@@ -1812,7 +1812,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimple
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -90,7 +90,7 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kNetworkServiceSandboxEnabled,
      prefs::kNetworkServiceSandboxEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1838,12 +1838,12 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1921,12 +1921,12 @@ const PolicyToPreferenceMapEntry kSimple
      prefs::kTotalMemoryLimitMb,
      base::Value::Type::INTEGER },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -105,16 +105,16 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kUnmanagedDeviceSignalsConsentFlowEnabled,
      device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1851,7 +1851,7 @@ const PolicyToPreferenceMapEntry kSimple
-     prefs::kProfileSeparationDomainExceptionList,
-     base::Value::Type::LIST },
+@@ -1937,7 +1937,7 @@ const PolicyToPreferenceMapEntry kSimple
+     prefs::kLiveTranslateEnabled,
+     base::Value::Type::BOOLEAN },
  #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kDefaultBrowserSettingEnabled,
      prefs::kDefaultBrowserSettingEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1863,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1949,7 +1949,7 @@ const PolicyToPreferenceMapEntry kSimple
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@@ -123,7 +123,7 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kAutoplayAllowed,
      prefs::kAutoplayAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1964,7 +1964,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -2050,7 +2050,7 @@ const PolicyToPreferenceMapEntry kSimple
      base::Value::Type::BOOLEAN },
  #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
  
@@ -132,25 +132,25 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kAlternativeBrowserPath,
      browser_switcher::prefs::kAlternativeBrowserPath,
      base::Value::Type::STRING },
-@@ -2075,7 +2075,7 @@ const PolicyToPreferenceMapEntry kSimple
-     base::Value::Type::LIST },
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -2155,7 +2155,7 @@ const PolicyToPreferenceMapEntry kSimple
+     base::Value::Type::BOOLEAN },
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    { key::kAuthNegotiateDelegateByKdcPolicy,
      prefs::kAuthNegotiateDelegateByKdcPolicy,
      base::Value::Type::BOOLEAN },
-@@ -2154,7 +2154,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -2226,7 +2226,7 @@ const PolicyToPreferenceMapEntry kSimple
      ash::prefs::kUrlParameterToAutofillSAMLUsername,
      base::Value::Type::STRING },
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    { key::kTabDiscardingExceptions,
      performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
      base::Value::Type::LIST },
-@@ -2183,7 +2183,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -2255,7 +2255,7 @@ const PolicyToPreferenceMapEntry kSimple
      prefs::kUiAutomationProviderEnabled,
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
@@ -159,7 +159,7 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kOutOfProcessSystemDnsResolutionEnabled,
      prefs::kOutOfProcessSystemDnsResolutionEnabled,
      base::Value::Type::BOOLEAN },
-@@ -2226,7 +2226,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -2298,7 +2298,7 @@ const PolicyToPreferenceMapEntry kSimple
      base::Value::Type::INTEGER },
  #endif
  #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -168,7 +168,7 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kExtensionInstallTypeBlocklist,
      extensions::pref_names::kExtensionInstallTypeBlocklist,
      base::Value::Type::LIST},
-@@ -2252,7 +2252,7 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -2324,7 +2324,7 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kTabCompareSettings,
      optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed,
      base::Value::Type::INTEGER},
@@ -177,26 +177,17 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    { key::kChromeForTestingAllowed,
      prefs::kChromeForTestingAllowed,
      base::Value::Type::BOOLEAN },
-@@ -2394,7 +2394,7 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -2513,7 +2513,7 @@ std::unique_ptr<ConfigurationPolicyHandl
    // Policies for all platforms - End
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
        key::kMemorySaverModeSavings,
        performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
-@@ -2410,7 +2410,7 @@ std::unique_ptr<ConfigurationPolicyHandl
-         // BUILDFLAG(IS_CHROMEOS_ASH)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(
-       std::make_unique<SiteSearchPolicyHandler>(chrome_schema));
- 
-@@ -2623,7 +2623,7 @@ std::unique_ptr<ConfigurationPolicyHandl
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -2734,7 +2734,7 @@ std::unique_ptr<ConfigurationPolicyHandl
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_ANDROID)
@@ -204,16 +195,16 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    handlers->AddHandler(
        std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
    handlers->AddHandler(
-@@ -2676,7 +2676,7 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -2793,7 +2793,7 @@ std::unique_ptr<ConfigurationPolicyHandl
        key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
        chrome_schema));
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   handlers->AddHandler(std::make_unique<GuestModePolicyHandler>());
    handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
    handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
-   handlers->AddHandler(
-@@ -2767,7 +2767,7 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -2890,7 +2890,7 @@ std::unique_ptr<ConfigurationPolicyHandl
    std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
        signin_legacy_policies;
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -222,7 +213,7 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
        key::kForceBrowserSignin, prefs::kForceBrowserSignin,
        base::Value::Type::BOOLEAN));
-@@ -3139,7 +3139,7 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -3262,7 +3262,7 @@ std::unique_ptr<ConfigurationPolicyHandl
  #endif
  
  #if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -231,7 +222,7 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
    handlers->AddHandler(
        std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -3147,7 +3147,7 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -3270,7 +3270,7 @@ std::unique_ptr<ConfigurationPolicyHandl
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
@@ -240,7 +231,7 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
        key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
        base::Value::Type::BOOLEAN));
-@@ -3165,7 +3165,7 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -3288,7 +3288,7 @@ std::unique_ptr<ConfigurationPolicyHandl
            first_party_sets::FirstPartySetsOverridesPolicyHandler>(
            key::kRelatedWebsiteSetsOverrides, chrome_schema)));
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -249,21 +240,21 @@ $NetBSD: patch-chrome_browser_policy_configuration__policy__handler__list__facto
    handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-@@ -3188,7 +3188,7 @@ std::unique_ptr<ConfigurationPolicyHandl
+@@ -3311,7 +3311,7 @@ std::unique_ptr<ConfigurationPolicyHandl
            base::Value::Type::BOOLEAN)));
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -3212,7 +3212,7 @@ std::unique_ptr<ConfigurationPolicyHandl
+         // BUILDFLAG(IS_CHROMEOS)
+@@ -3329,7 +3329,7 @@ std::unique_ptr<ConfigurationPolicyHandl
    std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails>
        gen_ai_default_policies;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    gen_ai_default_policies.emplace_back(
        key::kAutofillPredictionSettings,
        optimization_guide::prefs::
diff --git a/chromium/patches/patch-chrome_browser_policy_device__management__service__configuration.cc b/chromium/patches/patch-chrome_browser_policy_device__management__service__configuration.cc
index 5a20c0ad8a..9f2d1e9a68 100644
--- a/chromium/patches/patch-chrome_browser_policy_device__management__service__configuration.cc
+++ b/chromium/patches/patch-chrome_browser_policy_device__management__service__configuration.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_policy_device__management__service__configuration.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/policy/device_management_service_configuration.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/policy/device_management_service_configuration.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/policy/device_management_service_configuration.cc
-@@ -23,7 +23,7 @@
+@@ -22,7 +22,7 @@
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ||           \
      ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
diff --git a/chromium/patches/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/chromium/patches/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
index 4badaaf0b9..64a194c27d 100644
--- a/chromium/patches/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
+++ b/chromium/patches/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_policy_policy__value__and__status__aggregator.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/policy/policy_value_and_status_aggregator.cc
-@@ -53,7 +53,7 @@
+@@ -49,7 +49,7 @@
  #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
diff --git a/chromium/patches/patch-chrome_browser_prefs_browser__prefs.cc b/chromium/patches/patch-chrome_browser_prefs_browser__prefs.cc
index 1f8a6c921a..4aded482ae 100644
--- a/chromium/patches/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/chromium/patches/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,43 +1,35 @@
-$NetBSD: patch-chrome_browser_prefs_browser__prefs.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/prefs/browser_prefs.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/prefs/browser_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -313,7 +313,7 @@
- #include "components/user_notes/user_notes_prefs.h"
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -316,7 +316,7 @@
+ #include "chrome/browser/devtools/devtools_window.h"
+ #endif  // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_DESKTOP_ANDROID)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
  #endif
  
-@@ -488,18 +488,18 @@
+@@ -487,11 +487,11 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "components/device_signals/core/browser/pref_names.h"  // nogncheck due to crbug.com/1125897
  #endif
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
- #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
- #endif
- 
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #endif
- 
-@@ -534,7 +534,7 @@
+@@ -519,7 +519,7 @@
  #include "chrome/browser/sessions/session_service_log.h"
  #endif
  
@@ -46,16 +38,16 @@ $NetBSD: patch-chrome_browser_prefs_browser__prefs.cc,v 1.1 2025/02/06 09:57:50
  #include "ui/color/system_theme.h"
  #endif
  
-@@ -1753,7 +1753,7 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1664,7 +1664,7 @@ void RegisterLocalState(PrefRegistrySimp
    on_device_translation::RegisterLocalStatePrefs(registry);
- #endif  // BUILDFLAG(IS_ANDROID)
+ #endif  // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    WhatsNewUI::RegisterLocalStatePrefs(registry);
  #endif
  
-@@ -1929,7 +1929,7 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1821,7 +1821,7 @@ void RegisterLocalState(PrefRegistrySimp
  #endif  // BUILDFLAG(ENABLE_PDF)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -64,15 +56,15 @@ $NetBSD: patch-chrome_browser_prefs_browser__prefs.cc,v 1.1 2025/02/06 09:57:50
    registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
  #endif
  
-@@ -2286,12 +2286,12 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -2177,12 +2177,12 @@ void RegisterProfilePrefs(user_prefs::Pr
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    device_signals::RegisterProfilePrefs(registry);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS_ASH)
+         // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/chromium/patches/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
index 03ded6af55..3f7c80c113 100644
--- a/chromium/patches/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
+++ b/chromium/patches/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
-@@ -199,7 +199,7 @@ const char* const kPersistentPrefNames[]
+@@ -203,7 +203,7 @@ const char* const kPersistentPrefNames[]
      prefs::kShowFullscreenToolbar,
  #endif
  
diff --git a/chromium/patches/patch-chrome_browser_printing_print__backend__service__manager.cc b/chromium/patches/patch-chrome_browser_printing_print__backend__service__manager.cc
index d1d3fb3f6f..32d7a28fe1 100644
--- a/chromium/patches/patch-chrome_browser_printing_print__backend__service__manager.cc
+++ b/chromium/patches/patch-chrome_browser_printing_print__backend__service__manager.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_printing_print__backend__service__manager.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/printing/print_backend_service_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/printing/print_backend_service_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/printing/print_backend_service_manager.cc
 @@ -36,7 +36,7 @@
  #include "printing/printing_context.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_printing_print__backend__service__manager.cc,v 1.1
  #include "content/public/common/content_switches.h"
  #endif
  
-@@ -884,7 +884,7 @@ PrintBackendServiceManager::GetServiceFr
+@@ -883,7 +883,7 @@ PrintBackendServiceManager::GetServiceFr
          host.BindNewPipeAndPassReceiver(),
          content::ServiceProcessHost::Options()
              .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_printing_print__backend__service__manager.cc,v 1.1
              .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
  #endif
              .Pass());
-@@ -1061,7 +1061,7 @@ PrintBackendServiceManager::DetermineIdl
+@@ -1060,7 +1060,7 @@ PrintBackendServiceManager::DetermineIdl
        return kNoClientsRegisteredResetOnIdleTimeout;
  
      case ClientType::kQueryWithUi:
diff --git a/chromium/patches/patch-chrome_browser_printing_printer__query.cc b/chromium/patches/patch-chrome_browser_printing_printer__query.cc
index f0f8ba8676..f5169639cd 100644
--- a/chromium/patches/patch-chrome_browser_printing_printer__query.cc
+++ b/chromium/patches/patch-chrome_browser_printing_printer__query.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_printing_printer__query.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/printing/printer_query.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/printing/printer_query.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/printing/printer_query.cc
-@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(b
+@@ -342,7 +342,7 @@ void PrinterQuery::UpdatePrintSettings(b
      crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
          printer_name, print_backend->GetPrinterDriverInfo(printer_name));
  
diff --git a/chromium/patches/patch-chrome_browser_process__singleton__posix.cc b/chromium/patches/patch-chrome_browser_process__singleton__posix.cc
index a6c4c85655..469690bf31 100644
--- a/chromium/patches/patch-chrome_browser_process__singleton__posix.cc
+++ b/chromium/patches/patch-chrome_browser_process__singleton__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_process__singleton__posix.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/process_singleton_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/process_singleton_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/process_singleton_posix.cc
 @@ -102,7 +102,7 @@
  #include "ui/base/l10n/l10n_util.h"
diff --git a/chromium/patches/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/chromium/patches/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index 615286ee07..0a9733e963 100644
--- a/chromium/patches/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/chromium/patches/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,124 +1,145 @@
-$NetBSD: patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -349,7 +349,7 @@
- #include "chrome/browser/profiles/gaia_info_update_service_factory.h"
+@@ -358,7 +358,7 @@
  #endif
  
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/enterprise/idle/idle_service_factory.h"
  #endif
  
-@@ -429,18 +429,18 @@
+@@ -400,7 +400,7 @@
  #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
  #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
  #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
+@@ -408,7 +408,7 @@
+ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
  #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/enterprise/idle/idle_service_factory.h"
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
  #endif
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+@@ -416,7 +416,7 @@
+ #include "chrome/browser/history_embeddings/history_embeddings_service_factory.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
-@@ -700,7 +700,7 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -730,7 +730,7 @@ void ChromeBrowserMainExtraPartsProfiles
    DiceBoundSessionCookieServiceFactory::GetInstance();
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
- #endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #endif
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
  #endif
    browser_sync::UserEventServiceFactory::GetInstance();
-@@ -809,7 +809,7 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -787,7 +787,7 @@ void ChromeBrowserMainExtraPartsProfiles
+   commerce::ShoppingServiceFactory::GetInstance();
+   ConsentAuditorFactory::GetInstance();
+   ContentIndexProviderFactory::GetInstance();
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   contextual_cueing::ContextualCueingServiceFactory::GetInstance();
+ #endif
+   CookieControlsServiceFactory::GetInstance();
+@@ -843,31 +843,31 @@ void ChromeBrowserMainExtraPartsProfiles
    enterprise_connectors::ConnectorsServiceFactory::GetInstance();
- #endif
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   enterprise_connectors::ReportingEventRouterFactory::GetInstance();
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
    enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
  #endif
-@@ -817,25 +817,25 @@ void ChromeBrowserMainExtraPartsProfiles
-   enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance();
-   enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance();
- #endif
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \
+     BUILDFLAG(ENTERPRISE_LOCAL_CONTENT_ANALYSIS) &&                    \
+     BUILDFLAG(SAFE_BROWSING_AVAILABLE)
    enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance();
  #endif
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    enterprise_idle::IdleServiceFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_CHROMEOS)
    enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance();
  #endif
    enterprise_reporting::LegacyTechServiceFactory::GetInstance();
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    enterprise_signals::SignalsAggregatorFactory::GetInstance();
  #endif
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    enterprise_signals::UserPermissionServiceFactory::GetInstance();
  #endif
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
  #endif
  #if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -958,7 +958,7 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_ANDROID)
    MerchantViewerDataManagerFactory::GetInstance();
  #endif
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
  #endif
-   NavigationPredictorKeyedServiceFactory::GetInstance();
-@@ -1060,7 +1060,7 @@ void ChromeBrowserMainExtraPartsProfiles
+ #if !BUILDFLAG(IS_ANDROID)
+@@ -1111,7 +1111,7 @@ void ChromeBrowserMainExtraPartsProfiles
  #if BUILDFLAG(IS_CHROMEOS)
    policy::PolicyCertServiceFactory::GetInstance();
  #endif
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
-@@ -1108,7 +1108,7 @@ void ChromeBrowserMainExtraPartsProfiles
- #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
+@@ -1157,7 +1157,7 @@ void ChromeBrowserMainExtraPartsProfiles
+ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
    ProfileStatisticsFactory::GetInstance();
  #endif
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    ProfileTokenWebSigninInterceptorFactory::GetInstance();
    OidcAuthenticationSigninInterceptorFactory::GetInstance();
  #endif
-@@ -1127,7 +1127,7 @@ void ChromeBrowserMainExtraPartsProfiles
- #endif
+@@ -1177,7 +1177,7 @@ void ChromeBrowserMainExtraPartsProfiles
    ReduceAcceptLanguageFactory::GetInstance();
    RendererUpdaterFactory::GetInstance();
+   regional_capabilities::RegionalCapabilitiesServiceFactory::GetInstance();
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    reporting::ManualTestHeartbeatEventFactory::GetInstance();
  #endif
  #if !BUILDFLAG(IS_ANDROID)
+@@ -1368,7 +1368,7 @@ void ChromeBrowserMainExtraPartsProfiles
+   WebDataServiceFactory::GetInstance();
+   webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   if (tab_groups::SavedTabGroupUtils::SupportsSharedTabGroups()) {
+     tab_groups::CollaborationMessagingObserverFactory::GetInstance();
+   }
diff --git a/chromium/patches/patch-chrome_browser_profiles_profile__impl.cc b/chromium/patches/patch-chrome_browser_profiles_profile__impl.cc
index 1ef0c166c9..36a4c488de 100644
--- a/chromium/patches/patch-chrome_browser_profiles_profile__impl.cc
+++ b/chromium/patches/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_profiles_profile__impl.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/profiles/profile_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/profiles/profile_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/profiles/profile_impl.cc
-@@ -263,6 +263,10 @@
- #include "chrome/browser/spellchecker/spellcheck_service.h"
+@@ -270,6 +270,10 @@
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
  #endif
  
 +#if BUILDFLAG(IS_BSD)
@@ -17,7 +17,7 @@ $NetBSD: patch-chrome_browser_profiles_profile__impl.cc,v 1.1 2025/02/06 09:57:5
  using bookmarks::BookmarkModel;
  using content::BrowserThread;
  using content::DownloadManagerDelegate;
-@@ -573,7 +577,7 @@ void ProfileImpl::LoadPrefsForNormalStar
+@@ -594,7 +598,7 @@ void ProfileImpl::LoadPrefsForNormalStar
    policy_provider = GetUserCloudPolicyManagerAsh();
  #else  // !BUILDFLAG(IS_CHROMEOS)
    {
@@ -26,7 +26,7 @@ $NetBSD: patch-chrome_browser_profiles_profile__impl.cc,v 1.1 2025/02/06 09:57:5
      ProfileManager* profile_manager = g_browser_process->profile_manager();
      ProfileAttributesEntry* entry =
          profile_manager->GetProfileAttributesStorage()
-@@ -886,7 +890,17 @@ void ProfileImpl::DoFinalInit(CreateMode
+@@ -890,7 +894,17 @@ void ProfileImpl::DoFinalInit(CreateMode
  }
  
  base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/chromium/patches/patch-chrome_browser_profiles_profiles__state.cc b/chromium/patches/patch-chrome_browser_profiles_profiles__state.cc
index 1756cd1817..000d325ccb 100644
--- a/chromium/patches/patch-chrome_browser_profiles_profiles__state.cc
+++ b/chromium/patches/patch-chrome_browser_profiles_profiles__state.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_profiles_profiles__state.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/profiles/profiles_state.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/profiles/profiles_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/profiles/profiles_state.cc
-@@ -190,7 +190,7 @@ bool IsGuestModeRequested(const base::Co
+@@ -188,7 +188,7 @@ bool IsGuestModeRequested(const base::Co
                            PrefService* local_state,
                            bool show_warning) {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -15,21 +15,21 @@ $NetBSD: patch-chrome_browser_profiles_profiles__state.cc,v 1.1 2025/02/06 09:57
    DCHECK(local_state);
  
    // Check if guest mode enforcement commandline switch or policy are provided.
-@@ -226,7 +226,7 @@ bool IsGuestModeEnabled() {
+@@ -224,7 +224,7 @@ bool IsGuestModeEnabled() {
      return false;
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    // If there are any supervised profiles, disable guest mode.
-   if (base::FeatureList::IsEnabled(
-           supervised_user::kHideGuestModeForSupervisedUsers) &&
-@@ -245,7 +245,7 @@ bool IsGuestModeEnabled() {
+   if (std::ranges::any_of(g_browser_process->profile_manager()
+                               ->GetProfileAttributesStorage()
+@@ -240,7 +240,7 @@ bool IsGuestModeEnabled() {
  }
  
  bool IsGuestModeEnabled(const Profile& profile) {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(
-           supervised_user::kHideGuestModeForSupervisedUsers)) {
-     ProfileAttributesEntry* profile_attributes =
+   ProfileAttributesEntry* profile_attributes =
+       g_browser_process->profile_manager()
+           ->GetProfileAttributesStorage()
diff --git a/chromium/patches/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc b/chromium/patches/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
new file mode 100644
index 0000000000..b85b62e22e
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_regional__capabilities_regional__capabilities__service__client.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/regional_capabilities/regional_capabilities_service_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/regional_capabilities/regional_capabilities_service_client.cc
+@@ -107,7 +107,7 @@ void RegionalCapabilitiesServiceClient::
+       base::android::AttachCurrentThread(),
+       reinterpret_cast<intptr_t>(heap_callback.release()));
+ }
+-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void RegionalCapabilitiesServiceClient::FetchCountryId(
+     CountryIdCallback on_country_id_fetched) {
+   std::move(on_country_id_fetched).Run(variations_latest_country_id_);
diff --git a/chromium/patches/patch-chrome_browser_renderer__preferences__util.cc b/chromium/patches/patch-chrome_browser_renderer__preferences__util.cc
index ddff8d87bd..1b8726ba2e 100644
--- a/chromium/patches/patch-chrome_browser_renderer__preferences__util.cc
+++ b/chromium/patches/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_renderer__preferences__util.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/renderer_preferences_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/renderer_preferences_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/renderer_preferences_util.cc
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
  #include "ui/views/controls/textfield/textfield.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_renderer__preferences__util.cc,v 1.1 2025/02/06 09
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/linux/linux_ui.h"
-@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(blink::Ren
+@@ -180,7 +180,7 @@ void UpdateFromSystemSettings(blink::Ren
    prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
  #endif
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_renderer__preferences__util.cc,v 1.1 2025/02/06 09
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    if (linux_ui_theme) {
      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -177,7 +177,7 @@ void UpdateFromSystemSettings(blink::Ren
+@@ -203,7 +203,7 @@ void UpdateFromSystemSettings(blink::Ren
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/chromium/patches/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css b/chromium/patches/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
index 17b03e4c53..3a71465a1f 100644
--- a/chromium/patches/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
+++ b/chromium/patches/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/resources/settings/autofill_page/passwords_shared.css
 @@ -100,7 +100,7 @@ cr-input.password-input::part(input),
     * necessary to prevent Chrome from using the operating system's font
diff --git a/chromium/patches/patch-chrome_browser_resources_signin_signin__shared.css b/chromium/patches/patch-chrome_browser_resources_signin_signin__shared.css
index 58ee60bd3e..7bca5907df 100644
--- a/chromium/patches/patch-chrome_browser_resources_signin_signin__shared.css
+++ b/chromium/patches/patch-chrome_browser_resources_signin_signin__shared.css
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_resources_signin_signin__shared.css,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/resources/signin/signin_shared.css.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/resources/signin/signin_shared.css.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/resources/signin/signin_shared.css
 @@ -54,7 +54,7 @@ a {
    border-radius: var(--scrollbar-width);
diff --git a/chromium/patches/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc b/chromium/patches/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
index 736e8ab93d..45c8431f0a 100644
--- a/chromium/patches/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
+++ b/chromium/patches/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/safe_browsing/chrome_password_protection_service.cc
-@@ -1250,7 +1250,7 @@ std::string ChromePasswordProtectionServ
+@@ -1262,7 +1262,7 @@ std::string ChromePasswordProtectionServ
      ReusedPasswordAccountType password_type) const {
    if (base::FeatureList::IsEnabled(
            safe_browsing::kEnterprisePasswordReuseUiRefresh)) {
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     return GetPrefs()->GetString(prefs::kEnterpriseCustomLabel);
+     return GetPrefs()->GetString(prefs::kEnterpriseCustomLabelForProfile);
  #else
      return std::string();
diff --git a/chromium/patches/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/chromium/patches/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
index ffc4e9c6db..d4b79de2e4 100644
--- a/chromium/patches/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
+++ b/chromium/patches/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
@@ -1,26 +1,17 @@
-$NetBSD: patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
-@@ -18,7 +18,7 @@
+@@ -20,7 +20,7 @@
+ #include "components/safe_browsing/core/common/safebrowsing_switches.h"
  #include "net/base/url_util.h"
- #include "third_party/abseil-cpp/absl/types/variant.h"
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
  #endif
  
-@@ -436,7 +436,7 @@ BinaryUploadService* BinaryUploadService
-     Profile* profile,
-     const enterprise_connectors::AnalysisSettings& settings) {
-   // Local content analysis is supported only on desktop platforms.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (settings.cloud_or_local_settings.is_cloud_analysis()) {
-     return CloudBinaryUploadServiceFactory::GetForProfile(profile);
-   } else {
diff --git a/chromium/patches/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/chromium/patches/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
index 3327158197..fa8d76baa5 100644
--- a/chromium/patches/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
+++ b/chromium/patches/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -696,7 +696,7 @@ void IncidentReportingService::OnEnviron
+@@ -694,7 +694,7 @@ void IncidentReportingService::OnEnviron
  
  // Process::Current().CreationTime() is missing on some platforms.
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc b/chromium/patches/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc
new file mode 100644
index 0000000000..34c040e964
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_safe__browsing_safe__browsing__pref__change__handler.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/safe_browsing/safe_browsing_pref_change_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/safe_browsing/safe_browsing_pref_change_handler.cc
+@@ -12,7 +12,7 @@
+ #include "content/public/browser/web_contents.h"
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/browser_finder.h"
+ #include "chrome/browser/ui/browser_window/public/browser_window_features.h"
+ #include "chrome/browser/ui/toasts/api/toast_id.h"
+@@ -59,7 +59,7 @@ SafeBrowsingPrefChangeHandler::~SafeBrow
+ void SafeBrowsingPrefChangeHandler::
+     MaybeShowEnhancedProtectionSettingChangeNotification() {
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   if (!profile_ ||
+       !base::FeatureList::IsEnabled(safe_browsing::kEsbAsASyncedSetting)) {
+     return;
diff --git a/chromium/patches/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/chromium/patches/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
index 66b9df2ef4..731ff4349e 100644
--- a/chromium/patches/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
+++ b/chromium/patches/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
@@ -1,26 +1,17 @@
-$NetBSD: patch-chrome_browser_screen__ai_screen__ai__install__state.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/screen_ai/screen_ai_install_state.cc
-@@ -16,7 +16,7 @@
- #include "services/screen_ai/public/cpp/utilities.h"
- #include "ui/accessibility/accessibility_features.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/cpu.h"
- #include "base/files/file_util.h"
- #endif
-@@ -26,7 +26,7 @@ const int kScreenAICleanUpDelayInDays = 
- const char kMinExpectedVersion[] = "124.2";
- 
- bool IsDeviceCompatible() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #if defined(ARCH_CPU_X86_FAMILY)
-   // Check if the CPU has the required instruction set to run the Screen AI
-   // library.
+@@ -30,7 +30,7 @@ bool IsDeviceCompatible() {
+   // TODO(crbug.com/381256355): Update when ScreenAI library is compatible with
+   // older CPUs.
+   static const bool device_compatible = base::CPU().has_sse42();
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // On Linux, the library is only built for X86 CPUs.
+   static constexpr bool device_compatible = false;
+ #else
diff --git a/chromium/patches/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/chromium/patches/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
index 667f62218c..3c3c64bf1d 100644
--- a/chromium/patches/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
+++ b/chromium/patches/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_screen__ai_screen__ai__service__router.cc,v 1.1 2025/02/06 09:57:50 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/screen_ai/screen_ai_service_router.cc
-@@ -318,7 +318,7 @@ void ScreenAIServiceRouter::LaunchIfNotR
+@@ -403,7 +403,7 @@ void ScreenAIServiceRouter::LaunchIfNotR
    base::FilePath binary_path = state_instance->get_component_binary_path();
  #if BUILDFLAG(IS_WIN)
    std::vector<base::FilePath> preload_libraries = {binary_path};
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_screen__ai_screen__ai__service__router.cc,v 1.1 20
    std::vector<std::string> extra_switches = {
        base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
                           binary_path.MaybeAsASCII().c_str())};
-@@ -332,7 +332,7 @@ void ScreenAIServiceRouter::LaunchIfNotR
+@@ -417,7 +417,7 @@ void ScreenAIServiceRouter::LaunchIfNotR
            .WithPreloadedLibraries(
                preload_libraries,
                content::ServiceProcessHostPreloadLibraries::GetPassKey())
diff --git a/chromium/patches/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/chromium/patches/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
deleted file mode 100644
index 8ffe26946b..0000000000
--- a/chromium/patches/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
-@@ -15,7 +15,7 @@
- #include "components/send_tab_to_self/features.h"
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
- #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
- #endif
-@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController*
- ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile(
-     Profile* profile) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   for (const std::unique_ptr<ReceivingUiHandler>& handler :
-        applicable_handlers_) {
-     auto* button_controller =
diff --git a/chromium/patches/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/chromium/patches/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
deleted file mode 100644
index ff1228a647..0000000000
--- a/chromium/patches/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
-@@ -16,7 +16,7 @@
- #include "components/send_tab_to_self/send_tab_to_self_model.h"
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
- #endif
- 
-@@ -50,7 +50,7 @@ void SendTabToSelfClientService::Entries
-     const std::vector<const SendTabToSelfEntry*>& new_entries) {
-   for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     // Only respond to notifications corresponding to this service's profile
-     // for these OSes; mobile does not have a Profile.
-     // Cast note: on desktop, handlers are guaranteed to be the derived class
diff --git a/chromium/patches/patch-chrome_browser_sessions_session__restore.cc b/chromium/patches/patch-chrome_browser_sessions_session__restore.cc
index d73a645c49..7c611fd27c 100644
--- a/chromium/patches/patch-chrome_browser_sessions_session__restore.cc
+++ b/chromium/patches/patch-chrome_browser_sessions_session__restore.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_sessions_session__restore.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/sessions/session_restore.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/sessions/session_restore.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/sessions/session_restore.cc
-@@ -102,7 +102,7 @@
- #include "chrome/browser/web_applications/web_app_registrar.h"
+@@ -108,7 +108,7 @@
+ #include "ui/wm/core/scoped_animation_disabler.h"
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_sessions_session__restore.cc,v 1.1 2025/02/06 09:5
  #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -1093,7 +1093,7 @@ class SessionRestoreImpl : public Browse
+@@ -1117,7 +1117,7 @@ class SessionRestoreImpl : public Browse
      bool is_first_tab = true;
      for (const auto& startup_tab : startup_tabs) {
        const GURL& url = startup_tab.url;
diff --git a/chromium/patches/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/chromium/patches/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
index 9ed7717044..48e0007f4d 100644
--- a/chromium/patches/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
+++ b/chromium/patches/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
@@ -1,21 +1,21 @@
-$NetBSD: patch-chrome_browser_sharing_sharing__handler__registry__impl.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/sharing/sharing_handler_registry_impl.cc
-@@ -22,7 +22,7 @@
+@@ -21,7 +21,7 @@
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS)
-@@ -74,7 +74,7 @@ SharingHandlerRegistryImpl::SharingHandl
+ #endif
+ 
+@@ -72,7 +72,7 @@ SharingHandlerRegistryImpl::SharingHandl
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-chrome_browser_shortcuts_icon__badging.cc b/chromium/patches/patch-chrome_browser_shortcuts_icon__badging.cc
index 09c644f3ac..1dfc56fdb8 100644
--- a/chromium/patches/patch-chrome_browser_shortcuts_icon__badging.cc
+++ b/chromium/patches/patch-chrome_browser_shortcuts_icon__badging.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_shortcuts_icon__badging.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/shortcuts/icon_badging.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/shortcuts/icon_badging.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/shortcuts/icon_badging.cc
 @@ -59,7 +59,7 @@ enum class BadgeSize {
  constexpr ShortcutSize kSizesNeededForShortcutCreation[] = {
diff --git a/chromium/patches/patch-chrome_browser_signin_accounts__policy__manager.cc b/chromium/patches/patch-chrome_browser_signin_accounts__policy__manager.cc
new file mode 100644
index 0000000000..8c653b7191
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_signin_accounts__policy__manager.cc
@@ -0,0 +1,44 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/signin/accounts_policy_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/signin/accounts_policy_manager.cc
+@@ -41,7 +41,7 @@
+ #include "chrome/browser/ui/webui/profile_helper.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "components/policy/core/common/features.h"
+ #include "components/signin/public/identity_manager/accounts_mutator.h"
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+@@ -209,7 +209,7 @@ void AccountsPolicyManager::Initialize()
+           &AccountsPolicyManager::OnGoogleServicesUsernamePatternChanged,
+           weak_pointer_factory_.GetWeakPtr()));
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   auto* identity_manager = IdentityManagerFactory::GetForProfile(profile_);
+   identity_manager_observation_.Observe(identity_manager);
+   profile_pref_change_registrar_.Init(profile_->GetPrefs());
+@@ -224,7 +224,7 @@ void AccountsPolicyManager::Initialize()
+ }
+ 
+ void AccountsPolicyManager::Shutdown() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   profile_pref_change_registrar_.RemoveAll();
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+   local_state_pref_registrar_.RemoveAll();
+@@ -332,7 +332,7 @@ void AccountsPolicyManager::OnUserConfir
+ }
+ #endif  // defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void AccountsPolicyManager::OnRefreshTokensLoaded() {
+   RemoveUnallowedAccounts();
+   identity_manager_observation_.Reset();
diff --git a/chromium/patches/patch-chrome_browser_signin_accounts__policy__manager.h b/chromium/patches/patch-chrome_browser_signin_accounts__policy__manager.h
new file mode 100644
index 0000000000..9675a74ed8
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_signin_accounts__policy__manager.h
@@ -0,0 +1,35 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/signin/accounts_policy_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/signin/accounts_policy_manager.h
+@@ -13,7 +13,7 @@
+ #include "components/signin/public/base/signin_metrics.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/scoped_observation.h"
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
+@@ -64,7 +64,7 @@ class AccountsPolicyManager : public Key
+   }
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void RemoveUnallowedAccounts();
+ 
+   // IdentityManager::Observer implementation.
+@@ -85,7 +85,7 @@ class AccountsPolicyManager : public Key
+   bool hide_ui_for_testing_ = false;
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   base::ScopedObservation<signin::IdentityManager,
+                           signin::IdentityManager::Observer>
+       identity_manager_observation_{this};
diff --git a/chromium/patches/patch-chrome_browser_signin_signin__util.cc b/chromium/patches/patch-chrome_browser_signin_signin__util.cc
index 92735b069f..52ede641b7 100644
--- a/chromium/patches/patch-chrome_browser_signin_signin__util.cc
+++ b/chromium/patches/patch-chrome_browser_signin_signin__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_signin_signin__util.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/signin/signin_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/signin/signin_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/signin/signin_util.cc
-@@ -81,7 +81,7 @@ CookiesMover::CookiesMover(base::WeakPtr
+@@ -80,7 +80,7 @@ CookiesMover::CookiesMover(base::WeakPtr
  CookiesMover::~CookiesMover() = default;
  
  void CookiesMover::StartMovingCookies() {
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc b/chromium/patches/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
index 5403aaf50a..0e95b5133a 100644
--- a/chromium/patches/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
+++ b/chromium/patches/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc
@@ -1,17 +1,26 @@
-$NetBSD: patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/supervised_user/classify_url_navigation_throttle.cc
-@@ -219,7 +219,7 @@ void ClassifyUrlNavigationThrottle::OnIn
-     case SupervisedUserNavigationThrottle::kCancelWithInterstitial: {
+@@ -68,7 +68,7 @@ std::ostream& operator<<(std::ostream& s
+   }
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ bool ShouldShowReAuthInterstitial(
+     content::NavigationHandle& navigation_handle) {
+   Profile* profile = Profile::FromBrowserContext(
+@@ -230,7 +230,7 @@ void ClassifyUrlNavigationThrottle::OnIn
+     }
+     case InterstitialResultCallbackActions::kCancelWithInterstitial: {
        CHECK(navigation_handle());
- // LINT.IfChange(cancel_with_interstitial)
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-       if (ShouldShowReAuthInterstitial(*navigation_handle(), is_main_frame)) {
+       if (ShouldShowReAuthInterstitial(*navigation_handle())) {
          // Show the re-authentication interstitial if the user signed out of
          // the content area, as parent's approval requires authentication.
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
index d452ee328d..6fc9cbbb54 100644
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
+++ b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/supervised_user/supervised_user_browser_utils.cc
 @@ -40,7 +40,7 @@
  #include "chrome/browser/ash/profiles/profile_helper.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_supervised__user_supervised__user__browser__utils.
  #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h"
-@@ -158,7 +158,7 @@ void AssertChildStatusOfTheUser(Profile*
+@@ -165,7 +165,7 @@ void AssertChildStatusOfTheUser(Profile*
  #endif
  }
  
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
index 6f37587de4..c31592fd12 100644
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
+++ b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__browser__utils.h,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/supervised_user/supervised_user_browser_utils.h
 @@ -52,7 +52,7 @@ std::string GetAccountGivenName(Profile&
  // of the user.
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
index ccb2f660d6..899b0c5513 100644
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
+++ b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
-@@ -194,7 +194,7 @@ void SupervisedUserExtensionsDelegateImp
+@@ -197,7 +197,7 @@ void SupervisedUserExtensionsDelegateImp
        return;
      }
    }
@@ -14,4 +14,4 @@ $NetBSD: patch-chrome_browser_supervised__user_supervised__user__extensions__del
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    CHECK(contents.value());
    content::WebContents* web_contents = contents.value().get();
-   if (CanInstallExtensions()) {
+   if (supervised_user::
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
index dce467d6bc..208cebc880 100644
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
+++ b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
 @@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager::
      ActivateManagementPolicyAndUpdateRegistration() {
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_supervised__user_supervised__user__extensions__man
    MaybeMarkExtensionsLocallyParentApproved();
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  }
-@@ -475,7 +475,7 @@ bool SupervisedUserExtensionsManager::Sh
+@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::Sh
    return false;
  }
  
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
index c6943f18f8..46599a2f95 100644
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
+++ b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/supervised_user/supervised_user_extensions_manager.h
-@@ -154,7 +154,7 @@ class SupervisedUserExtensionsManager : 
+@@ -153,7 +153,7 @@ class SupervisedUserExtensionsManager : 
    // launched.
    bool ShouldBlockExtension(const std::string& extension_id) const;
  
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
index d3ced4d4e6..64b98c73b6 100644
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
+++ b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
-@@ -32,7 +32,7 @@
+@@ -33,12 +33,12 @@
  #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "ui/android/view_android.h"
@@ -15,7 +15,13 @@ $NetBSD: patch-chrome_browser_supervised__user_supervised__user__google__auth__n
  #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page.h"
  #endif
-@@ -148,7 +148,7 @@ SupervisedUserGoogleAuthNavigationThrott
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ namespace {
+ bool IsYouTubeInfrastructureSubframe(content::NavigationHandle* handle) {
+   if (handle->GetNavigatingFrameType() != content::FrameType::kSubframe) {
+@@ -160,7 +160,7 @@ SupervisedUserGoogleAuthNavigationThrott
      return content::NavigationThrottle::DEFER;
    }
  
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
index fcfe2f5daa..85c417c07b 100644
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc
 @@ -14,7 +14,7 @@
  #include "components/supervised_user/core/browser/supervised_user_service.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_supervised__user_supervised__user__metrics__servic
  #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_extensions_metrics_delegate_impl.h"
  #endif
  
-@@ -61,7 +61,7 @@ KeyedService* SupervisedUserMetricsServi
+@@ -62,7 +62,7 @@ SupervisedUserMetricsServiceFactory::Bui
    std::unique_ptr<supervised_user::SupervisedUserMetricsService ::
                        SupervisedUserMetricsServiceExtensionDelegate>
        extensions_metrics_delegate = nullptr;
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
index b4b1f5650c..e26d03c0e6 100644
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
+++ b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc
 @@ -47,7 +47,7 @@
  #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h"
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc
deleted file mode 100644
index ca541a4728..0000000000
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_navigation_throttle.cc
-@@ -213,7 +213,7 @@ void SupervisedUserNavigationThrottle::O
-     case kCancelWithInterstitial: {
-       CHECK(navigation_handle());
- // LINT.IfChange(cancel_with_interstitial)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-       if (supervised_user::ShouldShowReAuthInterstitial(*navigation_handle(),
-                                                         is_main_frame)) {
-         // Show the re-authentication interstitial if the user signed out of
-@@ -244,7 +244,7 @@ void SupervisedUserNavigationThrottle::O
- }
- 
- namespace supervised_user {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- 
- bool ShouldShowReAuthInterstitial(content::NavigationHandle& navigation_handle,
-                                   bool is_main_frame) {
diff --git a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h b/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h
deleted file mode 100644
index 728a3aaa74..0000000000
--- a/chromium/patches/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h,v 1.1 2025/02/06 09:57:51 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/supervised_user/supervised_user_navigation_throttle.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/supervised_user/supervised_user_navigation_throttle.h
-@@ -22,7 +22,7 @@
- class Profile;
- 
- namespace supervised_user {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- bool ShouldShowReAuthInterstitial(content::NavigationHandle& navigation_handle,
-                                   bool is_main_frame);
- #endif
diff --git a/chromium/patches/patch-chrome_browser_sync_chrome__sync__controller__builder.cc b/chromium/patches/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
index 6bb23c85ce..aeb5681b23 100644
--- a/chromium/patches/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
+++ b/chromium/patches/patch-chrome_browser_sync_chrome__sync__controller__builder.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_sync_chrome__sync__controller__builder.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/sync/chrome_sync_controller_builder.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/sync/chrome_sync_controller_builder.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/sync/chrome_sync_controller_builder.cc
-@@ -324,7 +324,7 @@ ChromeSyncControllerBuilder::Build(synce
+@@ -280,7 +280,7 @@ ChromeSyncControllerBuilder::Build(synce
  #if BUILDFLAG(ENABLE_SPELLCHECK)
      // Chrome prefers OS provided spell checkers where they exist. So only sync
      // the custom dictionary on platforms that typically don't provide one.
diff --git a/chromium/patches/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/chromium/patches/patch-chrome_browser_sync_device__info__sync__client__impl.cc
index 63a2640ca6..3ec00fb6d0 100644
--- a/chromium/patches/patch-chrome_browser_sync_device__info__sync__client__impl.cc
+++ b/chromium/patches/patch-chrome_browser_sync_device__info__sync__client__impl.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_sync_device__info__sync__client__impl.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/sync/device_info_sync_client_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/sync/device_info_sync_client_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/sync/device_info_sync_client_impl.cc
-@@ -41,7 +41,7 @@ std::string DeviceInfoSyncClientImpl::Ge
- // included in lacros-chrome once build flag switch of lacros-chrome is
- // complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+@@ -34,7 +34,7 @@ DeviceInfoSyncClientImpl::~DeviceInfoSyn
+ std::string DeviceInfoSyncClientImpl::GetSigninScopedDeviceId() const {
+ // Since the local sync backend is currently only supported on Windows, Mac and
+ // Linux don't even check the pref on other os-es.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    syncer::SyncPrefs prefs(profile_->GetPrefs());
    if (prefs.IsLocalSyncEnabled()) {
      return "local_device";
diff --git a/chromium/patches/patch-chrome_browser_sync_sync__service__factory.cc b/chromium/patches/patch-chrome_browser_sync_sync__service__factory.cc
index ff2b6885f7..edd90154c1 100644
--- a/chromium/patches/patch-chrome_browser_sync_sync__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_sync_sync__service__factory.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_sync_sync__service__factory.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/sync/sync_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/sync/sync_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/sync/sync_service_factory.cc
-@@ -109,7 +109,7 @@
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -108,7 +108,7 @@
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_sync_sync__service__factory.cc,v 1.1 2025/02/06 09
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h"
-@@ -157,7 +157,7 @@ syncer::DataTypeSet GetDisabledCommonDat
+@@ -135,7 +135,7 @@ namespace {
  tab_groups::TabGroupSyncService* GetTabGroupSyncService(Profile* profile) {
    CHECK(profile);
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -24,16 +24,16 @@ $NetBSD: patch-chrome_browser_sync_sync__service__factory.cc,v 1.1 2025/02/06 09
    tab_groups::TabGroupSyncService* service =
        tab_groups::SavedTabGroupUtils::GetServiceForProfile(profile);
    CHECK(service);
-@@ -395,7 +395,7 @@ std::unique_ptr<KeyedService> BuildSyncS
-   // included in lacros-chrome once build flag switch of lacros-chrome is
-   // complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+@@ -377,7 +377,7 @@ std::unique_ptr<KeyedService> BuildSyncS
+   bool local_sync_backend_enabled = false;
+   // Only check the local sync backend pref on the supported platforms of
+   // Windows, Mac and Linux.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    syncer::SyncPrefs prefs(profile->GetPrefs());
    local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
    base::UmaHistogramBoolean("Sync.Local.Enabled2", local_sync_backend_enabled);
-@@ -531,7 +531,7 @@ SyncServiceFactory::SyncServiceFactory()
+@@ -512,7 +512,7 @@ SyncServiceFactory::SyncServiceFactory()
    DependsOn(ProfilePasswordStoreFactory::GetInstance());
    DependsOn(PowerBookmarkServiceFactory::GetInstance());
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/chromium/patches/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc b/chromium/patches/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc
deleted file mode 100644
index 08feeb3a49..0000000000
--- a/chromium/patches/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc
-@@ -31,7 +31,7 @@
- #include "components/sync_device_info/device_info_sync_service.h"
- 
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_desktop.h"
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-         // BUILDFLAG(IS_WIN)
-@@ -89,7 +89,7 @@ TabGroupSyncServiceFactory::BuildService
- 
-   std::unique_ptr<TabGroupSyncDelegate> delegate;
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (tab_groups::IsTabGroupSyncServiceDesktopMigrationEnabled()) {
-     delegate =
-         std::make_unique<TabGroupSyncDelegateDesktop>(service.get(), profile);
diff --git a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.cc b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.cc
index 6e5f6091f0..4e0bba9c90 100644
--- a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.cc
+++ b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_task__manager_sampling_task__group.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/task_manager/sampling/task_group.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/task_manager/sampling/task_group.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/task_manager/sampling/task_group.cc
-@@ -41,7 +41,7 @@ const int kBackgroundRefreshTypesMask =
+@@ -36,7 +36,7 @@ const int kBackgroundRefreshTypesMask =
  #if BUILDFLAG(IS_WIN)
      REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
  #endif  // BUILDFLAG(IS_WIN)
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group.cc,v 1.1 2025/0
      REFRESH_TYPE_FD_COUNT |
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
  #if BUILDFLAG(ENABLE_NACL)
-@@ -126,7 +126,7 @@ TaskGroup::TaskGroup(
+@@ -117,7 +117,7 @@ TaskGroup::TaskGroup(
  #if BUILDFLAG(ENABLE_NACL)
        nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
  #endif  // BUILDFLAG(ENABLE_NACL)
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group.cc,v 1.1 2025/0
        open_fd_count_(-1),
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
        idle_wakeups_per_second_(-1),
-@@ -145,7 +145,7 @@ TaskGroup::TaskGroup(
+@@ -132,7 +132,7 @@ TaskGroup::TaskGroup(
                              weak_ptr_factory_.GetWeakPtr()),
          base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone,
                              weak_ptr_factory_.GetWeakPtr()),
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group.cc,v 1.1 2025/0
          base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone,
                              weak_ptr_factory_.GetWeakPtr()),
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -325,7 +325,7 @@ void TaskGroup::OnRefreshNaClDebugStubPo
+@@ -302,7 +302,7 @@ void TaskGroup::OnRefreshNaClDebugStubPo
  }
  #endif  // BUILDFLAG(ENABLE_NACL)
  
diff --git a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.h b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.h
index 8abbf63419..3d4ddc9a29 100644
--- a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_task__manager_sampling_task__group.h,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/task_manager/sampling/task_group.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/task_manager/sampling/task_group.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/task_manager/sampling/task_group.h
-@@ -44,7 +44,7 @@ constexpr int kUnsupportedVMRefreshFlags
+@@ -41,7 +41,7 @@ constexpr int kUnsupportedVMRefreshFlags
      REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
      REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES |
      REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY |
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group.h,v 1.1 2025/02
      REFRESH_TYPE_FD_COUNT |
  #endif
      REFRESH_TYPE_HARD_FAULTS;
-@@ -152,7 +152,7 @@ class TaskGroup {
+@@ -144,7 +144,7 @@ class TaskGroup {
    }
  #endif  // BUILDFLAG(ENABLE_NACL)
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group.h,v 1.1 2025/02
    int open_fd_count() const { return open_fd_count_; }
    void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -172,7 +172,7 @@ class TaskGroup {
+@@ -164,7 +164,7 @@ class TaskGroup {
    void RefreshNaClDebugStubPort(int child_process_unique_id);
    void OnRefreshNaClDebugStubPortDone(int port);
  #endif
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group.h,v 1.1 2025/02
    void OnOpenFdCountRefreshDone(int open_fd_count);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
  
-@@ -244,7 +244,7 @@ class TaskGroup {
+@@ -235,7 +235,7 @@ class TaskGroup {
  #if BUILDFLAG(ENABLE_NACL)
    int nacl_debug_stub_port_;
  #endif  // BUILDFLAG(ENABLE_NACL)
diff --git a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
index 20afa95cc9..bd019cd7b9 100644
--- a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
+++ b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_task__manager_sampling_task__group__sampler.cc,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/task_manager/sampling/task_group_sampler.cc
-@@ -46,7 +46,7 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler(
      const OnCpuRefreshCallback& on_cpu_refresh,
      const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
      const OnIdleWakeupsCallback& on_idle_wakeups,
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group__sampler.cc,v 1
      const OnOpenFdCountCallback& on_open_fd_count,
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
      const OnProcessPriorityCallback& on_process_priority)
-@@ -56,7 +56,7 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -55,7 +55,7 @@ TaskGroupSampler::TaskGroupSampler(
        on_cpu_refresh_callback_(on_cpu_refresh),
        on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
        on_idle_wakeups_callback_(on_idle_wakeups),
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group__sampler.cc,v 1
        on_open_fd_count_callback_(on_open_fd_count),
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
        on_process_priority_callback_(on_process_priority) {
-@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t r
+@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t r
          base::BindOnce(on_swapped_mem_refresh_callback_));
    }
  
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group__sampler.cc,v 1
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
                                                      refresh_flags)) {
      blocking_pool_runner_->PostTaskAndReplyWithResult(
-@@ -96,7 +96,7 @@ void TaskGroupSampler::Refresh(int64_t r
+@@ -95,7 +95,7 @@ void TaskGroupSampler::Refresh(int64_t r
    }
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -42,7 +42,7 @@ $NetBSD: patch-chrome_browser_task__manager_sampling_task__group__sampler.cc,v 1
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
                                                      refresh_flags)) {
      blocking_pool_runner_->PostTaskAndReplyWithResult(
-@@ -150,7 +150,7 @@ int TaskGroupSampler::RefreshIdleWakeups
+@@ -152,7 +152,7 @@ int TaskGroupSampler::RefreshIdleWakeups
    return process_metrics_->GetIdleWakeupsPerSecond();
  }
  
diff --git a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
index d216ba0a9a..4bb0c9505a 100644
--- a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
+++ b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_task__manager_sampling_task__group__sampler.h,v 1.1 2025/02/06 09:57:51 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/task_manager/sampling/task_group_sampler.h
 @@ -31,7 +31,7 @@ class TaskGroupSampler : public base::Re
    using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>;
diff --git a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index 38f5aab4c8..b809d6b321 100644
--- a/chromium/patches/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/chromium/patches/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_task__manager_sampling_task__manager__impl.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -219,7 +219,7 @@ void TaskManagerImpl::GetUSERHandles(Tas
+@@ -235,7 +235,7 @@ void TaskManagerImpl::GetUSERHandles(Tas
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/chromium/patches/patch-chrome_browser_task__manager_task__manager__observer.h b/chromium/patches/patch-chrome_browser_task__manager_task__manager__observer.h
index d0a62209ce..2a9571ca4e 100644
--- a/chromium/patches/patch-chrome_browser_task__manager_task__manager__observer.h
+++ b/chromium/patches/patch-chrome_browser_task__manager_task__manager__observer.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_task__manager_task__manager__observer.h,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/task_manager/task_manager_observer.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/task_manager/task_manager_observer.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/task_manager/task_manager_observer.h
-@@ -47,7 +47,7 @@ enum RefreshType {
+@@ -46,7 +46,7 @@ enum RefreshType {
    // or backgrounded.
    REFRESH_TYPE_PRIORITY = 1 << 13,
  
diff --git a/chromium/patches/patch-chrome_browser_themes_theme__helper.cc b/chromium/patches/patch-chrome_browser_themes_theme__helper.cc
index 780cfc877d..32cb82fee0 100644
--- a/chromium/patches/patch-chrome_browser_themes_theme__helper.cc
+++ b/chromium/patches/patch-chrome_browser_themes_theme__helper.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_themes_theme__helper.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/themes/theme_helper.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/themes/theme_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/themes/theme_helper.cc
-@@ -18,7 +18,7 @@
+@@ -16,7 +16,7 @@
  #include "ui/gfx/image/image.h"
  #include "ui/native_theme/native_theme.h"
  
diff --git a/chromium/patches/patch-chrome_browser_themes_theme__service.cc b/chromium/patches/patch-chrome_browser_themes_theme__service.cc
index 90cee1fb1a..aaaa286f73 100644
--- a/chromium/patches/patch-chrome_browser_themes_theme__service.cc
+++ b/chromium/patches/patch-chrome_browser_themes_theme__service.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_themes_theme__service.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/themes/theme_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/themes/theme_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/themes/theme_service.cc
-@@ -70,7 +70,7 @@
+@@ -72,7 +72,7 @@
  #include "extensions/browser/extension_registry_observer.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_themes_theme__service.cc,v 1.1 2025/02/06 09:57:52
  #include "ui/linux/linux_ui.h"
  #include "ui/ozone/public/ozone_platform.h"  // nogncheck
  #endif
-@@ -328,7 +328,7 @@ CustomThemeSupplier* ThemeService::GetTh
+@@ -332,7 +332,7 @@ CustomThemeSupplier* ThemeService::GetTh
  }
  
  bool ThemeService::ShouldUseCustomFrame() const {
diff --git a/chromium/patches/patch-chrome_browser_themes_theme__service__aura__linux.cc b/chromium/patches/patch-chrome_browser_themes_theme__service__aura__linux.cc
index ab4085d3dd..c23f808d5c 100644
--- a/chromium/patches/patch-chrome_browser_themes_theme__service__aura__linux.cc
+++ b/chromium/patches/patch-chrome_browser_themes_theme__service__aura__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_themes_theme__service__aura__linux.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/themes/theme_service_aura_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/themes/theme_service_aura_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/themes/theme_service_aura_linux.cc
 @@ -23,7 +23,7 @@ namespace {
  ui::SystemTheme ValidateSystemTheme(ui::SystemTheme system_theme) {
diff --git a/chromium/patches/patch-chrome_browser_themes_theme__service__factory.cc b/chromium/patches/patch-chrome_browser_themes_theme__service__factory.cc
index 5d3dac500b..97d5e426f1 100644
--- a/chromium/patches/patch-chrome_browser_themes_theme__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_themes_theme__service__factory.cc
@@ -1,43 +1,35 @@
-$NetBSD: patch-chrome_browser_themes_theme__service__factory.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/themes/theme_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/themes/theme_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/themes/theme_service_factory.cc
-@@ -27,11 +27,11 @@
- 
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/themes/theme_service_aura_linux.h"
+@@ -24,7 +24,7 @@
+ #include "chrome/browser/themes/theme_helper_win.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/themes/theme_service_aura_linux.h"
  #include "ui/linux/linux_ui_factory.h"
  #endif
- 
-@@ -106,7 +106,7 @@ ThemeServiceFactory::~ThemeServiceFactor
- 
- KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
+@@ -103,7 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactor
+ std::unique_ptr<KeyedService>
+ ThemeServiceFactory::BuildServiceInstanceForBrowserContext(
      content::BrowserContext* profile) const {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    using ThemeService = ThemeServiceAuraLinux;
  #endif
  
-@@ -120,9 +120,9 @@ void ThemeServiceFactory::RegisterProfil
+@@ -115,7 +115,7 @@ ThemeServiceFactory::BuildServiceInstanc
+ 
+ void ThemeServiceFactory::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   ui::SystemTheme default_system_theme = ui::SystemTheme::kDefault;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   default_system_theme = ui::GetDefaultSystemTheme();
- #endif
    registry->RegisterIntegerPref(prefs::kSystemTheme,
+                                 static_cast<int>(ui::GetDefaultSystemTheme()));
+ #endif
diff --git a/chromium/patches/patch-chrome_browser_ui_actions_chrome__action__id.h b/chromium/patches/patch-chrome_browser_ui_actions_chrome__action__id.h
index fbc8a50bf8..aec9074f84 100644
--- a/chromium/patches/patch-chrome_browser_ui_actions_chrome__action__id.h
+++ b/chromium/patches/patch-chrome_browser_ui_actions_chrome__action__id.h
@@ -1,15 +1,15 @@
-$NetBSD: patch-chrome_browser_ui_actions_chrome__action__id.h,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/actions/chrome_action_id.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/actions/chrome_action_id.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/actions/chrome_action_id.h
-@@ -513,7 +513,7 @@
-     IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \
-   E(kActionContentContextQuickAnswersInlineQuery, \
-     IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY)
+@@ -497,7 +497,7 @@
+ #if BUILDFLAG(IS_CHROMEOS)
+ #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
+   E(kToggleMultitaskMenu, IDC_TOGGLE_MULTITASK_MENU)
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \
diff --git a/chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
index 6f324454ce..0ab4622e37 100644
--- a/chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
+++ b/chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
-@@ -49,7 +49,7 @@ gfx::Rect GetPopupSizeForVcn3ds() {
+@@ -57,7 +57,7 @@ gfx::Rect GetPopupSizeForBnpl() {
  DesktopPaymentsWindowManager::DesktopPaymentsWindowManager(
      ContentAutofillClient* client)
      : client_(CHECK_DEREF(client)) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    scoped_observation_.Observe(BrowserList::GetInstance());
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ #endif  // BUILDFLAG(IS_LINUX)
  }
-@@ -109,7 +109,7 @@ void DesktopPaymentsWindowManager::WebCo
+@@ -142,7 +142,7 @@ void DesktopPaymentsWindowManager::WebCo
    }
  }
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void DesktopPaymentsWindowManager::OnBrowserSetLastActive(Browser* browser) {
    // If there is an ongoing payments window manager pop-up flow, and the
    // original tab's WebContents become active, activate the pop-up's
diff --git a/chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
index 15f45211b7..dbe1e4c25c 100644
--- a/chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
+++ b/chromium/patches/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h
 @@ -14,7 +14,7 @@
  #include "components/autofill/core/browser/payments/payments_window_manager.h"
  #include "content/public/browser/web_contents_observer.h"
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/scoped_observation.h"
  #include "chrome/browser/ui/browser_list.h"
  #include "chrome/browser/ui/browser_list_observer.h"
@@ -19,26 +19,26 @@ $NetBSD: patch-chrome_browser_ui_autofill_payments_desktop__payments__window__ma
  // WebContents of the original tab that the pop-up is created in. If there is a
  // pop-up currently present, `this` will observe the WebContents of that pop-up.
  class DesktopPaymentsWindowManager : public PaymentsWindowManager,
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
                                       public BrowserListObserver,
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ #endif  // BUILDFLAG(IS_LINUX)
                                       public content::WebContentsObserver {
-@@ -58,7 +58,7 @@ class DesktopPaymentsWindowManager : pub
+@@ -59,7 +59,7 @@ class DesktopPaymentsWindowManager : pub
        content::NavigationHandle* navigation_handle) override;
    void WebContentsDestroyed() override;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // BrowserListObserver:
    void OnBrowserSetLastActive(Browser* browser) override;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-@@ -136,7 +136,7 @@ class DesktopPaymentsWindowManager : pub
-   std::unique_ptr<PaymentsWindowUserConsentDialogControllerImpl>
-       payments_window_user_consent_dialog_controller_;
+ #endif  // BUILDFLAG(IS_LINUX)
+@@ -161,7 +161,7 @@ class DesktopPaymentsWindowManager : pub
+   // Used in tests to notify the test infrastructure that the pop-up has closed.
+   base::RepeatingClosure popup_closed_closure_for_testing_;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    base::ScopedObservation<BrowserList, BrowserListObserver> scoped_observation_{
        this};
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-chrome_browser_ui_browser.h b/chromium/patches/patch-chrome_browser_ui_browser.h
index 74af4741ac..b3e81d5e8f 100644
--- a/chromium/patches/patch-chrome_browser_ui_browser.h
+++ b/chromium/patches/patch-chrome_browser_ui_browser.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_browser.h,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/browser.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/browser.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/browser.h
-@@ -302,7 +302,7 @@ class Browser : public TabStripModelObse
+@@ -301,7 +301,7 @@ class Browser : public TabStripModelObse
      std::optional<int64_t> display_id;
  #endif
  
diff --git a/chromium/patches/patch-chrome_browser_ui_browser__command__controller.cc b/chromium/patches/patch-chrome_browser_ui_browser__command__controller.cc
index f4673ffe62..871100bf68 100644
--- a/chromium/patches/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/chromium/patches/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,20 +1,20 @@
-$NetBSD: patch-chrome_browser_ui_browser__command__controller.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/browser_command_controller.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/browser_command_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -127,7 +127,7 @@
+@@ -126,7 +126,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/base/ime/text_edit_commands.h"
  #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
- #endif
 @@ -136,7 +136,7 @@
  #include "ui/ozone/public/ozone_platform.h"
  #endif
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_ui_browser__command__controller.cc,v 1.1 2025/02/0
  #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h"
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  
-@@ -317,7 +317,7 @@ bool BrowserCommandController::IsReserve
+@@ -332,7 +332,7 @@ bool BrowserCommandController::IsReserve
  #endif
    }
  
@@ -33,54 +33,48 @@ $NetBSD: patch-chrome_browser_ui_browser__command__controller.cc,v 1.1 2025/02/0
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    auto* linux_ui = ui::LinuxUi::instance();
-@@ -572,7 +572,7 @@ bool BrowserCommandController::ExecuteCo
- 
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-     case IDC_MINIMIZE_WINDOW:
-       browser_->window()->Minimize();
-       break;
-@@ -584,7 +584,7 @@ bool BrowserCommandController::ExecuteCo
+@@ -595,7 +595,7 @@ bool BrowserCommandController::ExecuteCo
        break;
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case IDC_USE_SYSTEM_TITLE_BAR: {
-       PrefService* prefs = profile()->GetPrefs();
-       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
-@@ -788,7 +788,7 @@ bool BrowserCommandController::ExecuteCo
+     case IDC_MINIMIZE_WINDOW:
+       browser_->window()->Minimize();
+       break;
+@@ -812,7 +812,7 @@ bool BrowserCommandController::ExecuteCo
        break;
      case IDC_CREATE_SHORTCUT:
        base::RecordAction(base::UserMetricsAction("CreateShortcut"));
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) {
-         chrome::CreateDesktopShortcutForActiveWebContents(browser_);
-       } else {
-@@ -1267,12 +1267,12 @@ void BrowserCommandController::InitComma
+       chrome::CreateDesktopShortcutForActiveWebContents(browser_);
+ #else
+       web_app::CreateWebAppFromCurrentWebContents(
+@@ -979,7 +979,7 @@ bool BrowserCommandController::ExecuteCo
+ #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+     case IDC_CHROME_WHATS_NEW:
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \
+-    (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX))
++    (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+       ShowChromeWhatsNew(browser_);
+       break;
+ #else
+@@ -1324,7 +1324,7 @@ void BrowserCommandController::InitComma
+   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
+   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
  #endif
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
    command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
    command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool use_system_title_bar = true;
- #if BUILDFLAG(IS_OZONE)
-   use_system_title_bar = ui::OzonePlatform::GetInstance()
-@@ -1603,7 +1603,7 @@ void BrowserCommandController::UpdateCom
+@@ -1682,7 +1682,7 @@ void BrowserCommandController::UpdateCom
    bool can_create_web_app = web_app::CanCreateWebApp(browser_);
    command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app);
  
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) {
-     command_updater_.UpdateCommandEnabled(
-         IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_));
+   command_updater_.UpdateCommandEnabled(
+       IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_));
+ #else
diff --git a/chromium/patches/patch-chrome_browser_ui_browser__commands.cc b/chromium/patches/patch-chrome_browser_ui_browser__commands.cc
index 3bc3b3655a..2c319b99f8 100644
--- a/chromium/patches/patch-chrome_browser_ui_browser__commands.cc
+++ b/chromium/patches/patch-chrome_browser_ui_browser__commands.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_browser__commands.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/browser_commands.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/browser_commands.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/browser_commands.cc
-@@ -2035,7 +2035,7 @@ void OpenUpdateChromeDialog(Browser* bro
+@@ -1980,7 +1980,7 @@ void OpenUpdateChromeDialog(Browser* bro
    } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
      UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate();
    } else {
diff --git a/chromium/patches/patch-chrome_browser_ui_browser__ui__prefs.cc b/chromium/patches/patch-chrome_browser_ui_browser__ui__prefs.cc
index e58e903c6f..b8b4683d22 100644
--- a/chromium/patches/patch-chrome_browser_ui_browser__ui__prefs.cc
+++ b/chromium/patches/patch-chrome_browser_ui_browser__ui__prefs.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_browser__ui__prefs.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/browser_ui_prefs.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/browser_ui_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/browser_ui_prefs.cc
 @@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySi
    registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0);
@@ -12,15 +12,15 @@ $NetBSD: patch-chrome_browser_ui_browser__ui__prefs.cc,v 1.1 2025/02/06 09:57:52
                               base::Time());
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string());
-   registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string());
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -182,7 +182,7 @@ void RegisterBrowserUserPrefs(user_prefs
+   registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser,
+                                std::string());
+   registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser,
+@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
    registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string());
-   registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string());
    registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForProfile,
+                                std::string());
+   registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForProfile,
diff --git a/chromium/patches/patch-chrome_browser_ui_browser__view__prefs.cc b/chromium/patches/patch-chrome_browser_ui_browser__view__prefs.cc
index 39b0f5c398..6ffb049524 100644
--- a/chromium/patches/patch-chrome_browser_ui_browser__view__prefs.cc
+++ b/chromium/patches/patch-chrome_browser_ui_browser__view__prefs.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_browser__view__prefs.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/browser_view_prefs.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/browser_view_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/browser_view_prefs.cc
-@@ -15,7 +15,7 @@
+@@ -14,7 +14,7 @@
  
  namespace {
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_browser__view__prefs.cc,v 1.1 2025/02/06 09:57:
  bool GetCustomFramePrefDefault() {
  #if BUILDFLAG(IS_OZONE)
    return ui::OzonePlatform::GetInstance()
-@@ -31,7 +31,7 @@ bool GetCustomFramePrefDefault() {
+@@ -30,7 +30,7 @@ bool GetCustomFramePrefDefault() {
  
  void RegisterBrowserViewProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
diff --git a/chromium/patches/patch-chrome_browser_ui_chrome__pages.cc b/chromium/patches/patch-chrome_browser_ui_chrome__pages.cc
index 476f0abfcf..2c550172f2 100644
--- a/chromium/patches/patch-chrome_browser_ui_chrome__pages.cc
+++ b/chromium/patches/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_chrome__pages.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/chrome_pages.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/chrome_pages.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/chrome_pages.cc
-@@ -87,7 +87,7 @@
+@@ -84,7 +84,7 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_chrome__pages.cc,v 1.1 2025/02/06 09:57:52 wiz
  #include "chrome/browser/web_applications/web_app_utils.h"
  #endif
  
-@@ -380,7 +380,7 @@ void ShowChromeTips(Browser* browser) {
+@@ -381,7 +381,7 @@ void ShowChromeTips(Browser* browser) {
    ShowSingletonTab(browser, GURL(kChromeTipsURL));
  }
  
@@ -24,9 +24,9 @@ $NetBSD: patch-chrome_browser_ui_chrome__pages.cc,v 1.1 2025/02/06 09:57:52 wiz
  void ShowChromeWhatsNew(Browser* browser) {
    ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL));
  }
-@@ -726,7 +726,7 @@ void ShowShortcutCustomizationApp(Profil
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -699,7 +699,7 @@ void ShowShortcutCustomizationApp(Profil
  }
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_ui_chrome__pages.h b/chromium/patches/patch-chrome_browser_ui_chrome__pages.h
index 452d938cdf..d00d229a3c 100644
--- a/chromium/patches/patch-chrome_browser_ui_chrome__pages.h
+++ b/chromium/patches/patch-chrome_browser_ui_chrome__pages.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_chrome__pages.h,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/chrome_pages.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/chrome_pages.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/chrome_pages.h
 @@ -39,7 +39,7 @@ namespace signin {
  enum class ConsentLevel;
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_chrome__pages.h,v 1.1 2025/02/06 09:57:52 wiz E
  namespace web_app {
  enum class AppSettingsPageEntryPoint;
  }  // namespace web_app
-@@ -176,7 +176,7 @@ void ShowShortcutCustomizationApp(Profil
+@@ -174,7 +174,7 @@ void ShowShortcutCustomizationApp(Profil
                                    const std::string& category);
  #endif
  
diff --git a/chromium/patches/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc b/chromium/patches/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
index 8181fc4c82..ca7961d3ad 100644
--- a/chromium/patches/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
+++ b/chromium/patches/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_color_native__chrome__color__mixer.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/color/native_chrome_color_mixer.cc
 @@ -7,7 +7,7 @@
  #include "build/build_config.h"
diff --git a/chromium/patches/patch-chrome_browser_ui_managed__ui.cc b/chromium/patches/patch-chrome_browser_ui_managed__ui.cc
index 16007adf3b..383de10fe5 100644
--- a/chromium/patches/patch-chrome_browser_ui_managed__ui.cc
+++ b/chromium/patches/patch-chrome_browser_ui_managed__ui.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_managed__ui.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/managed_ui.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/managed_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/managed_ui.cc
-@@ -439,7 +439,7 @@ std::optional<std::string> GetDeviceMana
+@@ -433,7 +433,7 @@ std::optional<std::string> GetDeviceMana
        g_browser_process->platform_part()->browser_policy_connector_ash();
    return connector->GetEnterpriseDomainManager();
  #else
@@ -15,9 +15,9 @@ $NetBSD: patch-chrome_browser_ui_managed__ui.cc,v 1.1 2025/02/06 09:57:52 wiz Ex
    if (base::FeatureList::IsEnabled(
            features::kEnterpriseManagementDisclaimerUsesCustomLabel)) {
      std::string custom_management_label =
-@@ -476,7 +476,7 @@ std::optional<std::string> GetAccountMan
-                policy::EnterpriseManagementAuthority::CLOUD))
+@@ -463,7 +463,7 @@ std::optional<std::string> GetAccountMan
      return std::nullopt;
+   }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/chromium/patches/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
index 26ab59cb5a..f08eea0e4e 100644
--- a/chromium/patches/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
+++ b/chromium/patches/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
-@@ -1976,7 +1976,7 @@ const gfx::VectorIcon& GetSharingHubVect
+@@ -1985,7 +1985,7 @@ const gfx::VectorIcon& GetSharingHubVect
    return omnibox::kShareMacChromeRefreshIcon;
  #elif BUILDFLAG(IS_WIN)
    return omnibox::kShareWinChromeRefreshIcon;
diff --git a/chromium/patches/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc b/chromium/patches/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
index 405c6356ba..81b877cf3c 100644
--- a/chromium/patches/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
+++ b/chromium/patches/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc
 @@ -44,7 +44,7 @@ std::u16string RelaunchChromeBubbleContr
  #if BUILDFLAG(IS_MAC)
diff --git a/chromium/patches/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/chromium/patches/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
index d0ab5b465e..9443f4c3b5 100644
--- a/chromium/patches/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
+++ b/chromium/patches/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
-@@ -97,7 +97,7 @@ namespace {
+@@ -102,7 +102,7 @@ namespace {
  
  using Logger = autofill::SavePasswordProgressLogger;
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc,
  // Should be kept in sync with constant declared in
  // bubble_controllers/relaunch_chrome_bubble_controller.cc.
  constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3;
-@@ -517,7 +517,7 @@ void ManagePasswordsUIController::OnBiom
+@@ -549,7 +549,7 @@ void ManagePasswordsUIController::OnBiom
  }
  
  void ManagePasswordsUIController::OnKeychainError() {
diff --git a/chromium/patches/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc b/chromium/patches/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
new file mode 100644
index 0000000000..9f89d02631
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_prefs_prefs__tab__helper.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/prefs/prefs_tab_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/prefs/prefs_tab_helper.cc
+@@ -66,7 +66,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If a font name in prefs default values starts with a comma, consider it's a
+ // comma-separated font list and resolve it to the first available font.
+ #define PREFS_FONT_LIST 1
diff --git a/chromium/patches/patch-chrome_browser_ui_sad__tab.cc b/chromium/patches/patch-chrome_browser_ui_sad__tab.cc
index 4fabb5fce3..08fa1c78a7 100644
--- a/chromium/patches/patch-chrome_browser_ui_sad__tab.cc
+++ b/chromium/patches/patch-chrome_browser_ui_sad__tab.cc
@@ -1,15 +1,15 @@
-$NetBSD: patch-chrome_browser_ui_sad__tab.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/sad_tab.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/sad_tab.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/sad_tab.cc
-@@ -176,7 +176,7 @@ std::vector<int> SadTab::GetSubMessages(
-       // Only show Incognito suggestion if not already in Incognito mode.
-       if (!web_contents_->GetBrowserContext()->IsOffTheRecord())
+@@ -179,7 +179,7 @@ std::vector<int> SadTab::GetSubMessages(
+       if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) {
          message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO);
+       }
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
        // Note: on macOS, Linux and ChromeOS, the first bullet is either one of
diff --git a/chromium/patches/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h b/chromium/patches/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
index 6df3881db3..75e7023a75 100644
--- a/chromium/patches/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
+++ b/chromium/patches/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
 @@ -36,7 +36,7 @@ class SharingHubBubbleController {
    // Returns true if the omnibox icon should be shown.
diff --git a/chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller.cc b/chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller.cc
index a8a905daab..7880133100 100644
--- a/chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller.cc
+++ b/chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_ui_signin_signin__view__controller.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/signin/signin_view_controller.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/signin/signin_view_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/signin/signin_view_controller.cc
-@@ -489,7 +489,7 @@ void SigninViewController::ShowModalMana
+@@ -443,7 +443,7 @@ void SigninViewController::ShowModalSync
+ void SigninViewController::ShowModalManagedUserNoticeDialog(
      std::unique_ptr<signin::EnterpriseProfileCreationDialogParams>
          create_param) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    CloseModalSignin();
    dialog_ = std::make_unique<SigninModalDialogImpl>(
        SigninViewControllerDelegate::CreateManagedUserNoticeDelegate(
diff --git a/chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h b/chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
index ff1aacc229..01937f1fff 100644
--- a/chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
+++ b/chromium/patches/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_ui_signin_signin__view__controller__delegate.h,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/signin/signin_view_controller_delegate.h
-@@ -85,7 +85,7 @@ class SigninViewControllerDelegate {
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -79,7 +79,7 @@ class SigninViewControllerDelegate {
+       SignoutConfirmationCallback callback);
+ #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Returns a platform-specific SigninViewContolllerDelegate instance that
    // displays the managed user notice modal dialog. The returned object
    // should delete itself when the window it's managing is closed.
diff --git a/chromium/patches/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/chromium/patches/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index 8950509b43..9181a55f57 100644
--- a/chromium/patches/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/chromium/patches/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_ui_startup_bad__flags__prompt.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -105,7 +105,7 @@ const char* const kBadFlags[] = {
+@@ -95,7 +95,7 @@ const char* const kBadFlags[] = {
+     extensions::switches::kExtensionsOnChromeURLs,
+ #endif
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      // Speech dispatcher is buggy, it can crash and it can make Chrome freeze.
      // http://crbug.com/327295
      switches::kEnableSpeechDispatcher,
diff --git a/chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index e594faeedc..13f7b507a4 100644
--- a/chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_startup_startup__browser__creator.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -139,7 +139,7 @@
+@@ -134,7 +134,7 @@
  #include "chrome/credential_provider/common/gcp_strings.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_startup_startup__browser__creator.cc,v 1.1 2025
  #include "chrome/browser/headless/headless_mode_util.h"
  #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
  #include "components/headless/policy/headless_mode_policy.h"
-@@ -968,7 +968,7 @@ bool StartupBrowserCreator::ProcessCmdLi
+@@ -978,7 +978,7 @@ bool StartupBrowserCreator::ProcessCmdLi
    TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
    ComputeAndRecordLaunchMode(command_line);
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_ui_startup_startup__browser__creator.cc,v 1.1 2025
    if (headless::IsHeadlessMode() &&
        headless::HeadlessModePolicy::IsHeadlessModeDisabled(
            g_browser_process->local_state())) {
-@@ -1069,7 +1069,7 @@ bool StartupBrowserCreator::ProcessCmdLi
+@@ -1081,7 +1081,7 @@ bool StartupBrowserCreator::ProcessCmdLi
      silent_launch = true;
    }
  
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_ui_startup_startup__browser__creator.cc,v 1.1 2025
    // Writes open and installed web apps to the specified file without
    // launching a new browser window or tab.
    if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
-@@ -1284,7 +1284,7 @@ bool StartupBrowserCreator::ProcessCmdLi
+@@ -1298,7 +1298,7 @@ bool StartupBrowserCreator::ProcessCmdLi
      CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
          << "Failed launch with app: couldn't pick a profile";
      std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
@@ -41,4 +41,4 @@ $NetBSD: patch-chrome_browser_ui_startup_startup__browser__creator.cc,v 1.1 2025
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      // If Chrome Apps are deprecated and |app_id| is a Chrome App, display the
      // deprecation UI instead of launching the app.
-     if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id))
+     if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id)) {
diff --git a/chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
index 1957225e33..b50ce11288 100644
--- a/chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
+++ b/chromium/patches/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -85,7 +85,7 @@
- #include "chromeos/startup/browser_params_proxy.h"
+@@ -76,7 +76,7 @@
+ #include "components/app_restore/full_restore_utils.h"
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc,v 1.
  #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -225,7 +225,7 @@ Browser* StartupBrowserCreatorImpl::Open
+@@ -208,7 +208,7 @@ Browser* StartupBrowserCreatorImpl::Open
      // at the state of the MessageLoop.
      Browser::CreateParams params = Browser::CreateParams(profile_, false);
      params.creation_source = Browser::CreationSource::kStartupCreator;
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc,v 1.
      params.startup_id =
          command_line_->GetSwitchValueASCII("desktop-startup-id");
  #endif
-@@ -255,7 +255,7 @@ Browser* StartupBrowserCreatorImpl::Open
+@@ -238,7 +238,7 @@ Browser* StartupBrowserCreatorImpl::Open
        continue;
      }
  
diff --git a/chromium/patches/patch-chrome_browser_ui_startup_startup__tab__provider.cc b/chromium/patches/patch-chrome_browser_ui_startup_startup__tab__provider.cc
index 3964e90746..6cfcff2bd1 100644
--- a/chromium/patches/patch-chrome_browser_ui_startup_startup__tab__provider.cc
+++ b/chromium/patches/patch-chrome_browser_ui_startup_startup__tab__provider.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_startup_startup__tab__provider.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/startup/startup_tab_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/startup/startup_tab_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/startup/startup_tab_provider.cc
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
  #include "extensions/browser/extension_registry.h"
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -15,12 +15,12 @@ $NetBSD: patch-chrome_browser_ui_startup_startup__tab__provider.cc,v 1.1 2025/02
  #include "chrome/browser/headless/headless_mode_util.h"
  #endif
  
-@@ -105,7 +105,7 @@ bool ValidateUrl(const GURL& url) {
- #if BUILDFLAG(IS_CHROMEOS_LACROS)
-   // In ChromeOS, allow any URL pattern that matches chrome:// scheme.
-   url_scheme_is_chrome = url.SchemeIs(content::kChromeUIScheme);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+@@ -101,7 +101,7 @@ bool ValidateUrl(const GURL& url) {
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+   bool url_scheme_is_chrome = false;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    // In Headless mode, allow any URL pattern that matches chrome:// scheme if
    // the user explicitly allowed it.
    if (headless::IsHeadlessMode() && url.SchemeIs(content::kChromeUIScheme)) {
diff --git a/chromium/patches/patch-chrome_browser_ui_tab__helpers.cc b/chromium/patches/patch-chrome_browser_ui_tab__helpers.cc
index 358935826f..d35f71b298 100644
--- a/chromium/patches/patch-chrome_browser_ui_tab__helpers.cc
+++ b/chromium/patches/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_tab__helpers.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/tab_helpers.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/tab_helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -240,7 +240,7 @@
+@@ -218,7 +218,7 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -15,12 +15,12 @@ $NetBSD: patch-chrome_browser_ui_tab__helpers.cc,v 1.1 2025/02/06 09:57:52 wiz E
  #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
  #include "chrome/browser/ui/browser_finder.h"
  #include "chrome/browser/ui/hats/hats_helper.h"
-@@ -718,12 +718,12 @@ void TabHelpers::AttachTabHelpers(WebCon
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+@@ -697,12 +697,12 @@ void TabHelpers::AttachTabHelpers(WebCon
+   webapps::PreRedirectionURLObserver::CreateForWebContents(web_contents);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents);
  #endif
  
diff --git a/chromium/patches/patch-chrome_browser_ui_tabs_features.cc b/chromium/patches/patch-chrome_browser_ui_tabs_features.cc
index 7992fb7f25..16b09f4d73 100644
--- a/chromium/patches/patch-chrome_browser_ui_tabs_features.cc
+++ b/chromium/patches/patch-chrome_browser_ui_tabs_features.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_ui_tabs_features.cc,v 1.1 2025/02/06 09:57:52 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/tabs/features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/tabs/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/tabs/features.cc
-@@ -48,7 +48,7 @@ BASE_FEATURE(kTabStripCollectionStorage,
- bool CanShowTabSearchPositionSetting() {
+@@ -47,7 +47,7 @@ bool CanShowTabSearchPositionSetting() {
+   }
  // Mac and other platforms will always have the tab search position in the
  // correct location, cros/linux/win git the user the option to change.
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
diff --git a/chromium/patches/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc b/chromium/patches/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc
new file mode 100644
index 0000000000..3822ee11bb
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_tabs_tab__dialog__manager.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/tabs/tab_dialog_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/tabs/tab_dialog_manager.cc
+@@ -83,7 +83,7 @@ bool SupportsGlobalScreenCoordinates() {
+ }
+ 
+ bool PlatformClipsChildrenToViewport() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return true;
+ #else
+   return false;
diff --git a/chromium/patches/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc b/chromium/patches/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
index bec3ed89a3..5b99495826 100644
--- a/chromium/patches/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
+++ b/chromium/patches/patch-chrome_browser_ui_tabs_tab__strip__prefs.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_tabs_tab__strip__prefs.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/tabs/tab_strip_prefs.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/tabs/tab_strip_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/tabs/tab_strip_prefs.cc
-@@ -20,7 +20,7 @@ namespace tabs {
+@@ -21,7 +21,7 @@ namespace tabs {
  
  bool GetDefaultTabSearchRightAligned() {
    // These platforms are all left aligned, the others should be right.
diff --git a/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
deleted file mode 100644
index 176a9b1d56..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_task__manager_task__manager__columns.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/ui/task_manager/task_manager_columns.cc
-@@ -93,7 +93,7 @@ const TableColumnData kColumns[] = {
-      std::size("100000") * kCharWidth, -1, true, false, false},
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     {IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
-      std::size("999") * kCharWidth, -1, true, false, false},
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
diff --git a/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.h b/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.h
new file mode 100644
index 0000000000..9f84600df1
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__columns.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/task_manager/task_manager_columns.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/task_manager/task_manager_columns.h
+@@ -277,7 +277,7 @@ inline constexpr std::array kColumns = {
+                     .default_visibility = false},
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+     TableColumnData{.id = IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN,
+                     .align = ui::TableColumn::RIGHT,
+                     .width = -1,
diff --git a/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index eaf8d8f53f..66e517fcde 100644
--- a/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/chromium/patches/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,21 +1,30 @@
-$NetBSD: patch-chrome_browser_ui_task__manager_task__manager__table__model.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -459,7 +459,7 @@ std::u16string TaskManagerTableModel::Ge
-           ? stringifier_->backgrounded_string()
-           : stringifier_->foregrounded_string();
+@@ -419,7 +419,7 @@ TaskManagerTableModel::~TaskManagerTable
+   // Note: system_total_time_ is used for both since there is no functional
+   // difference between browser & system (they are essentially the same tab).
+   // Instead, the data is routed to the platform appropriate bucket.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   task_manager::RecordTabSwitchEvent(CategoryRecord::kBrowser,
+                                      system_total_time_);
+ #elif BUILDFLAG(IS_CHROMEOS)
+@@ -560,7 +560,7 @@ std::u16string TaskManagerTableModel::Ge
+                  ? stringifier_->backgrounded_string()
+                  : stringifier_->foregrounded_string();
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
        return fd_count >= 0 ? base::FormatNumber(fd_count)
-@@ -626,7 +626,7 @@ int TaskManagerTableModel::CompareValues
+@@ -723,7 +723,7 @@ int TaskManagerTableModel::CompareValues
        return BooleanCompare(is_proc1_bg, is_proc2_bg);
      }
  
@@ -24,7 +33,7 @@ $NetBSD: patch-chrome_browser_ui_task__manager_task__manager__table__model.cc,v
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int proc1_fd_count =
            observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -811,7 +811,7 @@ void TaskManagerTableModel::UpdateRefres
+@@ -1030,7 +1030,7 @@ void TaskManagerTableModel::UpdateRefres
        type = REFRESH_TYPE_KEEPALIVE_COUNT;
        break;
  
diff --git a/chromium/patches/patch-chrome_browser_ui_test_popup__browsertest.cc b/chromium/patches/patch-chrome_browser_ui_test_popup__browsertest.cc
index 3aeab6752f..db1229a417 100644
--- a/chromium/patches/patch-chrome_browser_ui_test_popup__browsertest.cc
+++ b/chromium/patches/patch-chrome_browser_ui_test_popup__browsertest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_test_popup__browsertest.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/test/popup_browsertest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/test/popup_browsertest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/test/popup_browsertest.cc
 @@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLe
    const display::Display display = GetDisplayNearestBrowser(popup);
diff --git a/chromium/patches/patch-chrome_browser_ui_test_test__browser__ui.cc b/chromium/patches/patch-chrome_browser_ui_test_test__browser__ui.cc
index 9bd43de76d..48ed4c0291 100644
--- a/chromium/patches/patch-chrome_browser_ui_test_test__browser__ui.cc
+++ b/chromium/patches/patch-chrome_browser_ui_test_test__browser__ui.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-chrome_browser_ui_test_test__browser__ui.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/test/test_browser_ui.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/test/test_browser_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/test/test_browser_ui.cc
-@@ -22,7 +22,7 @@
+@@ -19,7 +19,7 @@
+ #include "ui/views/widget/widget.h"
+ #endif
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "content/public/common/content_switches.h"
  #include "ui/base/test/skia_gold_matching_algorithm.h"
-@@ -39,7 +39,7 @@
+ #include "ui/compositor/compositor.h"
+@@ -33,7 +33,7 @@
+ #endif
+ 
  // TODO(crbug.com/40625383) support Mac for pixel tests.
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #define SUPPORTS_PIXEL_TEST
  #endif
  
diff --git a/chromium/patches/patch-chrome_browser_ui_ui__features.cc b/chromium/patches/patch-chrome_browser_ui_ui__features.cc
index bedf9e3dd0..c6cbf3c553 100644
--- a/chromium/patches/patch-chrome_browser_ui_ui__features.cc
+++ b/chromium/patches/patch-chrome_browser_ui_ui__features.cc
@@ -1,23 +1,23 @@
-$NetBSD: patch-chrome_browser_ui_ui__features.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/ui_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/ui_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/ui_features.cc
-@@ -104,7 +104,7 @@ BASE_FEATURE(kAccessCodeCastUI,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #endif
+@@ -45,7 +45,7 @@ bool IsExtensionMenuInRootAppMenu() {
+   return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu);
+ }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Enables the feature to remove the last confirmation dialog when relaunching
  // to update Chrome.
  BASE_FEATURE(kFewerUpdateConfirmations,
-@@ -446,7 +446,7 @@ BASE_FEATURE(kStopLoadingAnimationForHid
-              "StopLoadingAnimationForHiddenWindow",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -326,7 +326,7 @@ BASE_FEATURE(kViewsJSAppModalDialog,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_ui_ui__features.h b/chromium/patches/patch-chrome_browser_ui_ui__features.h
index 9ca15b160f..c851947587 100644
--- a/chromium/patches/patch-chrome_browser_ui_ui__features.h
+++ b/chromium/patches/patch-chrome_browser_ui_ui__features.h
@@ -1,23 +1,23 @@
-$NetBSD: patch-chrome_browser_ui_ui__features.h,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/ui_features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/ui_features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/ui_features.h
-@@ -76,7 +76,7 @@ bool IsExtensionMenuInRootAppMenu();
- BASE_DECLARE_FEATURE(kAccessCodeCastUI);
- #endif
+@@ -31,7 +31,7 @@ BASE_DECLARE_FEATURE(kCloseOmniboxPopupO
+ BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu);
+ bool IsExtensionMenuInRootAppMenu();
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_DECLARE_FEATURE(kFewerUpdateConfirmations);
  #endif
  
-@@ -279,7 +279,7 @@ BASE_DECLARE_FEATURE(kViewsJSAppModalDia
- 
- BASE_DECLARE_FEATURE(kStopLoadingAnimationForHiddenWindow);
+@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialo
+ BASE_DECLARE_FEATURE(kViewsJSAppModalDialog);
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_ui_views_accelerator__table.cc b/chromium/patches/patch-chrome_browser_ui_views_accelerator__table.cc
index 6d18bd9621..09193b9a4e 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_accelerator__table.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/accelerator_table.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/accelerator_table.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/accelerator_table.cc
-@@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap
+@@ -70,11 +70,11 @@ const AcceleratorMapping kAcceleratorMap
      {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
      {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
      {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
@@ -20,7 +20,7 @@ $NetBSD: patch-chrome_browser_ui_views_accelerator__table.cc,v 1.1 2025/02/06 09
      {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
      {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
       IDC_MOVE_TAB_PREVIOUS},
-@@ -104,7 +104,7 @@ const AcceleratorMapping kAcceleratorMap
+@@ -102,7 +102,7 @@ const AcceleratorMapping kAcceleratorMap
      {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
      {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
      {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
@@ -29,7 +29,7 @@ $NetBSD: patch-chrome_browser_ui_views_accelerator__table.cc,v 1.1 2025/02/06 09
      {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
      {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
-@@ -156,7 +156,7 @@ const AcceleratorMapping kAcceleratorMap
+@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap
       IDC_SHOW_AVATAR_MENU},
  
  // Platform-specific key maps.
diff --git a/chromium/patches/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/chromium/patches/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
index bc34a4cef8..6b0d286669 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
-@@ -20,7 +20,7 @@
- #include "ui/gfx/image/image_skia.h"
+@@ -19,7 +19,7 @@
+ #include "ui/menus/simple_menu_model.h"
  #include "ui/views/widget/widget.h"
  
 -#if BUILDFLAG(IS_LINUX)
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__
  #include "chrome/browser/shell_integration_linux.h"
  #endif
  
-@@ -55,7 +55,7 @@ void ChromeNativeAppWindowViewsAura::OnB
+@@ -49,7 +49,7 @@ void ChromeNativeAppWindowViewsAura::OnB
      const AppWindow::CreateParams& create_params,
      views::Widget::InitParams* init_params,
      views::Widget* widget) {
diff --git a/chromium/patches/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/chromium/patches/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
index a6143b366b..5535adb97b 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
 @@ -39,7 +39,7 @@
  #include "ui/wm/core/wm_state.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__view
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsViews::P
+@@ -135,7 +135,7 @@ void ChromeBrowserMainExtraPartsViews::P
          return controller;
        }));
  
diff --git a/chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate.h b/chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate.h
index de121ca3ac..bfcf5f444d 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate.h
+++ b/chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate.h
@@ -1,22 +1,17 @@
-$NetBSD: patch-chrome_browser_ui_views_chrome__views__delegate.h,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -61,11 +61,11 @@ class ChromeViewsDelegate : public views
+@@ -52,7 +52,7 @@ class ChromeViewsDelegate : public views
                               base::OnceClosure callback) override;
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   bool WindowManagerProvidesTitleBar(bool maximized) override;
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   bool WindowManagerProvidesTitleBar(bool maximized) override;
    gfx::ImageSkia* GetDefaultWindowIcon() const override;
  #endif
- 
diff --git a/chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc b/chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
index f4465cde9f..23cf019509 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/chrome_views_delegate_linux.cc
 @@ -26,7 +26,7 @@ bool IsDesktopEnvironmentUnity() {
    return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY;
diff --git a/chromium/patches/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc b/chromium/patches/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
index 0fc72350a2..061cf4e2da 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_compose_compose__dialog__view.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/compose/compose_dialog_view.cc
-@@ -159,7 +159,7 @@ void ComposeDialogView::OnBeforeBubbleWi
+@@ -160,7 +160,7 @@ void ComposeDialogView::OnBeforeBubbleWi
      views::Widget::InitParams* params,
      views::Widget* widget) const {
    WebUIBubbleDialogView::OnBeforeBubbleWidgetInit(params, widget);
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.cc
index 3b856dc2b2..b1d21ceb50 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_browser__frame.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -55,7 +55,7 @@
- #include "components/user_manager/user_manager.h"
+@@ -52,7 +52,7 @@
+ #include "ui/aura/window.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_browser__frame.cc,v 1.1 2025/02/06
  #include "ui/display/screen.h"
  #include "ui/linux/linux_ui.h"
  #endif
-@@ -90,7 +90,7 @@ class ThemeChangedObserver : public view
+@@ -87,7 +87,7 @@ class ThemeChangedObserver : public view
  };
  
  bool IsUsingLinuxSystemTheme(Profile* profile) {
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_browser__frame.cc,v 1.1 2025/02/06
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
-@@ -185,7 +185,7 @@ void BrowserFrame::InitBrowserFrame() {
+@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() {
  
    Init(std::move(params));
  
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_browser__frame.cc,v 1.1 2025/02/06
    SelectNativeTheme();
  #else
    SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi());
-@@ -372,7 +372,7 @@ void BrowserFrame::OnNativeWidgetWorkspa
+@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspa
    chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
    chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
                                             IsVisibleOnAllWorkspaces());
@@ -42,7 +42,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_browser__frame.cc,v 1.1 2025/02/06
    // If the window was sent to a different workspace, prioritize it if
    // it was sent to the current workspace and deprioritize it
    // otherwise.  This is done by MoveBrowsersInWorkspaceToFront()
-@@ -566,7 +566,7 @@ void BrowserFrame::OnMenuClosed() {
+@@ -568,7 +568,7 @@ void BrowserFrame::OnMenuClosed() {
  }
  
  void BrowserFrame::SelectNativeTheme() {
@@ -51,7 +51,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_browser__frame.cc,v 1.1 2025/02/06
    // Use the regular NativeTheme instance if running incognito mode, regardless
    // of system theme (gtk, qt etc).
    ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
-@@ -607,7 +607,7 @@ void BrowserFrame::OnTouchUiChanged() {
+@@ -609,7 +609,7 @@ void BrowserFrame::OnTouchUiChanged() {
  bool BrowserFrame::RegenerateFrameOnThemeChange(
      BrowserThemeChangeType theme_change_type) {
    bool need_regenerate = false;
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.h b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.h
index 25a40474a3..e42a05ace2 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.h
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_browser__frame.h,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/browser_frame.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/browser_frame.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/browser_frame.h
 @@ -66,7 +66,7 @@ class BrowserFrame : public views::Widge
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_browser__frame.h,v 1.1 2025/02/06 0
    // Returns whether the frame is in a tiled state.
    bool tiled() const { return tiled_; }
    void set_tiled(bool tiled) { tiled_ = tiled; }
-@@ -226,7 +226,7 @@ class BrowserFrame : public views::Widge
+@@ -227,7 +227,7 @@ class BrowserFrame : public views::Widge
    // contents for smoother dragging.
    TabDragKind tab_drag_kind_ = TabDragKind::kNone;
  
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
index 04d479ed48..e02101e00c 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc
 @@ -54,7 +54,7 @@ gfx::Insets BrowserFrameViewLayoutLinux:
          OpaqueBrowserFrameViewLayout::RestoredFrameBorderInsets());
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
index 868b6a951b..d4842e4f86 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc
 @@ -18,7 +18,7 @@ BrowserFrameViewLayoutLinuxNative::~Brow
  
@@ -13,5 +13,5 @@ $NetBSD: patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    const bool tiled = delegate_->IsTiled();
+   const bool maximized = delegate_->IsMaximized();
  #else
-   const bool tiled = false;
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
index 88a0b4f021..fc5c9d8ba3 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/browser_frame_view_linux.cc
 @@ -70,7 +70,7 @@ gfx::ShadowValues BrowserFrameViewLinux:
  
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
index d19c838178..14386739b9 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
  #include "chrome/browser/ui/views/frame/browser_frame_view_win.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__
  #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h"
  #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h"
  #include "chrome/browser/ui/views/frame/browser_frame_view_linux_native.h"
-@@ -33,7 +33,7 @@ namespace {
+@@ -32,7 +32,7 @@ namespace {
  std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView(
      BrowserFrame* frame,
      BrowserView* browser_view) {
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
index decacbc4b0..9c9879f710 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,17 +1,26 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_browser__view.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2367,7 +2367,7 @@ void BrowserView::TabDraggingStatusChang
-   // CrOS cleanup is done.
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
-   contents_web_view_->SetFastResize(is_dragging);
-   if (!is_dragging) {
-     // When tab dragging is ended, we need to make sure the web contents get
+@@ -2581,7 +2581,7 @@ void BrowserView::ToolbarSizeChanged(boo
+ }
+ 
+ void BrowserView::TabDraggingStatusChanged(bool is_dragging) {
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+   GetContentsWebView()->SetFastResize(is_dragging);
+   if (multi_contents_view_) {
+     multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging);
+@@ -5825,7 +5825,7 @@ void BrowserView::MaybeShowProfileSwitch
+ }
+ 
+ void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (!ShouldShowAvatarToolbarIPH()) {
+     return;
+   }
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index 9adaf39bec..98689d6827 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
 @@ -54,7 +54,7 @@
  #include "ui/views/window/vector_icons/vector_icons.h"
@@ -15,16 +15,16 @@ $NetBSD: patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc,v 1
  #include "ui/views/controls/menu/menu_runner.h"
  #endif
  
-@@ -559,7 +559,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
+@@ -572,7 +572,7 @@ bool OpaqueBrowserFrameView::EverHasVisi
+ 
+ OpaqueBrowserFrameView::FrameButtonStyle
  OpaqueBrowserFrameView::GetFrameButtonStyle() const {
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return FrameButtonStyle::kMdButton;
  #else
    return FrameButtonStyle::kImageButton;
-@@ -578,7 +578,7 @@ bool OpaqueBrowserFrameView::ShouldDrawR
+@@ -591,7 +591,7 @@ bool OpaqueBrowserFrameView::ShouldDrawR
    return false;
  }
  
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc,v 1
  bool OpaqueBrowserFrameView::IsTiled() const {
    return frame()->tiled();
  }
-@@ -777,7 +777,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIco
+@@ -794,7 +794,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIco
  }
  
  void OpaqueBrowserFrameView::WindowIconPressed() {
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
index bde2f217fe..e672feb4fa 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
-@@ -111,7 +111,7 @@ class OpaqueBrowserFrameView : public Br
+@@ -110,7 +110,7 @@ class OpaqueBrowserFrameView : public Br
    FrameButtonStyle GetFrameButtonStyle() const override;
    void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override;
    bool ShouldDrawRestoredFrameShadow() const override;
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h,v 1.
    bool IsTiled() const override;
  #endif
    int WebAppButtonHeight() const override;
-@@ -228,7 +228,7 @@ class OpaqueBrowserFrameView : public Br
+@@ -227,7 +227,7 @@ class OpaqueBrowserFrameView : public Br
    // Background painter for the window frame.
    std::unique_ptr<views::FrameBackground> frame_background_;
  
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h b/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
index a47c9a6211..b56acb8026 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
@@ -1,21 +1,21 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h,v 1.1 2025/02/06 09:57:53 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
+ 
  #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/base/ui_base_types.h"
  #endif
  
-@@ -93,7 +93,7 @@ class OpaqueBrowserFrameViewLayoutDelega
+@@ -92,7 +92,7 @@ class OpaqueBrowserFrameViewLayoutDelega
    // Returns true if a client-side shadow should be drawn for restored windows.
    virtual bool ShouldDrawRestoredFrameShadow() const = 0;
  
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
index 103f2c52f6..26cd9d5ed1 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
  #include "ui/aura/window.h"
  #endif
  
@@ -15,7 +15,16 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
-@@ -93,7 +93,7 @@ constexpr int kContentSettingIconSize = 
+@@ -76,7 +76,7 @@
+ 
+ // Windows, Mac and CrOS do not clip child widgets to their parents, so we
+ // don't have to worry about resizing quite as much.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #define PLATFORM_CLIPS_CHILD_WINDOWS
+ #endif
+ 
+@@ -89,7 +89,7 @@ constexpr int kContentSettingIconSize = 
  // The height of the controls bar at the top of the window.
  constexpr int kTopControlsHeight = 34;
  
@@ -24,7 +33,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
  // Frame border when window shadow is not drawn.
  constexpr int kFrameBorderThickness = 4;
  #endif
-@@ -188,7 +188,7 @@ class WindowEventObserver : public ui::E
+@@ -184,7 +184,7 @@ class WindowEventObserver : public ui::E
  
      gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
  
@@ -33,7 +42,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
      // Calculate input bounds for Linux. This is needed because the input bounds
      // is not necessary the same as the local bounds on Linux.
      if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -590,7 +590,7 @@ PictureInPictureBrowserFrameView::Pictur
+@@ -630,7 +630,7 @@ PictureInPictureBrowserFrameView::Pictur
          AddChildView(std::move(auto_pip_setting_overlay));
    }
  
@@ -42,16 +51,16 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
    auto* profile = browser_view->browser()->profile();
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
-@@ -812,7 +812,7 @@ void PictureInPictureBrowserFrameView::O
-   for (ContentSettingImageView* view : content_setting_views_)
+@@ -855,7 +855,7 @@ void PictureInPictureBrowserFrameView::O
      view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
+   }
  
 -#if !BUILDFLAG(IS_LINUX)
 +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
    // On Linux the top bar background will be drawn in OnPaint().
    top_bar_container_view_->SetBackground(views::CreateSolidBackground(
        color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -896,7 +896,7 @@ void PictureInPictureBrowserFrameView::R
+@@ -944,7 +944,7 @@ void PictureInPictureBrowserFrameView::R
    BrowserNonClientFrameView::RemovedFromWidget();
  }
  
@@ -60,7 +69,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
  gfx::Insets
  PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const {
    auto border = FrameBorderInsets();
-@@ -1188,7 +1188,7 @@ void PictureInPictureBrowserFrameView::A
+@@ -1235,7 +1235,7 @@ void PictureInPictureBrowserFrameView::A
  // views::View implementations:
  
  void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -69,7 +78,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
    // Draw the PiP window frame borders and shadows, including the top bar
    // background.
    if (window_frame_provider_) {
-@@ -1343,7 +1343,7 @@ void PictureInPictureBrowserFrameView::U
+@@ -1390,7 +1390,7 @@ void PictureInPictureBrowserFrameView::U
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -78,16 +87,16 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
    if (window_frame_provider_) {
      const auto insets = window_frame_provider_->GetFrameThicknessDip();
      const bool tiled = frame()->tiled();
-@@ -1361,7 +1361,7 @@ gfx::Insets PictureInPictureBrowserFrame
+@@ -1408,7 +1408,7 @@ gfx::Insets PictureInPictureBrowserFrame
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return FrameBorderInsets();
- #elif !BUILDFLAG(IS_CHROMEOS_ASH)
+ #elif !BUILDFLAG(IS_CHROMEOS)
    return gfx::Insets(kResizeBorder);
-@@ -1382,7 +1382,7 @@ gfx::Size PictureInPictureBrowserFrameVi
+@@ -1429,7 +1429,7 @@ gfx::Size PictureInPictureBrowserFrameVi
                     top_height + border_thickness.bottom());
  }
  
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
index a9e607cd8d..80726cba8b 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
-@@ -27,7 +27,7 @@
+@@ -30,7 +30,7 @@
  #include "ui/views/layout/flex_layout_view.h"
  #include "ui/views/widget/widget_observer.h"
  
@@ -15,16 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
  #include "ui/linux/window_frame_provider.h"
  #endif
  
-@@ -35,7 +35,7 @@
- // parent window, so to prevent cutting off important dialogs we resize the
- // picture-in-picture window to fit them. While ChromeOS Ash also uses Aura, it
- // does not have this issue so we do not resize on ChromeOS Ash.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
-         // BUILDFLAG(IS_CHROMEOS_LACROS)
-@@ -103,7 +103,7 @@ class PictureInPictureBrowserFrameView
+@@ -87,7 +87,7 @@ class PictureInPictureBrowserFrameView
    void Layout(PassKey) override;
    void AddedToWidget() override;
    void RemovedFromWidget() override;
@@ -33,7 +24,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
    gfx::Insets RestoredMirroredFrameBorderInsets() const override;
    gfx::Insets GetInputInsets() const override;
    SkRRect GetRestoredClipRegion() const override;
-@@ -195,7 +195,7 @@ class PictureInPictureBrowserFrameView
+@@ -179,7 +179,7 @@ class PictureInPictureBrowserFrameView
    // Returns true if there's an overlay view that's currently shown.
    bool IsOverlayViewVisible() const;
  
@@ -42,7 +33,7 @@ $NetBSD: patch-chrome_browser_ui_views_frame_picture__in__picture__browser__fram
    // Returns whether a client-side shadow should be drawn for the window.
    bool ShouldDrawFrameShadow() const;
  
-@@ -376,7 +376,7 @@ class PictureInPictureBrowserFrameView
+@@ -388,7 +388,7 @@ class PictureInPictureBrowserFrameView
    // `top_bar_color_animation_`.
    std::optional<SkColor> current_foreground_color_;
  
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
index 098f646f33..3635610777 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
@@ -1,30 +1,30 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
-@@ -77,7 +77,7 @@ void SystemMenuModelBuilder::BuildSystem
+@@ -74,7 +74,7 @@ void SystemMenuModelBuilder::BuildMenu(u
+ 
+ void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
      ui::SimpleMenuModel* model) {
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU);
    model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU);
    model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU);
-@@ -97,7 +97,7 @@ void SystemMenuModelBuilder::BuildSystem
+@@ -92,7 +92,7 @@ void SystemMenuModelBuilder::BuildSystem
+     model->AddSeparator(ui::NORMAL_SEPARATOR);
+     model->AddItemWithStringId(IDC_TASK_MANAGER_CONTEXT_MENU, IDS_TASK_MANAGER);
    }
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    model->AddSeparator(ui::NORMAL_SEPARATOR);
    bool supports_server_side_decorations = true;
  #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS)
-@@ -171,7 +171,7 @@ void SystemMenuModelBuilder::BuildSystem
+@@ -166,7 +166,7 @@ void SystemMenuModelBuilder::BuildSystem
      model->AddSeparator(ui::NORMAL_SEPARATOR);
      model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
    }
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
index 2338791187..b6fb1161c6 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
-@@ -21,7 +21,7 @@
+@@ -20,7 +20,7 @@
  #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h"
  #endif
  
@@ -15,8 +15,8 @@ $NetBSD: patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc,v
  #include "chrome/common/pref_names.h"
  #include "components/prefs/pref_service.h"
  #endif
-@@ -36,7 +36,7 @@ SystemMenuModelDelegate::SystemMenuModel
- SystemMenuModelDelegate::~SystemMenuModelDelegate() {}
+@@ -39,7 +39,7 @@ SystemMenuModelDelegate::SystemMenuModel
+ SystemMenuModelDelegate::~SystemMenuModelDelegate() = default;
  
  bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
 -#if BUILDFLAG(IS_LINUX)
@@ -24,12 +24,12 @@ $NetBSD: patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc,v
    if (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
      PrefService* prefs = browser_->profile()->GetPrefs();
      return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
-@@ -58,7 +58,7 @@ bool SystemMenuModelDelegate::IsCommandI
+@@ -59,7 +59,7 @@ bool SystemMenuModelDelegate::IsCommandI
+ }
+ 
  bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool is_maximized = browser_->window()->IsMaximized();
    switch (command_id) {
      case IDC_MAXIMIZE_WINDOW:
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
index e128ace950..45109a1955 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
-@@ -205,7 +205,7 @@ TabStripRegionView::TabStripRegionView(s
+@@ -222,7 +222,7 @@ TabStripRegionView::TabStripRegionView(s
+       new_tab_button_->GetViewAccessibility().SetName(
+           l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
  
-     // TODO(crbug.com/40118868): Revisit the macro expression once build flag
-     // switch of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-     // The New Tab Button can be middle-clicked on Linux.
-     new_tab_button_->SetTriggerableEventFlags(
-         new_tab_button_->GetTriggerableEventFlags() |
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       // The New Tab Button can be middle-clicked on Linux.
+       new_tab_button_->SetTriggerableEventFlags(
+           new_tab_button_->GetTriggerableEventFlags() |
diff --git a/chromium/patches/patch-chrome_browser_ui_views_hung__renderer__view.cc b/chromium/patches/patch-chrome_browser_ui_views_hung__renderer__view.cc
index f9097bd20b..1f85e83aa7 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_hung__renderer__view.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_hung__renderer__view.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/hung_renderer_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -408,7 +408,7 @@ void HungRendererDialogView::ForceCrashH
+@@ -452,7 +452,7 @@ void HungRendererDialogView::ForceCrashH
    content::RenderProcessHost* rph =
        hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
    if (rph) {
diff --git a/chromium/patches/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/chromium/patches/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
index db949d8edb..9cc6f0bbe1 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc
-@@ -1989,7 +1989,7 @@ void OmniboxViewViews::MaybeAddSendTabTo
+@@ -2089,7 +2089,7 @@ void OmniboxViewViews::MaybeAddSendTabTo
  }
  
  void OmniboxViewViews::OnPopupOpened() {
diff --git a/chromium/patches/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/chromium/patches/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
index 3fe8089e23..bd72aa7c11 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc
-@@ -40,7 +40,7 @@
+@@ -42,7 +42,7 @@
  #include "ui/base/metadata/metadata_impl_macros.h"
  #include "ui/views/controls/button/button.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
  #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h"
  #endif
  
-@@ -155,7 +155,7 @@ PasswordBubbleViewBase* PasswordBubbleVi
+@@ -175,7 +175,7 @@ PasswordBubbleViewBase* PasswordBubbleVi
    } else if (model_state ==
               password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) {
      view = new SharedPasswordsNotificationView(web_contents, anchor_view);
diff --git a/chromium/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc b/chromium/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc
new file mode 100644
index 0000000000..3159263889
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/views/profiles/avatar_toolbar_button.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
+@@ -346,7 +346,7 @@ void AvatarToolbarButton::MaybeShowProfi
+   }
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void AvatarToolbarButton::MaybeShowSupervisedUserSignInIPH() {
+   if (!base::FeatureList::IsEnabled(
+           feature_engagement::kIPHSupervisedUserProfileSigninFeature)) {
diff --git a/chromium/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h b/chromium/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h
new file mode 100644
index 0000000000..314f638c6d
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_views_profiles_avatar__toolbar__button.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/views/profiles/avatar_toolbar_button.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/views/profiles/avatar_toolbar_button.h
+@@ -84,7 +84,7 @@ class AvatarToolbarButton : public Toolb
+   // Attempts showing the In-Produce-Help for profile Switching.
+   void MaybeShowProfileSwitchIPH();
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Attempts showing the In-Produce-Help when a supervised user signs-in in a
+   // profile.
+   void MaybeShowSupervisedUserSignInIPH();
diff --git a/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc b/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc
new file mode 100644
index 0000000000..94aeca7f47
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__coordinator.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
+@@ -50,7 +50,7 @@ void ProfileMenuCoordinator::Show(bool i
+   browser.window()->NotifyFeaturePromoFeatureUsed(
+       feature_engagement::kIPHProfileSwitchFeature,
+       FeaturePromoFeatureUsedAction::kClosePromoIfPresent);
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   browser.window()->NotifyFeaturePromoFeatureUsed(
+       feature_engagement::kIPHSupervisedUserProfileSigninFeature,
+       FeaturePromoFeatureUsedAction::kClosePromoIfPresent);
diff --git a/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
index c356743110..5ff4dd82ea 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_profiles_profile__menu__view.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -89,7 +89,7 @@
+@@ -92,7 +92,7 @@
  #include "ui/strings/grit/ui_strings.h"
  #include "ui/views/accessibility/view_accessibility.h"
  
@@ -15,7 +15,16 @@ $NetBSD: patch-chrome_browser_ui_views_profiles_profile__menu__view.cc,v 1.1 202
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #endif
  
-@@ -572,7 +572,7 @@ void ProfileMenuView::BuildIdentity() {
+@@ -550,7 +550,7 @@ void ProfileMenuView::SetMenuTitleForAcc
+     case signin_util::SignedInState::kSignedOut:
+     case signin_util::SignedInState::kWebOnlySignedIn: {
+       std::string profile_user_display_name, profile_user_email;
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       profile_user_display_name = profile->GetPrefs()->GetString(
+           enterprise_signin::prefs::kProfileUserDisplayName);
+       profile_user_email = profile->GetPrefs()->GetString(
+@@ -647,7 +647,7 @@ void ProfileMenuView::BuildIdentity() {
          badge_image_model, menu_title_, menu_subtitle_, management_label);
    } else {
      std::string profile_user_display_name, profile_user_email;
diff --git a/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
index e554b1bcd8..90cf5c542b 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
@@ -1,14 +1,14 @@
-$NetBSD: patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -693,7 +693,7 @@ void ProfileMenuViewBase::SetProfileIden
-       image_model, management_badge, this,
-       ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder);
+@@ -650,7 +650,7 @@ void ProfileMenuViewBase::SetProfileIden
+       ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder,
+       /*has_dotted_ring=*/false);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc b/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
index 3dc558affb..aba9c14ece 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_ui_views_profiles_profile__picker__view.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/profiles/profile_picker_view.cc
-@@ -88,7 +88,7 @@
- #include "chrome/browser/ui/views/profiles/first_run_flow_controller_lacros.h"
+@@ -85,7 +85,7 @@
+ #include "chrome/browser/global_keyboard_shortcuts_mac.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_profiles_profile__picker__view.cc,v 1.1 2
  #include "chrome/browser/shell_integration_linux.h"
  #endif
  
-@@ -118,7 +118,7 @@ class ProfilePickerWidget : public views
+@@ -115,7 +115,7 @@ class ProfilePickerWidget : public views
      views::Widget::InitParams params(
          views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET);
      params.delegate = profile_picker_view_;
diff --git a/chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
index dd2e3f56bd..a731516f56 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
@@ -1,53 +1,53 @@
-$NetBSD: patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
-@@ -57,7 +57,7 @@ namespace {
+@@ -65,7 +65,7 @@
+ namespace {
  
  const int kModalDialogWidth = 448;
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  const int kManagedUserNoticeConfirmationDialogWidth = 512;
  const int kManagedUserNoticeConfirmationDialogHeight = 576;
  const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 780;
-@@ -179,7 +179,7 @@ SigninViewControllerDelegateViews::Creat
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -197,7 +197,7 @@ SigninViewControllerDelegateViews::Creat
+ }
+ #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // static
  std::unique_ptr<views::WebView>
  SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView(
-@@ -338,7 +338,7 @@ SigninViewControllerDelegateViews::Signi
+@@ -382,7 +382,7 @@ SigninViewControllerDelegateViews::Signi
+ 
    SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone));
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On the local profile creation dialog, cancelling the dialog (for instance
    // through the VKEY_ESCAPE accelerator) should delete the profile.
    if (delete_profile_on_cancel) {
-@@ -427,7 +427,7 @@ void SigninViewControllerDelegateViews::
+@@ -472,7 +472,7 @@ void SigninViewControllerDelegateViews::
+   content_view_->RequestFocus();
  }
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void SigninViewControllerDelegateViews::DeleteProfileOnCancel() {
    ProfileAttributesEntry* entry =
        g_browser_process->profile_manager()
-@@ -504,7 +504,7 @@ SigninViewControllerDelegate::CreateProf
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -553,7 +553,7 @@ SigninViewControllerDelegate::CreateSign
+ }
+ #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // static
  SigninViewControllerDelegate*
  SigninViewControllerDelegate::CreateManagedUserNoticeDelegate(
diff --git a/chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
index e3f8d6e797..e3d680a08c 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
+++ b/chromium/patches/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
@@ -1,26 +1,26 @@
-$NetBSD: patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
-@@ -76,7 +76,7 @@ class SigninViewControllerDelegateViews
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews
+       SignoutConfirmationCallback callback);
+ #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    static std::unique_ptr<views::WebView>
    CreateManagedUserNoticeConfirmationWebView(
        Browser* browser,
-@@ -139,7 +139,7 @@ class SigninViewControllerDelegateViews
+@@ -144,7 +144,7 @@ class SigninViewControllerDelegateViews
+       std::optional<int> dialog_width,
        InitializeSigninWebDialogUI initialize_signin_web_dialog_ui);
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Deletes the ephemeral profile when cancelling the local profile creation
    // dialog.
    void DeleteProfileOnCancel();
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc b/chromium/patches/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
new file mode 100644
index 0000000000..18c7d434d7
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_views_tabs_dragging_tab__drag__controller.cc
@@ -0,0 +1,53 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc
+@@ -190,7 +190,7 @@ bool IsWindowDragUsingSystemDragDropAllo
+ 
+ void UpdateSystemDnDDragImage(TabDragContext* attached_context,
+                               const gfx::ImageSkia& image) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   VLOG(1) << __func__ << " image size=" << image.size().ToString();
+   aura::Window* root_window =
+       attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
+@@ -381,7 +381,7 @@ TabDragController::Liveness TabDragContr
+   //     synchronous on desktop Linux, so use that.
+   // - ChromeOS Ash
+   //     Releasing capture on Ash cancels gestures so avoid it.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   ref->can_release_capture_ = false;
+ #endif
+   ref->start_point_in_screen_ =
+@@ -889,7 +889,7 @@ TabDragController::Liveness TabDragContr
+       CHECK_EQ(SetCapture(target_context), Liveness::ALIVE);
+     }
+ 
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+     // EndMoveLoop is going to snap the window back to its original location.
+     // Hide it so users don't see this. Hiding a window in Linux aura causes
+     // it to lose capture so skip it.
+@@ -1914,7 +1914,7 @@ void TabDragController::CompleteDrag() {
+     }
+ 
+     // If source window was maximized - maximize the new window as well.
+-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)
++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
+     // Keeping maximized state breaks snap to Grid on Windows when dragging
+     // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
+     // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
+@@ -2331,7 +2331,7 @@ TabDragController::Liveness TabDragContr
+     }
+   }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Exclude windows which are pending deletion via Browser::TabStripEmpty().
+   // These windows can be returned in the Linux Aura port because the browser
+   // window which was used for dragging is not hidden once all of its tabs are
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab.cc b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab.cc
index 9ad98f9e13..02c6b98cbb 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_tabs_tab.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/tabs/tab.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/tabs/tab.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/tabs/tab.cc
-@@ -626,7 +626,7 @@ void Tab::MaybeUpdateHoverStatus(const u
+@@ -642,7 +642,7 @@ void Tab::MaybeUpdateHoverStatus(const u
      return;
    }
  
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
deleted file mode 100644
index 780f155884..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -215,7 +215,7 @@ bool IsWindowDragUsingSystemDragDropAllo
- 
- void UpdateSystemDnDDragImage(TabDragContext* attached_context,
-                               const gfx::ImageSkia& image) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   aura::Window* root_window =
-       attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
-   if (aura::client::GetDragDropClient(root_window)) {
-@@ -415,7 +415,7 @@ TabDragController::Liveness TabDragContr
-   //     synchronous on desktop Linux, so use that.
-   // - ChromeOS Ash
-   //     Releasing capture on Ash cancels gestures so avoid it.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-   ref->can_release_capture_ = false;
- #endif
-   ref->start_point_in_screen_ =
-@@ -1021,7 +1021,7 @@ TabDragController::DragBrowserToNewTabSt
- 
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
-     // EndMoveLoop is going to snap the window back to its original location.
-     // Hide it so users don't see this. Hiding a window in Linux aura causes
-     // it to lose capture so skip it.
-@@ -2085,7 +2085,7 @@ void TabDragController::CompleteDrag() {
-       }
- 
-       // If source window was maximized - maximize the new window as well.
--#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)
-+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
-       // Keeping maximized state breaks snap to Grid on Windows when dragging
-       // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
-       // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2534,7 +2534,7 @@ TabDragController::Liveness TabDragContr
-   }
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   // Exclude windows which are pending deletion via Browser::TabStripEmpty().
-   // These windows can be returned in the Linux Aura port because the browser
-   // window which was used for dragging is not hidden once all of its tabs are
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
index eda9fe874f..5dba45817b 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
-@@ -376,7 +376,7 @@ TabHoverCardBubbleView::TabHoverCardBubb
+@@ -380,7 +380,7 @@ TabHoverCardBubbleView::TabHoverCardBubb
    // not become active. Setting this to false creates the need to explicitly
    // hide the hovercard on press, touch, and keyboard events.
    SetCanActivate(false);
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
new file mode 100644
index 0000000000..10b370aa97
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc
+@@ -97,7 +97,7 @@ TabStripComboButton::TabStripComboButton
+       base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged,
+                           base::Unretained(this))));
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // The New Tab Button can be middle-clicked on Linux.
+   new_tab_button->SetTriggerableEventFlags(
+       new_tab_button->GetTriggerableEventFlags() | ui::EF_MIDDLE_MOUSE_BUTTON);
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
index 7901783dc7..9cb9112ded 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__style__views.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_tabs_tab__style__views.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/tabs/tab_style_views.cc
-@@ -550,7 +550,7 @@ float TabStyleViewsImpl::GetCurrentActiv
+@@ -545,7 +545,7 @@ float TabStyleViewsImpl::GetCurrentActiv
    if (!IsHoverAnimationActive()) {
      return base_opacity;
    }
diff --git a/chromium/patches/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc b/chromium/patches/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc
new file mode 100644
index 0000000000..e17aac756b
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/views/task_manager_search_bar_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/views/task_manager_search_bar_view.cc
+@@ -27,7 +27,7 @@ TaskManagerSearchBarView::TaskManagerSea
+     const gfx::Insets& margins,
+     Delegate& delegate)
+     : delegate_(delegate)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       ,
+       textfield_placeholder_color_id_(kColorTaskManagerSearchBarPlaceholderText)
+ #endif
diff --git a/chromium/patches/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/chromium/patches/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
index 5fdd1a9e90..889effdea5 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
-@@ -845,7 +845,7 @@ void MaybeRegisterChromeFeaturePromos(
-                          "defaulted to saved for the first time.")));
+@@ -930,7 +930,7 @@ void MaybeRegisterChromeFeaturePromos(
+                 "Triggered when a shared tab becomes the active tab.")));
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_user__education_browser__user__education_
    // kIPHSupervisedUserProfileSigninFeature
    registry.RegisterFeature(std::move(
        FeaturePromoSpecification::CreateForCustomAction(
-@@ -1085,7 +1085,7 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -1209,7 +1209,7 @@ void MaybeRegisterChromeFeaturePromos(
                         "Triggered to inform users of the availability of the "
                         "new translate screen feature on the Lens Overlay.")));
  
diff --git a/chromium/patches/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/chromium/patches/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
index 39e169229b..690109f8e0 100644
--- a/chromium/patches/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
+++ b/chromium/patches/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
-@@ -516,7 +516,7 @@ std::string GetFileExtension(FileExtensi
+@@ -510,7 +510,7 @@ std::string GetFileExtension(FileExtensi
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_views_web__apps_web__app__integration__test__dr
  SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
    SiteConfig config;
    bool is_app_found = false;
-@@ -2109,7 +2109,7 @@ void WebAppIntegrationTestDriver::Delete
+@@ -2057,7 +2057,7 @@ void WebAppIntegrationTestDriver::Delete
    if (app_name.empty()) {
      app_name = GetSiteConfiguration(site).app_name;
    }
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_ui_views_web__apps_web__app__integration__test__dr
    ASSERT_TRUE(override_registration_->test_override().IsShortcutCreated(
        profile(), app_id, app_name));
    ASSERT_TRUE(
-@@ -3452,7 +3452,7 @@ void WebAppIntegrationTestDriver::CheckR
+@@ -3377,7 +3377,7 @@ void WebAppIntegrationTestDriver::CheckR
            app_state->id, app_state->name);
    ASSERT_TRUE(icon_color.has_value());
    ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_ui_views_web__apps_web__app__integration__test__dr
    ASSERT_TRUE(override_registration_->test_override().IsRunOnOsLoginEnabled(
        profile(), app_state->id, app_state->name));
  #endif
-@@ -3467,7 +3467,7 @@ void WebAppIntegrationTestDriver::CheckR
+@@ -3392,7 +3392,7 @@ void WebAppIntegrationTestDriver::CheckR
        GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
    ASSERT_TRUE(app_state);
    base::ScopedAllowBlockingForTesting allow_blocking;
@@ -42,7 +42,7 @@ $NetBSD: patch-chrome_browser_ui_views_web__apps_web__app__integration__test__dr
    ASSERT_FALSE(override_registration_->test_override().IsRunOnOsLoginEnabled(
        profile(), app_state->id, app_state->name));
  #endif
-@@ -3477,7 +3477,7 @@ void WebAppIntegrationTestDriver::CheckR
+@@ -3402,7 +3402,7 @@ void WebAppIntegrationTestDriver::CheckR
  void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
      Site site,
      FileExtension file_extension) {
@@ -51,7 +51,7 @@ $NetBSD: patch-chrome_browser_ui_views_web__apps_web__app__integration__test__dr
    if (!BeforeStateCheckAction(__FUNCTION__)) {
      return;
    }
-@@ -3493,7 +3493,7 @@ void WebAppIntegrationTestDriver::CheckS
+@@ -3418,7 +3418,7 @@ void WebAppIntegrationTestDriver::CheckS
  void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
      Site site,
      FileExtension file_extension) {
@@ -60,7 +60,7 @@ $NetBSD: patch-chrome_browser_ui_views_web__apps_web__app__integration__test__dr
    if (!BeforeStateCheckAction(__FUNCTION__)) {
      return;
    }
-@@ -4310,7 +4310,7 @@ base::FilePath WebAppIntegrationTestDriv
+@@ -4243,7 +4243,7 @@ base::FilePath WebAppIntegrationTestDriv
      base::FilePath shortcut_dir,
      const std::string& app_name,
      const webapps::AppId& app_id) {
@@ -69,7 +69,7 @@ $NetBSD: patch-chrome_browser_ui_views_web__apps_web__app__integration__test__dr
    return override_registration_->test_override().GetShortcutPath(
        profile(), shortcut_dir, app_id, app_name);
  #else
-@@ -4510,7 +4510,7 @@ bool WebAppIntegrationTestDriver::IsShor
+@@ -4443,7 +4443,7 @@ bool WebAppIntegrationTestDriver::IsShor
      const webapps::AppId& id) {
    base::ScopedAllowBlockingForTesting allow_blocking;
    bool is_shortcut_and_icon_correct = false;
@@ -78,7 +78,7 @@ $NetBSD: patch-chrome_browser_ui_views_web__apps_web__app__integration__test__dr
    bool is_shortcut_correct =
        override_registration_->test_override().IsShortcutCreated(profile, id,
                                                                  name);
-@@ -4554,7 +4554,7 @@ bool WebAppIntegrationTestDriver::DoIcon
+@@ -4487,7 +4487,7 @@ bool WebAppIntegrationTestDriver::DoIcon
      do_icon_colors_match =
          (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
    }
diff --git a/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__dialogs.h b/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
index 234cf984ec..190270fbc7 100644
--- a/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
+++ b/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_web__applications_web__app__dialogs.h,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/web_applications/web_app_dialogs.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/web_applications/web_app_dialogs.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/web_applications/web_app_dialogs.h
-@@ -22,7 +22,7 @@
+@@ -21,7 +21,7 @@
  #include "ui/gfx/native_widget_types.h"
  
  static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
diff --git a/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
index 0d7ad3a987..aaf07496c5 100644
--- a/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
+++ b/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
-@@ -583,7 +583,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPr
+@@ -519,7 +519,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPr
      Browser* browser,
      Profile* profile,
      const std::string& app_id) {
@@ -15,12 +15,12 @@ $NetBSD: patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.c
    WebAppProvider* provider = WebAppProvider::GetForWebApps(profile);
    CHECK(provider);
  
-@@ -809,7 +809,7 @@ void WebAppUiManagerImpl::ClearWebAppSit
+@@ -748,7 +748,7 @@ void WebAppUiManagerImpl::ClearWebAppSit
    }
  }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void WebAppUiManagerImpl::ShowIPHPromoForAppsLaunchedViaLinkCapturing(
-     const Browser* browser,
-     const webapps::AppId& app_id,
+ 
+ const base::Feature& GetPromoFeatureEngagementFromBrowser(
+     const Browser* browser) {
diff --git a/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h b/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
index c3aed150a0..ada261d42b 100644
--- a/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
+++ b/chromium/patches/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h
-@@ -227,7 +227,7 @@ class WebAppUiManagerImpl : public Brows
+@@ -225,7 +225,7 @@ class WebAppUiManagerImpl : public Brows
        UninstallCompleteCallback uninstall_complete_callback,
        webapps::UninstallResultCode uninstall_code);
  
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.cc b/chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.cc
index 7181e6250e..d95bbc3b67 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_webui_about_about__ui.cc,v 1.1 2025/02/06 09:57:54 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/about/about_ui.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/about/about_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/about/about_ui.cc
-@@ -596,7 +596,7 @@ std::string ChromeURLs(content::BrowserC
+@@ -496,7 +496,7 @@ std::string ChromeURLs(content::BrowserC
    return html;
  }
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_webui_about_about__ui.cc,v 1.1 2025/02/06 09:57
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data,
-@@ -629,7 +629,7 @@ TermsUIConfig::TermsUIConfig()
+@@ -538,7 +538,7 @@ TermsUIConfig::TermsUIConfig()
      : AboutUIConfigBase(chrome::kChromeUITermsHost) {}
  #endif
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_ui_webui_about_about__ui.cc,v 1.1 2025/02/06 09:57
  LinuxProxyConfigUI::LinuxProxyConfigUI()
      : AboutUIConfigBase(chrome::kChromeUILinuxProxyConfigHost) {}
  #endif
-@@ -681,7 +681,7 @@ void AboutUIHTMLSource::StartDataRequest
+@@ -590,7 +590,7 @@ void AboutUIHTMLSource::StartDataRequest
        response =
            ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
      }
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.h b/chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.h
index 96cdced638..3e97907be8 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.h
+++ b/chromium/patches/patch-chrome_browser_ui_webui_about_about__ui.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_webui_about_about__ui.h,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/about/about_ui.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/about/about_ui.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/about/about_ui.h
-@@ -50,7 +50,7 @@ class TermsUIConfig : public AboutUIConf
+@@ -55,7 +55,7 @@ class TermsUIConfig : public AboutUIConf
  };
  #endif
  
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
index 9348b0d008..ce89dda444 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -62,7 +62,7 @@
+@@ -61,7 +61,7 @@
  #include "ui/base/window_open_disposition_utils.h"
  #include "url/gurl.h"
  
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h b/chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
index d6eb8e94b9..c7fa282fc1 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
+++ b/chromium/patches/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_webui_app__home_app__home__page__handler.h,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/app_home/app_home_page_handler.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/app_home/app_home_page_handler.h
 @@ -24,7 +24,7 @@
  #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h b/chromium/patches/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
index 514b517159..219d8b7d58 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
+++ b/chromium/patches/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/app_settings/web_app_settings_ui.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/app_settings/web_app_settings_ui.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/app_settings/web_app_settings_ui.h
 @@ -14,13 +14,13 @@
  #include "ui/webui/mojo_web_ui_controller.h"
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
index b4233f9ef5..90e8500ea3 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc
@@ -1,14 +1,14 @@
-$NetBSD: patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc
-@@ -162,7 +162,7 @@ CertificateManagerPageHandler::GetCertSo
-             "distrusted_certs",
-             cert_verifier::mojom::CertificateTrust::kDistrusted);
+@@ -221,7 +221,7 @@ CertificateManagerPageHandler::GetCertSo
+                 CERTIFICATE_TRUST_TYPE_DISTRUSTED,
+             profile_, &remote_client_);
          break;
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
index 3a1fd5f3b6..e9a56e6d12 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc
@@ -1,21 +1,30 @@
-$NetBSD: patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc
-@@ -51,7 +51,7 @@
+@@ -54,7 +54,7 @@
  #include "net/ssl/client_cert_store_mac.h"
  #endif  // BUILDFLAG(IS_MAC)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
- #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h"
- #include "components/enterprise/client_certificates/core/client_certificates_service.h"
-@@ -195,7 +195,7 @@ std::unique_ptr<ClientCertStoreLoader> C
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public
+ };
+ #endif
+ 
+-#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ std::unique_ptr<ClientCertStoreLoader> CreatePlatformClientCertLoader(
+     Profile* profile) {
+ #if BUILDFLAG(IS_WIN)
+@@ -192,7 +192,7 @@ std::unique_ptr<ClientCertStoreLoader> C
  }
  #endif
  
@@ -24,7 +33,25 @@ $NetBSD: patch-chrome_browser_ui_webui_certificate__manager_client__cert__source
  // ClientCertStore implementation that always returns an empty list. The
  // CertificateProvisioningService implementation expects to wrap a platform
  // cert store, but here we only want to get results from the provisioning
-@@ -1056,7 +1056,7 @@ CreatePlatformClientCertSource(
+@@ -368,7 +368,7 @@ class ClientCertSource : public Certific
+   std::optional<net::CertificateList> certs_;
+ };
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // ChromeOS currently can use either Kcer or NSS for listing client certs, and
+ // Linux uses NSS only. This interface provides an abstraction to hide that
+ // from WritableClientCertSource. Currently this class only handles reading
+@@ -1099,7 +1099,7 @@ CreatePlatformClientCertSource(
+     mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>*
+         remote_client,
+     Profile* profile) {
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return std::make_unique<WritableClientCertSource>(remote_client, profile);
+ #else
+   return std::make_unique<ClientCertSource>(
+@@ -1107,7 +1107,7 @@ CreatePlatformClientCertSource(
  #endif
  }
  
@@ -33,3 +60,12 @@ $NetBSD: patch-chrome_browser_ui_webui_certificate__manager_client__cert__source
  std::unique_ptr<CertificateManagerPageHandler::CertSource>
  CreateProvisionedClientCertSource(Profile* profile) {
    return std::make_unique<ClientCertSource>(
+@@ -1156,7 +1156,7 @@ bool ClientCertManagementAccessControls:
+ 
+   return client_cert_policy_ == ClientCertificateManagementPermission::kAll;
+ }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ClientCertManagementAccessControls::ClientCertManagementAccessControls(
+     Profile* profile) {}
+ 
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
index 57842e6342..025abff163 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
+++ b/chromium/patches/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h
 @@ -19,7 +19,7 @@ CreatePlatformClientCertSource(
          remote_client,
@@ -15,3 +15,12 @@ $NetBSD: patch-chrome_browser_ui_webui_certificate__manager_client__cert__source
  std::unique_ptr<CertificateManagerPageHandler::CertSource>
  CreateProvisionedClientCertSource(Profile* profile);
  #endif
+@@ -29,7 +29,7 @@ std::unique_ptr<CertificateManagerPageHa
+ CreateExtensionsClientCertSource(Profile* profile);
+ #endif
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ class ClientCertManagementAccessControls {
+  public:
+   enum KeyStorage {
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
index f79d32d344..c53b93c2ca 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc
@@ -1,25 +1,21 @@
-$NetBSD: patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -135,30 +135,30 @@
+@@ -137,7 +137,7 @@
  #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
  #endif  // BUILDFLAG(IS_WIN)
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
  #include "chrome/browser/ui/webui/browser_switch/browser_switch_ui.h"
- #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
+ #include "chrome/browser/ui/webui/signin/history_sync_optin/history_sync_optin_ui.h"
+@@ -145,19 +145,19 @@
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -30,11 +26,11 @@ $NetBSD: patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc,v 1.1 2025/02
          // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS_ASH)
+         // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
@@ -42,43 +38,34 @@ $NetBSD: patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc,v 1.1 2025/02
  #include "chrome/browser/ui/webui/discards/discards_ui.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -194,7 +194,7 @@
+@@ -185,7 +185,7 @@
  #include "chrome/browser/ui/webui/signin/signin_error_ui.h"
- #endif  //  !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
+ #endif  //  !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -315,14 +315,14 @@ void RegisterChromeWebUIConfigs() {
-   map.AddWebUIConfig(std::make_unique<WebuiGalleryUIConfig>());
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -323,7 +323,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>());
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
--        // BUILDFLAG(IS_OPENBSD)
-+        // BUILDFLAG(IS_BSD)
- 
- #if BUILDFLAG(ENABLE_EXTENSIONS)
-   map.AddWebUIConfig(std::make_unique<extensions::ExtensionsUIConfig>());
-@@ -344,7 +344,7 @@ void RegisterChromeWebUIConfigs() {
+         // BUILDFLAG(IS_OPENBSD)
+@@ -348,7 +348,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>());
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>());
-   map.AddWebUIConfig(std::make_unique<WebAppSettingsUIConfig>());
-   map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>());
-@@ -352,20 +352,20 @@ void RegisterChromeWebUIConfigs() {
+   map.AddWebUIConfig(std::make_unique<HistorySyncOptinUIConfig>());
+   map.AddWebUIConfig(std::make_unique<OnDeviceTranslationInternalsUIConfig>());
+@@ -357,13 +357,13 @@ void RegisterChromeWebUIConfigs() {
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -88,17 +75,9 @@ $NetBSD: patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc,v 1.1 2025/02
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
          // BUILDFLAG(IS_ANDROID)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-   map.AddWebUIConfig(
-       std::make_unique<enterprise_connectors::ConnectorsInternalsUIConfig>());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS_ASH)
- 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   map.AddWebUIConfig(
+       std::make_unique<enterprise_connectors::ConnectorsInternalsUIConfig>());
    map.AddWebUIConfig(std::make_unique<DiscardsUIConfig>());
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index 64cec821b3..d5f7de97b3 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -130,16 +130,16 @@
+@@ -118,16 +118,16 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -26,17 +26,17 @@ $NetBSD: patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc,v
  #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h"
  #endif
  
-@@ -465,7 +465,7 @@ base::RefCountedMemory* ChromeWebUIContr
-   if (page_url.host_piece() == chrome::kChromeUINewTabPageHost)
+@@ -408,7 +408,7 @@ base::RefCountedMemory* ChromeWebUIContr
      return NewTabPageUI::GetFaviconResourceBytes(scale_factor);
+   }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost)
+   if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) {
      return WhatsNewUI::GetFaviconResourceBytes(scale_factor);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -493,7 +493,7 @@ base::RefCountedMemory* ChromeWebUIContr
-     return ManagementUI::GetFaviconResourceBytes(scale_factor);
+   }
+@@ -442,7 +442,7 @@ base::RefCountedMemory* ChromeWebUIContr
+   }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/chromium/patches/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
index b98fedff77..15d68cef5a 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
 @@ -7,7 +7,7 @@
  #include "build/build_config.h"
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc b/chromium/patches/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc
deleted file mode 100644
index 8d524aa2cf..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc
-@@ -44,7 +44,7 @@
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/webui/resource_path.h"
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/browser_navigator.h"
- #include "chrome/browser/ui/browser_navigator_params.h"
- #include "net/base/url_util.h"
-@@ -84,7 +84,7 @@ user_education::NewBadgeRegistry* GetNew
- }
- 
- whats_new::WhatsNewRegistry* GetWhatsNewRegistry() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return g_browser_process->GetFeatures()->whats_new_registry();
- #else
-   return nullptr;
-@@ -767,7 +767,7 @@ void UserEducationInternalsPageHandlerIm
- }
- 
- void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   GURL url = net::AppendQueryParameter(GURL(chrome::kChromeUIWhatsNewURL),
-                                        "staging", "true");
-   NavigateParams params(profile_, url, ui::PAGE_TRANSITION_TYPED);
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/chromium/patches/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
index 6bd643179c..9332263d78 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -74,7 +74,7 @@
+@@ -77,7 +77,7 @@
  #include "components/security_interstitials/content/captive_portal_blocking_page.h"
  #endif
  
@@ -15,16 +15,16 @@ $NetBSD: patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc,v 1.1 2
  #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h"
-@@ -396,7 +396,7 @@ std::unique_ptr<EnterpriseWarnPage> Crea
-                                                        kRequestUrl));
+@@ -424,7 +424,7 @@ std::unique_ptr<EnterpriseWarnPage> Crea
  }
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  std::unique_ptr<SupervisedUserVerificationPageForYouTube>
  CreateSupervisedUserVerificationPageForYouTube(
      content::WebContents* web_contents,
-@@ -613,7 +613,7 @@ void InterstitialHTMLSource::StartDataRe
+@@ -651,7 +651,7 @@ void InterstitialHTMLSource::StartDataRe
      interstitial_delegate = CreateInsecureFormPage(web_contents);
    } else if (path_without_query == "/https_only") {
      interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui.cc b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui.cc
index 2d9c78de49..f5db288834 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_webui_management_management__ui.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/management/management_ui.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/management/management_ui.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/management/management_ui.cc
-@@ -185,11 +185,11 @@ void ManagementUI::GetLocalizedStrings(
+@@ -175,11 +175,11 @@ void ManagementUI::GetLocalizedStrings(
         IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA},
        {kManagementReportFileEvents, IDS_MANAGEMENT_REPORT_FILE_EVENTS},
  #endif  // BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.cc b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
index f63d263934..d16700991e 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_webui_management_management__ui__constants.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/management/management_ui_constants.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/management/management_ui_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/management/management_ui_constants.cc
 @@ -89,12 +89,12 @@ const char kProfileReportingExtension[] 
  const char kProfileReportingPolicy[] = "profileReportingPolicy";
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.h b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.h
index ed86acfd26..849739c6a3 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.h
+++ b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__constants.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-chrome_browser_ui_webui_management_management__ui__constants.h,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/management/management_ui_constants.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/management/management_ui_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/management/management_ui_constants.h
-@@ -8,14 +8,14 @@
+@@ -7,14 +7,14 @@
+ 
  #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
  
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
index fa5d709989..0b242e98ca 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_webui_management_management__ui__handler.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/management/management_ui_handler.cc
 @@ -58,7 +58,7 @@
  #include "ui/base/l10n/l10n_util.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_webui_management_management__ui__handler.cc,v 1
  #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
  #include "components/device_signals/core/browser/user_permission_service.h"  // nogncheck
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -349,7 +349,7 @@ void ManagementUIHandler::AddReportingIn
+@@ -359,7 +359,7 @@ void ManagementUIHandler::AddReportingIn
        report_sources->Append(std::move(data));
      }
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_ui_webui_management_management__ui__handler.cc,v 1
      auto device_signal_data = GetDeviceSignalGrantedMessage();
      if (!device_signal_data.empty()) {
        report_sources->Append(std::move(device_signal_data));
-@@ -371,7 +371,7 @@ void ManagementUIHandler::AddReportingIn
+@@ -381,7 +381,7 @@ void ManagementUIHandler::AddReportingIn
        report_sources->Append(std::move(data));
      }
  
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_ui_webui_management_management__ui__handler.cc,v 1
      auto device_signal_data = GetDeviceSignalGrantedMessage();
      if (!device_signal_data.empty()) {
        report_sources->Append(std::move(device_signal_data));
-@@ -561,7 +561,7 @@ policy::PolicyService* ManagementUIHandl
+@@ -567,7 +567,7 @@ policy::PolicyService* ManagementUIHandl
        ->policy_service();
  }
  
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.h
index a38fec9a83..5e590c4542 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.h
+++ b/chromium/patches/patch-chrome_browser_ui_webui_management_management__ui__handler.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_webui_management_management__ui__handler.h,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/management/management_ui_handler.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/management/management_ui_handler.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/management/management_ui_handler.h
-@@ -31,7 +31,7 @@ namespace policy {
+@@ -30,7 +30,7 @@ namespace policy {
  class PolicyService;
  }  // namespace policy
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_webui_management_management__ui__handler.h,v 1.
  namespace device_signals {
  class UserPermissionService;
  }  // namespace device_signals
-@@ -72,7 +72,7 @@ class ManagementUIHandler : public conte
+@@ -71,7 +71,7 @@ class ManagementUIHandler : public conte
    base::Value::List GetManagedWebsitesInfo(Profile* profile) const;
    base::Value::List GetApplicationsInfo(Profile* profile) const;
    virtual policy::PolicyService* GetPolicyService();
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc b/chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
index 06e049eefc..fc15d7f21d 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/password_manager/promo_cards_handler.cc
 @@ -28,7 +28,7 @@
  #include "chrome/browser/ui/webui/password_manager/promo_cards/web_password_manager_promo.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.c
  #include "chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.h"
  #endif
  
-@@ -81,7 +81,7 @@ std::vector<std::unique_ptr<PasswordProm
+@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<PasswordProm
            .get()));
  #endif
  
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc b/chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
index 92e08f9996..bff64e64e0 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc
 @@ -37,7 +37,7 @@ std::u16string RelaunchChromePromo::GetT
    return l10n_util::GetStringUTF16(
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/chromium/patches/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
index 0caac20535..4dd3e06eb1 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc
-@@ -108,7 +108,7 @@ const char* kMacShareIconResourceName =
+@@ -111,7 +111,7 @@ const char* kMacShareIconResourceName =
  #elif BUILDFLAG(IS_WIN)
  const char* kWinShareIconResourceName =
      "//resources/cr_components/searchbox/icons/win_share.svg";
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc,v 1.1 202
  const char* kLinuxShareIconResourceName =
      "//resources/cr_components/searchbox/icons/share.svg";
  #else
-@@ -168,7 +168,7 @@ static void DefineChromeRefreshRealboxIc
+@@ -171,7 +171,7 @@ static void DefineChromeRefreshRealboxIc
  #elif BUILDFLAG(IS_WIN)
    kWinShareIconResourceName =
        "//resources/cr_components/searchbox/icons/win_share_cr23.svg";
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc,v 1.1 202
    kLinuxShareIconResourceName =
        "//resources/cr_components/searchbox/icons/share_cr23.svg";
  #else
-@@ -653,7 +653,7 @@ std::string SearchboxHandler::ActionVect
+@@ -607,7 +607,7 @@ std::string SearchboxHandler::ActionVect
        icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
      return kWinShareIconResourceName;
    }
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/chromium/patches/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
index 10c2574a94..36cee9a59d 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_webui_settings_appearance__handler.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/settings/appearance_handler.cc
-@@ -34,7 +34,7 @@ void AppearanceHandler::RegisterMessages
+@@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages
        "useDefaultTheme",
        base::BindRepeating(&AppearanceHandler::HandleUseTheme,
                            base::Unretained(this), ui::SystemTheme::kDefault));
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/chromium/patches/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index e69a1c045c..287c518c4a 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,21 +1,21 @@
-$NetBSD: patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -148,7 +148,7 @@
- #include "chrome/browser/ui/chrome_pages.h"
+@@ -140,7 +140,7 @@
+ #include "chrome/browser/ui/webui/settings/system_handler.h"
  #endif
  
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/display/screen.h"
  #endif
  
-@@ -167,7 +167,7 @@
+@@ -159,7 +159,7 @@
  #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
  #endif
  
@@ -24,16 +24,16 @@ $NetBSD: patch-chrome_browser_ui_webui_settings_settings__localized__strings__pr
  #include "ui/linux/linux_ui_factory.h"
  #include "ui/ozone/public/ozone_platform.h"
  #endif
-@@ -292,7 +292,7 @@ void AddA11yStrings(content::WebUIDataSo
-       {"focusHighlightLabel",
-        IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
+@@ -288,7 +288,7 @@ void AddA11yStrings(content::WebUIDataSo
+       {"toastAlertLevelDescription",
+        IDS_SETTINGS_ACCESSIBILITY_TOAST_FREQUENCY_DESCRIPTION},
  #endif
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
        {"overscrollHistoryNavigationTitle",
         IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
        {"overscrollHistoryNavigationSubtitle",
-@@ -548,7 +548,7 @@ void AddAppearanceStrings(content::WebUI
+@@ -577,7 +577,7 @@ void AddAppearanceStrings(content::WebUI
        {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT},
        {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT},
        {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT},
@@ -42,21 +42,30 @@ $NetBSD: patch-chrome_browser_ui_webui_settings_settings__localized__strings__pr
        {"gtkTheme", IDS_SETTINGS_GTK_THEME},
        {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
        {"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -556,7 +556,7 @@ void AddAppearanceStrings(content::WebUI
+@@ -585,7 +585,7 @@ void AddAppearanceStrings(content::WebUI
        {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
        {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME},
  #endif
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
        {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
  #endif
  #if BUILDFLAG(IS_MAC)
-@@ -584,7 +584,7 @@ void AddAppearanceStrings(content::WebUI
+@@ -607,7 +607,7 @@ void AddAppearanceStrings(content::WebUI
+   html_source->AddBoolean("tabSearchIsRightAlignedAtStartup",
+                           tabs::GetTabSearchTrailingTabstrip(profile));
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance()
                                        ->GetPlatformRuntimeProperties()
                                        .supports_server_side_window_decorations;
+@@ -1495,7 +1495,7 @@ void AddSignOutDialogStrings(content::We
+           g_browser_process->GetApplicationLocale())
+           .spec();
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   html_source->AddString(
+       "syncDisconnectManagedProfileExplanation",
+       l10n_util::GetStringFUTF8(
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/chromium/patches/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
index b650c25174..26df8a101d 100644
--- a/chromium/patches/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
+++ b/chromium/patches/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc,v 1.1 2025/02/06 09:57:55 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc
-@@ -209,7 +209,7 @@ base::Value::Dict CreateProfileEntry(con
- 
+@@ -165,7 +165,7 @@ base::Value::Dict CreateProfileEntry(con
+       IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name);
    if (AccountInfo::IsManaged(entry->GetHostedDomain())) {
      profile_entry.Set("avatarBadge", "cr:domain");
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -15,12 +15,3 @@ $NetBSD: patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc,v 1.1
    } else if (base::FeatureList::IsEnabled(
                   supervised_user::kShowKiteForSupervisedUsers) &&
               entry->IsSupervised()) {
-@@ -1211,7 +1211,7 @@ void ProfilePickerHandler::BeginFirstWeb
- }
- 
- void ProfilePickerHandler::MaybeUpdateGuestMode() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   if (!base::FeatureList::IsEnabled(
-           supervised_user::kHideGuestModeForSupervisedUsers)) {
-     return;
diff --git a/chromium/patches/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc b/chromium/patches/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
new file mode 100644
index 0000000000..599f84f0de
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc
@@ -0,0 +1,35 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc
+@@ -50,7 +50,7 @@
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/webui/resource_path.h"
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/browser_navigator.h"
+ #include "chrome/browser/ui/browser_navigator_params.h"
+ #include "net/base/url_util.h"
+@@ -90,7 +90,7 @@ user_education::NewBadgeRegistry* GetNew
+ }
+ 
+ whats_new::WhatsNewRegistry* GetWhatsNewRegistry() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return g_browser_process->GetFeatures()->whats_new_registry();
+ #else
+   return nullptr;
+@@ -828,7 +828,7 @@ void UserEducationInternalsPageHandlerIm
+ }
+ 
+ void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   GURL url = net::AppendQueryParameter(GURL(chrome::kChromeUIWhatsNewURL),
+                                        "staging", "true");
+   NavigateParams params(profile_, url, ui::PAGE_TRANSITION_TYPED);
diff --git a/chromium/patches/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/chromium/patches/patch-chrome_browser_ui_window__sizer_window__sizer.cc
index 007d305f22..40f82f6a4f 100644
--- a/chromium/patches/patch-chrome_browser_ui_window__sizer_window__sizer.cc
+++ b/chromium/patches/patch-chrome_browser_ui_window__sizer_window__sizer.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_ui_window__sizer_window__sizer.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/ui/window_sizer/window_sizer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/ui/window_sizer/window_sizer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/ui/window_sizer/window_sizer.cc
-@@ -214,7 +214,7 @@ void WindowSizer::GetBrowserWindowBounds
+@@ -220,7 +220,7 @@ void WindowSizer::GetBrowserWindowBounds
        browser, window_bounds, show_state);
  }
  
diff --git a/chromium/patches/patch-chrome_browser_upgrade__detector_version__history__client.cc b/chromium/patches/patch-chrome_browser_upgrade__detector_version__history__client.cc
new file mode 100644
index 0000000000..754139c524
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_upgrade__detector_version__history__client.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/upgrade_detector/version_history_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/upgrade_detector/version_history_client.cc
+@@ -175,7 +175,7 @@ GURL GetVersionReleasesUrl(base::Version
+ #define CURRENT_PLATFORM "win"
+ #endif
+ 
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ 
+ #define CURRENT_PLATFORM "linux"
+ 
diff --git a/chromium/patches/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/chromium/patches/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
index 5bbb8cccc9..e6a4afdb74 100644
--- a/chromium/patches/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
+++ b/chromium/patches/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  #include "components/visited_url_ranking/public/visited_url_ranking_service.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_visited__url__ranking_visited__url__ranking__servi
  #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h"
  #elif BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h"
-@@ -118,7 +118,7 @@ VisitedURLRankingServiceFactory::BuildSe
+@@ -119,7 +119,7 @@ VisitedURLRankingServiceFactory::BuildSe
  
    std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc b/chromium/patches/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
index 7d1c5614f1..f3cb13d594 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_web__applications_commands_launch__web__app__command.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/commands/launch_web_app_command.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/commands/launch_web_app_command.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/commands/launch_web_app_command.cc
-@@ -98,7 +98,7 @@ void LaunchWebAppCommand::StartWithLock(
+@@ -101,7 +101,7 @@ void LaunchWebAppCommand::StartWithLock(
      // OsIntegrationTestOverride can use the xdg install command to detect
      // install.
      SynchronizeOsOptions options;
diff --git a/chromium/patches/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc b/chromium/patches/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
index cfcc52ad10..07a889cdd3 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/commands/set_user_display_mode_command.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/commands/set_user_display_mode_command.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/commands/set_user_display_mode_command.cc
 @@ -57,7 +57,7 @@ void SetUserDisplayModeCommand::StartWit
      // OsIntegrationTestOverride can use the xdg install command to detect
diff --git a/chromium/patches/patch-chrome_browser_web__applications_extension__status__utils.h b/chromium/patches/patch-chrome_browser_web__applications_extension__status__utils.h
index 5a0e90be98..75b1a02ce3 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_extension__status__utils.h
+++ b/chromium/patches/patch-chrome_browser_web__applications_extension__status__utils.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_web__applications_extension__status__utils.h,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/extension_status_utils.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/extension_status_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/extension_status_utils.h
 @@ -50,7 +50,7 @@ bool IsExtensionDefaultInstalled(content
  bool IsExternalExtensionUninstalled(content::BrowserContext* context,
diff --git a/chromium/patches/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/chromium/patches/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
index d092fb0b8f..b938323b00 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_web__applications_extensions_extension__status__utils.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/extensions/extension_status_utils.cc
-@@ -25,7 +25,7 @@ namespace {
+@@ -26,7 +26,7 @@ namespace {
  
  const char* g_preinstalled_app_for_testing = nullptr;
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_web__applications_extensions_extension__status__ut
  // TODO(b/268221237): Remove this allow-list.
  const char kDefaultAllowedExtensionIds[] =
      "alhngdkjgnedakdlnamimgfihgkmenbh,"
-@@ -107,7 +107,7 @@ bool IsExternalExtensionUninstalled(cont
+@@ -105,7 +105,7 @@ bool IsExternalExtensionUninstalled(cont
    return prefs && prefs->IsExternalExtensionUninstalled(extension_id);
  }
  
diff --git a/chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
index 368dda7cf6..3c13c269de 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc
-@@ -649,7 +649,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrat
+@@ -662,7 +662,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrat
      }
    }
  
diff --git a/chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
index 4f6aed9c1d..a88b55c238 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
+++ b/chromium/patches/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/os_integration/os_integration_test_override.h
 @@ -99,7 +99,7 @@ class OsIntegrationTestOverride
    virtual base::FilePath chrome_apps_folder() = 0;
diff --git a/chromium/patches/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc b/chromium/patches/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
index 309352bebb..b919e02875 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc
-@@ -54,7 +54,7 @@ proto::RunOnOsLoginMode ConvertWebAppRun
+@@ -54,7 +54,7 @@ proto::os_state::RunOnOsLogin::Mode Conv
  // different from other platforms, see web_app_run_on_os_login_manager.h for
  // more info.
  bool DoesRunOnOsLoginRequireExecution() {
diff --git a/chromium/patches/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/chromium/patches/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
index a3563cd1d3..0ededaf2c2 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc
-@@ -191,7 +191,7 @@ void ShortcutSubManager::Execute(
+@@ -199,7 +199,7 @@ void ShortcutSubManager::Execute(
      return;
    }
  
diff --git a/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h b/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
index 3c15b643dc..3a8f032ba5 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
+++ b/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h
 @@ -43,7 +43,7 @@ void UnregisterFileHandlersWithOs(const 
                                    const base::FilePath& profile_path,
diff --git a/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
index 392eb1685d..ce56a82a26 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc
 @@ -71,7 +71,7 @@ namespace {
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_browser_web__applications_os__integration_web__app__shortc
  // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
  // that "Minimally you should install a 48x48 icon in the hicolor theme."
  const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512};
-@@ -251,7 +251,7 @@ std::unique_ptr<ShortcutInfo> BuildShort
+@@ -253,7 +253,7 @@ std::unique_ptr<ShortcutInfo> BuildShort
  
  // TODO(crbug.com/40257107): Implement tests on Linux for using shortcuts_menu
  // actions.
diff --git a/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
index e30fb7a65a..45d24d3df8 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
+++ b/chromium/patches/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
  #include "ui/gfx/image/image_family.h"
  #include "url/gurl.h"
  
@@ -15,10 +15,10 @@ $NetBSD: patch-chrome_browser_web__applications_os__integration_web__app__shortc
  #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -70,7 +70,7 @@ struct ShortcutInfo {
-   std::set<std::string> file_handler_extensions;
-   std::set<std::string> file_handler_mime_types;
-   std::set<std::string> protocol_handlers;
+@@ -77,7 +77,7 @@ struct ShortcutInfo {
+   // the installed PWA experience and thus the icons are not designed to be
+   // displayed on an OS dock.
+   bool is_diy_app = false;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    std::set<DesktopActionInfo> actions;
diff --git a/chromium/patches/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/chromium/patches/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
index cc33317ca9..811c60f7ca 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc
-@@ -106,7 +106,7 @@ namespace web_app {
+@@ -105,7 +105,7 @@ namespace web_app {
  
  BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration,
               "DesktopPWAsForceUnregisterOSIntegration",
diff --git a/chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
index 4ab9bb8886..8ea77c8424 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc
 @@ -45,7 +45,7 @@
  #include "third_party/skia/include/core/SkBitmap.h"
@@ -22,9 +22,9 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  // Performs a blocking read of app icons from the disk.
- SkColor IconManagerReadIconTopLeftColorForSize(WebAppIconManager& icon_manager,
-                                                const webapps::AppId& app_id,
-@@ -265,7 +265,7 @@ bool OsIntegrationTestOverrideImpl::Simu
+ std::optional<SkBitmap> IconManagerReadIconForSize(
+     WebAppIconManager& icon_manager,
+@@ -315,7 +315,7 @@ bool OsIntegrationTestOverrideImpl::Simu
        GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
    CHECK(base::PathExists(app_folder_shortcut_path));
    return base::DeletePathRecursively(app_folder_shortcut_path);
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
    base::FilePath desktop_shortcut_path =
        GetShortcutPath(profile, desktop(), app_id, app_name);
    LOG(INFO) << desktop_shortcut_path;
-@@ -313,7 +313,7 @@ bool OsIntegrationTestOverrideImpl::Dele
+@@ -362,7 +362,7 @@ bool OsIntegrationTestOverrideImpl::Dele
  }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -42,7 +42,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
  bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() {
    if (desktop_.IsValid()) {
      return desktop_.Delete();
-@@ -327,7 +327,7 @@ bool OsIntegrationTestOverrideImpl::IsRu
+@@ -376,7 +376,7 @@ bool OsIntegrationTestOverrideImpl::IsRu
      Profile* profile,
      const webapps::AppId& app_id,
      const std::string& app_name) {
@@ -51,7 +51,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
    std::string shortcut_filename =
        "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
    return base::PathExists(startup().Append(shortcut_filename));
-@@ -383,7 +383,7 @@ bool OsIntegrationTestOverrideImpl::IsFi
+@@ -431,7 +431,7 @@ bool OsIntegrationTestOverrideImpl::IsFi
    is_file_handled =
        shell_integration::CanApplicationHandleURL(app_path, test_file_url);
    base::DeleteFile(test_file_path);
@@ -60,16 +60,16 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
    base::FilePath user_applications_dir = applications();
    bool database_update_called = false;
    for (const LinuxFileRegistration& command : linux_file_registration_) {
-@@ -426,7 +426,7 @@ OsIntegrationTestOverrideImpl::GetShortc
+@@ -481,7 +481,7 @@ std::optional<SkBitmap> OsIntegrationTes
      return std::nullopt;
    }
-   return GetIconTopLeftColorFromShortcutFile(shortcut_path);
+   return GetIconFromShortcutFile(shortcut_path);
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile);
    if (!provider) {
      return std::nullopt;
-@@ -476,7 +476,7 @@ base::FilePath OsIntegrationTestOverride
+@@ -547,7 +547,7 @@ base::FilePath OsIntegrationTestOverride
        app_installed_profiles.end()) {
      return shortcut_path;
    }
@@ -78,7 +78,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
    std::string shortcut_filename =
        "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
    base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename);
-@@ -501,7 +501,7 @@ bool OsIntegrationTestOverrideImpl::IsSh
+@@ -572,7 +572,7 @@ bool OsIntegrationTestOverrideImpl::IsSh
    base::FilePath app_shortcut_path =
        GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
    return base::PathExists(app_shortcut_path);
@@ -87,7 +87,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
    base::FilePath desktop_shortcut_path =
        GetShortcutPath(profile, desktop(), app_id, app_name);
    return base::PathExists(desktop_shortcut_path);
-@@ -694,7 +694,7 @@ void OsIntegrationTestOverrideImpl::Enab
+@@ -764,7 +764,7 @@ void OsIntegrationTestOverrideImpl::Enab
  }
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -96,7 +96,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
  base::FilePath OsIntegrationTestOverrideImpl::desktop() {
    return desktop_.GetPath();
  }
-@@ -745,7 +745,7 @@ OsIntegrationTestOverrideImpl::OsIntegra
+@@ -815,7 +815,7 @@ OsIntegrationTestOverrideImpl::OsIntegra
    success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(
        outer_temp_dir_.GetPath());
    CHECK(success);
@@ -105,7 +105,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
    success = desktop_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath());
    CHECK(success);
    success = startup_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath());
-@@ -758,7 +758,7 @@ OsIntegrationTestOverrideImpl::OsIntegra
+@@ -828,7 +828,7 @@ OsIntegrationTestOverrideImpl::OsIntegra
    CHECK(success);
  #endif
  
@@ -114,7 +114,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
    auto callback = base::BindRepeating([](base::FilePath filename_in,
                                           std::string xdg_command,
                                           std::string file_contents) {
-@@ -830,7 +830,7 @@ OsIntegrationTestOverrideImpl::~OsIntegr
+@@ -900,7 +900,7 @@ OsIntegrationTestOverrideImpl::~OsIntegr
    EXPECT_TRUE(!startup_.IsValid() || startup_.Delete());
  #elif BUILDFLAG(IS_MAC)
    EXPECT_TRUE(!chrome_apps_folder_.IsValid() || DeleteChromeAppsDir());
diff --git a/chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
index d2e20b3fa6..818a6b43dc 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
+++ b/chromium/patches/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/test/os_integration_test_override_impl.h
 @@ -40,7 +40,7 @@ class ShellLinkItem;
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
    bool DeleteDesktopDirOnLinux();
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -241,7 +241,7 @@ class OsIntegrationTestOverrideImpl : pu
+@@ -250,7 +250,7 @@ class OsIntegrationTestOverrideImpl : pu
    base::FilePath chrome_apps_folder() override;
    void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
                                    bool enable_on_login) override;
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_browser_web__applications_test_os__integration__test__over
    base::FilePath desktop();
    base::FilePath startup();
    base::FilePath applications();
-@@ -321,7 +321,7 @@ class OsIntegrationTestOverrideImpl : pu
+@@ -323,7 +323,7 @@ class OsIntegrationTestOverrideImpl : pu
    base::ScopedTempDir chrome_apps_folder_;
    std::map<base::FilePath, bool> startup_enabled_;
  
diff --git a/chromium/patches/patch-chrome_browser_web__applications_web__app__helpers.cc b/chromium/patches/patch-chrome_browser_web__applications_web__app__helpers.cc
index a0d4171902..e49c84030b 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_web__app__helpers.cc
+++ b/chromium/patches/patch-chrome_browser_web__applications_web__app__helpers.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_web__applications_web__app__helpers.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/web_app_helpers.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/web_app_helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/web_app_helpers.cc
 @@ -145,7 +145,7 @@ bool IsValidWebAppUrl(const GURL& app_ur
      return false;
@@ -14,4 +14,4 @@ $NetBSD: patch-chrome_browser_web__applications_web__app__helpers.cc,v 1.1 2025/
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Stop allowing apps to be extension urls when the shortcuts are separated -
    // they can be extension urls instead.
-   allow_extension_apps =
+   allow_extension_apps = false;
diff --git a/chromium/patches/patch-chrome_browser_web__applications_web__app__install__info.h b/chromium/patches/patch-chrome_browser_web__applications_web__app__install__info.h
index 039f4ac731..b09ed2e54e 100644
--- a/chromium/patches/patch-chrome_browser_web__applications_web__app__install__info.h
+++ b/chromium/patches/patch-chrome_browser_web__applications_web__app__install__info.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_web__applications_web__app__install__info.h,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/web_applications/web_app_install_info.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/web_applications/web_app_install_info.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/web_applications/web_app_install_info.h
-@@ -39,7 +39,7 @@
+@@ -38,7 +38,7 @@
  #include "url/gurl.h"
  
  static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
diff --git a/chromium/patches/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/chromium/patches/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
index 381fc8b7c6..78e8956178 100644
--- a/chromium/patches/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/chromium/patches/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -1166,7 +1166,7 @@ void ChromeAuthenticatorRequestDelegate:
+@@ -577,7 +577,7 @@ void ChromeAuthenticatorRequestDelegate:
      g_observer->ConfiguringCable(request_type);
    }
  
diff --git a/chromium/patches/patch-chrome_browser_webauthn_enclave__manager.cc b/chromium/patches/patch-chrome_browser_webauthn_enclave__manager.cc
index 0d03ba493c..e7942f5abe 100644
--- a/chromium/patches/patch-chrome_browser_webauthn_enclave__manager.cc
+++ b/chromium/patches/patch-chrome_browser_webauthn_enclave__manager.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-chrome_browser_webauthn_enclave__manager.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/webauthn/enclave_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/webauthn/enclave_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/webauthn/enclave_manager.cc
-@@ -693,7 +693,7 @@ base::flat_set<std::string> GetGaiaIDs(
+@@ -689,7 +689,7 @@ base::flat_set<GaiaId> GetGaiaIDs(
  
  std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    return label;
  #else
    return std::string("placeholder");
-@@ -703,7 +703,7 @@ std::string UserVerifyingLabelToString(c
+@@ -699,7 +699,7 @@ std::string UserVerifyingLabelToString(c
  std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString(
      std::string saved_label) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    return saved_label;
  #else
    return std::nullopt;
diff --git a/chromium/patches/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc b/chromium/patches/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
index cc08db369e..21f9b77df7 100644
--- a/chromium/patches/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
+++ b/chromium/patches/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_browser_webauthn_gpm__user__verification__policy.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/webauthn/gpm_user_verification_policy.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/webauthn/gpm_user_verification_policy.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/webauthn/gpm_user_verification_policy.cc
 @@ -17,7 +17,7 @@ bool GpmWillDoUserVerification(device::U
        return platform_has_biometrics;
diff --git a/chromium/patches/patch-chrome_browser_webauthn_password__credential__controller.cc b/chromium/patches/patch-chrome_browser_webauthn_password__credential__controller.cc
new file mode 100644
index 0000000000..c974e8900d
--- /dev/null
+++ b/chromium/patches/patch-chrome_browser_webauthn_password__credential__controller.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/browser/webauthn/password_credential_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/browser/webauthn/password_credential_controller.cc
+@@ -46,7 +46,7 @@ password_manager::PasswordManagerClient*
+ }
+ 
+ std::u16string GetAuthenticationMessage(std::string_view rp_id) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return u"";
+ #else
+   return l10n_util::GetStringFUTF16(IDS_PASSWORD_MANAGER_FILLING_REAUTH,
diff --git a/chromium/patches/patch-chrome_browser_webauthn_unexportable__key__utils.cc b/chromium/patches/patch-chrome_browser_webauthn_unexportable__key__utils.cc
index ebd074735a..cac7aa4f5c 100644
--- a/chromium/patches/patch-chrome_browser_webauthn_unexportable__key__utils.cc
+++ b/chromium/patches/patch-chrome_browser_webauthn_unexportable__key__utils.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_browser_webauthn_unexportable__key__utils.cc,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/browser/webauthn/unexportable_key_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/browser/webauthn/unexportable_key_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/browser/webauthn/unexportable_key_utils.cc
 @@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() {
    // If there is a scoped UnexportableKeyProvider configured, we always use
    // that so that tests can still override the key provider.
    const bool use_software_provider =
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
        !crypto::internal::HasScopedUnexportableKeyProvider();
  #else
        false;
diff --git a/chromium/patches/patch-chrome_common_channel__info.h b/chromium/patches/patch-chrome_common_channel__info.h
index 6691607420..d94f5cb614 100644
--- a/chromium/patches/patch-chrome_common_channel__info.h
+++ b/chromium/patches/patch-chrome_common_channel__info.h
@@ -1,21 +1,21 @@
-$NetBSD: patch-chrome_common_channel__info.h,v 1.1 2025/02/06 09:57:56 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/channel_info.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/channel_info.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/channel_info.h
-@@ -12,7 +12,7 @@
+@@ -11,7 +11,7 @@
+ #include "build/branding_buildflags.h"
  #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  namespace base {
  class Environment;
  }
-@@ -100,7 +100,7 @@ void ClearChannelIdForTesting();
+@@ -99,7 +99,7 @@ void ClearChannelIdForTesting();
  std::string GetChannelSuffixForDataDir();
  #endif
  
diff --git a/chromium/patches/patch-chrome_common_channel__info__posix.cc b/chromium/patches/patch-chrome_common_channel__info__posix.cc
index 620840f001..6517392ebb 100644
--- a/chromium/patches/patch-chrome_common_channel__info__posix.cc
+++ b/chromium/patches/patch-chrome_common_channel__info__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_channel__info__posix.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/channel_info_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/channel_info_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/channel_info_posix.cc
-@@ -95,7 +95,7 @@ std::string GetChannelSuffixForDataDir()
+@@ -94,7 +94,7 @@ std::string GetChannelSuffixForDataDir()
    }
  }
  
@@ -15,12 +15,12 @@ $NetBSD: patch-chrome_common_channel__info__posix.cc,v 1.1 2025/02/06 09:57:57 w
  std::string GetChannelSuffixForExtraFlagsEnvVarName() {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    const auto channel_state = GetChannelImpl();
-@@ -123,7 +123,7 @@ std::string GetChannelSuffixForExtraFlag
+@@ -120,7 +120,7 @@ std::string GetChannelSuffixForExtraFlag
+ }
+ #endif  // BUILDFLAG(IS_LINUX)
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  std::string GetDesktopName(base::Environment* env) {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    // Google Chrome packaged as a snap is a special case: the application name
diff --git a/chromium/patches/patch-chrome_common_chrome__features.cc b/chromium/patches/patch-chrome_common_chrome__features.cc
index 245a5b75d1..e9cb98e679 100644
--- a/chromium/patches/patch-chrome_common_chrome__features.cc
+++ b/chromium/patches/patch-chrome_common_chrome__features.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_chrome__features.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/chrome_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/chrome_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/chrome_features.cc
-@@ -83,7 +83,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppSh
+@@ -80,7 +80,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppSh
  #endif  // BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_common_chrome__features.cc,v 1.1 2025/02/06 09:57:57 wiz E
  // Enables or disables the Autofill survey triggered by opening a prompt to
  // save address info.
  BASE_FEATURE(kAutofillAddressSurvey,
-@@ -101,7 +101,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
+@@ -98,7 +98,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_common_chrome__features.cc,v 1.1 2025/02/06 09:57:57 wiz E
  // Enables the Restart background mode optimization. When all Chrome UI is
  // closed and it goes in the background, allows to restart the browser to
  // discard memory.
-@@ -273,7 +273,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtension
+@@ -233,7 +233,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtension
  BASE_FEATURE(kDesktopPWAsRunOnOsLogin,
               "DesktopPWAsRunOnOsLogin",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_common_chrome__features.cc,v 1.1 2025/02/06 09:57:57 wiz E
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -305,7 +305,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSetting
+@@ -259,7 +259,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSetting
               "DesktopPWAsTabStripSettings",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -42,7 +42,7 @@ $NetBSD: patch-chrome_common_chrome__features.cc,v 1.1 2025/02/06 09:57:57 wiz E
  // Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
  // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
  // Apps will not launch and will be marked in the UI as deprecated.
-@@ -867,7 +867,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
+@@ -898,7 +898,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
               "KAnonymityServiceStorage",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -51,7 +51,7 @@ $NetBSD: patch-chrome_common_chrome__features.cc,v 1.1 2025/02/06 09:57:57 wiz E
  BASE_FEATURE(kLinuxLowMemoryMonitor,
               "LinuxLowMemoryMonitor",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -880,7 +880,7 @@ constexpr base::FeatureParam<int> kLinux
+@@ -911,7 +911,7 @@ constexpr base::FeatureParam<int> kLinux
      &kLinuxLowMemoryMonitor, "critical_level", 255};
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/chromium/patches/patch-chrome_common_chrome__features.h b/chromium/patches/patch-chrome_common_chrome__features.h
index 1963fa51f0..3fe5784712 100644
--- a/chromium/patches/patch-chrome_common_chrome__features.h
+++ b/chromium/patches/patch-chrome_common_chrome__features.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_chrome__features.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/chrome_features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/chrome_features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/chrome_features.h
-@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningFor
+@@ -50,13 +50,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningFor
  #endif  // BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -22,7 +22,7 @@ $NetBSD: patch-chrome_common_chrome__features.h,v 1.1 2025/02/06 09:57:57 wiz Ex
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -179,7 +179,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPrevent
+@@ -146,7 +146,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPrevent
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
  
@@ -31,7 +31,7 @@ $NetBSD: patch-chrome_common_chrome__features.h,v 1.1 2025/02/06 09:57:57 wiz Ex
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kShortcutsNotApps);
-@@ -503,7 +503,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceO
+@@ -521,7 +521,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceO
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
  
@@ -40,7 +40,7 @@ $NetBSD: patch-chrome_common_chrome__features.h,v 1.1 2025/02/06 09:57:57 wiz Ex
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
  COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -511,7 +511,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -529,7 +529,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/chromium/patches/patch-chrome_common_chrome__paths.cc b/chromium/patches/patch-chrome_common_chrome__paths.cc
index 8754273772..a1e98f0e15 100644
--- a/chromium/patches/patch-chrome_common_chrome__paths.cc
+++ b/chromium/patches/patch-chrome_common_chrome__paths.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_chrome__paths.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/chrome_paths.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/chrome_paths.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/chrome_paths.cc
-@@ -30,7 +30,7 @@
+@@ -32,7 +32,7 @@
  #include "base/apple/foundation_util.h"
  #endif
  
@@ -15,9 +15,9 @@ $NetBSD: patch-chrome_common_chrome__paths.cc,v 1.1 2025/02/06 09:57:57 wiz Exp
  #include "components/policy/core/common/policy_paths.h"
  #endif
  
-@@ -52,14 +52,14 @@
+@@ -48,14 +48,14 @@ namespace {
  
- namespace {
+ std::optional<bool> g_override_using_default_data_directory_for_testing;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_common_chrome__paths.cc,v 1.1 2025/02/06 09:57:57 wiz Exp
  #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
  
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -219,7 +219,7 @@ bool PathProvider(int key, base::FilePat
+@@ -212,7 +212,7 @@ bool PathProvider(int key, base::FilePat
        }
        break;
      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -42,25 +42,23 @@ $NetBSD: patch-chrome_common_chrome__paths.cc,v 1.1 2025/02/06 09:57:57 wiz Exp
        if (!GetUserDownloadsDirectorySafe(&cur)) {
          return false;
        }
-@@ -535,7 +535,7 @@ bool PathProvider(int key, base::FilePat
-         return false;
-       }
+@@ -504,13 +504,13 @@ bool PathProvider(int key, base::FilePat
        break;
+     }
+ #endif
 -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
 +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
      case chrome::DIR_POLICY_FILES: {
        cur = base::FilePath(policy::kPolicyPath);
        break;
-@@ -546,7 +546,7 @@ bool PathProvider(int key, base::FilePat
- #if BUILDFLAG(IS_CHROMEOS_ASH) ||                              \
-     ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
-      BUILDFLAG(CHROMIUM_BRANDING)) ||                          \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+     }
+ #endif
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+     (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING))
      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
-         return false;
-@@ -555,7 +555,7 @@ bool PathProvider(int key, base::FilePat
+@@ -520,7 +520,7 @@ bool PathProvider(int key, base::FilePat
        break;
      }
  #endif
@@ -69,7 +67,7 @@ $NetBSD: patch-chrome_common_chrome__paths.cc,v 1.1 2025/02/06 09:57:57 wiz Exp
      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
        cur = base::FilePath(kFilepathSinglePrefExtensions);
        break;
-@@ -593,7 +593,7 @@ bool PathProvider(int key, base::FilePat
+@@ -558,7 +558,7 @@ bool PathProvider(int key, base::FilePat
        break;
  
  #if BUILDFLAG(ENABLE_EXTENSIONS) && \
@@ -78,7 +76,7 @@ $NetBSD: patch-chrome_common_chrome__paths.cc,v 1.1 2025/02/06 09:57:57 wiz Exp
      case chrome::DIR_NATIVE_MESSAGING:
  #if BUILDFLAG(IS_MAC)
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -607,6 +607,9 @@ bool PathProvider(int key, base::FilePat
+@@ -572,6 +572,9 @@ bool PathProvider(int key, base::FilePat
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
        cur = base::FilePath(
            FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
diff --git a/chromium/patches/patch-chrome_common_chrome__paths.h b/chromium/patches/patch-chrome_common_chrome__paths.h
index 70e8827c5b..c33cde0b00 100644
--- a/chromium/patches/patch-chrome_common_chrome__paths.h
+++ b/chromium/patches/patch-chrome_common_chrome__paths.h
@@ -1,21 +1,21 @@
-$NetBSD: patch-chrome_common_chrome__paths.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/chrome_paths.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/chrome_paths.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/chrome_paths.h
-@@ -59,7 +59,7 @@ enum {
- #if BUILDFLAG(IS_CHROMEOS_ASH) ||                              \
-     ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
-      BUILDFLAG(CHROMIUM_BRANDING)) ||                          \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+@@ -56,7 +56,7 @@ enum {
+                      // to set policies for chrome. This directory
+                      // contains subdirectories.
+ #endif
+-#if BUILDFLAG(IS_CHROMEOS) || \
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || \
+     (BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || BUILDFLAG(IS_MAC)
    DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
                                   // on Chrome Mac and Chromium Linux.
-                                  // On Chrome OS, this path is used for OEM
-@@ -67,7 +67,7 @@ enum {
+@@ -65,7 +65,7 @@ enum {
                                   // create it.
  #endif
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_common_chrome__paths.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
    DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
                                         // definition manifest files that
                                         // describe extensions which are to be
-@@ -126,7 +126,7 @@ enum {
+@@ -112,7 +112,7 @@ enum {
  
  #endif
  #if BUILDFLAG(ENABLE_EXTENSIONS) && \
diff --git a/chromium/patches/patch-chrome_common_chrome__paths__internal.h b/chromium/patches/patch-chrome_common_chrome__paths__internal.h
index 96dd0b5a5e..6440f25733 100644
--- a/chromium/patches/patch-chrome_common_chrome__paths__internal.h
+++ b/chromium/patches/patch-chrome_common_chrome__paths__internal.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_chrome__paths__internal.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/chrome_paths_internal.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/chrome_paths_internal.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/chrome_paths_internal.h
-@@ -43,7 +43,7 @@ void GetUserCacheDirectory(const base::F
+@@ -53,7 +53,7 @@ void GetUserCacheDirectory(const base::F
  // Get the path to the user's documents directory.
  bool GetUserDocumentsDirectory(base::FilePath* result);
  
diff --git a/chromium/patches/patch-chrome_common_chrome__switches.cc b/chromium/patches/patch-chrome_common_chrome__switches.cc
index 895b47a13d..0850787ed1 100644
--- a/chromium/patches/patch-chrome_common_chrome__switches.cc
+++ b/chromium/patches/patch-chrome_common_chrome__switches.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_chrome__switches.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/chrome_switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/chrome_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/chrome_switches.cc
-@@ -892,7 +892,7 @@ const char kAllowNaClSocketAPI[] = "allo
+@@ -883,7 +883,7 @@ const char kAllowNaClSocketAPI[] = "allo
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -15,8 +15,8 @@ $NetBSD: patch-chrome_common_chrome__switches.cc,v 1.1 2025/02/06 09:57:57 wiz E
  const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
  
  // Causes the browser to launch directly in guest mode.
-@@ -902,7 +902,7 @@ const char kGuest[] = "guest";
- const char kForceNtpMobilePromo[] = "force-ntp-mobile-promo";
+@@ -911,7 +911,7 @@ const char kGlicDev[] = "glic-dev";
+ const char kGlicHostLogging[] = "glic-host-logging";
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/chromium/patches/patch-chrome_common_chrome__switches.h b/chromium/patches/patch-chrome_common_chrome__switches.h
index 4e02dae96c..2dd4137dac 100644
--- a/chromium/patches/patch-chrome_common_chrome__switches.h
+++ b/chromium/patches/patch-chrome_common_chrome__switches.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_chrome__switches.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/chrome_switches.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/chrome_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/chrome_switches.h
-@@ -277,13 +277,13 @@ extern const char kAllowNaClSocketAPI[];
+@@ -273,7 +273,7 @@ extern const char kAllowNaClSocketAPI[];
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -15,6 +15,8 @@ $NetBSD: patch-chrome_common_chrome__switches.h,v 1.1 2025/02/06 09:57:57 wiz Ex
  extern const char kEnableNewAppMenuIcon[];
  extern const char kGuest[];
  extern const char kForceNtpMobilePromo[];
+@@ -290,7 +290,7 @@ extern const char kGlicDev[];
+ extern const char kGlicHostLogging[];
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/chromium/patches/patch-chrome_common_crash__keys.cc b/chromium/patches/patch-chrome_common_crash__keys.cc
index 75064835c5..2ac552f695 100644
--- a/chromium/patches/patch-chrome_common_crash__keys.cc
+++ b/chromium/patches/patch-chrome_common_crash__keys.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_crash__keys.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/crash_keys.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/crash_keys.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/crash_keys.cc
-@@ -56,7 +56,9 @@ class CrashKeyWithName {
+@@ -51,7 +51,9 @@ class CrashKeyWithName {
    ~CrashKeyWithName() = delete;
  
    std::string_view Name() const { return name_; }
@@ -16,7 +16,7 @@ $NetBSD: patch-chrome_common_crash__keys.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
    void Clear() { crash_key_.Clear(); }
    void Set(std::string_view value) { crash_key_.Set(value); }
  
-@@ -201,6 +203,7 @@ void AllocateCrashKeyInBrowserAndChildre
+@@ -196,6 +198,7 @@ void AllocateCrashKeyInBrowserAndChildre
    GetCommandLineStringAnnotations().emplace_back(std::string(key)).Set(value);
  }
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_common_crash__keys.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
  void AppendStringAnnotationsCommandLineSwitch(base::CommandLine* command_line) {
    std::string string_annotations;
    for (const auto& crash_key : GetCommandLineStringAnnotations()) {
-@@ -212,6 +215,7 @@ void AppendStringAnnotationsCommandLineS
+@@ -210,6 +213,7 @@ void AppendStringAnnotationsCommandLineS
    }
    command_line->AppendSwitchASCII(kStringAnnotationsSwitch, string_annotations);
  }
diff --git a/chromium/patches/patch-chrome_common_extensions_extension__constants.cc b/chromium/patches/patch-chrome_common_extensions_extension__constants.cc
new file mode 100644
index 0000000000..2fc19d1378
--- /dev/null
+++ b/chromium/patches/patch-chrome_common_extensions_extension__constants.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/common/extensions/extension_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/common/extensions/extension_constants.cc
+@@ -38,7 +38,7 @@ const char* const kBuiltInFirstPartyExte
+     kGoogleSpeechSynthesisExtensionId,
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+     kReadingModeGDocsHelperExtensionId,
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+     kTTSEngineExtensionId,
+     kComponentUpdaterTTSEngineExtensionId,
+ #endif        // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
diff --git a/chromium/patches/patch-chrome_common_extensions_extension__constants.h b/chromium/patches/patch-chrome_common_extensions_extension__constants.h
new file mode 100644
index 0000000000..7d065955ca
--- /dev/null
+++ b/chromium/patches/patch-chrome_common_extensions_extension__constants.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/common/extensions/extension_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/common/extensions/extension_constants.h
+@@ -310,7 +310,7 @@ inline constexpr char kReadingModeGDocsH
+ inline constexpr base::FilePath::CharType
+     kReadingModeGDocsHelperManifestFilename[] =
+         FILE_PATH_LITERAL("reading_mode_gdocs_helper_manifest.json");
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ // The extension id of the google tts engine extension to use on-device natural
+ // Google voices.
+ inline constexpr char kTTSEngineExtensionId[] =
diff --git a/chromium/patches/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc b/chromium/patches/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
index 9829c62c00..86b0f651f7 100644
--- a/chromium/patches/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
+++ b/chromium/patches/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/extensions/permissions/chrome_permission_message_rules.cc
-@@ -285,7 +285,7 @@ int GetEnterpriseReportingPrivatePermiss
-   }
+@@ -280,7 +280,7 @@ class USBDevicesFormatter : public Chrom
+ int GetEnterpriseReportingPrivatePermissionMessageId() {
  #if BUILDFLAG(IS_WIN)
    return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN;
 -#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC)
diff --git a/chromium/patches/patch-chrome_common_media_cdm__host__file__path.cc b/chromium/patches/patch-chrome_common_media_cdm__host__file__path.cc
index da6d0f8f90..841d0aad9c 100644
--- a/chromium/patches/patch-chrome_common_media_cdm__host__file__path.cc
+++ b/chromium/patches/patch-chrome_common_media_cdm__host__file__path.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_common_media_cdm__host__file__path.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/media/cdm_host_file_path.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/media/cdm_host_file_path.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/media/cdm_host_file_path.cc
 @@ -90,7 +90,7 @@ void AddCdmHostFilePaths(
    cdm_host_file_paths->emplace_back(chrome_framework_path,
@@ -14,4 +14,4 @@ $NetBSD: patch-chrome_common_media_cdm__host__file__path.cc,v 1.1 2025/02/06 09:
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  
    base::FilePath chrome_exe_dir;
-   if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir))
+   if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir)) {
diff --git a/chromium/patches/patch-chrome_common_media_cdm__registration.cc b/chromium/patches/patch-chrome_common_media_cdm__registration.cc
index 48e7b1c9fa..444961d408 100644
--- a/chromium/patches/patch-chrome_common_media_cdm__registration.cc
+++ b/chromium/patches/patch-chrome_common_media_cdm__registration.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_media_cdm__registration.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/media/cdm_registration.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/media/cdm_registration.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/media/cdm_registration.cc
-@@ -33,7 +33,7 @@
+@@ -32,7 +32,7 @@
  #if BUILDFLAG(ENABLE_WIDEVINE)
  #include "components/cdm/common/cdm_manifest.h"
  #include "third_party/widevine/cdm/widevine_cdm_common.h"  // nogncheck
@@ -15,8 +15,8 @@ $NetBSD: patch-chrome_common_media_cdm__registration.cc,v 1.1 2025/02/06 09:57:5
  #include "base/native_library.h"
  #include "chrome/common/chrome_paths.h"
  #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
-@@ -86,7 +86,7 @@ void ReportLacrosUMA(LacrosBundledWidevi
- 
+@@ -51,7 +51,7 @@ using Robustness = content::CdmInfo::Rob
+ #if BUILDFLAG(ENABLE_WIDEVINE)
  #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) ||            \
       BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_common_media_cdm__registration.cc,v 1.1 2025/02/06 09:57:5
  // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and
  // |capability|.
  std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo(
-@@ -131,7 +131,7 @@ std::unique_ptr<content::CdmInfo> Create
+@@ -93,7 +93,7 @@ std::unique_ptr<content::CdmInfo> Create
          // BUILDFLAG(IS_CHROMEOS))
  
  #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \
@@ -33,30 +33,30 @@ $NetBSD: patch-chrome_common_media_cdm__registration.cc,v 1.1 2025/02/06 09:57:5
  // On Linux/ChromeOS we have to preload the CDM since it uses the zygote
  // sandbox. On Windows and Mac, CDM registration is handled by Component
  // Update (as the CDM can be loaded only when needed).
-@@ -185,7 +185,7 @@ std::unique_ptr<content::CdmInfo> GetAsh
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -117,7 +117,7 @@ std::unique_ptr<content::CdmInfo> GetBun
+         // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
  
- #if (BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) &&             \
--     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH))) || \
-+     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD))) || \
-     BUILDFLAG(IS_CHROMEOS_LACROS)
+ #if (BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \
+-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)))
++     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)))
  // This code checks to see if Component Updater picked a version of the Widevine
  // CDM to be used last time it ran. (Component Updater may choose the bundled
-@@ -232,7 +232,7 @@ void AddSoftwareSecureWidevine(std::vect
+ // CDM if there is not a new version available for download.) If there is one
+@@ -159,7 +159,7 @@ void AddSoftwareSecureWidevine(std::vect
        /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName,
-       kWidevineCdmType, base::Version(), base::FilePath());
+       kWidevineCdmType, base::FilePath());
  
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
-   base::Version glibc_version(gnu_get_libc_version());
-   DCHECK(glibc_version.IsValid());
-@@ -493,7 +493,7 @@ void RegisterCdmInfo(std::vector<content
+   // The Widevine CDM on Linux/ChromeOS needs to be registered (and loaded)
+   // before the zygote is locked down. The CDM can be found from the version
+   // bundled with Chrome (if BUNDLE_WIDEVINE_CDM = true) and/or the version
+@@ -385,7 +385,7 @@ void RegisterCdmInfo(std::vector<content
  }
  
  #if BUILDFLAG(ENABLE_WIDEVINE) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD))
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
  std::vector<content::CdmInfo> GetSoftwareSecureWidevine() {
    std::vector<content::CdmInfo> cdms;
    AddSoftwareSecureWidevine(&cdms);
diff --git a/chromium/patches/patch-chrome_common_media_cdm__registration.h b/chromium/patches/patch-chrome_common_media_cdm__registration.h
index 827557a22a..b68312ab9f 100644
--- a/chromium/patches/patch-chrome_common_media_cdm__registration.h
+++ b/chromium/patches/patch-chrome_common_media_cdm__registration.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-chrome_common_media_cdm__registration.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/media/cdm_registration.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/media/cdm_registration.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/media/cdm_registration.h
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
  void RegisterCdmInfo(std::vector<content::CdmInfo>* cdms);
  
  #if BUILDFLAG(ENABLE_WIDEVINE) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD))
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
  // Returns the software secure Widevine CDM, if one exists.
  std::vector<content::CdmInfo> GetSoftwareSecureWidevine();
  #endif
diff --git a/chromium/patches/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/chromium/patches/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
index 78023dbc1b..8dd8257cd7 100644
--- a/chromium/patches/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
+++ b/chromium/patches/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
@@ -1,15 +1,15 @@
-$NetBSD: patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/media/component_widevine_cdm_hint_file_linux.h
-@@ -17,7 +17,7 @@
+@@ -14,7 +14,7 @@
+ #error "This file only applies when Widevine used."
+ #endif
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
 -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
 +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
  #error "This file only applies to desktop Linux and ChromeOS."
diff --git a/chromium/patches/patch-chrome_common_pref__names.h b/chromium/patches/patch-chrome_common_pref__names.h
index 29ef6e4a93..8745ab3327 100644
--- a/chromium/patches/patch-chrome_common_pref__names.h
+++ b/chromium/patches/patch-chrome_common_pref__names.h
@@ -1,21 +1,21 @@
-$NetBSD: patch-chrome_common_pref__names.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/pref_names.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/pref_names.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/pref_names.h
-@@ -1387,7 +1387,7 @@ inline constexpr char kUseAshProxy[] = "
+@@ -1325,7 +1325,7 @@ inline constexpr char kGeminiSettings[] 
+ inline constexpr char kAllowedDomainsForApps[] =
+     "settings.allowed_domains_for_apps";
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Linux specific preference on whether we should match the system theme.
  inline constexpr char kSystemTheme[] = "extensions.theme.system_theme";
  #endif
-@@ -1564,7 +1564,7 @@ inline constexpr char kShowUpdatePromoti
+@@ -1502,7 +1502,7 @@ inline constexpr char kShowUpdatePromoti
      "browser.show_update_promotion_info_bar";
  #endif
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_common_pref__names.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -2176,7 +2176,7 @@ inline constexpr char kDownloadDefaultDi
+@@ -2129,7 +2129,7 @@ inline constexpr char kDownloadDefaultDi
  inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_common_pref__names.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
  inline constexpr char kOpenPdfDownloadInSystemReader[] =
      "download.open_pdf_in_system_reader";
  #endif
-@@ -2619,14 +2619,14 @@ inline constexpr char kMediaStorageIdSal
+@@ -2622,14 +2622,14 @@ inline constexpr char kMediaStorageIdSal
  inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data";
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -50,16 +50,16 @@ $NetBSD: patch-chrome_common_pref__names.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
  // Records whether the user has seen an HTTP auth "negotiate" header.
  inline constexpr char kReceivedHttpAuthNegotiateHeader[] =
      "net.received_http_auth_negotiate_headers";
-@@ -2704,7 +2704,7 @@ inline constexpr char kAmbientAuthentica
- inline constexpr char kBasicAuthOverHttpEnabled[] =
-     "auth.basic_over_http_enabled";
+@@ -2721,7 +2721,7 @@ inline constexpr char kIsolatedWebAppIns
+ inline constexpr char kIsolatedWebAppPendingInitializationCount[] =
+     "profile.isolated_web_app.install.pending_initialization_count";
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
  // along with kAuthNegotiateDelegateAllowlist.
  inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3245,7 +3245,7 @@ inline constexpr char kDeviceWeeklySched
+@@ -3240,7 +3240,7 @@ inline constexpr char kKioskChromeAppsFo
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -68,7 +68,7 @@ $NetBSD: patch-chrome_common_pref__names.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
  // Defines administrator-set availability of Chrome for Testing.
  inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed";
  #endif
-@@ -3836,7 +3836,7 @@ inline constexpr char kFileOrDirectoryPi
+@@ -3763,7 +3763,7 @@ inline constexpr char kScreenCaptureWith
  inline constexpr char kSandboxExternalProtocolBlocked[] =
      "profile.sandbox_external_protocol_blocked";
  
@@ -77,7 +77,7 @@ $NetBSD: patch-chrome_common_pref__names.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
  // Boolean that indicates if system notifications are allowed to be used in
  // place of Chrome notifications.
  inline constexpr char kAllowSystemNotifications[] =
-@@ -4103,7 +4103,7 @@ inline constexpr char kLensDesktopNTPSea
+@@ -3959,7 +3959,7 @@ inline constexpr char kLensDesktopNTPSea
      "policy.lens_desktop_ntp_search_enabled";
  #endif
  
@@ -86,7 +86,7 @@ $NetBSD: patch-chrome_common_pref__names.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
  // A dict mapping the edition name with the major version it was shown.
  inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used";
  // A list containing the features of each module in order of when they
-@@ -4197,7 +4197,7 @@ inline constexpr char kPrintingOAuth2Aut
+@@ -4056,7 +4056,7 @@ inline constexpr char kPrintingOAuth2Aut
      "printing.oauth2_authorization_servers";
  #endif
  
diff --git a/chromium/patches/patch-chrome_common_url__constants.h b/chromium/patches/patch-chrome_common_url__constants.h
index f7d5ef8c40..6eadaf9f5c 100644
--- a/chromium/patches/patch-chrome_common_url__constants.h
+++ b/chromium/patches/patch-chrome_common_url__constants.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_common_url__constants.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/url_constants.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/url_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/url_constants.h
-@@ -950,7 +950,7 @@ inline constexpr char kOutdatedPluginLea
+@@ -983,7 +983,7 @@ inline constexpr char kOutdatedPluginLea
  inline constexpr char kPhoneHubPermissionLearnMoreURL[] =
      "https://support.google.com/chromebook?p=multidevice";;
  
diff --git a/chromium/patches/patch-chrome_common_webui__url__constants.cc b/chromium/patches/patch-chrome_common_webui__url__constants.cc
index 0debe3ff19..061099bdba 100644
--- a/chromium/patches/patch-chrome_common_webui__url__constants.cc
+++ b/chromium/patches/patch-chrome_common_webui__url__constants.cc
@@ -1,22 +1,18 @@
-$NetBSD: patch-chrome_common_webui__url__constants.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/webui_url_constants.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/webui_url_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/webui_url_constants.cc
-@@ -197,21 +197,21 @@ base::span<const base::cstring_view> Chr
+@@ -192,18 +192,18 @@ base::span<const base::cstring_view> Chr
        kChromeUIAssistantOptInHost,
  #endif
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-       kChromeUIConnectorsInternalsHost,
- #endif
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+       kChromeUIConnectorsInternalsHost,
        kChromeUIDiscardsHost,
  #endif
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -32,12 +28,3 @@ $NetBSD: patch-chrome_common_webui__url__constants.cc,v 1.1 2025/02/06 09:57:57
        kChromeUISandboxHost,
  #endif
  #if BUILDFLAG(IS_WIN)
-@@ -284,7 +284,7 @@ base::span<const base::cstring_view> Chr
-        blink::kChromeUIGpuJavaCrashURL,
-        kChromeUIJavaCrashURL,
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-        kChromeUIWebUIJsErrorURL,
- #endif
-        kChromeUIQuitURL,
diff --git a/chromium/patches/patch-chrome_common_webui__url__constants.h b/chromium/patches/patch-chrome_common_webui__url__constants.h
index 9f8c655ee2..c18ad45ebb 100644
--- a/chromium/patches/patch-chrome_common_webui__url__constants.h
+++ b/chromium/patches/patch-chrome_common_webui__url__constants.h
@@ -1,24 +1,17 @@
-$NetBSD: patch-chrome_common_webui__url__constants.h,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/common/webui_url_constants.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/common/webui_url_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/common/webui_url_constants.h
-@@ -578,24 +578,24 @@ inline constexpr char16_t kOsUISystemURL
- inline constexpr char kOsUIVersionURL[] = "os://version";
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- inline constexpr char kChromeUIWebUIJsErrorHost[] = "webuijserror";
- inline constexpr char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/";
- #endif
+@@ -513,18 +513,18 @@ inline constexpr char kChromeUIOsUrlAppU
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  inline constexpr char kChromeUIConnectorsInternalsHost[] =
      "connectors-internals";
  #endif
@@ -35,7 +28,7 @@ $NetBSD: patch-chrome_common_webui__url__constants.h,v 1.1 2025/02/06 09:57:57 w
  inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings";
  inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
  inline constexpr char kChromeUIWhatsNewHost[] = "whats-new";
-@@ -607,13 +607,13 @@ inline constexpr char kChromeUILinuxProx
+@@ -536,11 +536,11 @@ inline constexpr char kChromeUILinuxProx
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -44,15 +37,13 @@ $NetBSD: patch-chrome_common_webui__url__constants.h,v 1.1 2025/02/06 09:57:57 w
  inline constexpr char kChromeUISandboxHost[] = "sandbox";
  #endif
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch";
  inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
-@@ -635,7 +635,7 @@ inline constexpr char kChromeUIProfilePi
- inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/";
+ inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser";
+@@ -565,7 +565,7 @@ inline constexpr char kChromeUIHistorySy
+     "chrome://history-sync-optin/";
  #endif
  
 -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
diff --git a/chromium/patches/patch-chrome_enterprise__companion_enterprise__companion__client.cc b/chromium/patches/patch-chrome_enterprise__companion_enterprise__companion__client.cc
index 668362360d..4de9c2f377 100644
--- a/chromium/patches/patch-chrome_enterprise__companion_enterprise__companion__client.cc
+++ b/chromium/patches/patch-chrome_enterprise__companion_enterprise__companion__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_enterprise__companion_enterprise__companion__client.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/enterprise_companion/enterprise_companion_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/enterprise_companion/enterprise_companion_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/enterprise_companion/enterprise_companion_client.cc
-@@ -37,7 +37,7 @@ namespace {
+@@ -35,7 +35,7 @@ namespace {
  
  #if BUILDFLAG(IS_MAC)
  constexpr char kServerName[] = MAC_BUNDLE_IDENTIFIER_STRING ".service";
diff --git a/chromium/patches/patch-chrome_enterprise__companion_event__logger.cc b/chromium/patches/patch-chrome_enterprise__companion_event__logger.cc
new file mode 100644
index 0000000000..40e2dfa693
--- /dev/null
+++ b/chromium/patches/patch-chrome_enterprise__companion_event__logger.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- chrome/enterprise_companion/event_logger.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ chrome/enterprise_companion/event_logger.cc
+@@ -126,7 +126,7 @@ proto::EnterpriseCompanionMetadata GetMe
+   metadata.set_application_arch(proto::ARM64);
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   metadata.set_os_platform(proto::LINUX);
+ #elif BUILDFLAG(IS_MAC)
+   metadata.set_os_platform(proto::MAC);
diff --git a/chromium/patches/patch-chrome_enterprise__companion_lock.cc b/chromium/patches/patch-chrome_enterprise__companion_lock.cc
index 7f9c2e0293..a449b682ea 100644
--- a/chromium/patches/patch-chrome_enterprise__companion_lock.cc
+++ b/chromium/patches/patch-chrome_enterprise__companion_lock.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_enterprise__companion_lock.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/enterprise_companion/lock.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/enterprise_companion/lock.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/enterprise_companion/lock.cc
 @@ -17,7 +17,7 @@
  
diff --git a/chromium/patches/patch-chrome_services_printing_print__backend__service__impl.cc b/chromium/patches/patch-chrome_services_printing_print__backend__service__impl.cc
index e6e8432c95..0e44b48f13 100644
--- a/chromium/patches/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/chromium/patches/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_services_printing_print__backend__service__impl.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/services/printing/print_backend_service_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/services/printing/print_backend_service_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/services/printing/print_backend_service_impl.cc
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,7 @@
  #include "printing/backend/cups_connection_pool.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_services_printing_print__backend__service__impl.cc,v 1.1 2
  #include "base/no_destructor.h"
  #include "ui/linux/linux_ui.h"
  #include "ui/linux/linux_ui_delegate_stub.h"
-@@ -77,7 +77,7 @@ namespace printing {
+@@ -76,7 +76,7 @@ namespace printing {
  
  namespace {
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_services_printing_print__backend__service__impl.cc,v 1.1 2
  void InstantiateLinuxUiDelegate() {
    // TODO(crbug.com/40561724)  Until a real UI can be used in a utility process,
    // need to use the stub version.
-@@ -86,7 +86,7 @@ void InstantiateLinuxUiDelegate() {
+@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() {
  #endif
  
  scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() {
@@ -33,7 +33,7 @@ $NetBSD: patch-chrome_services_printing_print__backend__service__impl.cc,v 1.1 2
    // Use task runner associated with equivalent of UI thread.  Needed for calls
    // made through `PrintDialogLinuxInterface` to properly execute.
    CHECK(base::SequencedTaskRunner::HasCurrentDefault());
-@@ -470,7 +470,7 @@ void PrintBackendServiceImpl::Init(
+@@ -468,7 +468,7 @@ void PrintBackendServiceImpl::Init(
    // `InitCommon()`.
    InitializeProcessForPrinting();
    print_backend_ = PrintBackend::CreateInstance(locale);
@@ -42,7 +42,7 @@ $NetBSD: patch-chrome_services_printing_print__backend__service__impl.cc,v 1.1 2
    // Test framework already initializes the UI, so this should not go in
    // `InitCommon()`.  Additionally, low-level Linux UI is not needed when tests
    // are using `TestPrintingContext`.
-@@ -691,7 +691,7 @@ void PrintBackendServiceImpl::UpdatePrin
+@@ -689,7 +689,7 @@ void PrintBackendServiceImpl::UpdatePrin
    crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
        *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name));
  
diff --git a/chromium/patches/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/chromium/patches/patch-chrome_services_speech_audio__source__fetcher__impl.cc
index 20f5b54332..84946a13e6 100644
--- a/chromium/patches/patch-chrome_services_speech_audio__source__fetcher__impl.cc
+++ b/chromium/patches/patch-chrome_services_speech_audio__source__fetcher__impl.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_services_speech_audio__source__fetcher__impl.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/services/speech/audio_source_fetcher_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/services/speech/audio_source_fetcher_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/services/speech/audio_source_fetcher_impl.cc
 @@ -132,7 +132,7 @@ void AudioSourceFetcherImpl::Start(
  
diff --git a/chromium/patches/patch-chrome_test_base_scoped__channel__override__posix.cc b/chromium/patches/patch-chrome_test_base_scoped__channel__override__posix.cc
index d74ed5e687..f730e0293f 100644
--- a/chromium/patches/patch-chrome_test_base_scoped__channel__override__posix.cc
+++ b/chromium/patches/patch-chrome_test_base_scoped__channel__override__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_test_base_scoped__channel__override__posix.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/test/base/scoped_channel_override_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/test/base/scoped_channel_override_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/test/base/scoped_channel_override_posix.cc
 @@ -45,7 +45,7 @@ std::string GetVersionExtra(ScopedChanne
        return "beta";
diff --git a/chromium/patches/patch-chrome_test_chromedriver_chrome__launcher.cc b/chromium/patches/patch-chrome_test_chromedriver_chrome__launcher.cc
index e0a212d1bb..1de31c2e2c 100644
--- a/chromium/patches/patch-chrome_test_chromedriver_chrome__launcher.cc
+++ b/chromium/patches/patch-chrome_test_chromedriver_chrome__launcher.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_test_chromedriver_chrome__launcher.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/test/chromedriver/chrome_launcher.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/test/chromedriver/chrome_launcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/test/chromedriver/chrome_launcher.cc
 @@ -73,6 +73,7 @@
  #include <fcntl.h>
diff --git a/chromium/patches/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/chromium/patches/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
index 8997ac1929..0d2b9e2177 100644
--- a/chromium/patches/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
+++ b/chromium/patches/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_test_chromedriver_chrome_chrome__finder.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/test/chromedriver/chrome/chrome_finder.cc
 @@ -58,7 +58,7 @@ void GetApplicationDirs(std::vector<base
          installation_locations[i].Append(L"Chromium\\Application"));
diff --git a/chromium/patches/patch-chrome_test_chromedriver_key__converter__unittest.cc b/chromium/patches/patch-chrome_test_chromedriver_key__converter__unittest.cc
index 80beb8a41a..18fc57a53b 100644
--- a/chromium/patches/patch-chrome_test_chromedriver_key__converter__unittest.cc
+++ b/chromium/patches/patch-chrome_test_chromedriver_key__converter__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_test_chromedriver_key__converter__unittest.cc,v 1.1 2025/02/06 09:57:57 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/test/chromedriver/key_converter_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/test/chromedriver/key_converter_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/test/chromedriver/key_converter_unittest.cc
-@@ -251,7 +251,7 @@ TEST(KeyConverter, ToggleModifiers) {
+@@ -252,7 +252,7 @@ TEST(KeyConverter, ToggleModifiers) {
    CheckEventsReleaseModifiers(keys, key_events);
  }
  
@@ -15,12 +15,12 @@ $NetBSD: patch-chrome_test_chromedriver_key__converter__unittest.cc,v 1.1 2025/0
  // Fails on bots: crbug.com/174962
  #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols
  #else
-@@ -308,7 +308,7 @@ TEST(KeyConverter, AllEnglishKeyboardTex
+@@ -310,7 +310,7 @@ TEST(KeyConverter, AllEnglishKeyboardTex
  TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) {
    ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US);
-   const char kTextForKeys[] = {
+   const auto kTextForKeys = std::to_array<char>({
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       0, 0, 0, 0, '\t', 0, '\r', '\r', 0, 0, 0, 0, 0,
+       0,   0,   0,   0,   '\t', 0,   '\r', '\r', 0,   0,   0,   0,   0,
  #else
-       0, 0, 0, 0, 0, 0, '\r', '\r', 0, 0, 0, 0, 0,
+       0,   0,   0,   0,   0,   0,   '\r', '\r', 0,   0,   0,   0,   0,
diff --git a/chromium/patches/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/chromium/patches/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
index bf90f529f2..41efd29aed 100644
--- a/chromium/patches/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
+++ b/chromium/patches/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc
-@@ -67,7 +67,7 @@ std::string ConvertKeyCodeToTextNoError(
+@@ -64,7 +64,7 @@ std::string ConvertKeyCodeToTextNoError(
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ }  // namespace
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Fails on bots: crbug.com/174962
  #define MAYBE_KeyCodeToText DISABLED_KeyCodeToText
  #else
-@@ -104,7 +104,7 @@ TEST(KeycodeTextConversionTest, MAYBE_Ke
+@@ -98,7 +98,7 @@ TEST(KeycodeTextConversionTest, MAYBE_Ke
+       ConvertKeyCodeToTextNoError(ui::VKEY_SHIFT, kShiftKeyModifierMask));
+ }
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Fails on bots: crbug.com/174962
  #define MAYBE_CharToKeyCode DISABLED_CharToKeyCode
  #else
diff --git a/chromium/patches/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc b/chromium/patches/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
index 7d370abdd6..a9343f4aca 100644
--- a/chromium/patches/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
+++ b/chromium/patches/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/test/supervised_user/google_auth_state_waiter_mixin.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/test/supervised_user/google_auth_state_waiter_mixin.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/test/supervised_user/google_auth_state_waiter_mixin.cc
 @@ -24,7 +24,7 @@ GoogleAuthStateWaiterMixin::GoogleAuthSt
  GoogleAuthStateWaiterMixin::~GoogleAuthStateWaiterMixin() = default;
diff --git a/chromium/patches/patch-chrome_updater_app_app__uninstall.cc b/chromium/patches/patch-chrome_updater_app_app__uninstall.cc
index 0d87f6051a..341db31b98 100644
--- a/chromium/patches/patch-chrome_updater_app_app__uninstall.cc
+++ b/chromium/patches/patch-chrome_updater_app_app__uninstall.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_updater_app_app__uninstall.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/updater/app/app_uninstall.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/updater/app/app_uninstall.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/updater/app/app_uninstall.cc
-@@ -161,7 +161,7 @@ void UninstallInThreadPool(UpdaterScope 
+@@ -157,7 +157,7 @@ void UninstallInThreadPool(UpdaterScope 
              }
              if (int result = UninstallOtherVersions(scope);
                  result != kErrorOk) {
diff --git a/chromium/patches/patch-chrome_updater_configurator.cc b/chromium/patches/patch-chrome_updater_configurator.cc
index d28ca866b7..714c382bc3 100644
--- a/chromium/patches/patch-chrome_updater_configurator.cc
+++ b/chromium/patches/patch-chrome_updater_configurator.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_updater_configurator.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/updater/configurator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/updater/configurator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/updater/configurator.cc
-@@ -70,7 +70,7 @@ Configurator::Configurator(scoped_refptr
+@@ -73,7 +73,7 @@ Configurator::Configurator(scoped_refptr
          return std::nullopt;
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
        }()) {
diff --git a/chromium/patches/patch-chrome_updater_lock.cc b/chromium/patches/patch-chrome_updater_lock.cc
index 3de9b29b85..caf4712d48 100644
--- a/chromium/patches/patch-chrome_updater_lock.cc
+++ b/chromium/patches/patch-chrome_updater_lock.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_updater_lock.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/updater/lock.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/updater/lock.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/updater/lock.cc
 @@ -26,7 +26,7 @@ namespace updater {
  std::unique_ptr<ScopedLock> CreateScopedLock(const std::string& name,
diff --git a/chromium/patches/patch-chrome_updater_util_posix__util.cc b/chromium/patches/patch-chrome_updater_util_posix__util.cc
index 458cb8c73d..4727bbb719 100644
--- a/chromium/patches/patch-chrome_updater_util_posix__util.cc
+++ b/chromium/patches/patch-chrome_updater_util_posix__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chrome_updater_util_posix__util.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/updater/util/posix_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/updater/util/posix_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/updater/util/posix_util.cc
 @@ -20,7 +20,7 @@
  #include "chrome/updater/updater_branding.h"
diff --git a/chromium/patches/patch-chrome_utility_services.cc b/chromium/patches/patch-chrome_utility_services.cc
index 9a8621ce68..9ba1e3317d 100644
--- a/chromium/patches/patch-chrome_utility_services.cc
+++ b/chromium/patches/patch-chrome_utility_services.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chrome_utility_services.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chrome/utility/services.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chrome/utility/services.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chrome/utility/services.cc
-@@ -51,7 +51,7 @@
+@@ -48,7 +48,7 @@
  #include "chrome/services/system_signals/mac/mac_system_signals_service.h"
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chrome_utility_services.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
  #include "chrome/services/system_signals/linux/linux_system_signals_service.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -210,7 +210,7 @@ auto RunMacNotificationService(
+@@ -205,7 +205,7 @@ auto RunMacNotificationService(
  }
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chrome_utility_services.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
  auto RunSystemSignalsService(
      mojo::PendingReceiver<device_signals::mojom::SystemSignalsService>
          receiver) {
-@@ -474,7 +474,7 @@ void RegisterMainThreadServices(mojo::Se
+@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::Se
    services.Add(RunWindowsIconReader);
  #endif  // BUILDFLAG(IS_WIN)
  
diff --git a/chromium/patches/patch-chromecast_browser_cast__browser__main__parts.cc b/chromium/patches/patch-chromecast_browser_cast__browser__main__parts.cc
index 2b1d5c6429..dd273ac86b 100644
--- a/chromium/patches/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/chromium/patches/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chromecast_browser_cast__browser__main__parts.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chromecast/browser/cast_browser_main_parts.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chromecast/browser/cast_browser_main_parts.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chromecast/browser/cast_browser_main_parts.cc
-@@ -94,7 +94,7 @@
+@@ -100,7 +100,7 @@
  #include "ui/ozone/public/ozone_platform.h"
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -15,7 +15,7 @@ $NetBSD: patch-chromecast_browser_cast__browser__main__parts.cc,v 1.1 2025/02/06
  #include <fontconfig/fontconfig.h>
  #include <signal.h>
  #include <sys/prctl.h>
-@@ -267,7 +267,7 @@ class CastViewsDelegate : public views::
+@@ -273,7 +273,7 @@ class CastViewsDelegate : public views::
  
  #endif  // defined(USE_AURA)
  
@@ -24,7 +24,7 @@ $NetBSD: patch-chromecast_browser_cast__browser__main__parts.cc,v 1.1 2025/02/06
  
  base::FilePath GetApplicationFontsDir() {
    std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -313,7 +313,7 @@ const DefaultCommandLineSwitch kDefaultS
+@@ -319,7 +319,7 @@ const DefaultCommandLineSwitch kDefaultS
      {switches::kDisableThreadedAnimation, ""},
  #endif  // BUILDFLAG(IS_ANDROID)
  #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -33,7 +33,7 @@ $NetBSD: patch-chromecast_browser_cast__browser__main__parts.cc,v 1.1 2025/02/06
  #if defined(ARCH_CPU_X86_FAMILY)
      // This is needed for now to enable the x11 Ozone platform to work with
      // current Linux/NVidia OpenGL drivers.
-@@ -490,7 +490,7 @@ void CastBrowserMainParts::ToolkitInitia
+@@ -496,7 +496,7 @@ void CastBrowserMainParts::ToolkitInitia
      views_delegate_ = std::make_unique<CastViewsDelegate>();
  #endif  // defined(USE_AURA)
  
diff --git a/chromium/patches/patch-chromecast_browser_cast__content__browser__client.cc b/chromium/patches/patch-chromecast_browser_cast__content__browser__client.cc
index b6629e1bde..ac2a9d51c8 100644
--- a/chromium/patches/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/chromium/patches/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chromecast_browser_cast__content__browser__client.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chromecast/browser/cast_content_browser_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chromecast/browser/cast_content_browser_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chromecast/browser/cast_content_browser_client.cc
-@@ -429,7 +429,7 @@ void CastContentBrowserClient::AppendExt
+@@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExt
                                            switches::kAudioOutputChannels));
      }
    } else if (process_type == switches::kGpuProcess) {
diff --git a/chromium/patches/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc b/chromium/patches/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
index 6ae9474368..bbb88bd1ee 100644
--- a/chromium/patches/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
+++ b/chromium/patches/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc
-@@ -346,7 +346,7 @@ CastWebView::Scoped RuntimeApplicationSe
+@@ -352,7 +352,7 @@ CastWebView::Scoped RuntimeApplicationSe
    params->force_720p_resolution =
        GetFlagEntry(feature::kCastCoreForce720p, config_.extra_features(),
                     /*default_value=*/false);
diff --git a/chromium/patches/patch-chromecast_media_base_default__monotonic__clock.cc b/chromium/patches/patch-chromecast_media_base_default__monotonic__clock.cc
index a7e797f996..ab10bce88b 100644
--- a/chromium/patches/patch-chromecast_media_base_default__monotonic__clock.cc
+++ b/chromium/patches/patch-chromecast_media_base_default__monotonic__clock.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-chromecast_media_base_default__monotonic__clock.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- chromecast/media/base/default_monotonic_clock.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- chromecast/media/base/default_monotonic_clock.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ chromecast/media/base/default_monotonic_clock.cc
 @@ -11,7 +11,7 @@
  #include "base/time/time.h"
diff --git a/chromium/patches/patch-components_BUILD.gn b/chromium/patches/patch-components_BUILD.gn
new file mode 100644
index 0000000000..e3a7ba9e4a
--- /dev/null
+++ b/chromium/patches/patch-components_BUILD.gn
@@ -0,0 +1,34 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/BUILD.gn
+@@ -208,7 +208,6 @@ test("components_unittests") {
+     "//components/content_settings/core/browser:unit_tests",
+     "//components/content_settings/core/common:unit_tests",
+     "//components/country_codes:unit_tests",
+-    "//components/crash/core/common:unit_tests",
+     "//components/cross_device/logging:unit_tests",
+     "//components/crx_file:unit_tests",
+     "//components/data_sharing:unit_tests",
+@@ -610,7 +609,7 @@ test("components_unittests") {
+       deps += [ "//components/cast:unit_tests" ]
+     }
+ 
+-    if (!is_fuchsia) {  #!iOS and!Fuchsia
++    if (!is_fuchsia && !is_bsd) {  #!iOS and!Fuchsia
+       deps += [
+         "//components/crash/content/browser:unit_tests",
+         "//components/crash/core/app:unit_tests",
+@@ -771,7 +770,7 @@ test("components_unittests") {
+     deps += [ "//components/constrained_window:unit_tests" ]
+   }
+ 
+-  if (is_win || is_linux || is_chromeos || is_mac) {
++  if (is_win || (is_linux && !is_bsd) || is_chromeos || is_mac) {
+     deps += [ "//components/stability_report:unit_tests" ]
+   }
+ 
diff --git a/chromium/patches/patch-components_autofill_core_browser_autofill__optimization__guide.cc b/chromium/patches/patch-components_autofill_core_browser_autofill__optimization__guide.cc
deleted file mode 100644
index fed18acf1c..0000000000
--- a/chromium/patches/patch-components_autofill_core_browser_autofill__optimization__guide.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-components_autofill_core_browser_autofill__optimization__guide.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/browser/autofill_optimization_guide.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/autofill/core/browser/autofill_optimization_guide.cc
-@@ -186,7 +186,7 @@ void AutofillOptimizationGuide::OnDidPar
-     }
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     if (has_credit_card_field &&
-         !personal_data_manager->payments_data_manager()
-              .GetServerCreditCards()
diff --git a/chromium/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/chromium/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
new file mode 100644
index 0000000000..6df166ec51
--- /dev/null
+++ b/chromium/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc
@@ -0,0 +1,44 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc
+@@ -950,7 +950,7 @@ void PaymentsDataManager::SetPrefService
+           &PaymentsDataManager::OnAutofillPaymentsCardBenefitsPrefChange,
+           base::Unretained(this)));
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   pref_registrar_.Add(
+       prefs::kAutofillBnplEnabled,
+       base::BindRepeating(&PaymentsDataManager::OnBnplEnabledPrefChange,
+@@ -1026,7 +1026,7 @@ void PaymentsDataManager::SetAutofillHas
+ }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ bool PaymentsDataManager::IsAutofillHasSeenBnplPrefEnabled() const {
+   return prefs::HasSeenBnpl(pref_service_);
+ }
+@@ -2022,7 +2022,7 @@ bool PaymentsDataManager::AreEwalletAcco
+ 
+ bool PaymentsDataManager::AreBnplIssuersSupported() const {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return app_locale_ == "en-US" && GetCountryCodeForExperimentGroup() == "US" &&
+          base::FeatureList::IsEnabled(
+              features::kAutofillEnableBuyNowPayLaterSyncing);
+@@ -2055,7 +2055,7 @@ void PaymentsDataManager::ClearAllCredit
+ }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void PaymentsDataManager::OnBnplEnabledPrefChange() {
+   // On pref change to `false`, clearing BNPL issuers is implicitly handled by
+   // `GetBnplIssuers()`, since it returns an empty vector when
diff --git a/chromium/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h b/chromium/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
new file mode 100644
index 0000000000..f775126429
--- /dev/null
+++ b/chromium/patches/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.h
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/autofill/core/browser/data_manager/payments/payments_data_manager.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/autofill/core/browser/data_manager/payments/payments_data_manager.h
+@@ -354,7 +354,7 @@ class PaymentsDataManager : public Autof
+   void SetAutofillHasSeenIban();
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Returns the value of the kAutofillHasSeenBnpl pref.
+   bool IsAutofillHasSeenBnplPrefEnabled() const;
+ 
+@@ -683,7 +683,7 @@ class PaymentsDataManager : public Autof
+   void ClearAllCreditCardBenefits();
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Monitors the `kAutofillBnplEnabled` preference for changes and controls the
+   // clearing/loading of payment instruments accordingly. Will also log the
+   // `Autofill.SettingsPage.BnplToggled` metric.
diff --git a/chromium/patches/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc b/chromium/patches/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc
new file mode 100644
index 0000000000..3c5776e13f
--- /dev/null
+++ b/chromium/patches/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/autofill/core/browser/integrators/autofill_optimization_guide.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/autofill/core/browser/integrators/autofill_optimization_guide.cc
+@@ -231,7 +231,7 @@ void AutofillOptimizationGuide::OnDidPar
+   }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   auto bnpl_issuer_allowlist_can_be_loaded =
+       [&payments_data_manager](std::string_view issuer_id) {
+         return base::Contains(payments_data_manager.GetBnplIssuers(), issuer_id,
diff --git a/chromium/patches/patch-components_autofill_core_browser_payments__data__manager.cc b/chromium/patches/patch-components_autofill_core_browser_payments__data__manager.cc
deleted file mode 100644
index 558910c797..0000000000
--- a/chromium/patches/patch-components_autofill_core_browser_payments__data__manager.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-components_autofill_core_browser_payments__data__manager.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/browser/payments_data_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/autofill/core/browser/payments_data_manager.cc
-@@ -1095,7 +1095,7 @@ bool PaymentsDataManager::ShouldShowCard
- // The feature is only for Linux, Windows, Mac, and Fuchsia.
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA)
-   // This option should only be shown for users that have not enabled the Sync
-   // Feature and that have server credit cards available.
diff --git a/chromium/patches/patch-components_autofill_core_browser_payments_bnpl__manager.cc b/chromium/patches/patch-components_autofill_core_browser_payments_bnpl__manager.cc
new file mode 100644
index 0000000000..8b345e6a94
--- /dev/null
+++ b/chromium/patches/patch-components_autofill_core_browser_payments_bnpl__manager.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/autofill/core/browser/payments/bnpl_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/autofill/core/browser/payments/bnpl_manager.cc
+@@ -114,7 +114,7 @@ void BnplManager::OnAmountExtractionRetu
+ 
+ bool BnplManager::ShouldShowBnplSettings() const {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   const PaymentsDataManager& payments_data_manager =
+       payments_autofill_client().GetPaymentsDataManager();
+ 
+@@ -431,7 +431,7 @@ void BnplManager::MaybeUpdateSuggestions
+       .Run(update_suggestions_result.suggestions, trigger_source);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   payments_autofill_client().GetPaymentsDataManager().SetAutofillHasSeenBnpl();
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-components_autofill_core_common_autofill__payments__features.cc b/chromium/patches/patch-components_autofill_core_common_autofill__payments__features.cc
index e16d42d658..513aff4a72 100644
--- a/chromium/patches/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/chromium/patches/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,26 +1,17 @@
-$NetBSD: patch-components_autofill_core_common_autofill__payments__features.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/autofill/core/common/autofill_payments_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/autofill/core/common/autofill_payments_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/autofill/core/common/autofill_payments_features.cc
-@@ -8,7 +8,7 @@
+@@ -267,7 +267,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccount
+ #endif  // BUILDFLAG(IS_ANDROID)
  
- namespace autofill::features {
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
- // When enabled, Chrome will extract the checkout amount from the checkout page
- // of the allowlisted merchant websites.
-@@ -331,7 +331,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccount
  bool ShouldShowImprovedUserConsentForCreditCardSave() {
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // The new user consent UI is fully launched on MacOS, Windows and Linux.
    return true;
+ #else
diff --git a/chromium/patches/patch-components_autofill_core_common_autofill__payments__features.h b/chromium/patches/patch-components_autofill_core_common_autofill__payments__features.h
deleted file mode 100644
index b09ad9e4ec..0000000000
--- a/chromium/patches/patch-components_autofill_core_common_autofill__payments__features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-components_autofill_core_common_autofill__payments__features.h,v 1.1 2025/02/06 09:57:58 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/autofill/core/common/autofill_payments_features.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/autofill/core/common/autofill_payments_features.h
-@@ -14,7 +14,7 @@ namespace autofill::features {
- 
- // All features in alphabetical order.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- COMPONENT_EXPORT(AUTOFILL)
- BASE_DECLARE_FEATURE(kAutofillEnableAmountExtractionDesktop);
- #endif
diff --git a/chromium/patches/patch-components_autofill_core_common_autofill__prefs.cc b/chromium/patches/patch-components_autofill_core_common_autofill__prefs.cc
index be69f5bafd..b1143fdf11 100644
--- a/chromium/patches/patch-components_autofill_core_common_autofill__prefs.cc
+++ b/chromium/patches/patch-components_autofill_core_common_autofill__prefs.cc
@@ -1,17 +1,44 @@
-$NetBSD: patch-components_autofill_core_common_autofill__prefs.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/autofill/core/common/autofill_prefs.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/autofill/core/common/autofill_prefs.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/autofill/core/common/autofill_prefs.cc
-@@ -118,7 +118,7 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -98,7 +98,7 @@ void RegisterProfilePrefs(user_prefs::Pr
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled,
-                                 false);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+   registry->RegisterBooleanPref(
+       kAutofillBnplEnabled, true,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+@@ -277,7 +277,7 @@ bool IsFacilitatedPaymentsEwalletEnabled
+ }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void SetAutofillBnplEnabled(PrefService* prefs, bool value) {
+   prefs->SetBoolean(kAutofillBnplEnabled, value);
+ }
+@@ -286,7 +286,7 @@ void SetAutofillBnplEnabled(PrefService*
+ 
+ bool IsAutofillBnplEnabled(const PrefService* prefs) {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return prefs->GetBoolean(kAutofillBnplEnabled);
+ #else
+   return false;
+@@ -295,7 +295,7 @@ bool IsAutofillBnplEnabled(const PrefSer
+ }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // If called, always sets the pref to true, and once true, it will follow the
+ // user around forever.
+ void SetAutofillHasSeenBnpl(PrefService* prefs) {
diff --git a/chromium/patches/patch-components_autofill_core_common_autofill__prefs.h b/chromium/patches/patch-components_autofill_core_common_autofill__prefs.h
index b170adfd00..5617c21c9e 100644
--- a/chromium/patches/patch-components_autofill_core_common_autofill__prefs.h
+++ b/chromium/patches/patch-components_autofill_core_common_autofill__prefs.h
@@ -1,17 +1,35 @@
-$NetBSD: patch-components_autofill_core_common_autofill__prefs.h,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/autofill/core/common/autofill_prefs.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/autofill/core/common/autofill_prefs.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/autofill/core/common/autofill_prefs.h
-@@ -73,7 +73,7 @@ inline constexpr char kAutofillPaymentCv
- inline constexpr char kAutofillPaymentCardBenefits[] =
-     "autofill.payment_card_benefits";
+@@ -32,7 +32,7 @@ inline constexpr std::string_view kAutof
+ inline constexpr char kAutofillAiOptInStatus[] =
+     "autofill.autofill_ai.opt_in_status";
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Boolean that controls improved autofill filling predictions. When enabled,
- // the autofill functionality is enhanced with adopting user data to
- // the form being filled in, which is triggered by the user via an extra
+ // Boolean that is true if BNPL on Autofill is enabled.
+ inline constexpr char kAutofillBnplEnabled[] = "autofill.bnpl_enabled";
+ // Boolean that is true if the user has ever seen a BNPL suggestion.
+@@ -208,7 +208,7 @@ void SetFacilitatedPaymentsEwallet(PrefS
+ bool IsFacilitatedPaymentsEwalletEnabled(const PrefService* prefs);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void SetAutofillBnplEnabled(PrefService* prefs, bool value);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_CHROMEOS)
+@@ -216,7 +216,7 @@ void SetAutofillBnplEnabled(PrefService*
+ bool IsAutofillBnplEnabled(const PrefService* prefs);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void SetAutofillHasSeenBnpl(PrefService* prefs);
+ 
+ bool HasSeenBnpl(const PrefService* prefs);
diff --git a/chromium/patches/patch-components_commerce_core_commerce__feature__list.cc b/chromium/patches/patch-components_commerce_core_commerce__feature__list.cc
index 22ff808f54..38d39b11c1 100644
--- a/chromium/patches/patch-components_commerce_core_commerce__feature__list.cc
+++ b/chromium/patches/patch-components_commerce_core_commerce__feature__list.cc
@@ -1,22 +1,32 @@
-$NetBSD: patch-components_commerce_core_commerce__feature__list.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/commerce/core/commerce_feature_list.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/commerce/core/commerce_feature_list.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/commerce/core/commerce_feature_list.cc
-@@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights,
+@@ -156,7 +156,8 @@ BASE_FEATURE(kPriceInsights,
               "PriceInsights",
               base::FEATURE_DISABLED_BY_DEFAULT);
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) || \
++    BUILDFLAG(IS_BSD)
  BASE_FEATURE(kPriceInsightsRegionLaunched,
               "PriceInsightsRegionLaunched",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -250,7 +250,7 @@ const base::FeatureParam<bool> kDiscount
-     &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, false};
+@@ -227,7 +228,7 @@ BASE_FEATURE(kEnableDiscountInfoApi,
+ const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page";
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ const base::FeatureParam<bool> kDiscountOnShoppyPage{
+     &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true};
+ #else
+@@ -236,7 +237,7 @@ const base::FeatureParam<bool> kDiscount
+ #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
@@ -24,12 +34,12 @@ $NetBSD: patch-components_commerce_core_commerce__feature__list.cc,v 1.1 2025/02
  BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched,
               "EnableDiscountInfoApiRegionLaunched",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -289,7 +289,7 @@ const base::FeatureParam<bool> kDeleteAl
+@@ -251,7 +252,7 @@ const char kMerchantWideBehaviorParam[] 
+ const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior";
  
- BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT);
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kShoppingListRegionLaunched,
-              "ShoppingListRegionLaunched",
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting,
+              "DiscountDialogAutoPopupBehaviorSetting",
               base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chromium/patches/patch-components_constrained__window_constrained__window__views.cc b/chromium/patches/patch-components_constrained__window_constrained__window__views.cc
index fa3807bafd..5c8ad69ff5 100644
--- a/chromium/patches/patch-components_constrained__window_constrained__window__views.cc
+++ b/chromium/patches/patch-components_constrained__window_constrained__window__views.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-components_constrained__window_constrained__window__views.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/constrained_window/constrained_window_views.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/constrained_window/constrained_window_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/constrained_window/constrained_window_views.cc
-@@ -372,7 +372,7 @@ bool SupportsGlobalScreenCoordinates() {
+@@ -377,7 +377,7 @@ bool SupportsGlobalScreenCoordinates() {
  }
  
  bool PlatformClipsChildrenToViewport() {
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return true;
  #else
    return false;
diff --git a/chromium/patches/patch-components_content__settings_core_browser_website__settings__registry.cc b/chromium/patches/patch-components_content__settings_core_browser_website__settings__registry.cc
index 3e0fa87a69..2bc3cba7c6 100644
--- a/chromium/patches/patch-components_content__settings_core_browser_website__settings__registry.cc
+++ b/chromium/patches/patch-components_content__settings_core_browser_website__settings__registry.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_content__settings_core_browser_website__settings__registry.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/content_settings/core/browser/website_settings_registry.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/content_settings/core/browser/website_settings_registry.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/content_settings/core/browser/website_settings_registry.cc
-@@ -67,7 +67,7 @@ const WebsiteSettingsInfo* WebsiteSettin
+@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettin
  #if BUILDFLAG(IS_WIN)
    if (!(platform & PLATFORM_WINDOWS))
      return nullptr;
diff --git a/chromium/patches/patch-components_cookie__config_cookie__store__util.cc b/chromium/patches/patch-components_cookie__config_cookie__store__util.cc
index cda19da51e..863992e06e 100644
--- a/chromium/patches/patch-components_cookie__config_cookie__store__util.cc
+++ b/chromium/patches/patch-components_cookie__config_cookie__store__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_cookie__config_cookie__store__util.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/cookie_config/cookie_store_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/cookie_config/cookie_store_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/cookie_config/cookie_store_util.cc
 @@ -12,7 +12,7 @@
  namespace cookie_config {
diff --git a/chromium/patches/patch-components_crash_core_app_BUILD.gn b/chromium/patches/patch-components_crash_core_app_BUILD.gn
index 348da16a9e..1bc1730e92 100644
--- a/chromium/patches/patch-components_crash_core_app_BUILD.gn
+++ b/chromium/patches/patch-components_crash_core_app_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_crash_core_app_BUILD.gn,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/crash/core/app/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/crash/core/app/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/crash/core/app/BUILD.gn
 @@ -70,6 +70,10 @@ static_library("app") {
      ]
@@ -26,7 +26,7 @@ $NetBSD: patch-components_crash_core_app_BUILD.gn,v 1.1 2025/02/06 09:57:58 wiz
      sources += [ "crashpad_linux.cc" ]
      data_deps = [ ":chrome_crashpad_handler" ]
    }
-@@ -103,7 +107,7 @@ static_library("app") {
+@@ -105,7 +109,7 @@ static_library("app") {
      libs = [ "log" ]
    }
  
@@ -35,7 +35,7 @@ $NetBSD: patch-components_crash_core_app_BUILD.gn,v 1.1 2025/02/06 09:57:58 wiz
      deps += [
        "//base:base_static",
        "//components/crash/core/common",
-@@ -234,11 +238,6 @@ if (is_mac || is_android || is_linux || 
+@@ -238,11 +242,6 @@ if (is_mac || is_android || is_linux || 
    executable("chrome_crashpad_handler") {
      sources = [ "chrome_crashpad_handler.cc" ]
  
diff --git a/chromium/patches/patch-components_crash_core_app_chrome__crashpad__handler.cc b/chromium/patches/patch-components_crash_core_app_chrome__crashpad__handler.cc
index 7059590cd6..3260d9111a 100644
--- a/chromium/patches/patch-components_crash_core_app_chrome__crashpad__handler.cc
+++ b/chromium/patches/patch-components_crash_core_app_chrome__crashpad__handler.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_crash_core_app_chrome__crashpad__handler.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/crash/core/app/chrome_crashpad_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/crash/core/app/chrome_crashpad_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/crash/core/app/chrome_crashpad_handler.cc
 @@ -6,5 +6,9 @@
  extern "C" int CrashpadHandlerMain(int argc, char* argv[]);
diff --git a/chromium/patches/patch-components_crash_core_app_crashpad__handler__main.cc b/chromium/patches/patch-components_crash_core_app_crashpad__handler__main.cc
index 4101117076..04b10129dc 100644
--- a/chromium/patches/patch-components_crash_core_app_crashpad__handler__main.cc
+++ b/chromium/patches/patch-components_crash_core_app_crashpad__handler__main.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_crash_core_app_crashpad__handler__main.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/crash/core/app/crashpad_handler_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/crash/core/app/crashpad_handler_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/crash/core/app/crashpad_handler_main.cc
 @@ -10,7 +10,7 @@
  #include "third_party/crashpad/crashpad/handler/handler_main.h"
diff --git a/chromium/patches/patch-components_crash_core_browser_crash__upload__list__crashpad.cc b/chromium/patches/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
index ec8955998b..004c90a9e3 100644
--- a/chromium/patches/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
+++ b/chromium/patches/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_crash_core_browser_crash__upload__list__crashpad.cc,v 1.1 2025/02/06 09:57:58 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/crash/core/browser/crash_upload_list_crashpad.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/crash/core/browser/crash_upload_list_crashpad.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/crash/core/browser/crash_upload_list_crashpad.cc
-@@ -38,7 +38,9 @@ CrashUploadListCrashpad::~CrashUploadLis
+@@ -37,7 +37,9 @@ CrashUploadListCrashpad::~CrashUploadLis
  std::vector<std::unique_ptr<UploadList::UploadInfo>>
  CrashUploadListCrashpad::LoadUploadList() {
    std::vector<crash_reporter::Report> reports;
@@ -16,7 +16,7 @@ $NetBSD: patch-components_crash_core_browser_crash__upload__list__crashpad.cc,v
  
    std::vector<std::unique_ptr<UploadInfo>> uploads;
    for (const crash_reporter::Report& report : reports) {
-@@ -52,9 +54,13 @@ CrashUploadListCrashpad::LoadUploadList(
+@@ -51,9 +53,13 @@ CrashUploadListCrashpad::LoadUploadList(
  
  void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin,
                                                const base::Time& end) {
diff --git a/chromium/patches/patch-components_crash_core_common_BUILD.gn b/chromium/patches/patch-components_crash_core_common_BUILD.gn
index c0c78dd3ee..1951148588 100644
--- a/chromium/patches/patch-components_crash_core_common_BUILD.gn
+++ b/chromium/patches/patch-components_crash_core_common_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_crash_core_common_BUILD.gn,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/crash/core/common/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/crash/core/common/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/crash/core/common/BUILD.gn
 @@ -9,7 +9,7 @@ import("//components/gwp_asan/buildflags
  
diff --git a/chromium/patches/patch-components_device__signals_core_browser_browser__utils.h b/chromium/patches/patch-components_device__signals_core_browser_browser__utils.h
new file mode 100644
index 0000000000..c63921e3fd
--- /dev/null
+++ b/chromium/patches/patch-components_device__signals_core_browser_browser__utils.h
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/device_signals/core/browser/browser_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/device_signals/core/browser/browser_utils.h
+@@ -15,7 +15,7 @@ namespace device_signals {
+ // Returns the hostname of the current machine.
+ std::string GetHostName();
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns the hostname of the current machine.
+ std::vector<std::string> GetSystemDnsServers();
+ 
+@@ -23,7 +23,7 @@ std::vector<std::string> GetSystemDnsSer
+ SettingValue GetOSFirewall();
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns the path to the ufw configuration file.
+ const char** GetUfwConfigPath();
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-components_device__signals_core_browser_mock__signals__aggregator.h b/chromium/patches/patch-components_device__signals_core_browser_mock__signals__aggregator.h
index 969bfedca0..c1792694ec 100644
--- a/chromium/patches/patch-components_device__signals_core_browser_mock__signals__aggregator.h
+++ b/chromium/patches/patch-components_device__signals_core_browser_mock__signals__aggregator.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_device__signals_core_browser_mock__signals__aggregator.h,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/browser/mock_signals_aggregator.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/browser/mock_signals_aggregator.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/browser/mock_signals_aggregator.h
 @@ -17,7 +17,7 @@ class MockSignalsAggregator : public Sig
    MockSignalsAggregator();
diff --git a/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator.h b/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator.h
index 5813bef6af..b27dc7fbd9 100644
--- a/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator.h
+++ b/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_device__signals_core_browser_signals__aggregator.h,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/browser/signals_aggregator.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/browser/signals_aggregator.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/browser/signals_aggregator.h
 @@ -22,7 +22,7 @@ class SignalsAggregator : public KeyedSe
  
diff --git a/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.cc b/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
index d04b72df7a..adcb2ba915 100644
--- a/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
+++ b/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_device__signals_core_browser_signals__aggregator__impl.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/browser/signals_aggregator_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/browser/signals_aggregator_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/browser/signals_aggregator_impl.cc
-@@ -65,7 +65,7 @@ SignalsAggregatorImpl::SignalsAggregator
+@@ -64,7 +64,7 @@ SignalsAggregatorImpl::SignalsAggregator
  
  SignalsAggregatorImpl::~SignalsAggregatorImpl() = default;
  
diff --git a/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.h b/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.h
index a970b444eb..391007a70b 100644
--- a/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.h
+++ b/chromium/patches/patch-components_device__signals_core_browser_signals__aggregator__impl.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_device__signals_core_browser_signals__aggregator__impl.h,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/browser/signals_aggregator_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/browser/signals_aggregator_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/browser/signals_aggregator_impl.h
-@@ -29,7 +29,7 @@ class SignalsAggregatorImpl : public Sig
+@@ -30,7 +30,7 @@ class SignalsAggregatorImpl : public Sig
    ~SignalsAggregatorImpl() override;
  
    // SignalsAggregator:
diff --git a/chromium/patches/patch-components_device__signals_core_browser_user__permission__service.h b/chromium/patches/patch-components_device__signals_core_browser_user__permission__service.h
index 2ce604a3d8..94121c91cf 100644
--- a/chromium/patches/patch-components_device__signals_core_browser_user__permission__service.h
+++ b/chromium/patches/patch-components_device__signals_core_browser_user__permission__service.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_device__signals_core_browser_user__permission__service.h,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/browser/user_permission_service.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/browser/user_permission_service.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/browser/user_permission_service.h
 @@ -57,7 +57,7 @@ class UserPermissionService : public Key
    // missing.
diff --git a/chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.cc b/chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.cc
index 1d449026cb..853d9ca5e0 100644
--- a/chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.cc
+++ b/chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_device__signals_core_browser_user__permission__service__impl.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/browser/user_permission_service_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/browser/user_permission_service_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/browser/user_permission_service_impl.cc
 @@ -87,7 +87,7 @@ bool UserPermissionServiceImpl::ShouldCo
           consent_required_by_dependent_policy;
diff --git a/chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.h b/chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.h
index 2a94c33d32..117780197c 100644
--- a/chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.h
+++ b/chromium/patches/patch-components_device__signals_core_browser_user__permission__service__impl.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_device__signals_core_browser_user__permission__service__impl.h,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/browser/user_permission_service_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/browser/user_permission_service_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/browser/user_permission_service_impl.h
 @@ -38,7 +38,7 @@ class UserPermissionServiceImpl : public
  
diff --git a/chromium/patches/patch-components_device__signals_core_common_linux_platform__utils__linux.cc b/chromium/patches/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
new file mode 100644
index 0000000000..40de314375
--- /dev/null
+++ b/chromium/patches/patch-components_device__signals_core_common_linux_platform__utils__linux.cc
@@ -0,0 +1,83 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/device_signals/core/common/linux/platform_utils_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/device_signals/core/common/linux/platform_utils_linux.cc
+@@ -4,11 +4,22 @@
+ 
+ #include "components/device_signals/core/common/platform_utils.h"
+ 
++#include "build/build_config.h"
++
+ #if defined(USE_GIO)
+ #include <gio/gio.h>
+ #endif  // defined(USE_GIO)
+ #include <sys/stat.h>
++#if !BUILDFLAG(IS_BSD)
+ #include <sys/sysmacros.h>
++#endif
++
++#if BUILDFLAG(IS_BSD)
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <ifaddrs.h>
++#include <net/if_dl.h>
++#endif
+ 
+ #include <algorithm>
+ #include <optional>
+@@ -100,6 +111,7 @@ SettingValue GetScreenlockSecured() {
+ // Implements the logic from the native host installation script. First find the
+ // root device identifier, then locate its parent and get its type.
+ SettingValue GetDiskEncrypted() {
++#if !BUILDFLAG(IS_BSD)
+   struct stat info;
+   // First figure out the device identifier. Fail fast if this fails.
+   if (stat("/", &info) != 0) {
+@@ -122,11 +134,35 @@ SettingValue GetDiskEncrypted() {
+     }
+     return SettingValue::UNKNOWN;
+   }
++#endif
+   return SettingValue::DISABLED;
+ }
+ 
+ std::vector<std::string> GetMacAddresses() {
+   std::vector<std::string> result;
++#if BUILDFLAG(IS_BSD)
++  struct ifaddrs* ifa = nullptr;
++
++  if (getifaddrs(&ifa) != 0)
++    return result;
++
++  struct ifaddrs* interface = ifa;
++  for (; interface != nullptr; interface = interface->ifa_next) {
++    if (interface->ifa_addr == nullptr ||
++        interface->ifa_addr->sa_family != AF_LINK) {
++      continue;
++    }
++    struct sockaddr_dl* sdl =
++        reinterpret_cast<struct sockaddr_dl*>(interface->ifa_addr);
++    if (!sdl || sdl->sdl_alen != 6)
++      continue;
++    char* link_address = static_cast<char*>(LLADDR(sdl));
++    result.push_back(base::StringPrintf(
++        "%02x:%02x:%02x:%02x:%02x:%02x", link_address[0] & 0xff,
++        link_address[1] & 0xff, link_address[2] & 0xff, link_address[3] & 0xff,
++        link_address[4] & 0xff, link_address[5] & 0xff));
++  }
++#else
+   base::DirReaderPosix reader("/sys/class/net");
+   if (!reader.IsValid()) {
+     return result;
+@@ -151,6 +187,7 @@ std::vector<std::string> GetMacAddresses
+                               &address);
+     result.push_back(address);
+   }
++#endif
+   return result;
+ }
+ 
diff --git a/chromium/patches/patch-components_device__signals_core_common_signals__features.cc b/chromium/patches/patch-components_device__signals_core_common_signals__features.cc
index 7110e1c59e..650619d268 100644
--- a/chromium/patches/patch-components_device__signals_core_common_signals__features.cc
+++ b/chromium/patches/patch-components_device__signals_core_common_signals__features.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-components_device__signals_core_common_signals__features.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/common/signals_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/common/signals_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/common/signals_features.cc
-@@ -50,7 +50,7 @@ bool IsNewFunctionEnabled(NewEvFunction 
+@@ -31,7 +31,7 @@ bool IsBrowserSignalsReportingEnabled() 
  }
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  // Enables the triggering of device signals consent dialog when conditions met
  // This feature also requires UnmanagedDeviceSignalsConsentFlowEnabled policy to
  // be enabled
diff --git a/chromium/patches/patch-components_device__signals_core_common_signals__features.h b/chromium/patches/patch-components_device__signals_core_common_signals__features.h
index 29c2d65803..8cd8911280 100644
--- a/chromium/patches/patch-components_device__signals_core_common_signals__features.h
+++ b/chromium/patches/patch-components_device__signals_core_common_signals__features.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-components_device__signals_core_common_signals__features.h,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/common/signals_features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/common/signals_features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/common/signals_features.h
-@@ -31,7 +31,7 @@ enum class NewEvFunction { kFileSystemIn
- bool IsNewFunctionEnabled(NewEvFunction new_ev_function);
+@@ -24,7 +24,7 @@ bool IsProfileSignalsReportingEnabled();
+ bool IsBrowserSignalsReportingEnabled();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS_ASH)
-+    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  BASE_DECLARE_FEATURE(kDeviceSignalsConsentDialog);
  
  // Returns true if device signals consent dialog has been enabled for
diff --git a/chromium/patches/patch-components_device__signals_core_system__signals_platform__delegate.cc b/chromium/patches/patch-components_device__signals_core_system__signals_platform__delegate.cc
index 86cf53adf7..91e515537c 100644
--- a/chromium/patches/patch-components_device__signals_core_system__signals_platform__delegate.cc
+++ b/chromium/patches/patch-components_device__signals_core_system__signals_platform__delegate.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_device__signals_core_system__signals_platform__delegate.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/core/system_signals/platform_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/core/system_signals/platform_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/core/system_signals/platform_delegate.cc
 @@ -11,7 +11,7 @@ namespace device_signals {
  
diff --git a/chromium/patches/patch-components_device__signals_test_signals__contract.cc b/chromium/patches/patch-components_device__signals_test_signals__contract.cc
index 0c1f9ac97b..32f4852c4d 100644
--- a/chromium/patches/patch-components_device__signals_test_signals__contract.cc
+++ b/chromium/patches/patch-components_device__signals_test_signals__contract.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_device__signals_test_signals__contract.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/device_signals/test/signals_contract.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/device_signals/test/signals_contract.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/device_signals/test/signals_contract.cc
-@@ -212,7 +212,7 @@ GetSignalsContract() {
+@@ -221,7 +221,7 @@ GetSignalsContract(bool is_av_signal_ena
        base::BindRepeating(VerifyUnset, names::kCrowdStrike);
  #endif
  
diff --git a/chromium/patches/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/chromium/patches/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
index d0d13d1085..6a7ce47508 100644
--- a/chromium/patches/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
+++ b/chromium/patches/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_discardable__memory_service_discardable__shared__memory__manager.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/discardable_memory/service/discardable_shared_memory_manager.cc
 @@ -172,7 +172,7 @@ uint64_t GetDefaultMemoryLimit() {
    // Limits the number of FDs used to 32, assuming a 4MB allocation size.
diff --git a/chromium/patches/patch-components_embedder__support_user__agent__utils.cc b/chromium/patches/patch-components_embedder__support_user__agent__utils.cc
index f94a903b78..5e390bbc2b 100644
--- a/chromium/patches/patch-components_embedder__support_user__agent__utils.cc
+++ b/chromium/patches/patch-components_embedder__support_user__agent__utils.cc
@@ -1,18 +1,53 @@
-$NetBSD: patch-components_embedder__support_user__agent__utils.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/embedder_support/user_agent_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/embedder_support/user_agent_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/embedder_support/user_agent_utils.cc
-@@ -445,6 +445,9 @@ std::string GetPlatformForUAMetadata() {
- # else
+@@ -318,7 +318,7 @@ std::string GetUserAgentPlatform() {
+   return "";
+ #elif BUILDFLAG(IS_MAC)
+   return "Macintosh; ";
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return "X11; ";  // strange, but that's what Firefox uses
+ #elif BUILDFLAG(IS_ANDROID)
+   return "Linux; ";
+@@ -344,7 +344,7 @@ std::string GetUnifiedPlatform() {
+   return "Windows NT 10.0; Win64; x64";
+ #elif BUILDFLAG(IS_FUCHSIA)
+   return "Fuchsia";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return "X11; Linux x86_64";
+ #elif BUILDFLAG(IS_IOS)
+   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
+@@ -601,6 +601,9 @@ std::string GetPlatformForUAMetadata() {
+ #else
    return "Chromium OS";
- # endif
+ #endif
 +#elif BUILDFLAG(IS_BSD)
 +  // The internet is weird...
 +  return "Linux";
  #else
    return std::string(version_info::GetOSType());
  #endif
+@@ -813,6 +816,16 @@ std::string BuildOSCpuInfoFromOSVersionA
+                       "Android %s", os_version.c_str()
+ #elif BUILDFLAG(IS_FUCHSIA)
+                       "Fuchsia"
++#elif BUILDFLAG(IS_BSD)
++#if defined(__x86_64__)
++                      "Linux x86_64; %s %s",
++#elif defined(__aarch64__)
++                      "Linux aarch64; %s %s",
++#else 
++                      "Linux i686; %s %s",
++#endif
++                      unixinfo.sysname,  // e.g. Linux
++                      cpu_type.c_str()   // e.g. i686
+ #elif BUILDFLAG(IS_IOS)
+                       "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
+                       os_version.c_str()
diff --git a/chromium/patches/patch-components_embedder__support_user__agent__utils__unittest.cc b/chromium/patches/patch-components_embedder__support_user__agent__utils__unittest.cc
index 2e4217b3d0..f2e85ea982 100644
--- a/chromium/patches/patch-components_embedder__support_user__agent__utils__unittest.cc
+++ b/chromium/patches/patch-components_embedder__support_user__agent__utils__unittest.cc
@@ -1,21 +1,12 @@
-$NetBSD: patch-components_embedder__support_user__agent__utils__unittest.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/embedder_support/user_agent_utils_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/embedder_support/user_agent_utils_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -71,7 +71,7 @@ const char kDesktop[] =
-     "X11; CrOS x86_64 14541.0.0"
- #elif BUILDFLAG(IS_FUCHSIA)
-     "Fuchsia"
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     "X11; Linux x86_64"
- #elif BUILDFLAG(IS_MAC)
-     "Macintosh; Intel Mac OS X 10_15_7"
-@@ -171,7 +171,7 @@ void CheckUserAgentStringOrdering(bool m
+@@ -148,7 +148,7 @@ void CheckUserAgentStringOrdering(bool m
    ASSERT_EQ("CrOS", pieces[0]);
    ASSERT_EQ("x86_64", pieces[1]);
    ASSERT_EQ("14541.0.0", pieces[2]);
@@ -24,7 +15,16 @@ $NetBSD: patch-components_embedder__support_user__agent__utils__unittest.cc,v 1.
    // Post-UA Reduction there is a single <unifiedPlatform> value for Linux:
    // X11; Linux x86_64
    ASSERT_EQ(2u, pieces.size());
-@@ -727,7 +727,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMeta
+@@ -336,7 +336,7 @@ class UserAgentUtilsTest : public testin
+         "X11; CrOS x86_64 14541.0.0";
+ #elif BUILDFLAG(IS_FUCHSIA)
+         "Fuchsia";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+         "X11; Linux x86_64";
+ #elif BUILDFLAG(IS_MAC)
+         "Macintosh; Intel Mac OS X 10_15_7";
+@@ -696,7 +696,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMeta
  #endif
  #elif BUILDFLAG(IS_ANDROID)
    EXPECT_EQ(metadata.platform, "Android");
diff --git a/chromium/patches/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc b/chromium/patches/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc
new file mode 100644
index 0000000000..600ad144da
--- /dev/null
+++ b/chromium/patches/patch-components_enterprise_connectors_core_realtime__reporting__client__base.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/enterprise/connectors/core/realtime_reporting_client_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/enterprise/connectors/core/realtime_reporting_client_base.cc
+@@ -190,7 +190,7 @@ void RealtimeReportingClientBase::Report
+     event.mutable_time()->set_nanos((timestamp_millis % 1000) * 1000000);
+   }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet)
+   MaybeCollectDeviceSignalsAndReportEvent(std::move(event), client, settings);
+ #else
+   // Regardless of collecting device signals or not, upload the security event
+@@ -239,7 +239,7 @@ void RealtimeReportingClientBase::Report
+   if (include_profile_user_name) {
+     event.Set(kKeyProfileUserName, GetProfileUserName());
+   }
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet)
+   MaybeCollectDeviceSignalsAndReportEventDeprecated(std::move(event), client,
+                                                     name, settings, time);
+ #else
diff --git a/chromium/patches/patch-components_enterprise_watermarking_watermark.cc b/chromium/patches/patch-components_enterprise_watermarking_watermark.cc
index 36090d125d..403c04d36b 100644
--- a/chromium/patches/patch-components_enterprise_watermarking_watermark.cc
+++ b/chromium/patches/patch-components_enterprise_watermarking_watermark.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_enterprise_watermarking_watermark.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/enterprise/watermarking/watermark.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/enterprise/watermarking/watermark.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/enterprise/watermarking/watermark.cc
-@@ -34,7 +34,7 @@ gfx::Font WatermarkFont() {
+@@ -31,7 +31,7 @@ gfx::Font WatermarkFont() {
        "Segoe UI",
  #elif BUILDFLAG(IS_MAC)
        "SF Pro Text",
@@ -15,7 +15,7 @@ $NetBSD: patch-components_enterprise_watermarking_watermark.cc,v 1.1 2025/02/06
        "Ubuntu",
  #elif BUILDFLAG(IS_CHROMEOS)
        "Google Sans",
-@@ -45,7 +45,7 @@ gfx::Font WatermarkFont() {
+@@ -47,7 +47,7 @@ const gfx::FontList& WatermarkFontList()
  }
  
  gfx::Font::Weight WatermarkFontWeight() {
diff --git a/chromium/patches/patch-components_error__page_common_localized__error.cc b/chromium/patches/patch-components_error__page_common_localized__error.cc
new file mode 100644
index 0000000000..30fe9c92f2
--- /dev/null
+++ b/chromium/patches/patch-components_error__page_common_localized__error.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/error_page/common/localized_error.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/error_page/common/localized_error.cc
+@@ -901,7 +901,7 @@ void AddSuggestionsDetails(int error_cod
+   if (suggestions & SUGGEST_PROXY_CONFIG) {
+     // Custom body string.
+     std::u16string inner =
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+         l10n_util::GetStringFUTF16(
+             IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM,
+             l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE),
diff --git a/chromium/patches/patch-components_eye__dropper_eye__dropper__view.cc b/chromium/patches/patch-components_eye__dropper_eye__dropper__view.cc
index c1ff0f008f..f3d0661ccd 100644
--- a/chromium/patches/patch-components_eye__dropper_eye__dropper__view.cc
+++ b/chromium/patches/patch-components_eye__dropper_eye__dropper__view.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_eye__dropper_eye__dropper__view.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/eye_dropper/eye_dropper_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/eye_dropper/eye_dropper_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/eye_dropper/eye_dropper_view.cc
-@@ -203,7 +203,7 @@ EyeDropperView::EyeDropperView(gfx::Nati
+@@ -208,7 +208,7 @@ EyeDropperView::EyeDropperView(gfx::Nati
    // EyeDropper/WidgetDelegate.
    set_owned_by_client();
    SetPreferredSize(GetSize());
diff --git a/chromium/patches/patch-components_feature__engagement_public_event__constants.cc b/chromium/patches/patch-components_feature__engagement_public_event__constants.cc
index bc42ea081e..473d19926d 100644
--- a/chromium/patches/patch-components_feature__engagement_public_event__constants.cc
+++ b/chromium/patches/patch-components_feature__engagement_public_event__constants.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_feature__engagement_public_event__constants.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feature_engagement/public/event_constants.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feature_engagement/public/event_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feature_engagement/public/event_constants.cc
 @@ -11,7 +11,7 @@ namespace feature_engagement {
  namespace events {
diff --git a/chromium/patches/patch-components_feature__engagement_public_event__constants.h b/chromium/patches/patch-components_feature__engagement_public_event__constants.h
index 7cbdfff33b..582d54040d 100644
--- a/chromium/patches/patch-components_feature__engagement_public_event__constants.h
+++ b/chromium/patches/patch-components_feature__engagement_public_event__constants.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_feature__engagement_public_event__constants.h,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feature_engagement/public/event_constants.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feature_engagement/public/event_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feature_engagement/public/event_constants.h
 @@ -14,7 +14,7 @@ namespace events {
  
diff --git a/chromium/patches/patch-components_feature__engagement_public_feature__configurations.cc b/chromium/patches/patch-components_feature__engagement_public_feature__configurations.cc
index 1bebdbfdaf..32c4a9aa1f 100644
--- a/chromium/patches/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/chromium/patches/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_feature__engagement_public_feature__configurations.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feature_engagement/public/feature_configurations.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feature_engagement/public/feature_configurations.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feature_engagement/public/feature_configurations.cc
-@@ -95,7 +95,7 @@ std::optional<FeatureConfig> CreateNewUs
+@@ -100,7 +100,7 @@ std::optional<FeatureConfig> CreateNewUs
  
  std::optional<FeatureConfig> GetClientSideFeatureConfig(
      const base::Feature* feature) {
@@ -15,16 +15,16 @@ $NetBSD: patch-components_feature__engagement_public_feature__configurations.cc,
  
    // The IPH bubble for link capturing has a trigger set to ANY so that it
    // always shows up. The per app specific guardrails are independently stored
-@@ -114,7 +114,7 @@ std::optional<FeatureConfig> GetClientSi
+@@ -119,7 +119,7 @@ std::optional<FeatureConfig> GetClientSi
  
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) {
-     std::optional<FeatureConfig> config = FeatureConfig();
-     config->valid = true;
-@@ -1641,7 +1641,8 @@ std::optional<FeatureConfig> GetClientSi
+     FeatureConfig config;
+     config.valid = true;
+@@ -1740,7 +1740,8 @@ std::optional<FeatureConfig> GetClientSi
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -33,4 +33,4 @@ $NetBSD: patch-components_feature__engagement_public_feature__configurations.cc,
 +    BUILDFLAG(IS_BSD)
  
    if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) {
-     // Credit card benefit IPH is shown:
+     // The credit card benefit IPH appears up to three times over 10 years and
diff --git a/chromium/patches/patch-components_feature__engagement_public_feature__constants.cc b/chromium/patches/patch-components_feature__engagement_public_feature__constants.cc
index 25b92267a5..b57ea61556 100644
--- a/chromium/patches/patch-components_feature__engagement_public_feature__constants.cc
+++ b/chromium/patches/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_feature__engagement_public_feature__constants.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feature_engagement/public/feature_constants.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feature_engagement/public/feature_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feature_engagement/public/feature_constants.cc
-@@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode
+@@ -19,7 +19,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode
  BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -15,17 +15,16 @@ $NetBSD: patch-components_feature__engagement_public_feature__constants.cc,v 1.1
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  BASE_FEATURE(kEsbDownloadRowPromoFeature,
               "EsbDownloadRowPromo",
-@@ -646,7 +646,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCrite
+@@ -710,7 +710,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCrite
+ 
  #endif  // BUILDFLAG(IS_IOS)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
- BASE_FEATURE(kIPHAutofillCreditCardBenefitFeature,
-              "IPH_AutofillCreditCardBenefit",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -786,7 +787,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeatur
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BASE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+              "IPH_AutofillBnplAffirmOrZipSuggestion",
+@@ -857,7 +857,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeatur
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
diff --git a/chromium/patches/patch-components_feature__engagement_public_feature__constants.h b/chromium/patches/patch-components_feature__engagement_public_feature__constants.h
index 95bede84cf..e59d36b0ff 100644
--- a/chromium/patches/patch-components_feature__engagement_public_feature__constants.h
+++ b/chromium/patches/patch-components_feature__engagement_public_feature__constants.h
@@ -1,36 +1,35 @@
-$NetBSD: patch-components_feature__engagement_public_feature__constants.h,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feature_engagement/public/feature_constants.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feature_engagement/public/feature_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feature_engagement/public/feature_constants.h
-@@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode);
- BASE_DECLARE_FEATURE(kIPHDummyFeature);
+@@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDe
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDummyFeature);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature);
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature);
  #endif
-@@ -261,7 +261,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTrig
+@@ -316,7 +316,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefau
+ 
  #endif  // BUILDFLAG(IS_IOS)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kIPHAutofillCreditCardBenefitFeature);
- BASE_DECLARE_FEATURE(kIPHAutofillDisabledVirtualCardSuggestionFeature);
- BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature);
-@@ -313,7 +314,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelp
- BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature);
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHAutofillBnplAffirmOrZipSuggestionFeature);
+ FEATURE_CONSTANTS_DECLARE_FEATURE(
+@@ -374,7 +374,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHSc
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphGamingFeature);
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch);
- BASE_DECLARE_FEATURE(kIPHToolbarManagementButtonFeature);
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch);
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunchAppInTab);
+ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHSupervisedUserProfileSigninFeature);
diff --git a/chromium/patches/patch-components_feature__engagement_public_feature__list.cc b/chromium/patches/patch-components_feature__engagement_public_feature__list.cc
index 5ed770523e..8139e8c4b4 100644
--- a/chromium/patches/patch-components_feature__engagement_public_feature__list.cc
+++ b/chromium/patches/patch-components_feature__engagement_public_feature__list.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-components_feature__engagement_public_feature__list.cc,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feature_engagement/public/feature_list.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feature_engagement/public/feature_list.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feature_engagement/public/feature_list.cc
-@@ -162,7 +162,7 @@ const base::Feature* const kAllFeatures[
-     &kIPHiOSLensOverlayEntrypointTipFeature,
+@@ -175,7 +175,7 @@ const base::Feature* const kAllFeatures[
+     &kIPHiOSSettingsInOverflowMenuBubbleFeature,
  #endif  // BUILDFLAG(IS_IOS)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -15,22 +15,21 @@ $NetBSD: patch-components_feature__engagement_public_feature__list.cc,v 1.1 2025
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
      &kEsbDownloadRowPromoFeature,
  #endif
-@@ -230,7 +230,8 @@ const base::Feature* const kAllFeatures[
+@@ -247,7 +247,7 @@ const base::Feature* const kAllFeatures[
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
-     &kIPHAutofillCreditCardBenefitFeature,
-     &kIPHAutofillDisabledVirtualCardSuggestionFeature,
-     &kIPHAutofillExternalAccountProfileSuggestionFeature,
-@@ -282,7 +283,7 @@ const base::Feature* const kAllFeatures[
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+     &kIPHAutofillAiOptInFeature,
+     &kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+@@ -302,7 +302,7 @@ const base::Feature* const kAllFeatures[
      &kIPHScalableIphGamingFeature,
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      &kIPHDesktopPWAsLinkCapturingLaunch,
-     &kIPHToolbarManagementButtonFeature,
- #endif  // BUILDFLAG(IS_WIN) ||  BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+     &kIPHDesktopPWAsLinkCapturingLaunchAppInTab,
+     &kIPHSupervisedUserProfileSigninFeature,
diff --git a/chromium/patches/patch-components_feature__engagement_public_feature__list.h b/chromium/patches/patch-components_feature__engagement_public_feature__list.h
index f81e9785a2..57a297ad99 100644
--- a/chromium/patches/patch-components_feature__engagement_public_feature__list.h
+++ b/chromium/patches/patch-components_feature__engagement_public_feature__list.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_feature__engagement_public_feature__list.h,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feature_engagement/public/feature_list.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feature_engagement/public/feature_list.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feature_engagement/public/feature_list.h
-@@ -282,7 +282,7 @@ DEFINE_VARIATION_PARAM(kIPHHomeCustomiza
+@@ -312,7 +312,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSettingsIn
  #endif  // BUILDFLAG(IS_IOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -15,50 +15,50 @@ $NetBSD: patch-components_feature__engagement_public_feature__list.h,v 1.1 2025/
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo");
  #endif
-@@ -388,7 +388,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSave
+@@ -427,7 +427,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsShar
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
 +    BUILDFLAG(IS_BSD)
- DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature,
-                        "IPH_AutofillCreditCardBenefit");
- 
-@@ -482,7 +483,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHe
+ DEFINE_VARIATION_PARAM(kIPHAutofillAiOptInFeature, "IPH_AutofillAiOptIn");
+ DEFINE_VARIATION_PARAM(kIPHAutofillBnplAffirmOrZipSuggestionFeature,
+                        "IPH_AutofillBnplAffirmOrZipSuggestion");
+@@ -523,7 +524,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHe
  DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming");
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch,
                         "IPH_DesktopPWAsLinkCapturingLaunch");
- DEFINE_VARIATION_PARAM(kIPHToolbarManagementButtonFeature,
-@@ -644,7 +645,7 @@ constexpr flags_ui::FeatureEntry::Featur
-         VARIATION_ENTRY(kIPHHomeCustomizationMenuFeature),
-         VARIATION_ENTRY(kIPHiOSLensOverlayEntrypointTipFeature),
+ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab,
+@@ -697,7 +698,7 @@ inline constexpr flags_ui::FeatureEntry:
+             kIPHiOSReminderNotificationsOverflowMenuNewBadgeFeature),
+         VARIATION_ENTRY(kIPHiOSDownloadAutoDeletionFeature),
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
          VARIATION_ENTRY(kIPHBatterySaverModeFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature),
-@@ -700,7 +701,8 @@ constexpr flags_ui::FeatureEntry::Featur
+@@ -759,7 +760,8 @@ inline constexpr flags_ui::FeatureEntry:
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
 +    BUILDFLAG(IS_BSD)
+         VARIATION_ENTRY(kIPHAutofillAiOptInFeature),
          VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature),
-         VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature),
-         VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature),
-@@ -752,7 +754,7 @@ constexpr flags_ui::FeatureEntry::Featur
+         VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature),
+@@ -812,7 +814,7 @@ inline constexpr flags_ui::FeatureEntry:
          VARIATION_ENTRY(kIPHScalableIphGamingFeature),
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
          VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunch),
-         VARIATION_ENTRY(kIPHToolbarManagementButtonFeature),
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+         VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunchAppInTab),
+         VARIATION_ENTRY(kIPHSupervisedUserProfileSigninFeature),
diff --git a/chromium/patches/patch-components_feed_core_proto_v2_wire_version.proto b/chromium/patches/patch-components_feed_core_proto_v2_wire_version.proto
index 8656df3f04..e6f55f6978 100644
--- a/chromium/patches/patch-components_feed_core_proto_v2_wire_version.proto
+++ b/chromium/patches/patch-components_feed_core_proto_v2_wire_version.proto
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_feed_core_proto_v2_wire_version.proto,v 1.1 2025/02/06 09:57:59 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feed/core/proto/v2/wire/version.proto.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feed/core/proto/v2/wire/version.proto.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feed/core/proto/v2/wire/version.proto
 @@ -25,8 +25,8 @@ message Version {
      BETA = 3;
diff --git a/chromium/patches/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/chromium/patches/patch-components_feed_core_v2_feed__network__impl__unittest.cc
index 89e6b2fb8f..5502403408 100644
--- a/chromium/patches/patch-components_feed_core_v2_feed__network__impl__unittest.cc
+++ b/chromium/patches/patch-components_feed_core_v2_feed__network__impl__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_feed_core_v2_feed__network__impl__unittest.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feed/core/v2/feed_network_impl_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feed/core/v2/feed_network_impl_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feed/core/v2/feed_network_impl_unittest.cc
 @@ -747,8 +747,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_D
  
diff --git a/chromium/patches/patch-components_feed_core_v2_proto__util.cc b/chromium/patches/patch-components_feed_core_v2_proto__util.cc
index 3f9344e795..db739e8790 100644
--- a/chromium/patches/patch-components_feed_core_v2_proto__util.cc
+++ b/chromium/patches/patch-components_feed_core_v2_proto__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_feed_core_v2_proto__util.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feed/core/v2/proto_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feed/core/v2/proto_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feed/core/v2/proto_util.cc
 @@ -93,8 +93,8 @@ feedwire::Version GetPlatformVersionMess
  
diff --git a/chromium/patches/patch-components_feed_core_v2_proto__util__unittest.cc b/chromium/patches/patch-components_feed_core_v2_proto__util__unittest.cc
index 141c828a99..1cb415248b 100644
--- a/chromium/patches/patch-components_feed_core_v2_proto__util__unittest.cc
+++ b/chromium/patches/patch-components_feed_core_v2_proto__util__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_feed_core_v2_proto__util__unittest.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feed/core/v2/proto_util_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feed/core/v2/proto_util_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feed/core/v2/proto_util_unittest.cc
 @@ -43,8 +43,8 @@ TEST(ProtoUtilTest, CreateClientInfo) {
    feedwire::ClientInfo result = CreateClientInfo(request_metadata);
diff --git a/chromium/patches/patch-components_feed_core_v2_test_proto__printer.cc b/chromium/patches/patch-components_feed_core_v2_test_proto__printer.cc
index 2cb3662c6a..462d2688bb 100644
--- a/chromium/patches/patch-components_feed_core_v2_test_proto__printer.cc
+++ b/chromium/patches/patch-components_feed_core_v2_test_proto__printer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_feed_core_v2_test_proto__printer.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/feed/core/v2/test/proto_printer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/feed/core/v2/test/proto_printer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/feed/core/v2/test/proto_printer.cc
 @@ -158,8 +158,8 @@ class TextProtoPrinter {
    }
diff --git a/chromium/patches/patch-components_flags__ui_flags__state.cc b/chromium/patches/patch-components_flags__ui_flags__state.cc
deleted file mode 100644
index 2637b755dd..0000000000
--- a/chromium/patches/patch-components_flags__ui_flags__state.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-components_flags__ui_flags__state.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/flags_ui/flags_state.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/flags_ui/flags_state.cc
-@@ -755,7 +755,7 @@ unsigned short FlagsState::GetCurrentPla
-   return kOsCrOS;
- #elif BUILDFLAG(IS_CHROMEOS_LACROS)
-   return kOsLacros;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return kOsLinux;
- #elif BUILDFLAG(IS_ANDROID)
-   return kOsAndroid;
diff --git a/chromium/patches/patch-components_gcm__driver_gcm__desktop__utils.cc b/chromium/patches/patch-components_gcm__driver_gcm__desktop__utils.cc
new file mode 100644
index 0000000000..e4dd5a265c
--- /dev/null
+++ b/chromium/patches/patch-components_gcm__driver_gcm__desktop__utils.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/gcm_driver/gcm_desktop_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/gcm_driver/gcm_desktop_utils.cc
+@@ -32,7 +32,7 @@ GCMClient::ChromePlatform GetPlatform() 
+   return GCMClient::PLATFORM_ANDROID;
+ #elif BUILDFLAG(IS_CHROMEOS)
+   return GCMClient::PLATFORM_CROS;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return GCMClient::PLATFORM_LINUX;
+ #else
+   // For all other platforms, return as LINUX.
diff --git a/chromium/patches/patch-components_gwp__asan_BUILD.gn b/chromium/patches/patch-components_gwp__asan_BUILD.gn
index 0a3b180ab8..8ce7f7af55 100644
--- a/chromium/patches/patch-components_gwp__asan_BUILD.gn
+++ b/chromium/patches/patch-components_gwp__asan_BUILD.gn
@@ -1,17 +1,17 @@
-$NetBSD: patch-components_gwp__asan_BUILD.gn,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/gwp_asan/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/gwp_asan/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/gwp_asan/BUILD.gn
 @@ -15,7 +15,7 @@ test("gwp_asan_unittests") {
      "//testing/gtest",
      "//third_party/boringssl",
    ]
--  if (is_win || is_mac || is_linux || is_chromeos || is_android) {
-+  if ((is_win || is_mac || is_linux || is_chromeos || is_android) && !is_bsd) {
+-  if (is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) {
++  if ((is_win || is_mac || is_linux || is_chromeos || is_android || is_ios) && !is_bsd) {
      deps += [
        "//components/gwp_asan/client:unit_tests",
        "//components/gwp_asan/crash_handler:unit_tests",
diff --git a/chromium/patches/patch-components_gwp__asan_buildflags_buildflags.gni b/chromium/patches/patch-components_gwp__asan_buildflags_buildflags.gni
new file mode 100644
index 0000000000..bbf13e1072
--- /dev/null
+++ b/chromium/patches/patch-components_gwp__asan_buildflags_buildflags.gni
@@ -0,0 +1,20 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/gwp_asan/buildflags/buildflags.gni.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/gwp_asan/buildflags/buildflags.gni
+@@ -10,10 +10,7 @@ import("//build/config/compiler/compiler
+ # Android component builds are disabled due to https://crbug.com/976399
+ # Android requires frame pointers for unwinding, unwind tables aren't shipped in
+ # official builds.
+-supported_platform =
+-    is_linux || is_chromeos || is_mac || is_ios ||
+-    (is_win && (current_cpu == "x64" || current_cpu == "arm64")) ||
+-    (is_android && !is_component_build && enable_frame_pointers)
++supported_platform = false
+ 
+ declare_args() {
+   # Is GWP-ASan malloc/PartitionAlloc hooking enabled for chrome/ on a given
diff --git a/chromium/patches/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc b/chromium/patches/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
index fd21da8187..8256a6f55f 100644
--- a/chromium/patches/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
+++ b/chromium/patches/patch-components_gwp__asan_client_guarded__page__allocator__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_gwp__asan_client_guarded__page__allocator__posix.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/gwp_asan/client/guarded_page_allocator_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/gwp_asan/client/guarded_page_allocator_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/gwp_asan/client/guarded_page_allocator_posix.cc
 @@ -35,8 +35,9 @@ void GuardedPageAllocator::MarkPageInacc
    // mmap() a PROT_NONE page over the address to release it to the system, if
diff --git a/chromium/patches/patch-components_gwp__asan_client_gwp__asan.cc b/chromium/patches/patch-components_gwp__asan_client_gwp__asan.cc
index 401b985ae8..5c6fa4f2d4 100644
--- a/chromium/patches/patch-components_gwp__asan_client_gwp__asan.cc
+++ b/chromium/patches/patch-components_gwp__asan_client_gwp__asan.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_gwp__asan_client_gwp__asan.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/gwp_asan/client/gwp_asan.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/gwp_asan/client/gwp_asan.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/gwp_asan/client/gwp_asan.cc
-@@ -75,7 +75,7 @@ namespace {
+@@ -76,7 +76,7 @@ namespace {
  // ProcessSamplingBoost is the multiplier to increase the
  // ProcessSamplingProbability in scenarios where we want to perform additional
  // testing (e.g., on canary/dev builds).
diff --git a/chromium/patches/patch-components_gwp__asan_client_gwp__asan__features.cc b/chromium/patches/patch-components_gwp__asan_client_gwp__asan__features.cc
index 5059f69380..1abae24a55 100644
--- a/chromium/patches/patch-components_gwp__asan_client_gwp__asan__features.cc
+++ b/chromium/patches/patch-components_gwp__asan_client_gwp__asan__features.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_gwp__asan_client_gwp__asan__features.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/gwp_asan/client/gwp_asan_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/gwp_asan/client/gwp_asan_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/gwp_asan/client/gwp_asan_features.cc
 @@ -9,7 +9,7 @@
  namespace gwp_asan::internal {
diff --git a/chromium/patches/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/chromium/patches/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
index a9080d9f93..deada05513 100644
--- a/chromium/patches/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
+++ b/chromium/patches/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_gwp__asan_crash__handler_crash__analyzer.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/gwp_asan/crash_handler/crash_analyzer.cc
 @@ -35,7 +35,7 @@
  #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-components_gwp__asan_crash__handler_crash__analyzer.cc,v 1.1 2025
  #include <signal.h>
  #elif BUILDFLAG(IS_APPLE)
  #include <mach/exception_types.h>
-@@ -95,7 +95,7 @@ bool CrashAnalyzer::GetExceptionInfo(
+@@ -113,7 +113,7 @@ bool CrashAnalyzer::GetExceptionInfo(
  
  crashpad::VMAddress CrashAnalyzer::GetAccessAddress(
      const crashpad::ExceptionSnapshot& exception) {
diff --git a/chromium/patches/patch-components_live__caption_caption__util.cc b/chromium/patches/patch-components_live__caption_caption__util.cc
index e2ab996687..8db40b527a 100644
--- a/chromium/patches/patch-components_live__caption_caption__util.cc
+++ b/chromium/patches/patch-components_live__caption_caption__util.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-components_live__caption_caption__util.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/live_caption/caption_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/live_caption/caption_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/live_caption/caption_util.cc
-@@ -139,7 +139,7 @@ std::string GetCaptionSettingsUrl() {
+@@ -136,7 +136,7 @@ bool IsLiveCaptionFeatureSupported() {
+ std::string GetCaptionSettingsUrl() {
+ #if BUILDFLAG(IS_CHROMEOS)
    return "chrome://os-settings/audioAndCaptions";
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return "chrome://settings/captions";
- #endif  // BUILDFLAG(IS_LINUX)
- 
+ #elif BUILDFLAG(IS_WIN)
+   return base::win::GetVersion() >= base::win::Version::WIN10
diff --git a/chromium/patches/patch-components_live__caption_caption__util.h b/chromium/patches/patch-components_live__caption_caption__util.h
index 6d33b74535..ce49a38d34 100644
--- a/chromium/patches/patch-components_live__caption_caption__util.h
+++ b/chromium/patches/patch-components_live__caption_caption__util.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_live__caption_caption__util.h,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/live_caption/caption_util.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/live_caption/caption_util.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/live_caption/caption_util.h
 @@ -15,7 +15,7 @@ class PrefService;
  namespace captions {
diff --git a/chromium/patches/patch-components_media__router_common_media__source.cc b/chromium/patches/patch-components_media__router_common_media__source.cc
index e832ff7099..039a5352a4 100644
--- a/chromium/patches/patch-components_media__router_common_media__source.cc
+++ b/chromium/patches/patch-components_media__router_common_media__source.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_media__router_common_media__source.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/media_router/common/media_source.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/media_router/common/media_source.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/media_router/common/media_source.cc
-@@ -57,7 +57,7 @@ bool IsSystemAudioCaptureSupported() {
+@@ -62,7 +62,7 @@ bool IsSystemAudioCaptureSupported() {
    if (!media::IsSystemLoopbackCaptureSupported()) {
      return false;
    }
diff --git a/chromium/patches/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc b/chromium/patches/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
index 3be7bec192..5b7669f472 100644
--- a/chromium/patches/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
+++ b/chromium/patches/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-components_media__router_common_providers_cast_channel_cast__message__util.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/media_router/common/providers/cast/channel/cast_message_util.cc
-@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() {
+@@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() {
    return 4;
- #elif BUILDFLAG(IS_CHROMEOS_ASH)
+ #elif BUILDFLAG(IS_CHROMEOS)
    return 5;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return 6;
  #else
    return 0;
diff --git a/chromium/patches/patch-components_media__router_common_providers_cast_channel_enum__table.h b/chromium/patches/patch-components_media__router_common_providers_cast_channel_enum__table.h
index 15d44623e9..7d3973dfeb 100644
--- a/chromium/patches/patch-components_media__router_common_providers_cast_channel_enum__table.h
+++ b/chromium/patches/patch-components_media__router_common_providers_cast_channel_enum__table.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_media__router_common_providers_cast_channel_enum__table.h,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/media_router/common/providers/cast/channel/enum_table.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/media_router/common/providers/cast/channel/enum_table.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/media_router/common/providers/cast/channel/enum_table.h
 @@ -368,7 +368,12 @@ class EnumTable {
  
diff --git a/chromium/patches/patch-components_metrics_drive__metrics__provider.cc b/chromium/patches/patch-components_metrics_drive__metrics__provider.cc
new file mode 100644
index 0000000000..1ec8adbd98
--- /dev/null
+++ b/chromium/patches/patch-components_metrics_drive__metrics__provider.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/metrics/drive_metrics_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/metrics/drive_metrics_provider.cc
+@@ -21,7 +21,7 @@
+ namespace metrics {
+ 
+ namespace {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void RecordTriStateMetric(const char* name, std::optional<bool> sample) {
+   base::UmaHistogramEnumeration(
+       name, !sample.has_value()
+@@ -106,7 +106,7 @@ void DriveMetricsProvider::FillDriveMetr
+     drive->set_has_seek_penalty(*response.has_seek_penalty);
+   }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   RecordTriStateMetric("UMA.DriveIsRemovableResult", response.is_removable);
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
diff --git a/chromium/patches/patch-components_metrics_drive__metrics__provider__linux.cc b/chromium/patches/patch-components_metrics_drive__metrics__provider__linux.cc
deleted file mode 100644
index 996e0a0510..0000000000
--- a/chromium/patches/patch-components_metrics_drive__metrics__provider__linux.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-components_metrics_drive__metrics__provider__linux.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/metrics/drive_metrics_provider_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/metrics/drive_metrics_provider_linux.cc
-@@ -4,7 +4,13 @@
- 
- #include "components/metrics/drive_metrics_provider.h"
- 
-+#if BUILDFLAG(IS_BSD)
-+#include <sys/types.h>
-+#define MAJOR(dev) major(dev)
-+#define MINOR(dev) minor(dev)
-+#else
- #include <linux/kdev_t.h>  // For MAJOR()/MINOR().
-+#endif
- #include <sys/stat.h>
- #include <string>
- 
diff --git a/chromium/patches/patch-components_metrics_dwa_dwa__service.cc b/chromium/patches/patch-components_metrics_dwa_dwa__service.cc
index 4b4f621b22..bb11ffcb3f 100644
--- a/chromium/patches/patch-components_metrics_dwa_dwa__service.cc
+++ b/chromium/patches/patch-components_metrics_dwa_dwa__service.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_metrics_dwa_dwa__service.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/metrics/dwa/dwa_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/metrics/dwa/dwa_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/metrics/dwa/dwa_service.cc
-@@ -88,7 +88,7 @@ void DwaService::RecordCoarseSystemInfor
+@@ -162,7 +162,7 @@ void DwaService::RecordCoarseSystemInfor
    coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_WINDOWS);
  #elif BUILDFLAG(IS_MAC)
    coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_MACOS);
diff --git a/chromium/patches/patch-components_metrics_metrics__log.cc b/chromium/patches/patch-components_metrics_metrics__log.cc
index 2247a0531e..37de91da87 100644
--- a/chromium/patches/patch-components_metrics_metrics__log.cc
+++ b/chromium/patches/patch-components_metrics_metrics__log.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_metrics_metrics__log.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/metrics/metrics_log.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/metrics/metrics_log.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/metrics/metrics_log.cc
-@@ -56,7 +56,7 @@
+@@ -62,7 +62,7 @@
  #include "base/win/current_module.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-components_metrics_metrics__log.cc,v 1.1 2025/02/06 09:58:00 wiz
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -146,7 +146,7 @@ void RecordCurrentTime(
+@@ -158,7 +158,7 @@ void RecordCurrentTime(
    }
  }
  
@@ -24,16 +24,16 @@ $NetBSD: patch-components_metrics_metrics__log.cc,v 1.1 2025/02/06 09:58:00 wiz
  metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType(
      base::nix::SessionType session_type) {
    switch (session_type) {
-@@ -415,7 +415,7 @@ void MetricsLog::RecordCoreSystemProfile
+@@ -441,7 +441,7 @@ void MetricsLog::RecordCoreSystemProfile
  // OperatingSystemVersion refers to the ChromeOS release version.
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
    os->set_kernel_version(base::SysInfo::KernelVersion());
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Linux operating system version is copied over into kernel version to be
    // consistent.
    os->set_kernel_version(base::SysInfo::OperatingSystemVersion());
-@@ -432,7 +432,7 @@ void MetricsLog::RecordCoreSystemProfile
+@@ -458,7 +458,7 @@ void MetricsLog::RecordCoreSystemProfile
    os->set_build_number(base::SysInfo::GetIOSBuildNumber());
  #endif
  
diff --git a/chromium/patches/patch-components_metrics_motherboard.cc b/chromium/patches/patch-components_metrics_motherboard.cc
index f1f088c254..3f54f2411e 100644
--- a/chromium/patches/patch-components_metrics_motherboard.cc
+++ b/chromium/patches/patch-components_metrics_motherboard.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_metrics_motherboard.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/metrics/motherboard.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/metrics/motherboard.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/metrics/motherboard.cc
 @@ -1,6 +1,7 @@
  // Copyright 2022 The Chromium Authors
diff --git a/chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h b/chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h
index 143f0dfa37..55db30bd0b 100644
--- a/chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h
+++ b/chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h
@@ -1,17 +1,20 @@
-$NetBSD: patch-components_named__mojo__ipc__server_connection__info.h,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/named_mojo_ipc_server/connection_info.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/named_mojo_ipc_server/connection_info.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/named_mojo_ipc_server/connection_info.h
-@@ -12,8 +12,14 @@
+@@ -12,8 +12,17 @@
  #include "base/win/scoped_handle.h"
  #elif BUILDFLAG(IS_MAC)
  #include <bsm/libbsm.h>
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_OPENBSD)
++#include <sys/ucred.h>
++#endif
  #include <sys/socket.h>
 +#if defined(__NetBSD__)
 +#include <sys/un.h>
@@ -22,12 +25,12 @@ $NetBSD: patch-components_named__mojo__ipc__server_connection__info.h,v 1.1 2025
  #endif
  
  namespace named_mojo_ipc_server {
-@@ -29,7 +35,7 @@ struct ConnectionInfo {
+@@ -29,7 +38,7 @@ struct ConnectionInfo {
    base::ProcessId pid{};
  #if BUILDFLAG(IS_MAC)
    audit_token_t audit_token{};
 -#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
    ucred credentials{};
  #endif
  };
diff --git a/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc b/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
index bd8af5d320..2b63eb5076 100644
--- a/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
+++ b/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc
 @@ -23,7 +23,7 @@ namespace named_mojo_ipc_server {
  // static
diff --git a/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc b/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
new file mode 100644
index 0000000000..07b998548a
--- /dev/null
+++ b/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
@@ -0,0 +1,18 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc
+@@ -89,7 +89,9 @@ void NamedMojoServerEndpointConnectorLin
+     PLOG(ERROR) << "getsockopt failed.";
+     return;
+   }
++#if !BUILDFLAG(IS_OPENBSD)
+   info->pid = info->credentials.pid;
++#endif
+ 
+   mojo::PlatformChannelEndpoint endpoint(
+       mojo::PlatformHandle(std::move(connection_fd)));
diff --git a/chromium/patches/patch-components_named__system__lock_BUILD.gn b/chromium/patches/patch-components_named__system__lock_BUILD.gn
new file mode 100644
index 0000000000..7d1c6f8b4b
--- /dev/null
+++ b/chromium/patches/patch-components_named__system__lock_BUILD.gn
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/named_system_lock/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/named_system_lock/BUILD.gn
+@@ -5,7 +5,7 @@
+ static_library("named_system_lock") {
+   sources = [ "lock.h" ]
+   deps = [ "//base" ]
+-  if (is_linux) {
++  if (!is_bsd && is_linux) {
+     sources += [ "lock_linux.cc" ]
+   } else if (is_mac) {
+     sources += [ "lock_mac.mm" ]
+@@ -20,7 +20,7 @@ source_set("unit_tests") {
+   sources = []
+ 
+   # Disable NamedSystemLockTest on unsupported platforms.
+-  if (is_linux || is_win || is_mac) {
++  if (!is_bsd && (is_linux || is_win || is_mac)) {
+     sources += [ "lock_unittest.cc" ]
+   }
+ 
diff --git a/chromium/patches/patch-components_named__system__lock_lock.h b/chromium/patches/patch-components_named__system__lock_lock.h
index a09d45b129..b1856842b9 100644
--- a/chromium/patches/patch-components_named__system__lock_lock.h
+++ b/chromium/patches/patch-components_named__system__lock_lock.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_named__system__lock_lock.h,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/named_system_lock/lock.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/named_system_lock/lock.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/named_system_lock/lock.h
 @@ -38,7 +38,7 @@ class ScopedLock {
    // may acquire that lock. The lock name has different meanings per platform:
diff --git a/chromium/patches/patch-components_named__system__lock_lock__unittest.cc b/chromium/patches/patch-components_named__system__lock_lock__unittest.cc
new file mode 100644
index 0000000000..4f6c9c2206
--- /dev/null
+++ b/chromium/patches/patch-components_named__system__lock_lock__unittest.cc
@@ -0,0 +1,35 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/named_system_lock/lock_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/named_system_lock/lock_unittest.cc
+@@ -18,7 +18,7 @@
+ #include "build/build_config.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ 
+@@ -45,7 +45,7 @@ class NamedSystemLockTest : public ::tes
+   const std::string lock_name_ = base::UnguessableToken::Create().ToString();
+ 
+   std::unique_ptr<ScopedLock> CreateLock() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+     return ScopedLock::Create(lock_name_, base::Seconds(0));
+ #else
+     CSecurityAttributes sa;
+@@ -95,7 +95,7 @@ TEST_F(NamedSystemLockTest, TryLockInThr
+   EXPECT_TRUE(CreateLock());
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ TEST_F(NamedSystemLockTest, SharedMemoryWrongPermissions) {
+   // Create a shared memory region with overpermissive perms.
+   int shm_fd = shm_open(lock_name_.c_str(), O_RDWR | O_CREAT | O_EXCL,
diff --git a/chromium/patches/patch-components_neterror_resources_neterror.js b/chromium/patches/patch-components_neterror_resources_neterror.js
deleted file mode 100644
index 27cfeadc51..0000000000
--- a/chromium/patches/patch-components_neterror_resources_neterror.js
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-components_neterror_resources_neterror.js,v 1.1 2025/02/06 09:58:00 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/neterror/resources/neterror.js.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/neterror/resources/neterror.js
-@@ -142,7 +142,7 @@ function detailsButtonClick() {
- 
- let primaryControlOnLeft = true;
- // clang-format off
--// <if expr="is_macosx or is_ios or is_linux or is_chromeos or is_android">
-+// <if expr="is_macosx or is_ios or is_posix or is_chromeos or is_android">
- // clang-format on
- primaryControlOnLeft = false;
- // </if>
diff --git a/chromium/patches/patch-components_optimization__guide_core_optimization__guide__features.cc b/chromium/patches/patch-components_optimization__guide_core_optimization__guide__features.cc
index 9172107be2..f66f768923 100644
--- a/chromium/patches/patch-components_optimization__guide_core_optimization__guide__features.cc
+++ b/chromium/patches/patch-components_optimization__guide_core_optimization__guide__features.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_optimization__guide_core_optimization__guide__features.cc,v 1.1 2025/02/06 09:58:00 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/optimization_guide/core/optimization_guide_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/optimization_guide/core/optimization_guide_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/optimization_guide/core/optimization_guide_features.cc
-@@ -140,7 +140,7 @@ BASE_FEATURE(kOptimizationGuideModelExec
+@@ -136,7 +136,7 @@ BASE_FEATURE(kOptimizationGuideModelExec
  // Whether to use the on device model service in optimization guide.
  BASE_FEATURE(kOptimizationGuideOnDeviceModel,
               "OptimizationGuideOnDeviceModel",
diff --git a/chromium/patches/patch-components_optimization__guide_core_optimization__guide__util.cc b/chromium/patches/patch-components_optimization__guide_core_optimization__guide__util.cc
index 5c1740eb86..7de889eff6 100644
--- a/chromium/patches/patch-components_optimization__guide_core_optimization__guide__util.cc
+++ b/chromium/patches/patch-components_optimization__guide_core_optimization__guide__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_optimization__guide_core_optimization__guide__util.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/optimization_guide/core/optimization_guide_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/optimization_guide/core/optimization_guide_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/optimization_guide/core/optimization_guide_util.cc
 @@ -37,7 +37,7 @@ optimization_guide::proto::Platform GetP
    return optimization_guide::proto::PLATFORM_CHROMEOS;
diff --git a/chromium/patches/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc b/chromium/patches/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
index bbdc0270a7..39acd7e739 100644
--- a/chromium/patches/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
+++ b/chromium/patches/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_os__crypt_async_browser_secret__portal__key__provider.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/os_crypt/async/browser/secret_portal_key_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/os_crypt/async/browser/secret_portal_key_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/os_crypt/async/browser/secret_portal_key_provider.cc
 @@ -5,7 +5,9 @@
  #include "components/os_crypt/async/browser/secret_portal_key_provider.h"
diff --git a/chromium/patches/patch-components_os__crypt_async_common_encryptor.cc b/chromium/patches/patch-components_os__crypt_async_common_encryptor.cc
deleted file mode 100644
index 0714a78755..0000000000
--- a/chromium/patches/patch-components_os__crypt_async_common_encryptor.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-components_os__crypt_async_common_encryptor.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/os_crypt/async/common/encryptor.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/os_crypt/async/common/encryptor.cc
-@@ -277,7 +277,7 @@ std::optional<std::string> Encryptor::De
-     // or not encryption worked or not, and certainly not advisable to recommend
-     // a re-encryption of this potentially invalid data.
-     // TODO(crbug.com/365712505): Remove this fallback.
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) &&         \
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \
-         !(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \
-     BUILDFLAG(IS_FUCHSIA)
-     if (plaintext == string_data) {
diff --git a/chromium/patches/patch-components_os__crypt_sync_libsecret__util__linux.cc b/chromium/patches/patch-components_os__crypt_sync_libsecret__util__linux.cc
index d780ce60a7..f8beca958c 100644
--- a/chromium/patches/patch-components_os__crypt_sync_libsecret__util__linux.cc
+++ b/chromium/patches/patch-components_os__crypt_sync_libsecret__util__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_os__crypt_sync_libsecret__util__linux.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/os_crypt/sync/libsecret_util_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/os_crypt/sync/libsecret_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/os_crypt/sync/libsecret_util_linux.cc
 @@ -185,16 +185,22 @@ bool LibsecretLoader::EnsureLibsecretLoa
  
diff --git a/chromium/patches/patch-components_os__crypt_sync_os__crypt.h b/chromium/patches/patch-components_os__crypt_sync_os__crypt.h
index 6ac0a8d638..e7b2ebf141 100644
--- a/chromium/patches/patch-components_os__crypt_sync_os__crypt.h
+++ b/chromium/patches/patch-components_os__crypt_sync_os__crypt.h
@@ -1,30 +1,21 @@
-$NetBSD: patch-components_os__crypt_sync_os__crypt.h,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/os_crypt/sync/os_crypt.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/os_crypt/sync/os_crypt.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/os_crypt/sync/os_crypt.h
-@@ -14,7 +14,7 @@
- #include "build/build_config.h"
+@@ -16,7 +16,7 @@
  #include "build/chromecast_buildflags.h"
+ #include "crypto/subtle_passkey.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  class KeyStorageLinux;
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -23,7 +23,7 @@ class PrefRegistrySimple;
- class PrefService;
- #endif  // BUILDFLAG(IS_WIN)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
- namespace crypto {
- class SymmetricKey;
- }
-@@ -36,7 +36,7 @@ struct Config;
+@@ -32,7 +32,7 @@ struct Config;
  // Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions
  // of what each function does.
  namespace OSCrypt {
@@ -33,7 +24,7 @@ $NetBSD: patch-components_os__crypt_sync_os__crypt.h,v 1.1 2025/02/06 09:58:01 w
  COMPONENT_EXPORT(OS_CRYPT)
  void SetConfig(std::unique_ptr<os_crypt::Config> config);
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -81,7 +81,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockK
+@@ -77,7 +77,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockK
  COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy);
  COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting();
  #endif  // BUILDFLAG(IS_WIN)
@@ -42,7 +33,7 @@ $NetBSD: patch-components_os__crypt_sync_os__crypt.h,v 1.1 2025/02/06 09:58:01 w
  COMPONENT_EXPORT(OS_CRYPT)
  void UseMockKeyStorageForTesting(
      base::OnceCallback<std::unique_ptr<KeyStorageLinux>()>
-@@ -108,7 +108,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCrypt
+@@ -111,7 +111,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCrypt
    // Returns singleton instance of OSCryptImpl.
    static OSCryptImpl* GetInstance();
  
@@ -51,7 +42,7 @@ $NetBSD: patch-components_os__crypt_sync_os__crypt.h,v 1.1 2025/02/06 09:58:01 w
    // Set the configuration of OSCryptImpl.
    // This method, or SetRawEncryptionKey(), must be called before using
    // EncryptString() and DecryptString().
-@@ -200,7 +200,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCrypt
+@@ -207,7 +207,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCrypt
    void ResetStateForTesting();
  #endif
  
@@ -60,8 +51,8 @@ $NetBSD: patch-components_os__crypt_sync_os__crypt.h,v 1.1 2025/02/06 09:58:01 w
    // For unit testing purposes, inject methods to be used.
    // |storage_provider_factory| provides the desired |KeyStorage|
    // implementation. If the provider returns |nullptr|, a hardcoded password
-@@ -225,13 +225,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCrypt
-   crypto::SymmetricKey* GetEncryptionKey();
+@@ -231,13 +231,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCrypt
+   bool DeriveKey();
  #endif  // BUILDFLAG(IS_APPLE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
@@ -73,6 +64,6 @@ $NetBSD: patch-components_os__crypt_sync_os__crypt.h,v 1.1 2025/02/06 09:58:01 w
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Returns a cached string of "peanuts". Is thread-safe.
-   crypto::SymmetricKey* GetPasswordV10();
+   static constexpr size_t kDerivedKeyBytes = 16;
  
+   crypto::SubtlePassKey MakeCryptoPassKey();
diff --git a/chromium/patches/patch-components_paint__preview_browser_paint__preview__client.cc b/chromium/patches/patch-components_paint__preview_browser_paint__preview__client.cc
index 63a371e16b..57306ac0cd 100644
--- a/chromium/patches/patch-components_paint__preview_browser_paint__preview__client.cc
+++ b/chromium/patches/patch-components_paint__preview_browser_paint__preview__client.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_paint__preview_browser_paint__preview__client.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/paint_preview/browser/paint_preview_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/paint_preview/browser/paint_preview_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/paint_preview/browser/paint_preview_client.cc
 @@ -326,8 +326,8 @@ void PaintPreviewClient::CapturePaintPre
    metadata->set_version(kPaintPreviewVersion);
diff --git a/chromium/patches/patch-components_paint__preview_browser_paint__preview__client__unittest.cc b/chromium/patches/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
index acd56db617..e4762746ee 100644
--- a/chromium/patches/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
+++ b/chromium/patches/patch-components_paint__preview_browser_paint__preview__client__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_paint__preview_browser_paint__preview__client__unittest.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/paint_preview/browser/paint_preview_client_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/paint_preview/browser/paint_preview_client_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/paint_preview/browser/paint_preview_client_unittest.cc
 @@ -174,8 +174,8 @@ TEST_P(PaintPreviewClientRenderViewHostT
    metadata->set_version(kPaintPreviewVersion);
diff --git a/chromium/patches/patch-components_paint__preview_common_proto_paint__preview.proto b/chromium/patches/patch-components_paint__preview_common_proto_paint__preview.proto
index 884cf1dec7..9b010ef558 100644
--- a/chromium/patches/patch-components_paint__preview_common_proto_paint__preview.proto
+++ b/chromium/patches/patch-components_paint__preview_common_proto_paint__preview.proto
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_paint__preview_common_proto_paint__preview.proto,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/paint_preview/common/proto/paint_preview.proto.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/paint_preview/common/proto/paint_preview.proto.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/paint_preview/common/proto/paint_preview.proto
 @@ -82,8 +82,8 @@ message PaintPreviewFrameProto {
  // Stores Chrome version.
diff --git a/chromium/patches/patch-components_paint__preview_player_player__compositor__delegate.cc b/chromium/patches/patch-components_paint__preview_player_player__compositor__delegate.cc
index 0bbeb5326e..0c5aa7e2a2 100644
--- a/chromium/patches/patch-components_paint__preview_player_player__compositor__delegate.cc
+++ b/chromium/patches/patch-components_paint__preview_player_player__compositor__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_paint__preview_player_player__compositor__delegate.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/paint_preview/player/player_compositor_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/paint_preview/player/player_compositor_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/paint_preview/player/player_compositor_delegate.cc
-@@ -434,8 +434,8 @@ void PlayerCompositorDelegate::ValidateP
+@@ -433,8 +433,8 @@ void PlayerCompositorDelegate::ValidateP
    auto chrome_version = capture_result_->proto.metadata().chrome_version();
    const auto& current_chrome_version = version_info::GetVersion();
    if (capture_result_->proto.metadata().has_chrome_version() &&
diff --git a/chromium/patches/patch-components_password__manager_core_browser_features_password__features.cc b/chromium/patches/patch-components_password__manager_core_browser_features_password__features.cc
index fc19409727..fdc0b0172d 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_features_password__features.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_features_password__features.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_features_password__features.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/features/password_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/features/password_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/features/password_features.cc
-@@ -45,7 +45,7 @@ BASE_FEATURE(kClearUndecryptablePassword
+@@ -40,7 +40,7 @@ BASE_FEATURE(kClearUndecryptablePassword
  BASE_FEATURE(kClearUndecryptablePasswordsOnSync,
               "ClearUndecryptablePasswordsInSync",
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \
@@ -15,9 +15,9 @@ $NetBSD: patch-components_password__manager_core_browser_features_password__feat
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -108,7 +108,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPassw
+@@ -112,7 +112,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPassw
               "ReuseDetectionBasedOnPasswordHashes",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-components_password__manager_core_browser_features_password__features.h b/chromium/patches/patch-components_password__manager_core_browser_features_password__features.h
index e1b9a93b12..a2a41ff4fc 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_features_password__features.h
+++ b/chromium/patches/patch-components_password__manager_core_browser_features_password__features.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_features_password__features.h,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/features/password_features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/features/password_features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/features/password_features.h
-@@ -106,7 +106,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFall
+@@ -108,7 +108,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFall
  // Detects password reuse based on hashed password values.
  BASE_DECLARE_FEATURE(kReuseDetectionBasedOnPasswordHashes);
  
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__form__manager.cc b/chromium/patches/patch-components_password__manager_core_browser_password__form__manager.cc
index c5ed2d1ab6..cf8cc6d124 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__form__manager.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__form__manager.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_password__form__manager.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_form_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_form_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_form_manager.cc
-@@ -61,7 +61,7 @@
+@@ -64,7 +64,7 @@
  #include "components/webauthn/android/webauthn_cred_man_delegate.h"
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -15,7 +15,7 @@ $NetBSD: patch-components_password__manager_core_browser_password__form__manager
  #include "components/os_crypt/sync/os_crypt.h"
  #endif
  
-@@ -231,7 +231,7 @@ bool ShouldUploadCrowdsourcingVotes(cons
+@@ -240,7 +240,7 @@ bool ShouldUploadCrowdsourcingVotes(cons
    return false;
  }
  
@@ -24,7 +24,7 @@ $NetBSD: patch-components_password__manager_core_browser_password__form__manager
  bool ShouldShowKeychainErrorBubble(
      std::optional<PasswordStoreBackendError> backend_error) {
    if (!backend_error.has_value()) {
-@@ -888,7 +888,7 @@ void PasswordFormManager::OnFetchComplet
+@@ -913,7 +913,7 @@ void PasswordFormManager::OnFetchComplet
          error.value().type);
    }
  
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__manager.cc b/chromium/patches/patch-components_password__manager_core_browser_password__manager.cc
index d74fe82f97..e57e0daaf3 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__manager.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__manager.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_password__manager.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_manager.cc
-@@ -419,7 +419,7 @@ void PasswordManager::RegisterProfilePre
+@@ -511,7 +511,7 @@ void PasswordManager::RegisterProfilePre
        prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false);
  #endif  // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
    registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true);
@@ -15,7 +15,7 @@ $NetBSD: patch-components_password__manager_core_browser_password__manager.cc,v
    registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter,
                                  0);
  #endif
-@@ -432,7 +432,7 @@ void PasswordManager::RegisterProfilePre
+@@ -524,7 +524,7 @@ void PasswordManager::RegisterProfilePre
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__manager__client.h b/chromium/patches/patch-components_password__manager_core_browser_password__manager__client.h
index f5821d93db..4a0e1499b9 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__manager__client.h
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__manager__client.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_password__manager__client.h,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_manager_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_manager_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_manager_client.h
-@@ -30,7 +30,7 @@
+@@ -31,7 +31,7 @@
  #include "net/cert/cert_status_flags.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -15,12 +15,12 @@ $NetBSD: patch-components_password__manager_core_browser_password__manager__clie
  #include "base/i18n/rtl.h"
  #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
  #include "ui/gfx/geometry/rect_f.h"
-@@ -551,7 +551,7 @@ class PasswordManagerClient {
-       CredentialsCallback callback);
+@@ -533,7 +533,7 @@ class PasswordManagerClient {
+   virtual void TriggerSignIn(signin_metrics::AccessPoint access_point) const;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
    // Shows the bubble with the details of the `form`.
    virtual void OpenPasswordDetailsBubble(
+       const password_manager::PasswordForm& form) = 0;
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.cc b/chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.cc
index 0d42080e0b..32bc33f014 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_password__manager_core_browser_password__manager__switches.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_manager_switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_manager_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_manager_switches.cc
 @@ -6,7 +6,7 @@
  
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.h b/chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.h
index 2107434553..0543b12fd9 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.h
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__manager__switches.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_password__manager__switches.h,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_manager_switches.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_manager_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_manager_switches.h
-@@ -10,7 +10,7 @@
+@@ -9,7 +9,7 @@
  
  namespace password_manager {
  
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
index 0d1b3996fa..af94f5468a 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_password__manual__fallback__flow.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_manual_fallback_flow.cc
-@@ -43,7 +43,7 @@ std::u16string GetUsernameFromLabel(cons
+@@ -46,7 +46,7 @@ std::u16string GetUsernameFromLabel(cons
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-components_password__manager_core_browser_password__manual__fallb
  // Returns the password form corresponding to the `payload` data. In most
  // cases there is only one such form stored, but having more than one or no
  // forms is also possible. If there is more than one form, showing any of them
-@@ -281,7 +281,7 @@ void PasswordManualFallbackFlow::DidAcce
+@@ -295,7 +295,7 @@ void PasswordManualFallbackFlow::DidAcce
      }
      case autofill::SuggestionType::kViewPasswordDetails: {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -24,7 +24,7 @@ $NetBSD: patch-components_password__manager_core_browser_password__manual__fallb
        std::optional<password_manager::PasswordForm> credentials =
            GetCorrespondingPasswordForm(
                suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(),
-@@ -418,7 +418,7 @@ void PasswordManualFallbackFlow::EnsureC
+@@ -425,7 +425,7 @@ void PasswordManualFallbackFlow::EnsureC
      const Suggestion::PasswordSuggestionDetails& payload,
      base::OnceClosure on_allowed) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
index 90996717f8..1448c5d85a 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_password__manual__fallback__flow.h,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_manual_fallback_flow.h
-@@ -17,7 +17,7 @@
+@@ -19,7 +19,7 @@
  #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-components_password__manager_core_browser_password__manual__fallb
  #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -178,7 +178,7 @@ class PasswordManualFallbackFlow : publi
+@@ -180,7 +180,7 @@ class PasswordManualFallbackFlow : publi
    std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__store__factory__util.cc b/chromium/patches/patch-components_password__manager_core_browser_password__store__factory__util.cc
index bbedc1fdbe..3729e79750 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__store__factory__util.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__store__factory__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_password__manager_core_browser_password__store__factory__util.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_store_factory_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_store_factory_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_store_factory_util.cc
 @@ -29,7 +29,7 @@ namespace {
  LoginDatabase::DeletingUndecryptablePasswordsEnabled GetPolicyFromPrefs(
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database.cc b/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database.cc
index df6ddfd046..c4ef177d9f 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_password__manager_core_browser_password__store_login__database.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_store/login_database.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_store/login_database.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_store/login_database.cc
 @@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords(
      bool is_user_data_dir_policy_set,
@@ -12,10 +12,10 @@ $NetBSD: patch-components_password__manager_core_browser_password__store_login__
      IsAccountStore is_account_store) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::string user_data_dir_string;
    std::unique_ptr<base::Environment> environment(base::Environment::Create());
    // On Linux user data directory ca be specified using an env variable. If it
-@@ -1049,7 +1049,7 @@ bool ShouldDeleteUndecryptablePasswords(
+   // exists, passwords shouldn't be deleted.
+@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords(
      return false;
    }
  
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc b/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
index cbbd325b8f..7391b84608 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_store/login_database_async_helper.cc
 @@ -154,7 +154,7 @@ LoginsResultOrError LoginDatabaseAsyncHe
      std::vector<PasswordForm> matched_forms;
diff --git a/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
index 5f1c39d98a..cb30163d25 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_password__store_login__database__unittest.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/password_store/login_database_unittest.cc
-@@ -2253,7 +2253,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCur
+@@ -2257,7 +2257,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCur
                                            testing::Bool()));
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \
diff --git a/chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.cc
index 1719fb05d6..ed3cd183aa 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.cc
+++ b/chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_stub__password__manager__client.cc,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/stub_password_manager_client.cc
-@@ -190,7 +190,7 @@ version_info::Channel StubPasswordManage
+@@ -206,7 +206,7 @@ version_info::Channel StubPasswordManage
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -14,4 +14,4 @@ $NetBSD: patch-components_password__manager_core_browser_stub__password__manager
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  void StubPasswordManagerClient::OpenPasswordDetailsBubble(
      const password_manager::PasswordForm& form) {}
- 
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
diff --git a/chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.h b/chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.h
index fc89d23be7..d83e6a5d42 100644
--- a/chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.h
+++ b/chromium/patches/patch-components_password__manager_core_browser_stub__password__manager__client.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_browser_stub__password__manager__client.h,v 1.1 2025/02/06 09:58:01 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/browser/stub_password_manager_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/browser/stub_password_manager_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/browser/stub_password_manager_client.h
-@@ -75,7 +75,7 @@ class StubPasswordManagerClient : public
+@@ -77,7 +77,7 @@ class StubPasswordManagerClient : public
    MockPasswordFeatureManager* GetPasswordFeatureManager();
    version_info::Channel GetChannel() const override;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -14,4 +14,4 @@ $NetBSD: patch-components_password__manager_core_browser_stub__password__manager
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    void OpenPasswordDetailsBubble(
        const password_manager::PasswordForm& form) override;
-   std::unique_ptr<
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
diff --git a/chromium/patches/patch-components_password__manager_core_common_password__manager__pref__names.h b/chromium/patches/patch-components_password__manager_core_common_password__manager__pref__names.h
index 16cc060172..ff7b7ddecb 100644
--- a/chromium/patches/patch-components_password__manager_core_common_password__manager__pref__names.h
+++ b/chromium/patches/patch-components_password__manager_core_common_password__manager__pref__names.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_password__manager_core_common_password__manager__pref__names.h,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/password_manager/core/common/password_manager_pref_names.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/password_manager/core/common/password_manager_pref_names.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/password_manager/core/common/password_manager_pref_names.h
-@@ -41,7 +41,7 @@ inline constexpr char kCredentialProvide
+@@ -59,7 +59,7 @@ inline constexpr char kCredentialProvide
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-components_password__manager_core_common_password__manager__pref_
  // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy.
  // If set to false it blocks deleting undecryptable passwords, otherwise the
  // deletion can happen.
-@@ -334,7 +334,7 @@ inline constexpr char kAutofillableCrede
+@@ -356,7 +356,7 @@ inline constexpr char kAutofillableCrede
  inline constexpr char kPasswordSharingEnabled[] =
      "password_manager.password_sharing_enabled";
  
diff --git a/chromium/patches/patch-components_performance__manager_decorators_process__metrics__decorator.cc b/chromium/patches/patch-components_performance__manager_decorators_process__metrics__decorator.cc
index 2c31ca8024..8bbd691ce8 100644
--- a/chromium/patches/patch-components_performance__manager_decorators_process__metrics__decorator.cc
+++ b/chromium/patches/patch-components_performance__manager_decorators_process__metrics__decorator.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_performance__manager_decorators_process__metrics__decorator.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/performance_manager/decorators/process_metrics_decorator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/performance_manager/decorators/process_metrics_decorator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/performance_manager/decorators/process_metrics_decorator.cc
 @@ -264,7 +264,7 @@ void ProcessMetricsDecorator::DidGetMemo
      // RSS and PMF to each node proportionally to its V8 heap size.
diff --git a/chromium/patches/patch-components_performance__manager_public_features.h b/chromium/patches/patch-components_performance__manager_public_features.h
index 1750fbfbd9..ed8ad9064e 100644
--- a/chromium/patches/patch-components_performance__manager_public_features.h
+++ b/chromium/patches/patch-components_performance__manager_public_features.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_performance__manager_public_features.h,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/performance_manager/public/features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/performance_manager/public/features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/performance_manager/public/features.h
-@@ -21,7 +21,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThreadSyn
+@@ -19,7 +19,7 @@ namespace performance_manager::features 
  
  #if !BUILDFLAG(IS_ANDROID)
  
diff --git a/chromium/patches/patch-components_permissions_prediction__service_prediction__common.cc b/chromium/patches/patch-components_permissions_prediction__service_prediction__common.cc
index 35693aea84..74cf5dc8b1 100644
--- a/chromium/patches/patch-components_permissions_prediction__service_prediction__common.cc
+++ b/chromium/patches/patch-components_permissions_prediction__service_prediction__common.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_permissions_prediction__service_prediction__common.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/permissions/prediction_service/prediction_common.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/permissions/prediction_service/prediction_common.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/permissions/prediction_service/prediction_common.cc
-@@ -33,7 +33,7 @@ int BucketizeValue(int count) {
+@@ -34,7 +34,7 @@ int BucketizeValue(int count) {
  
  ClientFeatures_Platform GetCurrentPlatformProto() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-components_permissions_prediction__service_prediction__common.cc,
    return permissions::ClientFeatures_Platform_PLATFORM_DESKTOP;
  #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
    return permissions::ClientFeatures_Platform_PLATFORM_MOBILE;
-@@ -44,7 +44,7 @@ ClientFeatures_Platform GetCurrentPlatfo
+@@ -45,7 +45,7 @@ ClientFeatures_Platform GetCurrentPlatfo
  
  ClientFeatures_PlatformEnum GetCurrentPlatformEnumProto() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/chromium/patches/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/chromium/patches/patch-components_policy_core_browser_policy__pref__mapping__test.cc
index f8cfa52728..6cb8b6c497 100644
--- a/chromium/patches/patch-components_policy_core_browser_policy__pref__mapping__test.cc
+++ b/chromium/patches/patch-components_policy_core_browser_policy__pref__mapping__test.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-components_policy_core_browser_policy__pref__mapping__test.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -411,7 +411,7 @@ class PolicyTestCase {
-     const std::string os("chromeos_lacros");
+@@ -432,7 +432,7 @@ class PolicyTestCase {
+     const std::string os("chromeos");
  #elif BUILDFLAG(IS_IOS)
      const std::string os("ios");
 -#elif BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__client.cc
index 4caf57c078..f44419617d 100644
--- a/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_policy_core_common_cloud_cloud__policy__client.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -720,7 +720,7 @@ void CloudPolicyClient::FetchPolicy(Poli
+@@ -742,7 +742,7 @@ void CloudPolicyClient::FetchPolicy(Poli
          fetch_request->set_invalidation_payload(invalidation_payload_);
        }
      }
diff --git a/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc b/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
index bb3266c993..17a8b9b4cb 100644
--- a/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
+++ b/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc
 @@ -25,7 +25,7 @@ namespace policy {
  
diff --git a/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__util.cc
index 0f47d4d556..3b480b9608 100644
--- a/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ b/chromium/patches/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-components_policy_core_common_cloud_cloud__policy__util.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/policy/core/common/cloud/cloud_policy_util.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
+ #include "base/win/wincred_shim.h"
  #endif
  
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
--    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
  #include <pwd.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -35,10 +35,15 @@
+@@ -36,10 +36,15 @@
  #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include <limits.h>  // For HOST_NAME_MAX
  #endif
  
@@ -32,16 +32,16 @@ $NetBSD: patch-components_policy_core_common_cloud_cloud__policy__util.cc,v 1.1
  #include <algorithm>
  #include <utility>
  
-@@ -88,7 +93,7 @@ namespace em = enterprise_management;
+@@ -84,7 +89,7 @@ namespace policy {
+ namespace em = enterprise_management;
  
  std::string GetMachineName() {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
    char hostname[HOST_NAME_MAX];
    if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
      return hostname;
-@@ -145,7 +150,7 @@ std::string GetMachineName() {
+@@ -140,7 +145,7 @@ std::string GetMachineName() {
  
  std::string GetOSVersion() {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
@@ -50,7 +50,7 @@ $NetBSD: patch-components_policy_core_common_cloud_cloud__policy__util.cc,v 1.1
    return base::SysInfo::OperatingSystemVersion();
  #elif BUILDFLAG(IS_WIN)
    base::win::OSInfo::VersionNumber version_number =
-@@ -168,7 +173,7 @@ std::string GetOSArchitecture() {
+@@ -162,7 +167,7 @@ std::string GetOSArchitecture() {
  }
  
  std::string GetOSUsername() {
diff --git a/chromium/patches/patch-components_policy_core_common_policy__loader__common.cc b/chromium/patches/patch-components_policy_core_common_policy__loader__common.cc
index 0e38eb3bea..933cfeab2b 100644
--- a/chromium/patches/patch-components_policy_core_common_policy__loader__common.cc
+++ b/chromium/patches/patch-components_policy_core_common_policy__loader__common.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_policy_core_common_policy__loader__common.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/policy/core/common/policy_loader_common.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/policy/core/common/policy_loader_common.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/policy/core/common/policy_loader_common.cc
 @@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = {
      key::kDefaultSearchProviderEnabled,
@@ -13,9 +13,9 @@ $NetBSD: patch-components_policy_core_common_policy__loader__common.cc,v 1.1 202
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      key::kAutoOpenFileTypes,
+     key::kEnterpriseSearchAggregatorSettings,
      key::kHomepageIsNewTabPage,
-     key::kPasswordProtectionChangePasswordURL,
-@@ -56,7 +56,7 @@ const char* kSensitivePolicies[] = {
+@@ -57,7 +57,7 @@ const char* kSensitivePolicies[] = {
      key::kSafeBrowsingAllowlistDomains,
      key::kSiteSearchSettings,
  #endif
diff --git a/chromium/patches/patch-components_policy_core_common_policy__paths.cc b/chromium/patches/patch-components_policy_core_common_policy__paths.cc
index 1dcb4e3f3b..9d38d8a7f5 100644
--- a/chromium/patches/patch-components_policy_core_common_policy__paths.cc
+++ b/chromium/patches/patch-components_policy_core_common_policy__paths.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_policy_core_common_policy__paths.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/policy/core/common/policy_paths.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/policy/core/common/policy_paths.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/policy/core/common/policy_paths.cc
 @@ -17,6 +17,10 @@ namespace policy {
  const char kPolicyPath[] = "/etc/opt/chrome/policies";
diff --git a/chromium/patches/patch-components_policy_core_common_policy__utils.cc b/chromium/patches/patch-components_policy_core_common_policy__utils.cc
index bb4c3cb220..305b7dce8f 100644
--- a/chromium/patches/patch-components_policy_core_common_policy__utils.cc
+++ b/chromium/patches/patch-components_policy_core_common_policy__utils.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_policy_core_common_policy__utils.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/policy/core/common/policy_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/policy/core/common/policy_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/policy/core/common/policy_utils.cc
 @@ -22,7 +22,7 @@ bool IsPolicyTestingEnabled(PrefService*
      return true;
diff --git a/chromium/patches/patch-components_policy_tools_generate__policy__source.py b/chromium/patches/patch-components_policy_tools_generate__policy__source.py
index e8f0fec4ce..5b8140f580 100644
--- a/chromium/patches/patch-components_policy_tools_generate__policy__source.py
+++ b/chromium/patches/patch-components_policy_tools_generate__policy__source.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_policy_tools_generate__policy__source.py,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/policy/tools/generate_policy_source.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/policy/tools/generate_policy_source.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/policy/tools/generate_policy_source.py
 @@ -38,9 +38,9 @@ PLATFORM_STRINGS = {
      'ios': ['ios'],
diff --git a/chromium/patches/patch-components_power__metrics_BUILD.gn b/chromium/patches/patch-components_power__metrics_BUILD.gn
index 97640802cc..3f8fece877 100644
--- a/chromium/patches/patch-components_power__metrics_BUILD.gn
+++ b/chromium/patches/patch-components_power__metrics_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_power__metrics_BUILD.gn,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/power_metrics/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/power_metrics/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/power_metrics/BUILD.gn
 @@ -41,7 +41,7 @@ static_library("power_metrics") {
      ldflags = [ "/DELAYLOAD:setupapi.dll" ]
diff --git a/chromium/patches/patch-components_power__metrics_energy__metrics__provider.cc b/chromium/patches/patch-components_power__metrics_energy__metrics__provider.cc
index 01d0bc5d65..119e200418 100644
--- a/chromium/patches/patch-components_power__metrics_energy__metrics__provider.cc
+++ b/chromium/patches/patch-components_power__metrics_energy__metrics__provider.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_power__metrics_energy__metrics__provider.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/power_metrics/energy_metrics_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/power_metrics/energy_metrics_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/power_metrics/energy_metrics_provider.cc
 @@ -9,6 +9,8 @@
  #include "components/power_metrics/energy_metrics_provider_win.h"
diff --git a/chromium/patches/patch-components_regional__capabilities_regional__capabilities__service.cc b/chromium/patches/patch-components_regional__capabilities_regional__capabilities__service.cc
new file mode 100644
index 0000000000..4c1e855f1d
--- /dev/null
+++ b/chromium/patches/patch-components_regional__capabilities_regional__capabilities__service.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/regional_capabilities/regional_capabilities_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/regional_capabilities/regional_capabilities_service.cc
+@@ -216,7 +216,7 @@ std::optional<CountryId> RegionalCapabil
+     return persisted_country_id;
+   }
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(switches::kClearPrefForUnknownCountry)) {
+     profile_prefs_->ClearPref(country_codes::kCountryIDAtInstall);
+     base::UmaHistogramEnumeration(kUnknownCountryIdStored,
diff --git a/chromium/patches/patch-components_regional__capabilities_regional__capabilities__switches.cc b/chromium/patches/patch-components_regional__capabilities_regional__capabilities__switches.cc
new file mode 100644
index 0000000000..8a7e5ed527
--- /dev/null
+++ b/chromium/patches/patch-components_regional__capabilities_regional__capabilities__switches.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/regional_capabilities/regional_capabilities_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/regional_capabilities/regional_capabilities_switches.cc
+@@ -6,7 +6,7 @@
+ 
+ namespace switches {
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kClearPrefForUnknownCountry,
+              "ClearCountryPrefForStoredUnknownCountry",
+              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chromium/patches/patch-components_regional__capabilities_regional__capabilities__switches.h b/chromium/patches/patch-components_regional__capabilities_regional__capabilities__switches.h
new file mode 100644
index 0000000000..f21af23c21
--- /dev/null
+++ b/chromium/patches/patch-components_regional__capabilities_regional__capabilities__switches.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/regional_capabilities/regional_capabilities_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/regional_capabilities/regional_capabilities_switches.h
+@@ -25,7 +25,7 @@ inline constexpr char kSearchEngineChoic
+ inline constexpr char kDefaultListCountryOverride[] = "DEFAULT_EEA";
+ inline constexpr char kEeaListCountryOverride[] = "EEA_ALL";
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // When an invalid `country_codes::CountryId` is stored in prefs and this
+ // feature is enabled the pref will be cleared allowing a valid country to be
+ // set again.
diff --git a/chromium/patches/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc b/chromium/patches/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
index c2a8682c20..f59fa6a8fe 100644
--- a/chromium/patches/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
+++ b/chromium/patches/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
@@ -1,15 +1,15 @@
-$NetBSD: patch-components_safe__browsing_content_common_file__type__policies__unittest.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/safe_browsing/content/common/file_type_policies_unittest.cc
-@@ -148,7 +148,7 @@ TEST_F(FileTypePoliciesTest, UnpackResou
+@@ -146,7 +146,7 @@ TEST_F(FileTypePoliciesTest, UnpackResou
+   EXPECT_EQ(142, file_type.uma_value());
+   EXPECT_FALSE(file_type.is_archive());
    EXPECT_EQ(DownloadFileType::FULL_PING, file_type.ping_setting());
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    EXPECT_EQ(DownloadFileType::ALLOW_ON_USER_GESTURE,
diff --git a/chromium/patches/patch-components_safe__browsing_content_resources_gen__file__type__proto.py b/chromium/patches/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
index 13f19dd3e3..c53042634a 100644
--- a/chromium/patches/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
+++ b/chromium/patches/patch-components_safe__browsing_content_resources_gen__file__type__proto.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_safe__browsing_content_resources_gen__file__type__proto.py,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/safe_browsing/content/resources/gen_file_type_proto.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/safe_browsing/content/resources/gen_file_type_proto.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/safe_browsing/content/resources/gen_file_type_proto.py
 @@ -37,6 +37,9 @@ def PlatformTypes():
          "chromeos":
diff --git a/chromium/patches/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/chromium/patches/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
index 9092663372..29c1145b9c 100644
--- a/chromium/patches/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
+++ b/chromium/patches/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
 @@ -119,7 +119,7 @@ std::ostream& operator<<(std::ostream& o
  PlatformType GetCurrentPlatformType() {
diff --git a/chromium/patches/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/chromium/patches/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
index 82c92e9883..f55bc21d0e 100644
--- a/chromium/patches/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
+++ b/chromium/patches/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
-@@ -110,7 +110,7 @@ RTLookupRequest::OSType GetRTLookupReque
+@@ -111,7 +111,7 @@ RTLookupRequest::OSType GetRTLookupReque
    return RTLookupRequest::OS_TYPE_CHROME_OS;
  #elif BUILDFLAG(IS_IOS)
    return RTLookupRequest::OS_TYPE_IOS;
diff --git a/chromium/patches/patch-components_safe__browsing_core_common_features.cc b/chromium/patches/patch-components_safe__browsing_core_common_features.cc
deleted file mode 100644
index 20c1866664..0000000000
--- a/chromium/patches/patch-components_safe__browsing_core_common_features.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-components_safe__browsing_core_common_features.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/safe_browsing/core/common/features.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/safe_browsing/core/common/features.cc
-@@ -249,7 +249,7 @@ constexpr base::FeatureParam<std::string
- BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck,
-              "SafeBrowsingAsyncRealTimeCheck",
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium/patches/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc b/chromium/patches/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc
deleted file mode 100644
index 91a10c1d32..0000000000
--- a/chromium/patches/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/search_engines/search_engine_choice/search_engine_choice_service.cc
-@@ -613,7 +613,7 @@ void SearchEngineChoiceService::Register
- 
- int SearchEngineChoiceService::GetCountryIdInternal() {
-   // `country_codes::kCountryIDAtInstall` may not be set yet.
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On Android, ChromeOS and Linux, `country_codes::kCountryIDAtInstall` is
-   // computed asynchronously using platform-specific signals, and may not be
-   // available yet.
diff --git a/chromium/patches/patch-components_search__engines_template__url__service.cc b/chromium/patches/patch-components_search__engines_template__url__service.cc
index 6d1085a705..a5b25ec0b0 100644
--- a/chromium/patches/patch-components_search__engines_template__url__service.cc
+++ b/chromium/patches/patch-components_search__engines_template__url__service.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-components_search__engines_template__url__service.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/search_engines/template_url_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/search_engines/template_url_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/search_engines/template_url_service.cc
-@@ -3069,7 +3069,7 @@ bool TemplateURLService::MatchesDefaultS
- std::unique_ptr<EnterpriseSiteSearchManager>
- TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) {
+@@ -3435,7 +3435,7 @@ bool TemplateURLService::MatchesDefaultS
+ std::unique_ptr<EnterpriseSearchManager>
+ TemplateURLService::GetEnterpriseSearchManager(PrefService* prefs) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(omnibox::kSiteSearchSettingsPolicy)
-              ? std::make_unique<EnterpriseSiteSearchManager>(
-                    prefs, base::BindRepeating(
+   return std::make_unique<EnterpriseSearchManager>(
+       prefs, base::BindRepeating(&TemplateURLService::EnterpriseSearchChanged,
+                                  base::Unretained(this)));
diff --git a/chromium/patches/patch-components_security__interstitials_content_utils.cc b/chromium/patches/patch-components_security__interstitials_content_utils.cc
index 251c35304d..e5155ef216 100644
--- a/chromium/patches/patch-components_security__interstitials_content_utils.cc
+++ b/chromium/patches/patch-components_security__interstitials_content_utils.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-components_security__interstitials_content_utils.cc,v 1.1 2025/02/06 09:58:02 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/security_interstitials/content/utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/security_interstitials/content/utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/security_interstitials/content/utils.cc
-@@ -38,7 +38,7 @@ void LaunchDateAndTimeSettings() {
+@@ -37,7 +37,7 @@ void LaunchDateAndTimeSettings() {
  #if BUILDFLAG(IS_ANDROID)
    JNIEnv* env = base::android::AttachCurrentThread();
    Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    struct ClockCommand {
      const char* const pathname;
      const char* const argument;
diff --git a/chromium/patches/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/chromium/patches/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
index facf4d3441..16cd25fdbf 100644
--- a/chromium/patches/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
+++ b/chromium/patches/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc
-@@ -148,7 +148,7 @@ void CrossDeviceUserSegment::ExecuteMode
+@@ -147,7 +147,7 @@ void CrossDeviceUserSegment::ExecuteMode
  // Check for current device type and subtract it from the device count
  // calculation.
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/chromium/patches/patch-components_services_on__device__translation_sandbox__hook.cc b/chromium/patches/patch-components_services_on__device__translation_sandbox__hook.cc
index 5c752a647c..be1a5d9781 100644
--- a/chromium/patches/patch-components_services_on__device__translation_sandbox__hook.cc
+++ b/chromium/patches/patch-components_services_on__device__translation_sandbox__hook.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_services_on__device__translation_sandbox__hook.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/services/on_device_translation/sandbox_hook.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/services/on_device_translation/sandbox_hook.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/services/on_device_translation/sandbox_hook.cc
 @@ -7,12 +7,15 @@
  #include "components/services/on_device_translation/translate_kit_client.h"
diff --git a/chromium/patches/patch-components_services_on__device__translation_sandbox__hook.h b/chromium/patches/patch-components_services_on__device__translation_sandbox__hook.h
index 09ee0123a3..32fe0b1b50 100644
--- a/chromium/patches/patch-components_services_on__device__translation_sandbox__hook.h
+++ b/chromium/patches/patch-components_services_on__device__translation_sandbox__hook.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_services_on__device__translation_sandbox__hook.h,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/services/on_device_translation/sandbox_hook.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/services/on_device_translation/sandbox_hook.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/services/on_device_translation/sandbox_hook.h
 @@ -5,7 +5,13 @@
  #ifndef COMPONENTS_SERVICES_ON_DEVICE_TRANSLATION_SANDBOX_HOOK_H_
diff --git a/chromium/patches/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/chromium/patches/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
index 651b0c5d8c..acb4ae9fca 100644
--- a/chromium/patches/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
+++ b/chromium/patches/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc
 @@ -22,7 +22,7 @@
  
diff --git a/chromium/patches/patch-components_signin_public_base_signin__switches.cc b/chromium/patches/patch-components_signin_public_base_signin__switches.cc
new file mode 100644
index 0000000000..cdc78a6640
--- /dev/null
+++ b/chromium/patches/patch-components_signin_public_base_signin__switches.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/signin/public/base/signin_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/signin/public/base/signin_switches.cc
+@@ -55,7 +55,7 @@ BASE_FEATURE(kUseHostedDomainForManageme
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables the History Sync Opt-in on Desktop.
+ BASE_FEATURE(kEnableHistorySyncOptin,
+              "EnableHistorySyncOptin",
diff --git a/chromium/patches/patch-components_signin_public_base_signin__switches.h b/chromium/patches/patch-components_signin_public_base_signin__switches.h
new file mode 100644
index 0000000000..41d380d092
--- /dev/null
+++ b/chromium/patches/patch-components_signin_public_base_signin__switches.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/signin/public/base/signin_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/signin/public/base/signin_switches.h
+@@ -52,7 +52,7 @@ COMPONENT_EXPORT(SIGNIN_SWITCHES)
+ BASE_DECLARE_FEATURE(kUseHostedDomainForManagementCheckOnSignin);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(SIGNIN_SWITCHES)
+ BASE_DECLARE_FEATURE(kEnableHistorySyncOptin);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-components_soda_soda__util.cc b/chromium/patches/patch-components_soda_soda__util.cc
index 636db4fb1c..3da89ad4ab 100644
--- a/chromium/patches/patch-components_soda_soda__util.cc
+++ b/chromium/patches/patch-components_soda_soda__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_soda_soda__util.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/soda/soda_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/soda/soda_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/soda/soda_util.cc
-@@ -27,7 +27,7 @@
+@@ -23,7 +23,7 @@
  #include "base/win/windows_version.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-components_soda_soda__util.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
  #include "base/cpu.h"
  #endif
  
-@@ -52,7 +52,7 @@ bool IsSupportedChromeOS() {
+@@ -39,7 +39,7 @@ bool IsSupportedChromeOS() {
  }
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -24,7 +24,7 @@ $NetBSD: patch-components_soda_soda__util.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
  bool IsSupportedLinux() {
  #if defined(ARCH_CPU_X86_FAMILY)
    // Check if the CPU has the required instruction set to run the Speech
-@@ -83,7 +83,7 @@ bool IsSupportedWin() {
+@@ -70,7 +70,7 @@ bool IsSupportedWin() {
  bool IsOnDeviceSpeechRecognitionSupported() {
  #if BUILDFLAG(IS_CHROMEOS)
    return IsSupportedChromeOS();
diff --git a/chromium/patches/patch-components_startup__metric__utils_common_startup__metric__utils.cc b/chromium/patches/patch-components_startup__metric__utils_common_startup__metric__utils.cc
index b0abb7a150..9de80e7b87 100644
--- a/chromium/patches/patch-components_startup__metric__utils_common_startup__metric__utils.cc
+++ b/chromium/patches/patch-components_startup__metric__utils_common_startup__metric__utils.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_startup__metric__utils_common_startup__metric__utils.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/startup_metric_utils/common/startup_metric_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/startup_metric_utils/common/startup_metric_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/startup_metric_utils/common/startup_metric_utils.cc
 @@ -94,7 +94,7 @@ base::TimeTicks CommonStartupMetricRecor
    // Enabling this logic on OS X causes a significant performance regression.
diff --git a/chromium/patches/patch-components_storage__monitor_BUILD.gn b/chromium/patches/patch-components_storage__monitor_BUILD.gn
index 0862607a46..6c80e511cf 100644
--- a/chromium/patches/patch-components_storage__monitor_BUILD.gn
+++ b/chromium/patches/patch-components_storage__monitor_BUILD.gn
@@ -1,26 +1,26 @@
-$NetBSD: patch-components_storage__monitor_BUILD.gn,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/storage_monitor/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/storage_monitor/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/storage_monitor/BUILD.gn
-@@ -75,7 +75,7 @@ static_library("storage_monitor") {
+@@ -73,7 +73,7 @@ component("storage_monitor") {
        deps += [ "//services/device/public/mojom" ]
      }
-   } else if (is_linux || is_chromeos_lacros) {
+   } else if (is_linux) {
 -    if (use_udev) {
 +    if (use_udev && !is_bsd) {
        sources += [
          "mtab_watcher_linux.cc",
          "mtab_watcher_linux.h",
-@@ -180,7 +180,7 @@ source_set("unit_tests") {
+@@ -182,7 +182,7 @@ source_set("unit_tests") {
          "storage_monitor_chromeos_unittest.cc",
        ]
      }
--  } else if (is_linux || is_chromeos_lacros) {
-+  } else if ((is_linux || is_chromeos_lacros) && !is_bsd) {
+-  } else if (is_linux) {
++  } else if (is_linux && !is_bsd) {
      if (use_udev) {
        sources += [ "storage_monitor_linux_unittest.cc" ]
      }
diff --git a/chromium/patches/patch-components_storage__monitor_removable__device__constants.cc b/chromium/patches/patch-components_storage__monitor_removable__device__constants.cc
index b55f262e90..bdb2ed9c14 100644
--- a/chromium/patches/patch-components_storage__monitor_removable__device__constants.cc
+++ b/chromium/patches/patch-components_storage__monitor_removable__device__constants.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_storage__monitor_removable__device__constants.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/storage_monitor/removable_device_constants.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/storage_monitor/removable_device_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/storage_monitor/removable_device_constants.cc
 @@ -10,7 +10,7 @@ namespace storage_monitor {
  const char kFSUniqueIdPrefix[] = "UUID:";
diff --git a/chromium/patches/patch-components_storage__monitor_removable__device__constants.h b/chromium/patches/patch-components_storage__monitor_removable__device__constants.h
index c2f7c7c603..275d6c934c 100644
--- a/chromium/patches/patch-components_storage__monitor_removable__device__constants.h
+++ b/chromium/patches/patch-components_storage__monitor_removable__device__constants.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-components_storage__monitor_removable__device__constants.h,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/storage_monitor/removable_device_constants.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/storage_monitor/removable_device_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/storage_monitor/removable_device_constants.h
-@@ -14,7 +14,7 @@ namespace storage_monitor {
- extern const char kFSUniqueIdPrefix[];
- extern const char kVendorModelSerialPrefix[];
+@@ -15,7 +15,7 @@ namespace storage_monitor {
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kFSUniqueIdPrefix[];
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const char kVendorModelSerialPrefix[];
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kVendorModelVolumeStoragePrefix[];
+ extern COMPONENT_EXPORT(STORAGE_MONITOR) const
+     char kVendorModelVolumeStoragePrefix[];
  #endif
- 
diff --git a/chromium/patches/patch-components_supervised__user_core_browser_list__family__members__service.h b/chromium/patches/patch-components_supervised__user_core_browser_list__family__members__service.h
new file mode 100644
index 0000000000..c538586b61
--- /dev/null
+++ b/chromium/patches/patch-components_supervised__user_core_browser_list__family__members__service.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/supervised_user/core/browser/list_family_members_service.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/supervised_user/core/browser/list_family_members_service.h
+@@ -33,7 +33,7 @@ namespace supervised_user {
+ // If true, this fetcher is active for all users with CanFetchFamilyMemberInfo
+ // capability. Otherwise, it is only used by supervised users.
+ constexpr bool FetchListFamilyMembersWithCapability() {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   return true;
+ #else
+   return false;
diff --git a/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc b/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
index 160d1f410e..bdb0ccc881 100644
--- a/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
+++ b/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_supervised__user_core_browser_supervised__user__metrics__service.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/supervised_user/core/browser/supervised_user_metrics_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/supervised_user/core/browser/supervised_user_metrics_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/supervised_user/core/browser/supervised_user_metrics_service.cc
 @@ -47,7 +47,7 @@ SupervisedUserMetricsService::Supervised
        extensions_metrics_delegate_(std::move(extensions_metrics_delegate)) {
diff --git a/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
index 1a7c171847..346394fc91 100644
--- a/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
+++ b/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_supervised__user_core_browser_supervised__user__preferences.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/supervised_user/core/browser/supervised_user_preferences.cc
 @@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySi
    registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false);
diff --git a/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__service.cc b/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__service.cc
deleted file mode 100644
index 6327892bc4..0000000000
--- a/chromium/patches/patch-components_supervised__user_core_browser_supervised__user__service.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-components_supervised__user_core_browser_supervised__user__service.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- components/supervised_user/core/browser/supervised_user_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ components/supervised_user/core/browser/supervised_user_service.cc
-@@ -152,7 +152,7 @@ FirstTimeInterstitialBannerState Supervi
-     const FirstTimeInterstitialBannerState original_state) {
-   FirstTimeInterstitialBannerState target_state = original_state;
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_IOS)
-+    BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
-   if (original_state != FirstTimeInterstitialBannerState::kSetupComplete &&
-       can_show_first_time_interstitial_banner_) {
-     target_state = FirstTimeInterstitialBannerState::kNeedToShow;
diff --git a/chromium/patches/patch-components_supervised__user_core_common_features.cc b/chromium/patches/patch-components_supervised__user_core_common_features.cc
index 081186ab27..e66695432c 100644
--- a/chromium/patches/patch-components_supervised__user_core_common_features.cc
+++ b/chromium/patches/patch-components_supervised__user_core_common_features.cc
@@ -1,21 +1,39 @@
-$NetBSD: patch-components_supervised__user_core_common_features.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/supervised_user/core/common/features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/supervised_user/core/common/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/supervised_user/core/common/features.cc
-@@ -66,7 +66,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExten
-              "UpdatedSupervisedUserExtensionApprovalStrings",
+@@ -36,7 +36,7 @@ BASE_FEATURE(kAllowSubframeLocalWebAppro
+ #endif
+ 
+ #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
+ 
+ const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs{
+@@ -45,7 +45,7 @@ const base::FeatureParam<int> kLocalWebA
+ #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kEnableLocalWebApprovalErrorDialog,
+              "EnableLocalWebApprovalErrorDialog",
               base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -97,7 +97,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExten
+              "UpdatedSupervisedUserExtensionApprovalStrings",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop,
               "EnableExtensionsPermissionsForSupervisedUsersOnDesktop",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -81,7 +81,7 @@ bool IsSupervisedUserSkipParentApprovalT
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -112,7 +112,7 @@ bool IsSupervisedUserSkipParentApprovalT
  #if BUILDFLAG(IS_CHROMEOS)
    return base::FeatureList::IsEnabled(
        kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
@@ -24,37 +42,37 @@ $NetBSD: patch-components_supervised__user_core_common_features.cc,v 1.1 2025/02
    bool skipParentApprovalEnabled = base::FeatureList::IsEnabled(
        kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
    bool permissionExtensionsForSupervisedUsersEnabled =
-@@ -106,13 +106,13 @@ BASE_FEATURE(kSupervisedUserProfileSigni
-              "SupervisedUserProfileSigninIPH",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -129,7 +129,7 @@ bool IsSupervisedUserSkipParentApprovalT
+ }
+ #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kShowKiteForSupervisedUsers,
-              "ShowKiteForSupervisedUsers",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
+ BASE_FEATURE(kCustomProfileStringsForSupervisedUsers,
+              "CustomProfileStringsForSupervisedUsers",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -141,13 +141,13 @@ BASE_FEATURE(kShowKiteForSupervisedUsers
  
+ BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers,
+              "ForceSafeSearchForUnauthenticatedSupervisedUsers",
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kHideGuestModeForSupervisedUsers,
-              "HideGuestModeForSupervisedUsers",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -122,7 +122,7 @@ BASE_FEATURE(kForceSafeSearchForUnauthen
-              "ForceSafeSearchForUnauthenticatedSupervisedUsers",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ #else
               base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kForceSupervisedUserReauthenticationForYouTube,
-              "ForceSupervisedUserReauthenticationForYouTube",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -172,7 +172,7 @@ BASE_FEATURE(kReplaceSupervisionSystemCa
- 
- BASE_FEATURE(kFetchListFamilyMembersWithCapability,
-              "FetchListFamilyMembersWithCapability",
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
+ BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog,
+              "EnableSupervisedUserVersionSignOutDialog",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -169,7 +169,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructur
+ // platform #defines.
+ BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers,
+              "UncredentialedFilteringFallbackForSupervisedUsers",
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT);
  #else
-              base::FEATURE_DISABLED_BY_DEFAULT
+              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium/patches/patch-components_supervised__user_core_common_features.h b/chromium/patches/patch-components_supervised__user_core_common_features.h
index 044df8ebb6..54e80b381b 100644
--- a/chromium/patches/patch-components_supervised__user_core_common_features.h
+++ b/chromium/patches/patch-components_supervised__user_core_common_features.h
@@ -1,12 +1,27 @@
-$NetBSD: patch-components_supervised__user_core_common_features.h,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/supervised_user/core/common/features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/supervised_user/core/common/features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/supervised_user/core/common/features.h
-@@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE(
+@@ -19,12 +19,12 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals)
+ BASE_DECLARE_FEATURE(kAllowSubframeLocalWebApprovals);
+ 
+ #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ extern const base::FeatureParam<int> kLocalWebApprovalBottomSheetLoadTimeoutMs;
+ #endif  // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Whether we show an error screen in case of failure of a local web approval.
+ BASE_DECLARE_FEATURE(kEnableLocalWebApprovalErrorDialog);
+ #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(
  // Applies new informative strings during the parental extension approval flow.
  BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings);
  
@@ -15,26 +30,21 @@ $NetBSD: patch-components_supervised__user_core_common_features.h,v 1.1 2025/02/
  BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
  #endif
  
-@@ -59,11 +59,11 @@ BASE_DECLARE_FEATURE(kSupervisedUserProf
+@@ -62,7 +62,7 @@ BASE_DECLARE_FEATURE(kExposedParentalCon
+ bool IsSupervisedUserSkipParentApprovalToInstallExtensionsEnabled();
+ #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
- // Displays a Family Link kite badge on the supervised user avatar in various
- // surfaces.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers);
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // This hides the following guest mode entry points for supervised users:
+ // Enable different web sign in interception behaviour for supervised users:
  //
- // * In the Profile menu for supervised profiles
-@@ -75,7 +75,7 @@ BASE_DECLARE_FEATURE(kHideGuestModeForSu
+ // 1. Supervised user signs in to existing signed out Profile: show modal
+@@ -80,7 +80,7 @@ BASE_DECLARE_FEATURE(kShowKiteForSupervi
  // unauthenticated (e.g. signed out of the content area) account.
  BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers);
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Force re-authentication when an unauthenticated supervised user tries to
- // access YouTube, so that content restrictions can be applied.
- BASE_DECLARE_FEATURE(kForceSupervisedUserReauthenticationForYouTube);
+ // Uses supervised user strings on the signout dialog.
+ BASE_DECLARE_FEATURE(kEnableSupervisedUserVersionSignOutDialog);
+ 
diff --git a/chromium/patches/patch-components_supervised__user_core_common_pref__names.h b/chromium/patches/patch-components_supervised__user_core_common_pref__names.h
index 3ae723071c..f173c6c3a0 100644
--- a/chromium/patches/patch-components_supervised__user_core_common_pref__names.h
+++ b/chromium/patches/patch-components_supervised__user_core_common_pref__names.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-components_supervised__user_core_common_pref__names.h,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/supervised_user/core/common/pref_names.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/supervised_user/core/common/pref_names.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/supervised_user/core/common/pref_names.h
-@@ -137,7 +137,7 @@ inline constexpr char kFirstTimeIntersti
-     "profile.managed.banner_state";
+@@ -129,7 +129,7 @@ inline constexpr char kDefaultSupervised
+     "profile.managed.default_filtering_behavior";
  
  #if BUILDFLAG(ENABLE_EXTENSIONS)
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-components_sync__device__info_local__device__info__util.cc b/chromium/patches/patch-components_sync__device__info_local__device__info__util.cc
index 1f57b35c35..ddd1ad668c 100644
--- a/chromium/patches/patch-components_sync__device__info_local__device__info__util.cc
+++ b/chromium/patches/patch-components_sync__device__info_local__device__info__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_sync__device__info_local__device__info__util.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/sync_device_info/local_device_info_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/sync_device_info/local_device_info_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/sync_device_info/local_device_info_util.cc
-@@ -85,7 +85,7 @@ void OnMachineStatisticsLoaded(LocalDevi
+@@ -84,7 +84,7 @@ void OnMachineStatisticsLoaded(LocalDevi
  sync_pb::SyncEnums::DeviceType GetLocalDeviceType() {
  #if BUILDFLAG(IS_CHROMEOS)
    return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
@@ -15,16 +15,16 @@ $NetBSD: patch-components_sync__device__info_local__device__info__util.cc,v 1.1
    return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
  #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
    switch (ui::GetDeviceFormFactor()) {
-@@ -110,7 +110,7 @@ DeviceInfo::OsType GetLocalDeviceOSType(
+@@ -107,7 +107,7 @@ sync_pb::SyncEnums::DeviceType GetLocalD
+ DeviceInfo::OsType GetLocalDeviceOSType() {
+ #if BUILDFLAG(IS_CHROMEOS)
    return DeviceInfo::OsType::kChromeOsAsh;
- #elif BUILDFLAG(IS_CHROMEOS_LACROS)
-   return DeviceInfo::OsType::kChromeOsLacros;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return DeviceInfo::OsType::kLinux;
  #elif BUILDFLAG(IS_ANDROID)
    return DeviceInfo::OsType::kAndroid;
-@@ -129,7 +129,7 @@ DeviceInfo::OsType GetLocalDeviceOSType(
+@@ -126,7 +126,7 @@ DeviceInfo::OsType GetLocalDeviceOSType(
  
  DeviceInfo::FormFactor GetLocalDeviceFormFactor() {
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/chromium/patches/patch-components_sync__device__info_local__device__info__util__linux.cc b/chromium/patches/patch-components_sync__device__info_local__device__info__util__linux.cc
index ade9a3264e..1ca3e1c3d7 100644
--- a/chromium/patches/patch-components_sync__device__info_local__device__info__util__linux.cc
+++ b/chromium/patches/patch-components_sync__device__info_local__device__info__util__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_sync__device__info_local__device__info__util__linux.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/sync_device_info/local_device_info_util_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/sync_device_info/local_device_info_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/sync_device_info/local_device_info_util_linux.cc
 @@ -9,6 +9,11 @@
  
diff --git a/chromium/patches/patch-components_sync__preferences_common__syncable__prefs__database.cc b/chromium/patches/patch-components_sync__preferences_common__syncable__prefs__database.cc
new file mode 100644
index 0000000000..e082365513
--- /dev/null
+++ b/chromium/patches/patch-components_sync__preferences_common__syncable__prefs__database.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/sync_preferences/common_syncable_prefs_database.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/sync_preferences/common_syncable_prefs_database.cc
+@@ -334,7 +334,7 @@ constexpr auto kCommonSyncablePrefsAllow
+           PrefSensitivity::kNone, MergeBehavior::kNone}},
+ #endif  // BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+         {autofill::prefs::kAutofillBnplEnabled,
+          {syncable_prefs_ids::kAutofillBnplEnabled, syncer::PREFERENCES,
+           PrefSensitivity::kNone, MergeBehavior::kNone}},
diff --git a/chromium/patches/patch-components_sync_base_sync__util.cc b/chromium/patches/patch-components_sync_base_sync__util.cc
index 6334954716..cda727de4b 100644
--- a/chromium/patches/patch-components_sync_base_sync__util.cc
+++ b/chromium/patches/patch-components_sync_base_sync__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_sync_base_sync__util.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/sync/base/sync_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/sync/base/sync_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/sync/base/sync_util.cc
-@@ -45,6 +45,8 @@ std::string GetSystemString() {
+@@ -44,6 +44,8 @@ std::string GetSystemString() {
    system = "FREEBSD ";
  #elif BUILDFLAG(IS_OPENBSD)
    system = "OPENBSD ";
diff --git a/chromium/patches/patch-components_system__cpu_cpu__probe.cc b/chromium/patches/patch-components_system__cpu_cpu__probe.cc
index b07045fb1d..1aeacb2569 100644
--- a/chromium/patches/patch-components_system__cpu_cpu__probe.cc
+++ b/chromium/patches/patch-components_system__cpu_cpu__probe.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_system__cpu_cpu__probe.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/system_cpu/cpu_probe.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/system_cpu/cpu_probe.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/system_cpu/cpu_probe.cc
 @@ -30,6 +30,9 @@ std::unique_ptr<CpuProbe> CpuProbe::Crea
    return CpuProbeWin::Create();
diff --git a/chromium/patches/patch-components_translate_core_common_translate__util.cc b/chromium/patches/patch-components_translate_core_common_translate__util.cc
index 7df0938efc..f985dd0e09 100644
--- a/chromium/patches/patch-components_translate_core_common_translate__util.cc
+++ b/chromium/patches/patch-components_translate_core_common_translate__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_translate_core_common_translate__util.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/translate/core/common/translate_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/translate/core/common/translate_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/translate/core/common/translate_util.cc
 @@ -21,7 +21,7 @@ const char kSecurityOrigin[] = "https://
  BASE_FEATURE(kTFLiteLanguageDetectionEnabled,
diff --git a/chromium/patches/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/chromium/patches/patch-components_trusted__vault_trusted__vault__connection__impl.cc
index a963546043..582e9d01f4 100644
--- a/chromium/patches/patch-components_trusted__vault_trusted__vault__connection__impl.cc
+++ b/chromium/patches/patch-components_trusted__vault_trusted__vault__connection__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_trusted__vault_trusted__vault__connection__impl.cc,v 1.1 2025/02/06 09:58:03 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/trusted_vault/trusted_vault_connection_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/trusted_vault/trusted_vault_connection_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/trusted_vault/trusted_vault_connection_impl.cc
-@@ -102,7 +102,7 @@ GetLocalPhysicalDeviceType() {
+@@ -103,7 +103,7 @@ GetLocalPhysicalDeviceType() {
    // currently used or even built on all platforms.
  #if BUILDFLAG(IS_CHROMEOS)
    return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS;
diff --git a/chromium/patches/patch-components_update__client_update__query__params.cc b/chromium/patches/patch-components_update__client_update__query__params.cc
index 92041d9fa3..5f7e4e4449 100644
--- a/chromium/patches/patch-components_update__client_update__query__params.cc
+++ b/chromium/patches/patch-components_update__client_update__query__params.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_update__client_update__query__params.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/update_client/update_query_params.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/update_client/update_query_params.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/update_client/update_query_params.cc
-@@ -40,6 +40,10 @@ const char kOs[] =
+@@ -39,6 +39,10 @@ const char kOs[] =
      "fuchsia";
  #elif BUILDFLAG(IS_OPENBSD)
      "openbsd";
diff --git a/chromium/patches/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/chromium/patches/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
index 826480ab04..942ed1be08 100644
--- a/chromium/patches/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
+++ b/chromium/patches/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -294,7 +294,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
+@@ -298,7 +298,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
    // The ideal fix would be to change the omnibox font used for Thai. In
    // that case, the Linux-only list should be revisited and potentially
    // removed.
diff --git a/chromium/patches/patch-components_user__education_views_help__bubble__view.cc b/chromium/patches/patch-components_user__education_views_help__bubble__view.cc
index f8b095800c..fe80bcd202 100644
--- a/chromium/patches/patch-components_user__education_views_help__bubble__view.cc
+++ b/chromium/patches/patch-components_user__education_views_help__bubble__view.cc
@@ -1,17 +1,35 @@
-$NetBSD: patch-components_user__education_views_help__bubble__view.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/user_education/views/help_bubble_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/user_education/views/help_bubble_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/user_education/views/help_bubble_view.cc
-@@ -852,7 +852,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect(
+@@ -268,7 +268,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(He
+ // TODO(https://crbug.com/382611284): Temporarily handle the case when the
+ // primary window is minimized by closing the help bubble. Remove this code when
+ // the issue is solved at the Views framework level.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver {
+  public:
+   explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble)
+@@ -743,7 +743,7 @@ HelpBubbleView::HelpBubbleView(
+     event_relay_->Init(this);
+   }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   primary_widget_observer_ = std::make_unique<PrimaryWidgetObserver>(*this);
+ #endif
+ 
+@@ -855,7 +855,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect(
  void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
                                                views::Widget* widget) const {
    BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget);
 -#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD)
    // Help bubbles anchored to menus may be clipped to their anchors' bounds,
    // resulting in visual errors, unless they use accelerated rendering. See
    // crbug.com/1445770 for details. This also applies to bubbles anchored to
diff --git a/chromium/patches/patch-components_user__education_views_help__bubble__view.h b/chromium/patches/patch-components_user__education_views_help__bubble__view.h
new file mode 100644
index 0000000000..390dc0789d
--- /dev/null
+++ b/chromium/patches/patch-components_user__education_views_help__bubble__view.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/user_education/views/help_bubble_view.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/user_education/views/help_bubble_view.h
+@@ -160,7 +160,7 @@ class HelpBubbleView : public views::Bub
+ // work around this problem by closing the bubble if the widget is minimized.
+ // When the underlying issue is fixed at the framework level, this can be
+ // removed.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   class PrimaryWidgetObserver;
+   std::unique_ptr<PrimaryWidgetObserver> primary_widget_observer_;
+ #endif
diff --git a/chromium/patches/patch-components_variations_service_variations__service.cc b/chromium/patches/patch-components_variations_service_variations__service.cc
index 2e48152728..6a96c21ee7 100644
--- a/chromium/patches/patch-components_variations_service_variations__service.cc
+++ b/chromium/patches/patch-components_variations_service_variations__service.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_variations_service_variations__service.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/variations/service/variations_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/variations/service/variations_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/variations/service/variations_service.cc
-@@ -102,7 +102,7 @@ std::string GetPlatformString() {
+@@ -100,7 +100,7 @@ std::string GetPlatformString() {
    return "android";
  #elif BUILDFLAG(IS_FUCHSIA)
    return "fuchsia";
diff --git a/chromium/patches/patch-components_visited__url__ranking_public_url__visit__util.cc b/chromium/patches/patch-components_visited__url__ranking_public_url__visit__util.cc
index faaba72074..f047b5a0c6 100644
--- a/chromium/patches/patch-components_visited__url__ranking_public_url__visit__util.cc
+++ b/chromium/patches/patch-components_visited__url__ranking_public_url__visit__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_visited__url__ranking_public_url__visit__util.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/visited_url_ranking/public/url_visit_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/visited_url_ranking/public/url_visit_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/visited_url_ranking/public/url_visit_util.cc
-@@ -66,7 +66,7 @@ PlatformType GetPlatformInput() {
+@@ -67,7 +67,7 @@ PlatformType GetPlatformInput() {
    return PlatformType::kWindows;
  #elif BUILDFLAG(IS_MAC)
    return PlatformType::kMac;
diff --git a/chromium/patches/patch-components_viz_host_gpu__host__impl.cc b/chromium/patches/patch-components_viz_host_gpu__host__impl.cc
new file mode 100644
index 0000000000..7f13d2b61e
--- /dev/null
+++ b/chromium/patches/patch-components_viz_host_gpu__host__impl.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/viz/host/gpu_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/viz/host/gpu_host_impl.cc
+@@ -135,7 +135,7 @@ GpuHostImpl::GpuHostImpl(Delegate* deleg
+       mojom::GpuServiceCreationParams::New();
+ #if BUILDFLAG(IS_OZONE)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Linux has an issue when running in single-process mode wherein
+   // GetPlatformRuntimeProperties() browser-side calls can have a data race with
+   // in-process GPU service initialization. The call to
diff --git a/chromium/patches/patch-components_viz_host_host__display__client.cc b/chromium/patches/patch-components_viz_host_host__display__client.cc
index 854f46ee51..f2f112f33d 100644
--- a/chromium/patches/patch-components_viz_host_host__display__client.cc
+++ b/chromium/patches/patch-components_viz_host_host__display__client.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_viz_host_host__display__client.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/host/host_display_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/host/host_display_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/host/host_display_client.cc
 @@ -65,7 +65,7 @@ void HostDisplayClient::AddChildWindowTo
  }
diff --git a/chromium/patches/patch-components_viz_host_host__display__client.h b/chromium/patches/patch-components_viz_host_host__display__client.h
index 1cca197b4f..cb968b9264 100644
--- a/chromium/patches/patch-components_viz_host_host__display__client.h
+++ b/chromium/patches/patch-components_viz_host_host__display__client.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_viz_host_host__display__client.h,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/host/host_display_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/host/host_display_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/host/host_display_client.h
 @@ -52,7 +52,7 @@ class VIZ_HOST_EXPORT HostDisplayClient 
    void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override;
diff --git a/chromium/patches/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/chromium/patches/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
index d01ebce427..b8494378ce 100644
--- a/chromium/patches/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/chromium/patches/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_viz_service_display__embedder_skia__output__surface__impl.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1498,7 +1498,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::G
+@@ -1510,7 +1510,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::G
                                              ->GetVulkanPhysicalDevice(),
                                          VK_IMAGE_TILING_OPTIMAL, vk_format,
                                          si_format, yuv_color_space, ycbcr_info);
diff --git a/chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.cc b/chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.cc
index f47ccb0982..7b75558d7f 100644
--- a/chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.cc
+++ b/chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-components_viz_service_display__embedder_software__output__surface.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/service/display_embedder/software_output_surface.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/service/display_embedder/software_output_surface.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/service/display_embedder/software_output_surface.cc
 @@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersC
+   base::TimeTicks now = base::TimeTicks::Now();
+   base::TimeDelta interval_to_next_refresh =
        now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (needs_swap_size_notifications_)
      client_->DidSwapWithSize(pixel_size);
  #endif
-@@ -144,7 +144,7 @@ gfx::OverlayTransform SoftwareOutputSurf
+@@ -142,7 +142,7 @@ gfx::OverlayTransform SoftwareOutputSurf
+   return gfx::OVERLAY_TRANSFORM_NONE;
+ }
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void SoftwareOutputSurface::SetNeedsSwapSizeNotifications(
      bool needs_swap_size_notifications) {
    needs_swap_size_notifications_ = needs_swap_size_notifications;
diff --git a/chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.h b/chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.h
index 4a7c2883ff..6011347c69 100644
--- a/chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.h
+++ b/chromium/patches/patch-components_viz_service_display__embedder_software__output__surface.h
@@ -1,26 +1,26 @@
-$NetBSD: patch-components_viz_service_display__embedder_software__output__surface.h,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/service/display_embedder/software_output_surface.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/service/display_embedder/software_output_surface.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/service/display_embedder/software_output_surface.h
-@@ -44,7 +44,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputS
+@@ -41,7 +41,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputS
+       UpdateVSyncParametersCallback callback) override;
+   void SetDisplayTransformHint(gfx::OverlayTransform transform) override {}
    gfx::OverlayTransform GetDisplayTransform() override;
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    void SetNeedsSwapSizeNotifications(
        bool needs_swap_size_notifications) override;
  #endif
-@@ -64,7 +64,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputS
+@@ -59,7 +59,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputS
+   base::TimeTicks refresh_timebase_;
+   base::TimeDelta refresh_interval_ = BeginFrameArgs::DefaultInterval();
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool needs_swap_size_notifications_ = false;
  #endif
  
diff --git a/chromium/patches/patch-components_viz_service_display_skia__renderer.cc b/chromium/patches/patch-components_viz_service_display_skia__renderer.cc
index 2e79c929fc..4ae3523e37 100644
--- a/chromium/patches/patch-components_viz_service_display_skia__renderer.cc
+++ b/chromium/patches/patch-components_viz_service_display_skia__renderer.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_viz_service_display_skia__renderer.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/service/display/skia_renderer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/service/display/skia_renderer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/service/display/skia_renderer.cc
-@@ -1364,7 +1364,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1391,7 +1391,7 @@ void SkiaRenderer::ClearFramebuffer() {
    if (current_frame()->current_render_pass->has_transparent_background) {
      ClearCanvas(SkColors::kTransparent);
    } else {
diff --git a/chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index 5e122887a5..bd02e01d82 100644
--- a/chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -113,7 +113,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -126,7 +126,7 @@ RootCompositorFrameSinkImpl::Create(
    output_surface->SetNeedsSwapSizeNotifications(
        params->send_swap_size_notifications);
  
@@ -15,7 +15,7 @@ $NetBSD: patch-components_viz_service_frame__sinks_root__compositor__frame__sink
    // For X11, we need notify client about swap completion after resizing, so the
    // client can use it for synchronize with X11 WM.
    output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -792,7 +792,7 @@ void RootCompositorFrameSinkImpl::Displa
+@@ -884,7 +884,7 @@ void RootCompositorFrameSinkImpl::Displa
    if (display_client_ && enable_swap_completion_callback_) {
      display_client_->DidCompleteSwapWithSize(pixel_size);
    }
diff --git a/chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index 5544f4d81b..c3287d2501 100644
--- a/chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/chromium/patches/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -231,7 +231,7 @@ class VIZ_SERVICE_EXPORT RootCompositorF
-   // See comments on `EvictionHandler`.
-   EvictionHandler eviction_handler_;
+@@ -229,7 +229,7 @@ class VIZ_SERVICE_EXPORT RootCompositorF
+   base::TimeDelta preferred_frame_interval_ =
+       FrameRateDecider::UnspecifiedFrameInterval();
  
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
diff --git a/chromium/patches/patch-components_viz_test_fake__display__client.cc b/chromium/patches/patch-components_viz_test_fake__display__client.cc
index e62d9248f3..6fd998c297 100644
--- a/chromium/patches/patch-components_viz_test_fake__display__client.cc
+++ b/chromium/patches/patch-components_viz_test_fake__display__client.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_viz_test_fake__display__client.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/test/fake_display_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/test/fake_display_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/test/fake_display_client.cc
 @@ -27,7 +27,7 @@ void FakeDisplayClient::AddChildWindowTo
      gpu::SurfaceHandle child_window) {}
diff --git a/chromium/patches/patch-components_viz_test_fake__display__client.h b/chromium/patches/patch-components_viz_test_fake__display__client.h
index 0fd5572166..b950bdd14e 100644
--- a/chromium/patches/patch-components_viz_test_fake__display__client.h
+++ b/chromium/patches/patch-components_viz_test_fake__display__client.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-components_viz_test_fake__display__client.h,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/test/fake_display_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/test/fake_display_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/test/fake_display_client.h
 @@ -36,7 +36,7 @@ class FakeDisplayClient : public mojom::
    void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override;
diff --git a/chromium/patches/patch-components_viz_test_mock__display__client.h b/chromium/patches/patch-components_viz_test_mock__display__client.h
index aba299ef7b..4c96d0e35f 100644
--- a/chromium/patches/patch-components_viz_test_mock__display__client.h
+++ b/chromium/patches/patch-components_viz_test_mock__display__client.h
@@ -1,15 +1,15 @@
-$NetBSD: patch-components_viz_test_mock__display__client.h,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- components/viz/test/mock_display_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- components/viz/test/mock_display_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ components/viz/test/mock_display_client.h
 @@ -45,7 +45,7 @@ class MockDisplayClient : public mojom::
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
    MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate));
- #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&));
diff --git a/chromium/patches/patch-components_webui_flags_flags__state.cc b/chromium/patches/patch-components_webui_flags_flags__state.cc
new file mode 100644
index 0000000000..3c8dfc51ef
--- /dev/null
+++ b/chromium/patches/patch-components_webui_flags_flags__state.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- components/webui/flags/flags_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ components/webui/flags/flags_state.cc
+@@ -782,7 +782,7 @@ unsigned short FlagsState::GetCurrentPla
+   return kOsWin;
+ #elif BUILDFLAG(IS_CHROMEOS)
+   return kOsCrOS;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return kOsLinux;
+ #elif BUILDFLAG(IS_ANDROID)
+   return kOsAndroid;
diff --git a/chromium/patches/patch-content_app_BUILD.gn b/chromium/patches/patch-content_app_BUILD.gn
index 901e5a41d8..f0beaf2d99 100644
--- a/chromium/patches/patch-content_app_BUILD.gn
+++ b/chromium/patches/patch-content_app_BUILD.gn
@@ -1,15 +1,15 @@
-$NetBSD: patch-content_app_BUILD.gn,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/app/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/app/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/app/BUILD.gn
-@@ -96,9 +96,9 @@ source_set("content_main_runner_app") {
-       "//chromeos/startup:constants",
-     ]
-   }
+@@ -90,9 +90,9 @@ source_set("content_main_runner_app") {
+            "//third_party/tflite:buildflags",
+            "//tools/v8_context_snapshot:buildflags",
+          ]
 -  if (build_tflite_with_xnnpack) {
 -    deps += [ "//third_party/cpuinfo" ]
 -  }
diff --git a/chromium/patches/patch-content_app_content__main.cc b/chromium/patches/patch-content_app_content__main.cc
index 58d54e2b71..c7627102d5 100644
--- a/chromium/patches/patch-content_app_content__main.cc
+++ b/chromium/patches/patch-content_app_content__main.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_app_content__main.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/app/content_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/app/content_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/app/content_main.cc
 @@ -227,7 +227,7 @@ NO_STACK_PROTECTOR int RunContentProcess
      base::EnableTerminationOnOutOfMemory();
@@ -15,8 +15,8 @@ $NetBSD: patch-content_app_content__main.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
      // The various desktop environments set this environment variable that
      // allows the dbus client library to connect directly to the bus. When this
      // variable is not set (test environments like xvfb-run), the dbus client
-@@ -313,7 +313,7 @@ NO_STACK_PROTECTOR int RunContentProcess
-     command_line->AppendSwitch(switches::kUseMobileUserAgent);
+@@ -317,7 +317,7 @@ NO_STACK_PROTECTOR int RunContentProcess
+ #endif
  #endif
  
 -#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD)
diff --git a/chromium/patches/patch-content_app_content__main__runner__impl.cc b/chromium/patches/patch-content_app_content__main__runner__impl.cc
index 4fa7db25fd..009df48b85 100644
--- a/chromium/patches/patch-content_app_content__main__runner__impl.cc
+++ b/chromium/patches/patch-content_app_content__main__runner__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_app_content__main__runner__impl.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/app/content_main_runner_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/app/content_main_runner_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/app/content_main_runner_impl.cc
-@@ -147,18 +147,20 @@
+@@ -146,18 +146,20 @@
  #include "content/browser/posix_file_descriptor_info_impl.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -29,7 +29,7 @@ $NetBSD: patch-content_app_content__main__runner__impl.cc,v 1.1 2025/02/06 09:58
  #include "third_party/boringssl/src/include/openssl/crypto.h"
  #include "third_party/webrtc_overrides/init_webrtc.h"  // nogncheck
  
-@@ -192,6 +194,10 @@
+@@ -186,6 +188,10 @@
  #include "media/base/media_switches.h"
  #endif
  
@@ -40,7 +40,7 @@ $NetBSD: patch-content_app_content__main__runner__impl.cc,v 1.1 2025/02/06 09:58
  #if BUILDFLAG(IS_ANDROID)
  #include "base/system/sys_info.h"
  #include "content/browser/android/battery_metrics.h"
-@@ -400,7 +406,7 @@ void InitializeZygoteSandboxForBrowserPr
+@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserPr
  }
  #endif  // BUILDFLAG(USE_ZYGOTE)
  
@@ -49,7 +49,7 @@ $NetBSD: patch-content_app_content__main__runner__impl.cc,v 1.1 2025/02/06 09:58
  
  #if BUILDFLAG(ENABLE_PPAPI)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -438,7 +444,10 @@ void PreloadLibraryCdms() {
+@@ -422,7 +428,10 @@ void PreloadLibraryCdms() {
  
  void PreSandboxInit() {
    // Ensure the /dev/urandom is opened.
@@ -60,7 +60,7 @@ $NetBSD: patch-content_app_content__main__runner__impl.cc,v 1.1 2025/02/06 09:58
  
    // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
    // files.
-@@ -450,9 +459,16 @@ void PreSandboxInit() {
+@@ -434,9 +443,16 @@ void PreSandboxInit() {
    // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
    CRYPTO_pre_sandbox_init();
  
@@ -77,7 +77,7 @@ $NetBSD: patch-content_app_content__main__runner__impl.cc,v 1.1 2025/02/06 09:58
  
  #if BUILDFLAG(ENABLE_PPAPI)
    // Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -764,7 +780,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProc
+@@ -750,7 +766,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProc
      unregister_thread_closure = base::HangWatcher::RegisterThread(
          base::HangWatcher::ThreadType::kMainThread);
      bool start_hang_watcher_now;
@@ -86,7 +86,7 @@ $NetBSD: patch-content_app_content__main__runner__impl.cc,v 1.1 2025/02/06 09:58
      // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is
      // initialized, because the sandbox can't be started with multiple threads.
      // TODO(mpdenton): start the HangWatcher after the sandbox is initialized.
-@@ -874,11 +890,10 @@ int ContentMainRunnerImpl::Initialize(Co
+@@ -863,11 +879,10 @@ int ContentMainRunnerImpl::Initialize(Co
                   base::GlobalDescriptors::kBaseDescriptor);
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -100,14 +100,16 @@ $NetBSD: patch-content_app_content__main__runner__impl.cc,v 1.1 2025/02/06 09:58
  
  #endif  // !BUILDFLAG(IS_WIN)
  
-@@ -1059,6 +1074,18 @@ int ContentMainRunnerImpl::Initialize(Co
+@@ -1048,10 +1063,22 @@ int ContentMainRunnerImpl::Initialize(Co
        process_type == switches::kZygoteProcess) {
      PreSandboxInit();
    }
 +#elif BUILDFLAG(IS_BSD)
 +  PreSandboxInit();
-+#endif
-+
+ #elif BUILDFLAG(IS_IOS)
+   ChildProcessEnterSandbox();
+ #endif
+ 
 +#if BUILDFLAG(IS_BSD)
 +  if (process_type.empty()) {
 +    sandbox::policy::SandboxLinux::Options sandbox_options;
@@ -116,10 +118,12 @@ $NetBSD: patch-content_app_content__main__runner__impl.cc,v 1.1 2025/02/06 09:58
 +            *base::CommandLine::ForCurrentProcess()),
 +        sandbox::policy::SandboxLinux::PreSandboxHook(), sandbox_options);
 +  }
- #endif
- 
++#endif
++
    delegate_->SandboxInitialized(process_type);
-@@ -1158,6 +1185,11 @@ NO_STACK_PROTECTOR int ContentMainRunner
+ 
+ #if BUILDFLAG(USE_ZYGOTE)
+@@ -1149,6 +1176,11 @@ NO_STACK_PROTECTOR int ContentMainRunner
  
    RegisterMainThreadFactories();
  
diff --git a/chromium/patches/patch-content_browser_BUILD.gn b/chromium/patches/patch-content_browser_BUILD.gn
index 552c5392e0..6e08f061f6 100644
--- a/chromium/patches/patch-content_browser_BUILD.gn
+++ b/chromium/patches/patch-content_browser_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_BUILD.gn,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/BUILD.gn
-@@ -2434,6 +2434,14 @@ source_set("browser") {
+@@ -2560,6 +2560,14 @@ source_set("browser") {
      ]
    }
  
@@ -19,10 +19,10 @@ $NetBSD: patch-content_browser_BUILD.gn,v 1.1 2025/02/06 09:58:04 wiz Exp $
 +  }
 +
    if (is_linux || is_chromeos) {
-     sources += [
-       "child_process_launcher_helper_linux.cc",
-@@ -2479,6 +2487,15 @@ source_set("browser") {
-     deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ]
+     sources -=
+         [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ]
+@@ -2607,6 +2615,15 @@ source_set("browser") {
+     deps += [ "//media/mojo/mojom" ]
    }
  
 +  if (is_bsd) {
diff --git a/chromium/patches/patch-content_browser_accessibility_browser__accessibility__state__impl.cc b/chromium/patches/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
new file mode 100644
index 0000000000..1372704e85
--- /dev/null
+++ b/chromium/patches/patch-content_browser_accessibility_browser__accessibility__state__impl.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- content/browser/accessibility/browser_accessibility_state_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ content/browser/accessibility/browser_accessibility_state_impl.cc
+@@ -180,7 +180,7 @@ BrowserAccessibilityStateImpl* BrowserAc
+ 
+ // On Android, Mac, Windows and Linux there are platform-specific subclasses.
+ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_MAC) && \
+-    !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++    !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
+ // static
+ std::unique_ptr<BrowserAccessibilityStateImpl>
+ BrowserAccessibilityStateImpl::Create() {
diff --git a/chromium/patches/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc b/chromium/patches/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
new file mode 100644
index 0000000000..44a2de2c6a
--- /dev/null
+++ b/chromium/patches/patch-content_browser_accessibility_browser__accessibility__state__impl__auralinux.cc
@@ -0,0 +1,43 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ content/browser/accessibility/browser_accessibility_state_impl_auralinux.cc
+@@ -32,7 +32,15 @@ bool CheckCmdlineForOrca(const std::stri
+   std::string cmdline;
+   std::stringstream ss(cmdline_all);
+   while (std::getline(ss, cmdline, '\0')) {
++#if BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_NETBSD)
++    re2::RE2 orca_regex(R"((^|/)(usr/)?(pkg/)?bin/orca(\s|$))");
++#else
++    re2::RE2 orca_regex(R"((^|/)(usr/)?(local/)?bin/orca(\s|$))");
++#endif
++#else
+     re2::RE2 orca_regex(R"((^|/)(usr/)?bin/orca(\s|$))");
++#endif
+     if (re2::RE2::PartialMatch(cmdline, orca_regex)) {
+       return true;  // Orca was found
+     }
+@@ -42,6 +50,10 @@ bool CheckCmdlineForOrca(const std::stri
+ 
+ // Returns true if Orca is active.
+ bool DiscoverOrca() {
++#if BUILDFLAG(IS_BSD)
++  NOTIMPLEMENTED();
++  return false;
++#else
+   // NOTE: this method is run from another thread to reduce jank, since
+   // there's no guarantee these system calls will return quickly.
+   std::unique_ptr<DIR, decltype(&CloseDir)> proc_dir(opendir("/proc"),
+@@ -79,6 +91,7 @@ bool DiscoverOrca() {
+   }
+ 
+   return is_orca_active;
++#endif
+ }
+ 
+ }  // namespace
diff --git a/chromium/patches/patch-content_browser_audio_audio__service.cc b/chromium/patches/patch-content_browser_audio_audio__service.cc
index 4b688a98b9..be9317c4a9 100644
--- a/chromium/patches/patch-content_browser_audio_audio__service.cc
+++ b/chromium/patches/patch-content_browser_audio_audio__service.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_audio_audio__service.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/audio/audio_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/audio/audio_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/audio/audio_service.cc
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
  #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
  #include "ui/display/util/edid_parser.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_audio_audio__service.cc,v 1.1 2025/02/06 09:58:04
  #include "ui/display/display_util.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -200,7 +200,7 @@ audio::mojom::AudioService& GetAudioServ
+@@ -201,7 +201,7 @@ audio::mojom::AudioService& GetAudioServ
          ->PostTaskAndReplyWithResult(
              FROM_HERE, base::BindOnce(&ScanEdidBitstreams),
              base::BindOnce(&LaunchAudioService, std::move(receiver)));
diff --git a/chromium/patches/patch-content_browser_browser__child__process__host__impl.cc b/chromium/patches/patch-content_browser_browser__child__process__host__impl.cc
index a9a6e0134c..0e2526e148 100644
--- a/chromium/patches/patch-content_browser_browser__child__process__host__impl.cc
+++ b/chromium/patches/patch-content_browser_browser__child__process__host__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_browser__child__process__host__impl.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/browser_child_process_host_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/browser_child_process_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/browser_child_process_host_impl.cc
-@@ -328,6 +328,7 @@ void BrowserChildProcessHostImpl::Launch
+@@ -326,6 +326,7 @@ void BrowserChildProcessHostImpl::Launch
        switches::kLogBestEffortTasks,
        switches::kPerfettoDisableInterning,
        switches::kTraceToConsole,
@@ -14,7 +14,7 @@ $NetBSD: patch-content_browser_browser__child__process__host__impl.cc,v 1.1 2025
    };
    cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches);
  
-@@ -659,7 +660,7 @@ void BrowserChildProcessHostImpl::OnProc
+@@ -690,7 +691,7 @@ void BrowserChildProcessHostImpl::OnProc
            ->child_process());
  #endif
  
diff --git a/chromium/patches/patch-content_browser_browser__child__process__host__impl.h b/chromium/patches/patch-content_browser_browser__child__process__host__impl.h
index cfe9642791..b667657b47 100644
--- a/chromium/patches/patch-content_browser_browser__child__process__host__impl.h
+++ b/chromium/patches/patch-content_browser_browser__child__process__host__impl.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_browser__child__process__host__impl.h,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/browser_child_process_host_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/browser_child_process_host_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/browser_child_process_host_impl.h
-@@ -35,7 +35,7 @@
+@@ -36,7 +36,7 @@
  #include "base/win/object_watcher.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_browser__child__process__host__impl.h,v 1.1 2025/
  #include "content/browser/child_thread_type_switcher_linux.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -269,7 +269,7 @@ class BrowserChildProcessHostImpl
+@@ -287,7 +287,7 @@ class BrowserChildProcessHostImpl
    std::unique_ptr<tracing::SystemTracingService> system_tracing_service_;
  #endif
  
diff --git a/chromium/patches/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc b/chromium/patches/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
index aafb26222b..f924182f35 100644
--- a/chromium/patches/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
+++ b/chromium/patches/patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_browser__child__process__host__impl__receiver__bindings.cc,v 1.1 2025/02/06 09:58:04 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/browser_child_process_host_impl_receiver_bindings.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/browser_child_process_host_impl_receiver_bindings.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/browser_child_process_host_impl_receiver_bindings.cc
-@@ -62,7 +62,7 @@ void BrowserChildProcessHostImpl::BindHo
+@@ -64,7 +64,7 @@ void BrowserChildProcessHostImpl::BindHo
      }
    }
  
diff --git a/chromium/patches/patch-content_browser_browser__main__loop.cc b/chromium/patches/patch-content_browser_browser__main__loop.cc
index 8cad61c7f2..f367c44e8f 100644
--- a/chromium/patches/patch-content_browser_browser__main__loop.cc
+++ b/chromium/patches/patch-content_browser_browser__main__loop.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_browser__main__loop.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/browser_main_loop.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/browser_main_loop.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/browser_main_loop.cc
-@@ -250,6 +250,12 @@
+@@ -249,6 +249,12 @@
  #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
  #endif
  
@@ -19,7 +19,7 @@ $NetBSD: patch-content_browser_browser__main__loop.cc,v 1.1 2025/02/06 09:58:05
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -545,6 +551,12 @@ int BrowserMainLoop::EarlyInitialization
+@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization
    // by now since a thread to start the ServiceManager has been created
    // before the browser main loop starts.
    DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -32,7 +32,7 @@ $NetBSD: patch-content_browser_browser__main__loop.cc,v 1.1 2025/02/06 09:58:05
  #endif
  
    // GLib's spawning of new processes is buggy, so it's important that at this
-@@ -583,7 +595,7 @@ int BrowserMainLoop::EarlyInitialization
+@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization
        base::ThreadType::kDisplayCritical);
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/chromium/patches/patch-content_browser_child__process__launcher__helper.h b/chromium/patches/patch-content_browser_child__process__launcher__helper.h
index 75647987b1..a08a2dadb4 100644
--- a/chromium/patches/patch-content_browser_child__process__launcher__helper.h
+++ b/chromium/patches/patch-content_browser_child__process__launcher__helper.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_child__process__launcher__helper.h,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/child_process_launcher_helper.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/child_process_launcher_helper.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/child_process_launcher_helper.h
-@@ -304,7 +304,7 @@ class ChildProcessLauncherHelper
+@@ -308,7 +308,7 @@ class ChildProcessLauncherHelper
    std::optional<base::ProcessId> process_id_ = std::nullopt;
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/chromium/patches/patch-content_browser_child__process__launcher__helper__linux.cc b/chromium/patches/patch-content_browser_child__process__launcher__helper__linux.cc
index 6549bd288b..597b85fe19 100644
--- a/chromium/patches/patch-content_browser_child__process__launcher__helper__linux.cc
+++ b/chromium/patches/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_child__process__launcher__helper__linux.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/child_process_launcher_helper_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/child_process_launcher_helper_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/child_process_launcher_helper_linux.cc
 @@ -22,7 +22,9 @@
  #include "content/public/common/result_codes.h"
diff --git a/chromium/patches/patch-content_browser_child__thread__type__switcher__linux.cc b/chromium/patches/patch-content_browser_child__thread__type__switcher__linux.cc
index 74dede1925..2647b30e8b 100644
--- a/chromium/patches/patch-content_browser_child__thread__type__switcher__linux.cc
+++ b/chromium/patches/patch-content_browser_child__thread__type__switcher__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_child__thread__type__switcher__linux.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/child_thread_type_switcher_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/child_thread_type_switcher_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/child_thread_type_switcher_linux.cc
 @@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base:
                                     base::ThreadType thread_type) {
@@ -14,13 +14,22 @@ $NetBSD: patch-content_browser_child__thread__type__switcher__linux.cc,v 1.1 202
 +  NOTIMPLEMENTED();
 +#else
    bool ns_pid_supported = false;
-   pid_t peer_tid = base::FindThreadID(peer_pid, ns_tid, &ns_pid_supported);
-   if (peer_tid == -1) {
-@@ -39,6 +42,7 @@ void SetThreadTypeOnLauncherThread(base:
- 
-   base::PlatformThread::SetThreadType(peer_pid, peer_tid, thread_type,
-                                       base::IsViaIPC(true));
+   pid_t peer_tid =
+       base::FindThreadID(peer_pid, ns_tid.raw(), &ns_pid_supported);
+@@ -41,6 +44,7 @@ void SetThreadTypeOnLauncherThread(base:
+   base::PlatformThread::SetThreadType(peer_pid,
+                                       base::PlatformThreadId(peer_tid),
+                                       thread_type, base::IsViaIPC(true));
 +#endif
  }
  
  }  // namespace
+@@ -69,7 +73,7 @@ void ChildThreadTypeSwitcher::SetPid(bas
+   }
+ }
+ 
+-void ChildThreadTypeSwitcher::SetThreadType(int32_t ns_tid,
++void ChildThreadTypeSwitcher::SetThreadType(uint64_t ns_tid,
+                                             base::ThreadType thread_type) {
+   // This function is only used on platforms with 32-bit thread ids.
+   static_assert(sizeof(ns_tid) == sizeof(base::PlatformThreadId));
diff --git a/chromium/patches/patch-content_browser_child__thread__type__switcher__linux.h b/chromium/patches/patch-content_browser_child__thread__type__switcher__linux.h
new file mode 100644
index 0000000000..061081c457
--- /dev/null
+++ b/chromium/patches/patch-content_browser_child__thread__type__switcher__linux.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- content/browser/child_thread_type_switcher_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ content/browser/child_thread_type_switcher_linux.h
+@@ -36,7 +36,7 @@ class ChildThreadTypeSwitcher : public m
+   void SetPid(base::ProcessId child_pid);
+ 
+   // mojom::ThreadTypeSwitcher:
+-  void SetThreadType(int32_t ns_tid, base::ThreadType thread_type) override;
++  void SetThreadType(uint64_t ns_tid, base::ThreadType thread_type) override;
+ 
+  private:
+   base::ProcessId child_pid_ = base::kNullProcessHandle;
diff --git a/chromium/patches/patch-content_browser_compositor_viz__process__transport__factory.cc b/chromium/patches/patch-content_browser_compositor_viz__process__transport__factory.cc
index 010616165d..129046cf07 100644
--- a/chromium/patches/patch-content_browser_compositor_viz__process__transport__factory.cc
+++ b/chromium/patches/patch-content_browser_compositor_viz__process__transport__factory.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_compositor_viz__process__transport__factory.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/compositor/viz_process_transport_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/compositor/viz_process_transport_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/compositor/viz_process_transport_factory.cc
-@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::Ho
+@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::Ho
    HostDisplayClient& operator=(const HostDisplayClient&) = delete;
  
    // viz::HostDisplayClient:
diff --git a/chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.cc b/chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.cc
index 9139ccc663..96e038f3ec 100644
--- a/chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.cc
+++ b/chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_devtools_devtools__frontend__host__impl.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/devtools/devtools_frontend_host_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/devtools/devtools_frontend_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/devtools/devtools_frontend_host_impl.cc
-@@ -27,7 +27,7 @@
+@@ -24,7 +24,7 @@
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
  #include "ui/base/webui/resource_path.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_devtools_devtools__frontend__host__impl.cc,v 1.1
  #include "components/crash/content/browser/error_reporting/javascript_error_report.h"  // nogncheck
  #include "components/crash/content/browser/error_reporting/js_error_report_processor.h"  // nogncheck
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -42,7 +42,7 @@ const char kCompatibilityScriptSourceURL
+@@ -36,7 +36,7 @@ const char kCompatibilityScriptSourceURL
      "\n//# "
      "sourceURL=devtools://devtools/bundled/devtools_compatibility.js";
  
@@ -24,7 +24,7 @@ $NetBSD: patch-content_browser_devtools_devtools__frontend__host__impl.cc,v 1.1
  // Remove the pieces of the URL we don't want to send back with the error
  // reports. In particular, do not send query or fragments as those can have
  // privacy-sensitive information in them.
-@@ -112,7 +112,7 @@ DevToolsFrontendHostImpl::DevToolsFronte
+@@ -106,7 +106,7 @@ DevToolsFrontendHostImpl::DevToolsFronte
      const HandleMessageCallback& handle_message_callback)
      : web_contents_(WebContents::FromRenderFrameHost(frame_host)),
        handle_message_callback_(handle_message_callback) {
@@ -33,7 +33,7 @@ $NetBSD: patch-content_browser_devtools_devtools__frontend__host__impl.cc,v 1.1
    Observe(web_contents_);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
    mojo::AssociatedRemote<blink::mojom::DevToolsFrontend> frontend;
-@@ -137,7 +137,7 @@ void DevToolsFrontendHostImpl::DispatchE
+@@ -131,7 +131,7 @@ void DevToolsFrontendHostImpl::DispatchE
    handle_message_callback_.Run(std::move(message));
  }
  
diff --git a/chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.h b/chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.h
index e7faa7635b..0d20aa7475 100644
--- a/chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.h
+++ b/chromium/patches/patch-content_browser_devtools_devtools__frontend__host__impl.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_devtools_devtools__frontend__host__impl.h,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/devtools/devtools_frontend_host_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/devtools/devtools_frontend_host_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/devtools/devtools_frontend_host_impl.h
 @@ -34,7 +34,7 @@ class DevToolsFrontendHostImpl : public 
  
diff --git a/chromium/patches/patch-content_browser_devtools_protocol_system__info__handler.cc b/chromium/patches/patch-content_browser_devtools_protocol_system__info__handler.cc
index 4adf29d2ff..457d91634a 100644
--- a/chromium/patches/patch-content_browser_devtools_protocol_system__info__handler.cc
+++ b/chromium/patches/patch-content_browser_devtools_protocol_system__info__handler.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_devtools_protocol_system__info__handler.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/devtools/protocol/system_info_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/devtools/protocol/system_info_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/devtools/protocol/system_info_handler.cc
-@@ -51,7 +51,7 @@ std::unique_ptr<SystemInfo::Size> GfxSiz
+@@ -52,7 +52,7 @@ std::unique_ptr<SystemInfo::Size> GfxSiz
  // 1046598, and 1153667.
  // Windows builds need more time -- see Issue 873112 and 1004472.
  // Mac builds need more time - see Issue angleproject:6182.
diff --git a/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h b/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
index 481e7aa81b..223f41014f 100644
--- a/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
+++ b/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/file_system_access/file_path_watcher/file_path_watcher.h
-@@ -125,7 +125,7 @@ class CONTENT_EXPORT FilePathWatcher {
+@@ -126,7 +126,7 @@ class CONTENT_EXPORT FilePathWatcher {
      Type type = Type::kNonRecursive;
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc b/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
index c9c018814b..13908dcdb8 100644
--- a/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
+++ b/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc.orig	2024-12-21 10:25:10.270974112 +0000
+--- content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc.orig	2025-05-08 12:01:57.732821580 +0000
 +++ content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,60 @@
 +// Copyright 2024 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -61,4 +61,9 @@ $NetBSD: patch-content_browser_file__system__access_file__path__watcher_file__pa
 +FilePathWatcher::FilePathWatcher()
 +    : FilePathWatcher(std::make_unique<FilePathWatcherImpl>()) {}
 +
++// static
++size_t FilePathWatcher::GetQuotaLimitImpl() {
++  return std::numeric_limits<size_t>::max();
++}
++
 +}  // namespace content
diff --git a/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h b/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
index 014f1a7c8f..a33b73c196 100644
--- a/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
+++ b/chromium/patches/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__kqueue.h,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/file_system_access/file_path_watcher/file_path_watcher_kqueue.h
 @@ -5,6 +5,7 @@
  #ifndef CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_PATH_WATCHER_FILE_PATH_WATCHER_KQUEUE_H_
diff --git a/chromium/patches/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc b/chromium/patches/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
index 3924c26855..5915d56af4 100644
--- a/chromium/patches/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
+++ b/chromium/patches/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/file_system_access/file_system_access_local_path_watcher.cc
-@@ -63,7 +63,7 @@ void FileSystemAccessLocalPathWatcher::I
+@@ -67,7 +67,7 @@ void FileSystemAccessLocalPathWatcher::I
        .type = scope().IsRecursive() ? FilePathWatcher::Type::kRecursive
                                      : FilePathWatcher::Type::kNonRecursive,
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
diff --git a/chromium/patches/patch-content_browser_font__access_font__enumeration__data__source.cc b/chromium/patches/patch-content_browser_font__access_font__enumeration__data__source.cc
index 0ae8ab69e1..8e36ff4f6b 100644
--- a/chromium/patches/patch-content_browser_font__access_font__enumeration__data__source.cc
+++ b/chromium/patches/patch-content_browser_font__access_font__enumeration__data__source.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_font__access_font__enumeration__data__source.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/font_access/font_enumeration_data_source.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/font_access/font_enumeration_data_source.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/font_access/font_enumeration_data_source.cc
 @@ -16,7 +16,7 @@
  #include "content/browser/font_access/font_enumeration_data_source_win.h"
diff --git a/chromium/patches/patch-content_browser_gpu_compositor__util.cc b/chromium/patches/patch-content_browser_gpu_compositor__util.cc
index d4ed058094..e5064ca548 100644
--- a/chromium/patches/patch-content_browser_gpu_compositor__util.cc
+++ b/chromium/patches/patch-content_browser_gpu_compositor__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_gpu_compositor__util.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/gpu/compositor_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/gpu/compositor_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/gpu/compositor_util.cc
-@@ -153,7 +153,7 @@ std::vector<GpuFeatureData> GetGpuFeatur
+@@ -142,7 +142,7 @@ std::vector<GpuFeatureData> GetGpuFeatur
        "video_decode",
        SafeGetFeatureStatus(
            gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_gpu_compositor__util.cc,v 1.1 2025/02/06 09:58:05
            !base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) ||
  #endif  // BUILDFLAG(IS_LINUX)
                command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)),
-@@ -165,7 +165,7 @@ std::vector<GpuFeatureData> GetGpuFeatur
+@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatur
        "video_encode",
        SafeGetFeatureStatus(
            gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE,
diff --git a/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.cc b/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.cc
index 71779e3f28..ffa856f383 100644
--- a/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.cc
+++ b/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_gpu_gpu__data__manager__impl.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/gpu/gpu_data_manager_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/gpu/gpu_data_manager_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/gpu/gpu_data_manager_impl.cc
-@@ -402,7 +402,7 @@ void GpuDataManagerImpl::OnDisplayMetric
+@@ -412,7 +412,7 @@ void GpuDataManagerImpl::OnDisplayMetric
    private_->OnDisplayMetricsChanged(display, changed_metrics);
  }
  
diff --git a/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.h b/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.h
index 2c8d55694e..79e76a2b8e 100644
--- a/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.h
+++ b/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_gpu_gpu__data__manager__impl.h,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/gpu/gpu_data_manager_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/gpu/gpu_data_manager_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/gpu/gpu_data_manager_impl.h
-@@ -220,7 +220,7 @@ class CONTENT_EXPORT GpuDataManagerImpl 
+@@ -225,7 +225,7 @@ class CONTENT_EXPORT GpuDataManagerImpl 
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics) override;
  
diff --git a/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
index afbac9a750..c8a772a9d7 100644
--- a/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ b/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_gpu_gpu__data__manager__impl__private.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1672,7 +1672,7 @@ void GpuDataManagerImplPrivate::RecordCo
+@@ -1692,7 +1692,7 @@ void GpuDataManagerImplPrivate::RecordCo
    UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
  }
  
diff --git a/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.h
index f946968b6c..7285a472e9 100644
--- a/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.h
+++ b/chromium/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_gpu_gpu__data__manager__impl__private.h,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
+@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics);
  
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_gpu_gpu__data__manager__impl__private.h,v 1.1 202
    bool IsGpuMemoryBufferNV12Supported();
    void SetGpuMemoryBufferNV12Supported(bool supported);
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -311,7 +311,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
+@@ -313,7 +313,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
    bool application_is_visible_ = true;
  
    bool disable_gpu_compositing_ = false;
@@ -23,4 +23,4 @@ $NetBSD: patch-content_browser_gpu_gpu__data__manager__impl__private.h,v 1.1 202
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool is_gpu_memory_buffer_NV12_supported_ = false;
  #endif  // BUILDFLAG(IS_LINUX)
- };
+ 
diff --git a/chromium/patches/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/chromium/patches/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
index 30d1789794..0f8da20c57 100644
--- a/chromium/patches/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
+++ b/chromium/patches/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
 @@ -46,7 +46,7 @@ scoped_refptr<base::SingleThreadTaskRunn
  #endif
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc,v
  bool IsGpuMemoryBufferNV12Supported() {
    static bool is_computed = false;
    static bool supported = false;
-@@ -98,7 +98,7 @@ GpuMemoryBufferManagerSingleton::GetInst
+@@ -111,7 +111,7 @@ void GpuMemoryBufferManagerSingleton::Re
  }
  
  void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUpdate() {
diff --git a/chromium/patches/patch-content_browser_gpu_gpu__process__host.cc b/chromium/patches/patch-content_browser_gpu_gpu__process__host.cc
index 6e83d9f0c8..b102ad9424 100644
--- a/chromium/patches/patch-content_browser_gpu_gpu__process__host.cc
+++ b/chromium/patches/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,22 +1,22 @@
-$NetBSD: patch-content_browser_gpu_gpu__process__host.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/gpu/gpu_process_host.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/gpu/gpu_process_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/gpu/gpu_process_host.cc
 @@ -275,6 +275,7 @@ static const char* const kSwitchNames[] 
-     switches::kEnableLowEndDeviceMode,
      switches::kDisableSkiaGraphite,
+     switches::kDisableSkiaGraphitePrecompilation,
      switches::kDisableLowEndDeviceMode,
 +    switches::kDisableUnveil,
      switches::kProfilingAtStart,
      switches::kProfilingFile,
      switches::kProfilingFlush,
-@@ -302,7 +303,7 @@ static const char* const kSwitchNames[] 
-     switches::kOzoneDumpFile,
+@@ -304,7 +305,7 @@ static const char* const kSwitchNames[] 
      switches::kEnableNativeGpuMemoryBuffers,
+     switches::kRenderNodeOverride,
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-content_browser_media_frameless__media__interface__proxy.h b/chromium/patches/patch-content_browser_media_frameless__media__interface__proxy.h
index d7229fbd3d..a8ca9113dd 100644
--- a/chromium/patches/patch-content_browser_media_frameless__media__interface__proxy.h
+++ b/chromium/patches/patch-content_browser_media_frameless__media__interface__proxy.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_media_frameless__media__interface__proxy.h,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/media/frameless_media_interface_proxy.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/media/frameless_media_interface_proxy.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/media/frameless_media_interface_proxy.h
 @@ -19,7 +19,7 @@
  #include "mojo/public/cpp/bindings/receiver_set.h"
@@ -12,15 +12,15 @@ $NetBSD: patch-content_browser_media_frameless__media__interface__proxy.h,v 1.1
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
+ #include "media/mojo/mojom/video_decoder.mojom.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -105,7 +105,7 @@ class FramelessMediaInterfaceProxy final
+@@ -104,7 +104,7 @@ class FramelessMediaInterfaceProxy final
    // Connections to the renderer.
    mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Connection to the StableVideoDecoderFactory that lives in a utility
-   // process. This is only used for out-of-process video decoding and only when
-   // the FramelessMediaInterfaceProxy is created without a RenderProcessHost
+   // Connection to the InterfaceFactory that lives in a utility process.
+   // This is only used for out-of-process video decoding and only when the
+   // FramelessMediaInterfaceProxy is created without a RenderProcessHost
diff --git a/chromium/patches/patch-content_browser_media_media__keys__listener__manager__impl.cc b/chromium/patches/patch-content_browser_media_media__keys__listener__manager__impl.cc
index 58f59b6136..175d911c51 100644
--- a/chromium/patches/patch-content_browser_media_media__keys__listener__manager__impl.cc
+++ b/chromium/patches/patch-content_browser_media_media__keys__listener__manager__impl.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-content_browser_media_media__keys__listener__manager__impl.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/media/media_keys_listener_manager_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/media/media_keys_listener_manager_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/media/media_keys_listener_manager_impl.cc
-@@ -333,7 +333,7 @@ void MediaKeysListenerManagerImpl::Start
+@@ -332,7 +332,7 @@ void MediaKeysListenerManagerImpl::Start
      return;
    }
  
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) || BUILDFLAG(IS_WIN)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    // Create SystemMediaControls with the SingletonHwnd.
    browser_system_media_controls_ =
        system_media_controls::SystemMediaControls::Create(
diff --git a/chromium/patches/patch-content_browser_network__service__instance__impl.cc b/chromium/patches/patch-content_browser_network__service__instance__impl.cc
index 86a612ce9d..bc7fe09e4c 100644
--- a/chromium/patches/patch-content_browser_network__service__instance__impl.cc
+++ b/chromium/patches/patch-content_browser_network__service__instance__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_network__service__instance__impl.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/network_service_instance_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/network_service_instance_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/network_service_instance_impl.cc
-@@ -85,7 +85,7 @@
+@@ -83,7 +83,7 @@
  #include "content/browser/network/network_service_process_tracker_win.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_network__service__instance__impl.cc,v 1.1 2025/02
  #include "content/browser/system_dns_resolution/system_dns_resolver.h"
  #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
  #endif
-@@ -368,7 +368,7 @@ void CreateInProcessNetworkService(
+@@ -341,7 +341,7 @@ void CreateInProcessNetworkService(
                                  std::move(receiver)));
  }
  
@@ -24,7 +24,7 @@ $NetBSD: patch-content_browser_network__service__instance__impl.cc,v 1.1 2025/02
  // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a
  // high-priority thread pool.
  void RunSystemDnsResolverOnThreadPool(
-@@ -437,7 +437,7 @@ network::mojom::NetworkServiceParamsPtr 
+@@ -410,7 +410,7 @@ network::mojom::NetworkServiceParamsPtr 
    }
  #endif  // BUILDFLAG(IS_POSIX)
  
diff --git a/chromium/patches/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/chromium/patches/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
index 2ec3038001..6664aa5ce8 100644
--- a/chromium/patches/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
+++ b/chromium/patches/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/ppapi_plugin_process_host_receiver_bindings.cc
 @@ -8,7 +8,7 @@
  
diff --git a/chromium/patches/patch-content_browser_renderer__host_delegated__frame__host.cc b/chromium/patches/patch-content_browser_renderer__host_delegated__frame__host.cc
index cb199c3448..8fdea53acd 100644
--- a/chromium/patches/patch-content_browser_renderer__host_delegated__frame__host.cc
+++ b/chromium/patches/patch-content_browser_renderer__host_delegated__frame__host.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-content_browser_renderer__host_delegated__frame__host.cc,v 1.1 2025/02/06 09:58:05 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/delegated_frame_host.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/renderer_host/delegated_frame_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -318,7 +318,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -333,7 +333,7 @@ void DelegatedFrameHost::EmbedSurface(
  
    if (!primary_surface_id ||
        primary_surface_id->local_surface_id() != local_surface_id_) {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      // On Windows and Linux, we would like to produce new content as soon as
      // possible or the OS will create an additional black gutter. Until we can
      // block resize on surface synchronization on these platforms, we will not
diff --git a/chromium/patches/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc b/chromium/patches/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
index 070daa7b06..aa925516db 100644
--- a/chromium/patches/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
+++ b/chromium/patches/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
  #include "media/base/media_switches.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_renderer__host_media_service__video__capture__dev
  #include "content/browser/gpu/gpu_data_manager_impl.h"
  #endif
  
-@@ -173,7 +173,7 @@ void ServiceVideoCaptureDeviceLauncher::
+@@ -183,7 +183,7 @@ void ServiceVideoCaptureDeviceLauncher::
    }
  #else
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
diff --git a/chromium/patches/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/chromium/patches/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
index 8f946f9c21..d37cd1f34b 100644
--- a/chromium/patches/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
+++ b/chromium/patches/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc
 @@ -462,7 +462,7 @@ void PepperFileIOHost::OnLocalFileOpened
      ppapi::host::ReplyMessageContext reply_context,
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
index f290e5ad12..35f0ce28d9 100644
--- a/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_renderer__host_render__process__host__impl.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-02-01 12:26:17.880666258 +0100
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -220,7 +220,7 @@
+@@ -224,7 +224,7 @@
  #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_renderer__host_render__process__host__impl.cc,v 1
  #include <sys/resource.h>
  
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
-@@ -1083,7 +1083,7 @@ static constexpr size_t kUnknownPlatform
+@@ -1122,7 +1122,7 @@ static constexpr size_t kUnknownPlatform
  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
  // unlimited.
  size_t GetPlatformProcessLimit() {
@@ -24,7 +24,7 @@ $NetBSD: patch-content_browser_renderer__host_render__process__host__impl.cc,v 1
    struct rlimit limit;
    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
      return kUnknownPlatformProcessLimit;
-@@ -1260,7 +1260,7 @@ RenderProcessHostImpl::IOThreadHostImpl:
+@@ -1317,7 +1317,7 @@ RenderProcessHostImpl::IOThreadHostImpl:
  
  void RenderProcessHostImpl::IOThreadHostImpl::SetPid(
      base::ProcessId child_pid) {
@@ -33,7 +33,7 @@ $NetBSD: patch-content_browser_renderer__host_render__process__host__impl.cc,v 1
    child_thread_type_switcher_.SetPid(child_pid);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  }
-@@ -3264,7 +3264,7 @@ void RenderProcessHostImpl::AppendRender
+@@ -3410,7 +3410,7 @@ void RenderProcessHostImpl::AppendRender
              base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
    }
  
@@ -42,7 +42,7 @@ $NetBSD: patch-content_browser_renderer__host_render__process__host__impl.cc,v 1
    // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
    // for NV12 GPU memory buffer.
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
-@@ -3320,6 +3320,7 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3465,6 +3465,7 @@ void RenderProcessHostImpl::PropagateBro
        switches::kDisableSpeechAPI,
        switches::kDisableThreadedCompositing,
        switches::kDisableTouchDragDrop,
@@ -50,7 +50,7 @@ $NetBSD: patch-content_browser_renderer__host_render__process__host__impl.cc,v 1
        switches::kDisableV8IdleTasks,
        switches::kDisableVideoCaptureUseGpuMemoryBuffer,
        switches::kDisableWebGLImageChromium,
-@@ -5102,7 +5103,7 @@ uint64_t RenderProcessHostImpl::GetPriva
+@@ -5310,7 +5311,7 @@ uint64_t RenderProcessHostImpl::GetPriva
    // - Win: https://crbug.com/707022 .
    uint64_t total_size = 0;
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.h b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.h
index 66f25f423a..309a68b6ae 100644
--- a/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_renderer__host_render__process__host__impl.h,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/render_process_host_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/renderer_host/render_process_host_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/render_process_host_impl.h
 @@ -102,7 +102,7 @@
  #include "media/fuchsia_media_codec_provider_impl.h"
@@ -15,16 +15,7 @@ $NetBSD: patch-content_browser_renderer__host_render__process__host__impl.h,v 1.
  #include "content/browser/child_thread_type_switcher_linux.h"
  #include "media/mojo/mojom/video_encode_accelerator.mojom.h"
  #endif
-@@ -612,7 +612,7 @@ class CONTENT_EXPORT RenderProcessHostIm
-   // Sets this RenderProcessHost to be guest only. For Testing only.
-   void SetForGuestsOnlyForTesting();
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
-   // Launch the zygote early in the browser startup.
-   static void EarlyZygoteLaunch();
- #endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC)
-@@ -973,7 +973,7 @@ class CONTENT_EXPORT RenderProcessHostIm
+@@ -986,7 +986,7 @@ class CONTENT_EXPORT RenderProcessHostIm
      std::unique_ptr<service_manager::BinderRegistry> binders_;
      mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
  
@@ -33,3 +24,12 @@ $NetBSD: patch-content_browser_renderer__host_render__process__host__impl.h,v 1.
      mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
          video_encode_accelerator_factory_remote_;
      ChildThreadTypeSwitcher child_thread_type_switcher_;
+@@ -1235,7 +1235,7 @@ class CONTENT_EXPORT RenderProcessHostIm
+   // if the request isn't handled on the IO thread.
+   void OnBindHostReceiver(mojo::GenericPendingReceiver receiver);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Provides /proc/{renderer pid}/status and statm files for the renderer,
+   // because the files are required to calculate the renderer's private
+   // footprint on Chromium Linux. Regarding MacOS X and Windows, we have
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
index 62357b4c34..4e1f721f4e 100644
--- a/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
+++ b/chromium/patches/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc
 @@ -52,7 +52,7 @@
  #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_renderer__host_render__process__host__impl__recei
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
  #include "content/browser/font_service.h"  // nogncheck
  #include "content/browser/media/video_encode_accelerator_provider_launcher.h"
-@@ -341,7 +341,7 @@ void RenderProcessHostImpl::IOThreadHost
+@@ -343,7 +343,7 @@ void RenderProcessHostImpl::IOThreadHost
    }
  #endif
  
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__view__host__impl.cc b/chromium/patches/patch-content_browser_renderer__host_render__view__host__impl.cc
index 1170262519..6f309d1133 100644
--- a/chromium/patches/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/chromium/patches/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_renderer__host_render__view__host__impl.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/render_view_host_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/renderer_host/render_view_host_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -274,7 +274,7 @@ void RenderViewHostImpl::GetPlatformSpec
+@@ -275,7 +275,7 @@ void RenderViewHostImpl::GetPlatformSpec
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
    prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 5c686e9998..10e4418ef6 100644
--- a/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,21 +1,21 @@
-$NetBSD: patch-content_browser_renderer__host_render__widget__host__view__aura.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -121,7 +121,7 @@
  #include "ui/gfx/gdi_util.h"
- #endif
+ #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/accessibility/platform/browser_accessibility_auralinux.h"
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/text_input_flags.h"
-@@ -484,7 +484,7 @@ gfx::NativeViewAccessible RenderWidgetHo
+@@ -478,7 +478,7 @@ gfx::NativeViewAccessible RenderWidgetHo
      return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot())
          ->GetCOM();
  
@@ -24,7 +24,7 @@ $NetBSD: patch-content_browser_renderer__host_render__widget__host__view__aura.c
    ui::BrowserAccessibilityManager* manager =
        host()->GetOrCreateRootBrowserAccessibilityManager();
    if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1745,7 +1745,7 @@ bool RenderWidgetHostViewAura::ShouldDoL
+@@ -1882,7 +1882,7 @@ bool RenderWidgetHostViewAura::ShouldDoL
    return host() && host()->delegate() && host()->delegate()->ShouldDoLearning();
  }
  
@@ -33,21 +33,21 @@ $NetBSD: patch-content_browser_renderer__host_render__widget__host__view__aura.c
  bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
      const gfx::Range& range,
      const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2654,7 +2654,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
+@@ -2858,7 +2858,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return NeedsInputGrab();
  #else
    return false;
-@@ -2838,7 +2838,7 @@ void RenderWidgetHostViewAura::ForwardKe
+@@ -3042,7 +3042,7 @@ void RenderWidgetHostViewAura::ForwardKe
    if (!target_host)
      return;
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!event.skip_if_unhandled && linux_ui && event.os_event &&
+   if (!event.skip_if_unhandled && linux_ui && event.os_event) {
+     const auto command = linux_ui->GetTextEditCommandForEvent(
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.h
index 052d742f89..4344cc255c 100644
--- a/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.h
+++ b/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__aura.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_renderer__host_render__widget__host__view__aura.h,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/render_widget_host_view_aura.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/renderer_host/render_widget_host_view_aura.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/render_widget_host_view_aura.h
-@@ -267,7 +267,7 @@ class CONTENT_EXPORT RenderWidgetHostVie
+@@ -276,7 +276,7 @@ class CONTENT_EXPORT RenderWidgetHostVie
    ukm::SourceId GetClientSourceForMetrics() const override;
    bool ShouldDoLearning() override;
  
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
index 0db1d9969a..d691a494f6 100644
--- a/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ b/chromium/patches/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
 @@ -602,7 +602,7 @@ bool RenderWidgetHostViewEventHandler::C
    if (event->type() == ui::EventType::kMouseExited) {
diff --git a/chromium/patches/patch-content_browser_sandbox__host__linux.cc b/chromium/patches/patch-content_browser_sandbox__host__linux.cc
index 9a77f861c3..540dbaff39 100644
--- a/chromium/patches/patch-content_browser_sandbox__host__linux.cc
+++ b/chromium/patches/patch-content_browser_sandbox__host__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_sandbox__host__linux.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/sandbox_host_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/sandbox_host_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/sandbox_host_linux.cc
 @@ -45,6 +45,7 @@ void SandboxHostLinux::Init() {
    // Instead, it replies on a temporary socket provided by the caller.
diff --git a/chromium/patches/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/chromium/patches/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
index e333395f42..79c75d9eac 100644
--- a/chromium/patches/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
+++ b/chromium/patches/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc
-@@ -340,7 +340,7 @@ void JankMonitorImpl::ThreadExecutionSta
+@@ -337,7 +337,7 @@ void JankMonitorImpl::ThreadExecutionSta
      // in context menus, among others). Simply ignore the mismatches for now.
      // See https://crbug.com/929813 for the details of why the mismatch
      // happens.
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \
-     BUILDFLAG(IS_OZONE)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE)
      task_execution_metadata_.clear();
  #endif
+     return;
diff --git a/chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.cc b/chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
index c286ef4d73..4af9a78136 100644
--- a/chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
+++ b/chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_scheduler_responsiveness_native__event__observer.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/scheduler/responsiveness/native_event_observer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/scheduler/responsiveness/native_event_observer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/scheduler/responsiveness/native_event_observer.cc
 @@ -15,7 +15,7 @@
  
diff --git a/chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.h b/chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.h
index e78c68731c..a14e6b363f 100644
--- a/chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.h
+++ b/chromium/patches/patch-content_browser_scheduler_responsiveness_native__event__observer.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_browser_scheduler_responsiveness_native__event__observer.h,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/scheduler/responsiveness/native_event_observer.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/scheduler/responsiveness/native_event_observer.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/scheduler/responsiveness/native_event_observer.h
 @@ -16,7 +16,7 @@
  #include "content/public/browser/native_event_processor_observer_mac.h"
diff --git a/chromium/patches/patch-content_browser_service__host_utility__process__host.cc b/chromium/patches/patch-content_browser_service__host_utility__process__host.cc
new file mode 100644
index 0000000000..577e5a14d4
--- /dev/null
+++ b/chromium/patches/patch-content_browser_service__host_utility__process__host.cc
@@ -0,0 +1,44 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- content/browser/service_host/utility_process_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ content/browser/service_host/utility_process_host.cc
+@@ -68,7 +68,7 @@
+ #include "content/browser/v8_snapshot_files.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/files/file_util.h"
+ #include "base/files/scoped_file.h"
+ #include "base/pickle.h"
+@@ -96,7 +96,7 @@ namespace content {
+ 
+ namespace {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ base::ScopedFD PassNetworkContextParentDirs(
+     std::vector<base::FilePath> network_context_parent_dirs) {
+   base::Pickle pickle;
+@@ -427,7 +427,7 @@ bool UtilityProcessHost::StartProcess() 
+     file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line));
+ #endif  // BUILDFLAG(IS_POSIX)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     // The network service should have access to the parent directories
+     // necessary for its usage.
+     if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
+@@ -444,7 +444,7 @@ bool UtilityProcessHost::StartProcess() 
+     if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
+       bool pass_gpu_buffer_flag =
+           switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       // Check if NV12 GPU memory buffer supported at the same time.
+       pass_gpu_buffer_flag =
+           pass_gpu_buffer_flag &&
diff --git a/chromium/patches/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc b/chromium/patches/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc
new file mode 100644
index 0000000000..0765de51e3
--- /dev/null
+++ b/chromium/patches/patch-content_browser_service__host_utility__process__host__receiver__bindings.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- content/browser/service_host/utility_process_host_receiver_bindings.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ content/browser/service_host/utility_process_host_receiver_bindings.cc
+@@ -10,7 +10,7 @@
+ #include "content/public/common/content_client.h"
+ #include "media/media_buildflags.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
+ #include "content/browser/font_service.h"  // nogncheck
+ #endif
+@@ -24,7 +24,7 @@ namespace content {
+ 
+ void UtilityProcessHost::BindHostReceiver(
+     mojo::GenericPendingReceiver receiver) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
+     ConnectToFontService(std::move(font_receiver));
+     return;
diff --git a/chromium/patches/patch-content_browser_service__host_utility__sandbox__delegate.cc b/chromium/patches/patch-content_browser_service__host_utility__sandbox__delegate.cc
new file mode 100644
index 0000000000..bcb9a32b13
--- /dev/null
+++ b/chromium/patches/patch-content_browser_service__host_utility__sandbox__delegate.cc
@@ -0,0 +1,58 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- content/browser/service_host/utility_sandbox_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ content/browser/service_host/utility_sandbox_delegate.cc
+@@ -77,7 +77,7 @@ UtilitySandboxedProcessLauncherDelegate:
+ #if BUILDFLAG(IS_FUCHSIA)
+       sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture ||
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
+       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -90,14 +90,14 @@ UtilitySandboxedProcessLauncherDelegate:
+ #endif  // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+       sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI ||
+       sandbox_type_ == sandbox::mojom::Sandbox::kPrintBackend ||
+ #endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       sandbox_type_ == sandbox::mojom::Sandbox::kVideoEffects ||
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation ||
+ #endif
+       sandbox_type_ == sandbox::mojom::Sandbox::kAudio ||
+@@ -144,7 +144,7 @@ ZygoteCommunication* UtilitySandboxedPro
+   // process upon startup.
+   if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
+       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution ||
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
+       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -158,11 +158,11 @@ ZygoteCommunication* UtilitySandboxedPro
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+       sandbox_type_ == sandbox::mojom::Sandbox::kAudio ||
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+       sandbox_type_ == sandbox::mojom::Sandbox::kPrintBackend ||
+       sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI ||
+ #endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       sandbox_type_ == sandbox::mojom::Sandbox::kVideoEffects ||
+       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation ||
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-content_browser_utility__process__host.cc b/chromium/patches/patch-content_browser_utility__process__host.cc
deleted file mode 100644
index 6f3f4d112e..0000000000
--- a/chromium/patches/patch-content_browser_utility__process__host.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-content_browser_utility__process__host.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/utility_process_host.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ content/browser/utility_process_host.cc
-@@ -62,7 +62,7 @@
- #include "content/browser/v8_snapshot_files.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/files/file_util.h"
- #include "base/files/scoped_file.h"
- #include "base/pickle.h"
-@@ -76,7 +76,7 @@
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "base/task/sequenced_task_runner.h"
- #include "components/viz/host/gpu_client.h"
- #include "media/capture/capture_switches.h"
-@@ -87,7 +87,7 @@ namespace content {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- base::ScopedFD PassNetworkContextParentDirs(
-     std::vector<base::FilePath> network_context_parent_dirs) {
-   base::Pickle pickle;
-@@ -153,7 +153,7 @@ UtilityProcessHost::UtilityProcessHost(s
-       name_(u"utility process"),
-       file_data_(std::make_unique<ChildProcessLauncherFileData>()),
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       allowed_gpu_(false),
-       gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)),
- #endif
-@@ -213,7 +213,7 @@ void UtilityProcessHost::SetPreloadLibra
- 
- void UtilityProcessHost::SetAllowGpuClient() {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   allowed_gpu_ = true;
- #endif
- }
-@@ -351,7 +351,7 @@ bool UtilityProcessHost::StartProcess() 
-         switches::kMuteAudio,
-         switches::kUseFileForFakeAudioCapture,
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \
--    BUILDFLAG(IS_SOLARIS)
-+    BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_NETBSD)
-         switches::kAlsaInputDevice,
-         switches::kAlsaOutputDevice,
- #endif
-@@ -410,7 +410,7 @@ bool UtilityProcessHost::StartProcess() 
-     file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line));
- #endif  // BUILDFLAG(IS_POSIX)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // The network service should have access to the parent directories
-     // necessary for its usage.
-     if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
-@@ -421,13 +421,13 @@ bool UtilityProcessHost::StartProcess() 
-     }
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only
-     // when the video capture use GPU memory buffer enabled.
-     if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
-       bool pass_gpu_buffer_flag =
-           switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       // Check if NV12 GPU memory buffer supported at the same time.
-       pass_gpu_buffer_flag =
-           pass_gpu_buffer_flag &&
diff --git a/chromium/patches/patch-content_browser_utility__process__host.h b/chromium/patches/patch-content_browser_utility__process__host.h
deleted file mode 100644
index 35b47b25ab..0000000000
--- a/chromium/patches/patch-content_browser_utility__process__host.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-content_browser_utility__process__host.h,v 1.1 2025/02/06 09:58:06 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/utility_process_host.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ content/browser/utility_process_host.h
-@@ -34,7 +34,7 @@ class Thread;
- }  // namespace base
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- namespace viz {
- class GpuClient;
- }  // namespace viz
-@@ -202,7 +202,7 @@ class CONTENT_EXPORT UtilityProcessHost
-   LaunchState launch_state_ = LaunchState::kLaunchInProgress;
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   bool allowed_gpu_;
-   std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_;
- #endif
diff --git a/chromium/patches/patch-content_browser_utility__process__host__receiver__bindings.cc b/chromium/patches/patch-content_browser_utility__process__host__receiver__bindings.cc
deleted file mode 100644
index db42450597..0000000000
--- a/chromium/patches/patch-content_browser_utility__process__host__receiver__bindings.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-content_browser_utility__process__host__receiver__bindings.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/utility_process_host_receiver_bindings.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ content/browser/utility_process_host_receiver_bindings.cc
-@@ -10,13 +10,13 @@
- #include "content/public/browser/content_browser_client.h"
- #include "content/public/common/content_client.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
- #include "content/browser/font_service.h"  // nogncheck
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "components/viz/host/gpu_client.h"
- #include "content/public/browser/gpu_client.h"
- #endif
-@@ -25,14 +25,14 @@ namespace content {
- 
- void UtilityProcessHost::BindHostReceiver(
-     mojo::GenericPendingReceiver receiver) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
-     ConnectToFontService(std::move(font_receiver));
-     return;
-   }
- #endif
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (allowed_gpu_) {
-     // TODO(crbug.com/328099369) Remove once all clients get this directly.
-     if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) {
diff --git a/chromium/patches/patch-content_browser_utility__sandbox__delegate.cc b/chromium/patches/patch-content_browser_utility__sandbox__delegate.cc
deleted file mode 100644
index c89a99d538..0000000000
--- a/chromium/patches/patch-content_browser_utility__sandbox__delegate.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-content_browser_utility__sandbox__delegate.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/utility_sandbox_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ content/browser/utility_sandbox_delegate.cc
-@@ -76,10 +76,10 @@ UtilitySandboxedProcessLauncherDelegate:
- #if BUILDFLAG(IS_FUCHSIA)
-       sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture ||
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -93,10 +93,10 @@ UtilitySandboxedProcessLauncherDelegate:
- #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
-       sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI ||
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kVideoEffects ||
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation ||
- #endif
-       sandbox_type_ == sandbox::mojom::Sandbox::kAudio ||
-@@ -142,10 +142,10 @@ ZygoteCommunication* UtilitySandboxedPro
-   // process upon startup.
-   if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
-       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution ||
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -163,7 +163,7 @@ ZygoteCommunication* UtilitySandboxedPro
- #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
-       sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI ||
- #endif
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       sandbox_type_ == sandbox::mojom::Sandbox::kVideoEffects ||
-       sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation ||
- #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-content_browser_v8__snapshot__files.cc b/chromium/patches/patch-content_browser_v8__snapshot__files.cc
index deb1fcfaee..1137a90968 100644
--- a/chromium/patches/patch-content_browser_v8__snapshot__files.cc
+++ b/chromium/patches/patch-content_browser_v8__snapshot__files.cc
@@ -1,15 +1,15 @@
-$NetBSD: patch-content_browser_v8__snapshot__files.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/v8_snapshot_files.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/v8_snapshot_files.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/v8_snapshot_files.cc
-@@ -17,7 +17,7 @@ namespace content {
- std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>>
+@@ -19,7 +19,7 @@ namespace content {
+ std::map<std::string, std::variant<base::FilePath, base::ScopedFD>>
  GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) {
-   std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files;
+   std::map<std::string, std::variant<base::FilePath, base::ScopedFD>> files;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT)
diff --git a/chromium/patches/patch-content_browser_web__contents_slow__web__preference__cache.cc b/chromium/patches/patch-content_browser_web__contents_slow__web__preference__cache.cc
index a71fe4e8b4..92e3e7bf3f 100644
--- a/chromium/patches/patch-content_browser_web__contents_slow__web__preference__cache.cc
+++ b/chromium/patches/patch-content_browser_web__contents_slow__web__preference__cache.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_web__contents_slow__web__preference__cache.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/web_contents/slow_web_preference_cache.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/web_contents/slow_web_preference_cache.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/web_contents/slow_web_preference_cache.cc
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
  
  #if BUILDFLAG(IS_WIN)
  #include "ui/events/devices/input_device_observer_win.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-content_browser_web__contents_slow__web__preference__cache.cc,v 1
  #include "ui/events/devices/device_data_manager.h"
  #elif BUILDFLAG(IS_ANDROID)
  #include "ui/base/device_form_factor.h"
-@@ -54,7 +54,7 @@ SlowWebPreferenceCache::SlowWebPreferenc
+@@ -57,7 +57,7 @@ SlowWebPreferenceCache::SlowWebPreferenc
  
  #if BUILDFLAG(IS_WIN)
    ui::InputDeviceObserverWin::GetInstance()->AddObserver(this);
@@ -24,7 +24,7 @@ $NetBSD: patch-content_browser_web__contents_slow__web__preference__cache.cc,v 1
    ui::DeviceDataManager::GetInstance()->AddObserver(this);
  #elif BUILDFLAG(IS_ANDROID)
    ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this);
-@@ -64,7 +64,7 @@ SlowWebPreferenceCache::SlowWebPreferenc
+@@ -69,7 +69,7 @@ SlowWebPreferenceCache::SlowWebPreferenc
  SlowWebPreferenceCache::~SlowWebPreferenceCache() {
  #if BUILDFLAG(IS_WIN)
    ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this);
diff --git a/chromium/patches/patch-content_browser_web__contents_web__contents__view__aura.cc b/chromium/patches/patch-content_browser_web__contents_web__contents__view__aura.cc
index 3a343da532..95146ab022 100644
--- a/chromium/patches/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ b/chromium/patches/patch-content_browser_web__contents_web__contents__view__aura.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_web__contents_web__contents__view__aura.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/web_contents/web_contents_view_aura.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/web_contents/web_contents_view_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/web_contents/web_contents_view_aura.cc
-@@ -174,7 +174,7 @@ class WebDragSourceAura : public content
+@@ -173,7 +173,7 @@ class WebDragSourceAura : public content
    raw_ptr<aura::Window> window_;
  };
  
@@ -24,7 +24,7 @@ $NetBSD: patch-content_browser_web__contents_web__contents__view__aura.cc,v 1.1
    // We set the file contents before the URL because the URL also sets file
    // contents (to a .URL shortcut).  We want to prefer file content data over
    // a shortcut so we add it first.
-@@ -1326,7 +1326,7 @@ void WebContentsViewAura::OnMouseEvent(u
+@@ -1327,7 +1327,7 @@ void WebContentsViewAura::OnMouseEvent(u
      // Linux window managers like to handle raise-on-click themselves.  If we
      // raise-on-click manually, this may override user settings that prevent
      // focus-stealing.
diff --git a/chromium/patches/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc b/chromium/patches/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
index 56c304c0af..53efe7f312 100644
--- a/chromium/patches/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
+++ b/chromium/patches/patch-content_browser_web__contents_web__contents__view__aura__unittest.cc
@@ -1,12 +1,21 @@
-$NetBSD: patch-content_browser_web__contents_web__contents__view__aura__unittest.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/web_contents/web_contents_view_aura_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/web_contents/web_contents_view_aura_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/web_contents/web_contents_view_aura_unittest.cc
-@@ -97,7 +97,7 @@ class TestDragDropClient : public aura::
+@@ -40,7 +40,7 @@
+ #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
+ #include "ui/base/x/selection_utils.h"
+ #include "ui/base/x/x11_os_exchange_data_provider.h"
+ #include "ui/gfx/x/atom_cache.h"
+@@ -96,7 +96,7 @@ class TestDragDropClient : public aura::
      drag_drop_data_ = std::move(data);
      return DragOperation::kCopy;
    }
@@ -15,3 +24,57 @@ $NetBSD: patch-content_browser_web__contents_web__contents__view__aura__unittest
    void UpdateDragImage(const gfx::ImageSkia& image,
                         const gfx::Vector2d& offset) override {}
  #endif
+@@ -231,7 +231,7 @@ TEST_F(WebContentsViewAuraTest, WebConte
+                              ui::EF_LEFT_MOUSE_BUTTON, 0);
+   ui::EventHandler* event_handler = GetView();
+   event_handler->OnMouseEvent(&mouse_event);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // The web-content is not activated during mouse-press on Linux.
+   // See comment in WebContentsViewAura::OnMouseEvent() for more details.
+   EXPECT_NE(web_contents(), nullptr);
+@@ -297,7 +297,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
+   view->OnDragEntered(event);
+   ASSERT_NE(nullptr, view->current_drag_data_);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // By design, Linux implementations return an empty string if file data
+   // is also present.
+   EXPECT_TRUE(!view->current_drag_data_->text ||
+@@ -337,7 +337,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
+ 
+   CheckDropData(view);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // By design, Linux implementations returns an empty string if file data
+   // is also present.
+   EXPECT_TRUE(!drop_complete_data_->drop_data.text ||
+@@ -395,7 +395,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
+   view->OnDragEntered(event);
+   ASSERT_NE(nullptr, view->current_drag_data_);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // By design, Linux implementations return an empty string if file data
+   // is also present.
+   EXPECT_TRUE(!view->current_drag_data_->text ||
+@@ -427,7 +427,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
+ 
+   CheckDropData(view);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // By design, Linux implementations returns an empty string if file data is
+   // also present.
+   EXPECT_TRUE(!drop_complete_data_->drop_data.text ||
+@@ -458,7 +458,7 @@ TEST_F(WebContentsViewAuraTest, MAYBE_Dr
+ 
+   auto data = std::make_unique<ui::OSExchangeData>();
+ 
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
+   // FileContents drag-drop in X relies on XDragDropClient::InitDrag() setting
+   // window property 'XdndDirectSave0' to filename. Since XDragDropClient is not
+   // created in this unittest, we will set this property manually to allow
diff --git a/chromium/patches/patch-content_browser_webui_web__ui__main__frame__observer.cc b/chromium/patches/patch-content_browser_webui_web__ui__main__frame__observer.cc
index e7f76462d9..9d3c208ffd 100644
--- a/chromium/patches/patch-content_browser_webui_web__ui__main__frame__observer.cc
+++ b/chromium/patches/patch-content_browser_webui_web__ui__main__frame__observer.cc
@@ -1,44 +1,17 @@
-$NetBSD: patch-content_browser_webui_web__ui__main__frame__observer.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/webui/web_ui_main_frame_observer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/webui/web_ui_main_frame_observer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/webui/web_ui_main_frame_observer.cc
-@@ -13,7 +13,7 @@
- #include "content/public/browser/navigation_handle.h"
- #include "content/public/browser/web_ui_controller.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/feature_list.h"
- #include "base/functional/callback_helpers.h"
- #include "base/logging.h"
-@@ -31,7 +31,7 @@ namespace content {
- 
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Remove the pieces of the URL we don't want to send back with the error
- // reports. In particular, do not send query or fragments as those can have
- // privacy-sensitive information in them.
-@@ -55,7 +55,7 @@ WebUIMainFrameObserver::WebUIMainFrameOb
- 
- WebUIMainFrameObserver::~WebUIMainFrameObserver() = default;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void WebUIMainFrameObserver::OnDidAddMessageToConsole(
-     RenderFrameHost* source_frame,
-     blink::mojom::ConsoleMessageLevel log_level,
-@@ -167,7 +167,7 @@ void WebUIMainFrameObserver::ReadyToComm
- 
- // TODO(crbug.com/40149439) This is currently disabled due to Windows DLL
- // thunking issues. Fix & re-enable.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   MaybeEnableWebUIJavaScriptErrorReporting(navigation_handle);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- }
+@@ -47,7 +47,7 @@ std::string RedactURL(const GURL& url) {
+ bool IsWebUIJavaScriptErrorReportingSupported() {
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+   return false;
+-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return true;
+ #else
+   return base::FeatureList::IsEnabled(features::kWebUIJSErrorReportingExtended);
diff --git a/chromium/patches/patch-content_browser_webui_web__ui__main__frame__observer.h b/chromium/patches/patch-content_browser_webui_web__ui__main__frame__observer.h
deleted file mode 100644
index 1c8490a5f1..0000000000
--- a/chromium/patches/patch-content_browser_webui_web__ui__main__frame__observer.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-content_browser_webui_web__ui__main__frame__observer.h,v 1.1 2025/02/06 09:58:06 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/browser/webui/web_ui_main_frame_observer.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ content/browser/webui/web_ui_main_frame_observer.h
-@@ -44,7 +44,7 @@ class CONTENT_EXPORT WebUIMainFrameObser
- 
- // TODO(crbug.com/40149439) This is currently disabled due to Windows DLL
- // thunking issues. Fix & re-enable.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // On official Google builds, capture and report JavaScript error messages on
-   // WebUI surfaces back to Google. This allows us to fix JavaScript errors and
-   // exceptions.
-@@ -60,7 +60,7 @@ class CONTENT_EXPORT WebUIMainFrameObser
-   void ReadyToCommitNavigation(NavigationHandle* navigation_handle) override;
- 
-  private:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   void MaybeEnableWebUIJavaScriptErrorReporting(
-       NavigationHandle* navigation_handle);
- 
diff --git a/chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
index fbc1970e4b..6686a43ede 100644
--- a/chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
+++ b/chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.cc,v 1.1 2025/02/06 09:58:06 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/zygote_host/zygote_host_impl_linux.cc
-@@ -19,8 +19,10 @@
- #include "build/chromeos_buildflags.h"
+@@ -23,8 +23,10 @@
+ #include "build/build_config.h"
  #include "content/common/zygote/zygote_commands_linux.h"
  #include "content/common/zygote/zygote_communication_linux.h"
 +#if !BUILDFLAG(IS_BSD)
@@ -17,7 +17,7 @@ $NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.cc,v 1.1 2
  #include "sandbox/linux/services/credentials.h"
  #include "sandbox/linux/services/namespace_sandbox.h"
  #include "sandbox/linux/suid/client/setuid_sandbox_host.h"
-@@ -38,6 +40,7 @@ namespace content {
+@@ -42,6 +44,7 @@ namespace content {
  
  namespace {
  
@@ -25,7 +25,7 @@ $NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.cc,v 1.1 2
  // Receive a fixed message on fd and return the sender's PID.
  // Returns true if the message received matches the expected message.
  bool ReceiveFixedMessage(int fd,
-@@ -60,6 +63,7 @@ bool ReceiveFixedMessage(int fd,
+@@ -64,6 +67,7 @@ bool ReceiveFixedMessage(int fd,
      return false;
    return true;
  }
@@ -33,7 +33,7 @@ $NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.cc,v 1.1 2
  
  }  // namespace
  
-@@ -69,9 +73,13 @@ ZygoteHost* ZygoteHost::GetInstance() {
+@@ -73,9 +77,13 @@ ZygoteHost* ZygoteHost::GetInstance() {
  }
  
  ZygoteHostImpl::ZygoteHostImpl()
@@ -47,7 +47,7 @@ $NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.cc,v 1.1 2
        sandbox_binary_(),
        zygote_pids_lock_(),
        zygote_pids_() {}
-@@ -84,6 +92,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInsta
+@@ -88,6 +96,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInsta
  }
  
  void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
@@ -55,7 +55,7 @@ $NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.cc,v 1.1 2
    if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) {
      return;
    }
-@@ -138,6 +147,7 @@ void ZygoteHostImpl::Init(const base::Co
+@@ -142,6 +151,7 @@ void ZygoteHostImpl::Init(const base::Co
             "you can try using --"
          << sandbox::policy::switches::kNoSandbox << ".";
    }
@@ -63,7 +63,7 @@ $NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.cc,v 1.1 2
  }
  
  void ZygoteHostImpl::AddZygotePid(pid_t pid) {
-@@ -162,6 +172,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
+@@ -166,6 +176,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
      base::CommandLine* cmd_line,
      base::ScopedFD* control_fd,
      base::FileHandleMappingVector additional_remapped_fds) {
@@ -71,7 +71,7 @@ $NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.cc,v 1.1 2
    int fds[2];
    CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds));
    CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0]));
-@@ -230,9 +241,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
+@@ -234,9 +245,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
  
    AddZygotePid(pid);
    return pid;
diff --git a/chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.h b/chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.h
index 390fcef693..380047a775 100644
--- a/chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.h
+++ b/chromium/patches/patch-content_browser_zygote__host_zygote__host__impl__linux.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.h,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/browser/zygote_host/zygote_host_impl_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/browser/zygote_host/zygote_host_impl_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/browser/zygote_host/zygote_host_impl_linux.h
-@@ -47,12 +47,14 @@ class CONTENT_EXPORT ZygoteHostImpl : pu
+@@ -46,12 +46,14 @@ class CONTENT_EXPORT ZygoteHostImpl : pu
                       base::ScopedFD* control_fd,
                       base::FileHandleMappingVector additional_remapped_fds);
  
@@ -21,7 +21,7 @@ $NetBSD: patch-content_browser_zygote__host_zygote__host__impl__linux.h,v 1.1 20
  
    bool HasZygote() { return !zygote_pids_.empty(); }
  
-@@ -67,9 +69,11 @@ class CONTENT_EXPORT ZygoteHostImpl : pu
+@@ -66,9 +68,11 @@ class CONTENT_EXPORT ZygoteHostImpl : pu
  
    int renderer_sandbox_status_;
  
diff --git a/chromium/patches/patch-content_child_BUILD.gn b/chromium/patches/patch-content_child_BUILD.gn
index c0ae299eda..9c66b4f476 100644
--- a/chromium/patches/patch-content_child_BUILD.gn
+++ b/chromium/patches/patch-content_child_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_child_BUILD.gn,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/child/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/child/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/child/BUILD.gn
-@@ -130,6 +130,13 @@ target(link_target_type, "child") {
+@@ -135,6 +135,13 @@ target(link_target_type, "child") {
      ]
    }
  
@@ -19,4 +19,4 @@ $NetBSD: patch-content_child_BUILD.gn,v 1.1 2025/02/06 09:58:07 wiz Exp $
 +
    if (is_win) {
      sources += [
-       "dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc",
+       "child_process_sandbox_support_impl_win.cc",
diff --git a/chromium/patches/patch-content_child_child__process.cc b/chromium/patches/patch-content_child_child__process.cc
index 52019b6915..bcc5608492 100644
--- a/chromium/patches/patch-content_child_child__process.cc
+++ b/chromium/patches/patch-content_child_child__process.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_child_child__process.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/child/child_process.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/child/child_process.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/child/child_process.cc
 @@ -31,7 +31,7 @@
  #include "content/common/android/cpu_time_metrics.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-content_child_child__process.cc,v 1.1 2025/02/06 09:58:07 wiz Exp
  #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
  
-@@ -178,7 +178,7 @@ void ChildProcess::set_main_thread(Child
+@@ -177,7 +177,7 @@ void ChildProcess::set_main_thread(Child
    main_thread_.reset(thread);
  }
  
diff --git a/chromium/patches/patch-content_child_child__process.h b/chromium/patches/patch-content_child_child__process.h
index 14f2c1161c..e3b6b489e8 100644
--- a/chromium/patches/patch-content_child_child__process.h
+++ b/chromium/patches/patch-content_child_child__process.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_child_child__process.h,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/child/child_process.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/child/child_process.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/child/child_process.h
 @@ -79,7 +79,7 @@ class CONTENT_EXPORT ChildProcess {
      return io_thread_runner_.get();
diff --git a/chromium/patches/patch-content_common_BUILD.gn b/chromium/patches/patch-content_common_BUILD.gn
index e643e4d1b6..b8efe73446 100644
--- a/chromium/patches/patch-content_common_BUILD.gn
+++ b/chromium/patches/patch-content_common_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_common_BUILD.gn,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/common/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/common/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/common/BUILD.gn
-@@ -386,19 +386,28 @@ source_set("common") {
+@@ -382,19 +382,28 @@ source_set("common") {
    }
  
    if (is_linux || is_chromeos) {
diff --git a/chromium/patches/patch-content_common_features.cc b/chromium/patches/patch-content_common_features.cc
index e566a3c893..944020b4d1 100644
--- a/chromium/patches/patch-content_common_features.cc
+++ b/chromium/patches/patch-content_common_features.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-content_common_features.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/common/features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/common/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/common/features.cc
-@@ -143,7 +143,7 @@ BASE_FEATURE(kEnableBackForwardCacheForO
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -124,7 +124,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
  // Enables error reporting for JS errors inside DevTools frontend host
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -15,12 +15,3 @@ $NetBSD: patch-content_common_features.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
  BASE_FEATURE(kEnableDevToolsJsErrorReporting,
               "EnableDevToolsJsErrorReporting",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -306,7 +306,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin,
- // process and having browser process handle adjusting thread properties (nice
- // value, c-group, latency sensitivity...) for children which have sandbox
- // restrictions.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kHandleChildThreadTypeChangesInBrowser,
-              "HandleChildThreadTypeChangesInBrowser",
-              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chromium/patches/patch-content_common_features.h b/chromium/patches/patch-content_common_features.h
index e6e82ec3a3..89230d375f 100644
--- a/chromium/patches/patch-content_common_features.h
+++ b/chromium/patches/patch-content_common_features.h
@@ -1,26 +1,17 @@
-$NetBSD: patch-content_common_features.h,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/common/features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/common/features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/common/features.h
-@@ -34,7 +34,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDoc
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(
-     kEnableBackForwardCacheForOngoingSubframeNavigation);
+@@ -27,7 +27,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCom
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking);
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint);
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation);
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn);
-@@ -80,7 +80,7 @@ CONTENT_EXPORT extern const base::Featur
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch);
- #endif
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleChildThreadTypeChangesInBrowser);
- #endif
- #if BUILDFLAG(IS_ANDROID)
diff --git a/chromium/patches/patch-content_common_font__list__unittest.cc b/chromium/patches/patch-content_common_font__list__unittest.cc
index ceaeb8f02e..e0db1ac5ba 100644
--- a/chromium/patches/patch-content_common_font__list__unittest.cc
+++ b/chromium/patches/patch-content_common_font__list__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_common_font__list__unittest.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/common/font_list_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/common/font_list_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/common/font_list_unittest.cc
 @@ -48,7 +48,7 @@ TEST(FontList, GetFontList) {
          EXPECT_TRUE(HasFontWithName(fonts, "MS Gothic", "MS Gothic"));
diff --git a/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.cc b/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
index 742c917daa..5576dad4aa 100644
--- a/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
+++ b/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_common_gpu__pre__sandbox__hook__bsd.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/common/gpu_pre_sandbox_hook_bsd.cc.orig	2024-12-21 10:25:10.309586963 +0000
+--- content/common/gpu_pre_sandbox_hook_bsd.cc.orig	2025-05-08 12:01:57.747693258 +0000
 +++ content/common/gpu_pre_sandbox_hook_bsd.cc
 @@ -0,0 +1,68 @@
 +// Copyright 2023 The Chromium Authors
diff --git a/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.h b/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.h
index f4ae61676e..24e791ad70 100644
--- a/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.h
+++ b/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__bsd.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_common_gpu__pre__sandbox__hook__bsd.h,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/common/gpu_pre_sandbox_hook_bsd.h.orig	2024-12-21 10:25:10.310090101 +0000
+--- content/common/gpu_pre_sandbox_hook_bsd.h.orig	2025-05-08 12:01:57.747848236 +0000
 +++ content/common/gpu_pre_sandbox_hook_bsd.h
 @@ -0,0 +1,20 @@
 +// Copyright 2017 The Chromium Authors
diff --git a/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__linux.h b/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__linux.h
index 0a3d12a5fa..47c468c207 100644
--- a/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__linux.h
+++ b/chromium/patches/patch-content_common_gpu__pre__sandbox__hook__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_common_gpu__pre__sandbox__hook__linux.h,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/common/gpu_pre_sandbox_hook_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/common/gpu_pre_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/common/gpu_pre_sandbox_hook_linux.h
 @@ -5,8 +5,13 @@
  #ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium/patches/patch-content_common_thread__type__switcher.mojom b/chromium/patches/patch-content_common_thread__type__switcher.mojom
new file mode 100644
index 0000000000..8eb7bab380
--- /dev/null
+++ b/chromium/patches/patch-content_common_thread__type__switcher.mojom
@@ -0,0 +1,16 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- content/common/thread_type_switcher.mojom.orig	2025-05-05 19:21:24.000000000 +0000
++++ content/common/thread_type_switcher.mojom
+@@ -10,6 +10,6 @@ import "mojo/public/mojom/base/thread_ty
+ // occur in a child process due to its sandbox, e.g. on Linux and ChromeOS.
+ interface ThreadTypeSwitcher {
+   // Asks the browser to change the type of thread.
+-  SetThreadType(int32 platform_thread_id,
++  SetThreadType(uint64 platform_thread_id,
+                 mojo_base.mojom.ThreadType thread_type);
+ };
diff --git a/chromium/patches/patch-content_common_user__agent.cc b/chromium/patches/patch-content_common_user__agent.cc
deleted file mode 100644
index 0f34dfcb28..0000000000
--- a/chromium/patches/patch-content_common_user__agent.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-content_common_user__agent.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/common/user_agent.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ content/common/user_agent.cc
-@@ -45,7 +45,7 @@ std::string GetUserAgentPlatform() {
-   return "";
- #elif BUILDFLAG(IS_MAC)
-   return "Macintosh; ";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return "X11; ";  // strange, but that's what Firefox uses
- #elif BUILDFLAG(IS_ANDROID)
-   return "Linux; ";
-@@ -71,7 +71,7 @@ std::string GetUnifiedPlatform() {
-   return "Windows NT 10.0; Win64; x64";
- #elif BUILDFLAG(IS_FUCHSIA)
-   return "Fuchsia";
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return "X11; Linux x86_64";
- #elif BUILDFLAG(IS_IOS)
-   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
-@@ -296,6 +296,16 @@ std::string BuildOSCpuInfoFromOSVersionA
-                       "Android %s", os_version.c_str()
- #elif BUILDFLAG(IS_FUCHSIA)
-                       "Fuchsia"
-+#elif BUILDFLAG(IS_BSD)
-+#if defined(__x86_64__)
-+                      "Linux x86_64; %s %s",
-+#elif defined(__aarch64__)
-+                      "Linux aarch64; %s %s",
-+#else
-+                      "Linux i686; %s %s",
-+#endif
-+                      unixinfo.sysname,  // e.g. Linux
-+                      cpu_type.c_str()   // e.g. i686
- #elif BUILDFLAG(IS_IOS)
-                       "CPU %s OS %s like Mac OS X", cpu_type.c_str(),
-                       os_version.c_str()
diff --git a/chromium/patches/patch-content_gpu_gpu__child__thread.cc b/chromium/patches/patch-content_gpu_gpu__child__thread.cc
index 574545d3aa..2c5e594a07 100644
--- a/chromium/patches/patch-content_gpu_gpu__child__thread.cc
+++ b/chromium/patches/patch-content_gpu_gpu__child__thread.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_gpu_gpu__child__thread.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/gpu/gpu_child_thread.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/gpu/gpu_child_thread.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/gpu/gpu_child_thread.cc
-@@ -58,7 +58,7 @@
+@@ -57,7 +57,7 @@
  #include "third_party/skia/include/ports/SkFontConfigInterface.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-content_gpu_gpu__child__thread.cc,v 1.1 2025/02/06 09:58:07 wiz E
  #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
  
-@@ -142,7 +142,8 @@ void GpuChildThread::Init(const base::Ti
+@@ -147,7 +147,8 @@ void GpuChildThread::Init(const base::Ti
  
    viz_main_.gpu_service()->set_start_time(process_start_time);
  
diff --git a/chromium/patches/patch-content_gpu_gpu__main.cc b/chromium/patches/patch-content_gpu_gpu__main.cc
index ba75c3abbc..1aa233e283 100644
--- a/chromium/patches/patch-content_gpu_gpu__main.cc
+++ b/chromium/patches/patch-content_gpu_gpu__main.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_gpu_gpu__main.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/gpu/gpu_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/gpu/gpu_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/gpu/gpu_main.cc
 @@ -95,10 +95,14 @@
  #include "sandbox/win/src/sandbox.h"
@@ -31,16 +31,16 @@ $NetBSD: patch-content_gpu_gpu__main.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
  bool StartSandboxLinux(gpu::GpuWatchdogThread*,
                         const gpu::GPUInfo*,
                         const gpu::GpuPreferences&);
-@@ -175,7 +179,7 @@ class ContentSandboxHelper : public gpu:
-   bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
+@@ -177,7 +181,7 @@ class ContentSandboxHelper : public gpu:
                                  const gpu::GPUInfo* gpu_info,
                                  const gpu::GpuPreferences& gpu_prefs) override {
+     GPU_STARTUP_TRACE_EVENT("gpu_main::EnsureSandboxInitialized");
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
  #elif BUILDFLAG(IS_WIN)
      return StartSandboxWindows(sandbox_info_);
-@@ -293,7 +297,7 @@ int GpuMain(MainFunctionParams parameter
+@@ -303,7 +307,7 @@ int GpuMain(MainFunctionParams parameter
            std::make_unique<base::SingleThreadTaskExecutor>(
                gpu_preferences.message_pump_type);
      }
@@ -49,7 +49,7 @@ $NetBSD: patch-content_gpu_gpu__main.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
  #error "Unsupported Linux platform."
  #elif BUILDFLAG(IS_MAC)
      // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -318,7 +322,8 @@ int GpuMain(MainFunctionParams parameter
+@@ -329,7 +333,8 @@ int GpuMain(MainFunctionParams parameter
    base::PlatformThread::SetName("CrGpuMain");
    mojo::InterfaceEndpointClient::SetThreadNameSuffixForMetrics("GpuMain");
  
@@ -59,7 +59,7 @@ $NetBSD: patch-content_gpu_gpu__main.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
    // Thread type delegate of the process should be registered before
    // thread type change below for the main thread and for thread pool in
    // ChildProcess constructor.
-@@ -449,7 +454,7 @@ int GpuMain(MainFunctionParams parameter
+@@ -462,7 +467,7 @@ int GpuMain(MainFunctionParams parameter
  
  namespace {
  
@@ -68,12 +68,12 @@ $NetBSD: patch-content_gpu_gpu__main.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
  bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
                         const gpu::GPUInfo* gpu_info,
                         const gpu::GpuPreferences& gpu_prefs) {
-@@ -489,7 +494,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogT
+@@ -502,7 +507,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogT
    sandbox_options.accelerated_video_encode_enabled =
        !gpu_prefs.disable_accelerated_video_encode;
  
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Video decoding of many video streams can use thousands of FDs as well as
-   // Exo clients like Lacros.
+   // Exo clients.
    // See https://crbug.com/1417237
diff --git a/chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
index 8bfa41c67a..f401b6abc7 100644
--- a/chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
+++ b/chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
 @@ -21,7 +21,7 @@
  
diff --git a/chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
index e03cfa1ee3..257ce335c3 100644
--- a/chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
+++ b/chromium/patches/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_ppapi__plugin_ppapi__blink__platform__impl.h,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/ppapi_plugin/ppapi_blink_platform_impl.h
 @@ -36,7 +36,7 @@ class PpapiBlinkPlatformImpl : public Bl
    blink::WebString DefaultLocale() override;
diff --git a/chromium/patches/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/chromium/patches/patch-content_ppapi__plugin_ppapi__plugin__main.cc
index 387d1cc049..22b6ac2d05 100644
--- a/chromium/patches/patch-content_ppapi__plugin_ppapi__plugin__main.cc
+++ b/chromium/patches/patch-content_ppapi__plugin_ppapi__plugin__main.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_ppapi__plugin_ppapi__plugin__main.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/ppapi_plugin/ppapi_plugin_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/ppapi_plugin/ppapi_plugin_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/ppapi_plugin/ppapi_plugin_main.cc
 @@ -52,6 +52,11 @@
  #include "gin/v8_initializer.h"
@@ -18,7 +18,7 @@ $NetBSD: patch-content_ppapi__plugin_ppapi__plugin__main.cc,v 1.1 2025/02/06 09:
  #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
  #include <stdlib.h>
  #endif
-@@ -141,7 +146,7 @@ int PpapiPluginMain(MainFunctionParams p
+@@ -139,7 +144,7 @@ int PpapiPluginMain(MainFunctionParams p
    gin::V8Initializer::LoadV8Snapshot();
  #endif
  
diff --git a/chromium/patches/patch-content_public_browser_content__browser__client.cc b/chromium/patches/patch-content_public_browser_content__browser__client.cc
index 73968036a1..fb1222fddc 100644
--- a/chromium/patches/patch-content_public_browser_content__browser__client.cc
+++ b/chromium/patches/patch-content_public_browser_content__browser__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_public_browser_content__browser__client.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/public/browser/content_browser_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/public/browser/content_browser_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/public/browser/content_browser_client.cc
-@@ -1343,7 +1343,7 @@ bool ContentBrowserClient::ShouldRunOutO
+@@ -1395,7 +1395,7 @@ bool ContentBrowserClient::ShouldRunOutO
  // that can be adequately sandboxed.
  // Currently Android's network service will not run out of process or sandboxed,
  // so OutOfProcessSystemDnsResolution is not currently enabled on Android.
diff --git a/chromium/patches/patch-content_public_browser_service__process__host.cc b/chromium/patches/patch-content_public_browser_service__process__host.cc
deleted file mode 100644
index 4f642c6adb..0000000000
--- a/chromium/patches/patch-content_public_browser_service__process__host.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-content_public_browser_service__process__host.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- content/public/browser/service_process_host.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ content/public/browser/service_process_host.cc
-@@ -71,7 +71,7 @@ ServiceProcessHost::Options::WithPreload
- ServiceProcessHost::Options& ServiceProcessHost::Options::WithGpuClient(
-     base::PassKey<ServiceProcessHostGpuClient> passkey) {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   allow_gpu_client = true;
- #endif
-   return *this;
diff --git a/chromium/patches/patch-content_public_browser_zygote__host_zygote__host__linux.h b/chromium/patches/patch-content_public_browser_zygote__host_zygote__host__linux.h
index 814dadf9b7..bd22942e8f 100644
--- a/chromium/patches/patch-content_public_browser_zygote__host_zygote__host__linux.h
+++ b/chromium/patches/patch-content_public_browser_zygote__host_zygote__host__linux.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_public_browser_zygote__host_zygote__host__linux.h,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/public/browser/zygote_host/zygote_host_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/public/browser/zygote_host/zygote_host_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/public/browser/zygote_host/zygote_host_linux.h
-@@ -35,11 +35,13 @@ class ZygoteHost {
+@@ -34,11 +34,13 @@ class ZygoteHost {
    // after the first render has been forked.
    virtual int GetRendererSandboxStatus() = 0;
  
diff --git a/chromium/patches/patch-content_public_common_content__features.cc b/chromium/patches/patch-content_public_common_content__features.cc
index a00c4bcf34..c971808abd 100644
--- a/chromium/patches/patch-content_public_common_content__features.cc
+++ b/chromium/patches/patch-content_public_common_content__features.cc
@@ -1,33 +1,33 @@
-$NetBSD: patch-content_public_common_content__features.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/public/common/content_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/public/common/content_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/public/common/content_features.cc
-@@ -65,7 +65,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
- // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being
- // built with OS_CHROMEOS instead of OS_LINUX.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
--    (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+@@ -75,7 +75,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartu
+ // Runs the audio service in a separate process.
+ BASE_FEATURE(kAudioServiceOutOfProcess,
+              "AudioServiceOutOfProcess",
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1218,9 +1218,9 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -1271,9 +1271,9 @@ BASE_FEATURE(kWebAssemblyTiering,
  BASE_FEATURE(kWebAssemblyTrapHandler,
               "WebAssemblyTrapHandler",
  #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ||  \
 -      BUILDFLAG(IS_MAC)) &&                                                  \
-+      BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) &&                                                  \
++      BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) &&                             \
       defined(ARCH_CPU_X86_64)) ||                                            \
 -    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) && \
 +    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \
       defined(ARCH_CPU_ARM64))
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
-@@ -1257,7 +1257,11 @@ BASE_FEATURE(kWebUICodeCache,
+@@ -1330,7 +1330,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExten
  
  // Controls whether the WebUSB API is enabled:
  // https://wicg.github.io/webusb
diff --git a/chromium/patches/patch-content_public_common_content__switches.cc b/chromium/patches/patch-content_public_common_content__switches.cc
index 35ae8b6fd5..16e41a6175 100644
--- a/chromium/patches/patch-content_public_common_content__switches.cc
+++ b/chromium/patches/patch-content_public_common_content__switches.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_public_common_content__switches.cc,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/public/common/content_switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/public/common/content_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/public/common/content_switches.cc
-@@ -350,6 +350,8 @@ const char kEnableIsolatedWebAppsInRende
+@@ -339,6 +339,8 @@ const char kEnableIsolatedWebAppsInRende
  // builds.
  const char kEnableLogging[]                 = "enable-logging";
  
@@ -15,12 +15,12 @@ $NetBSD: patch-content_public_common_content__switches.cc,v 1.1 2025/02/06 09:58
  // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
  // triggering of change attribute of the NetInfo API when there is a change in
  // the connection type.
-@@ -969,7 +971,7 @@ const char kPreventResizingContentsForTe
+@@ -946,7 +948,7 @@ const char kPreventResizingContentsForTe
+     "prevent-resizing-contents-for-testing";
+ #endif
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Allows sending text-to-speech requests to speech-dispatcher, a common
  // Linux speech service. Because it's buggy, the user must explicitly
  // enable it so that visiting a random webpage can't cause instability.
diff --git a/chromium/patches/patch-content_public_common_content__switches.h b/chromium/patches/patch-content_public_common_content__switches.h
index 34cf8f2b8e..cb41276a59 100644
--- a/chromium/patches/patch-content_public_common_content__switches.h
+++ b/chromium/patches/patch-content_public_common_content__switches.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_public_common_content__switches.h,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/public/common/content_switches.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/public/common/content_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/public/common/content_switches.h
-@@ -110,6 +110,7 @@ CONTENT_EXPORT extern const char kEnable
+@@ -107,6 +107,7 @@ CONTENT_EXPORT extern const char kEnable
  CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
  CONTENT_EXPORT extern const char kEnableLCDText[];
  CONTENT_EXPORT extern const char kEnableLogging[];
@@ -14,12 +14,12 @@ $NetBSD: patch-content_public_common_content__switches.h,v 1.1 2025/02/06 09:58:
  CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
  CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
  CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -265,7 +266,7 @@ CONTENT_EXPORT extern const char kPreven
+@@ -258,7 +259,7 @@ CONTENT_EXPORT extern const char kRender
+ CONTENT_EXPORT extern const char kPreventResizingContentsForTesting[];
+ #endif
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
- CONTENT_EXPORT extern const char kLLVMProfileFile[];
  #endif
+ 
diff --git a/chromium/patches/patch-content_public_common_zygote_features.gni b/chromium/patches/patch-content_public_common_zygote_features.gni
index 9f81e0c7ee..cb51a9b592 100644
--- a/chromium/patches/patch-content_public_common_zygote_features.gni
+++ b/chromium/patches/patch-content_public_common_zygote_features.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_public_common_zygote_features.gni,v 1.1 2025/02/06 09:58:07 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/public/common/zygote/features.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/public/common/zygote/features.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/public/common/zygote/features.gni
 @@ -2,4 +2,4 @@
  # Use of this source code is governed by a BSD-style license that can be
diff --git a/chromium/patches/patch-content_renderer_render__thread__impl.cc b/chromium/patches/patch-content_renderer_render__thread__impl.cc
index da929249f8..1582852c95 100644
--- a/chromium/patches/patch-content_renderer_render__thread__impl.cc
+++ b/chromium/patches/patch-content_renderer_render__thread__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_renderer_render__thread__impl.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/renderer/render_thread_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/renderer/render_thread_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/renderer/render_thread_impl.cc
-@@ -214,6 +214,8 @@
+@@ -207,6 +207,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -15,7 +15,7 @@ $NetBSD: patch-content_renderer_render__thread__impl.cc,v 1.1 2025/02/06 09:58:0
  #else
  #include <malloc.h>
  #endif
-@@ -1017,7 +1019,7 @@ media::GpuVideoAcceleratorFactories* Ren
+@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* Ren
                               kGpuStreamIdMedia, kGpuStreamPriorityMedia);
  
    const bool enable_video_decode_accelerator =
@@ -24,7 +24,7 @@ $NetBSD: patch-content_renderer_render__thread__impl.cc,v 1.1 2025/02/06 09:58:0
        base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) &&
  #endif  // BUILDFLAG(IS_LINUX)
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1026,7 +1028,7 @@ media::GpuVideoAcceleratorFactories* Ren
+@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* Ren
         gpu::kGpuFeatureStatusEnabled);
  
    const bool enable_video_encode_accelerator =
@@ -33,7 +33,7 @@ $NetBSD: patch-content_renderer_render__thread__impl.cc,v 1.1 2025/02/06 09:58:0
        base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux) &&
  #else
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1830,7 +1832,7 @@ std::unique_ptr<CodecFactory> RenderThre
+@@ -1870,7 +1872,7 @@ RenderThreadImpl::CreateMediaMojoCodecFa
      bool enable_video_encode_accelerator) {
    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
        vea_provider;
diff --git a/chromium/patches/patch-content_renderer_renderer__blink__platform__impl.cc b/chromium/patches/patch-content_renderer_renderer__blink__platform__impl.cc
index ab06612580..383593120d 100644
--- a/chromium/patches/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/chromium/patches/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_renderer_renderer__blink__platform__impl.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/renderer/renderer_blink_platform_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -127,7 +127,7 @@
+@@ -124,7 +124,7 @@
  
  #if BUILDFLAG(IS_MAC)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-content_renderer_renderer__blink__platform__impl.cc,v 1.1 2025/02
  #include "content/child/child_process_sandbox_support_impl_linux.h"
  #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
-@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlink
+@@ -192,13 +192,13 @@ RendererBlinkPlatformImpl::RendererBlink
        is_locked_to_site_(false),
        main_thread_scheduler_(main_thread_scheduler),
        next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -32,20 +32,20 @@ $NetBSD: patch-content_renderer_renderer__blink__platform__impl.cc,v 1.1 2025/02
      RenderThreadImpl::current()->BindHostReceiver(
          font_service.InitWithNewPipeAndPassReceiver());
 @@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlink
- #endif
    }
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    if (sandboxEnabled()) {
  #if BUILDFLAG(IS_MAC)
      sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -284,7 +284,7 @@ void RendererBlinkPlatformImpl::SetThrea
- #endif
+@@ -296,7 +296,7 @@ RendererBlinkPlatformImpl::GetWebUIBundl
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    return sandbox_support_.get();
  #else
    // These platforms do not require sandbox support.
diff --git a/chromium/patches/patch-content_renderer_renderer__blink__platform__impl.h b/chromium/patches/patch-content_renderer_renderer__blink__platform__impl.h
index d12f5a2d10..e13483a6af 100644
--- a/chromium/patches/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/chromium/patches/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-content_renderer_renderer__blink__platform__impl.h,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/renderer/renderer_blink_platform_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/renderer/renderer_blink_platform_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -254,7 +254,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
-   void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
+@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
                                     const gpu::GPUInfo& gpu_info) const;
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
  #endif
  
diff --git a/chromium/patches/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/chromium/patches/patch-content_renderer_renderer__main__platform__delegate__linux.cc
index e9ddbb6a19..dd37e24227 100644
--- a/chromium/patches/patch-content_renderer_renderer__main__platform__delegate__linux.cc
+++ b/chromium/patches/patch-content_renderer_renderer__main__platform__delegate__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_renderer_renderer__main__platform__delegate__linux.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/renderer/renderer_main_platform_delegate_linux.cc
 @@ -44,6 +44,7 @@ bool RendererMainPlatformDelegate::Enabl
    // any renderer has been started.
diff --git a/chromium/patches/patch-content_shell_BUILD.gn b/chromium/patches/patch-content_shell_BUILD.gn
index 40fd5e9627..b9c0fa579d 100644
--- a/chromium/patches/patch-content_shell_BUILD.gn
+++ b/chromium/patches/patch-content_shell_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_shell_BUILD.gn,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/shell/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/shell/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/shell/BUILD.gn
-@@ -1086,7 +1086,7 @@ group("content_shell_crash_test") {
+@@ -1099,7 +1099,7 @@ group("content_shell_crash_test") {
    if (is_win) {
      data_deps += [ "//build/win:copy_cdb_to_output" ]
    }
diff --git a/chromium/patches/patch-content_shell_app_shell__main__delegate.cc b/chromium/patches/patch-content_shell_app_shell__main__delegate.cc
index ae849884dd..aa56b30d60 100644
--- a/chromium/patches/patch-content_shell_app_shell__main__delegate.cc
+++ b/chromium/patches/patch-content_shell_app_shell__main__delegate.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_shell_app_shell__main__delegate.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/shell/app/shell_main_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/shell/app/shell_main_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/shell/app/shell_main_delegate.cc
 @@ -269,7 +269,7 @@ void ShellMainDelegate::PreSandboxStartu
      // Reporting for sub-processes will be initialized in ZygoteForked.
diff --git a/chromium/patches/patch-content_shell_browser_shell__browser__main__parts.cc b/chromium/patches/patch-content_shell_browser_shell__browser__main__parts.cc
index 8908bc9435..2c1308a626 100644
--- a/chromium/patches/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/chromium/patches/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,39 +1,39 @@
-$NetBSD: patch-content_shell_browser_shell__browser__main__parts.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/shell/browser/shell_browser_main_parts.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/shell/browser/shell_browser_main_parts.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/shell/browser/shell_browser_main_parts.cc
-@@ -51,7 +51,7 @@
+@@ -50,7 +50,7 @@
  #include "net/base/network_change_notifier.h"
  #endif
  
--#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+-#if BUILDFLAG(IS_LINUX) && defined(USE_AURA)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_AURA)
  #include "ui/base/ime/init/input_method_initializer.h"
  #endif
  
-@@ -68,7 +68,7 @@
- #include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h"
+@@ -61,7 +61,7 @@
+ #include "device/bluetooth/floss/floss_features.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
  #include "ui/linux/linux_ui.h"          // nogncheck
  #include "ui/linux/linux_ui_factory.h"  // nogncheck
- #endif
-@@ -139,7 +139,7 @@ void ShellBrowserMainParts::PostCreateMa
+@@ -128,7 +128,7 @@ void ShellBrowserMainParts::PostCreateMa
  }
  
  int ShellBrowserMainParts::PreEarlyInitialization() {
--#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+-#if BUILDFLAG(IS_LINUX) && defined(USE_AURA)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_AURA)
    ui::InitializeInputMethodForTesting();
- #endif
- #if BUILDFLAG(IS_ANDROID)
-@@ -168,7 +168,7 @@ void ShellBrowserMainParts::ToolkitIniti
+ #elif BUILDFLAG(IS_ANDROID)
+   net::NetworkChangeNotifier::SetFactory(
+@@ -156,7 +156,7 @@ void ShellBrowserMainParts::ToolkitIniti
    if (switches::IsRunWebTestsSwitchPresent())
      return;
  
@@ -42,7 +42,7 @@ $NetBSD: patch-content_shell_browser_shell__browser__main__parts.cc,v 1.1 2025/0
    ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi());
  #endif
  }
-@@ -215,7 +215,7 @@ void ShellBrowserMainParts::PostMainMess
+@@ -203,7 +203,7 @@ void ShellBrowserMainParts::PostMainMess
    ShellDevToolsManagerDelegate::StopHttpHandler();
    browser_context_.reset();
    off_the_record_browser_context_.reset();
diff --git a/chromium/patches/patch-content_shell_browser_shell__paths.cc b/chromium/patches/patch-content_shell_browser_shell__paths.cc
index a5b21fe0ab..fab8041706 100644
--- a/chromium/patches/patch-content_shell_browser_shell__paths.cc
+++ b/chromium/patches/patch-content_shell_browser_shell__paths.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_shell_browser_shell__paths.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/shell/browser/shell_paths.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/shell/browser/shell_paths.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/shell/browser/shell_paths.cc
 @@ -13,7 +13,7 @@
  
diff --git a/chromium/patches/patch-content_shell_browser_shell__platform__delegate__views.cc b/chromium/patches/patch-content_shell_browser_shell__platform__delegate__views.cc
new file mode 100644
index 0000000000..be53c1c5f7
--- /dev/null
+++ b/chromium/patches/patch-content_shell_browser_shell__platform__delegate__views.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- content/shell/browser/shell_platform_delegate_views.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ content/shell/browser/shell_platform_delegate_views.cc
+@@ -373,7 +373,7 @@ void ShellPlatformDelegate::CreatePlatfo
+       views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET);
+   params.bounds = gfx::Rect(initial_size);
+   params.delegate = delegate.release();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   params.wm_class_class = "chromium-content_shell";
+   params.wm_class_name = params.wm_class_class;
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-content_shell_renderer_shell__content__renderer__client.cc b/chromium/patches/patch-content_shell_renderer_shell__content__renderer__client.cc
index be57941834..782ccd7494 100644
--- a/chromium/patches/patch-content_shell_renderer_shell__content__renderer__client.cc
+++ b/chromium/patches/patch-content_shell_renderer_shell__content__renderer__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_shell_renderer_shell__content__renderer__client.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/shell/renderer/shell_content_renderer_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/shell/renderer/shell_content_renderer_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/shell/renderer/shell_content_renderer_client.cc
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
  #include "media/base/media_switches.h"
  #endif
  
diff --git a/chromium/patches/patch-content_shell_utility_shell__content__utility__client.cc b/chromium/patches/patch-content_shell_utility_shell__content__utility__client.cc
index 7a31d753d0..dfab87a237 100644
--- a/chromium/patches/patch-content_shell_utility_shell__content__utility__client.cc
+++ b/chromium/patches/patch-content_shell_utility_shell__content__utility__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_shell_utility_shell__content__utility__client.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/shell/utility/shell_content_utility_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/shell/utility/shell_content_utility_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/shell/utility/shell_content_utility_client.cc
-@@ -38,7 +38,7 @@
+@@ -43,7 +43,7 @@
  #include "sandbox/policy/sandbox.h"
  #include "services/test/echo/echo_service.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-content_shell_utility_shell__content__utility__client.cc,v 1.1 20
  #include "content/test/sandbox_status_service.h"
  #endif
  
-@@ -187,7 +187,7 @@ void ShellContentUtilityClient::ExposeIn
+@@ -192,7 +192,7 @@ void ShellContentUtilityClient::ExposeIn
    binders->Add<mojom::PowerMonitorTest>(
        base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver),
        base::SingleThreadTaskRunner::GetCurrentDefault());
diff --git a/chromium/patches/patch-content_test_BUILD.gn b/chromium/patches/patch-content_test_BUILD.gn
index c3e0e26946..e9a639c88a 100644
--- a/chromium/patches/patch-content_test_BUILD.gn
+++ b/chromium/patches/patch-content_test_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_test_BUILD.gn,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/test/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/test/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/test/BUILD.gn
-@@ -1754,7 +1754,7 @@ test("content_browsertests") {
+@@ -1764,7 +1764,7 @@ test("content_browsertests") {
      "../test/url_loader_interceptor_browsertest.cc",
    ]
  
diff --git a/chromium/patches/patch-content_utility_services.cc b/chromium/patches/patch-content_utility_services.cc
index 41965072ec..2affcf8587 100644
--- a/chromium/patches/patch-content_utility_services.cc
+++ b/chromium/patches/patch-content_utility_services.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_utility_services.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/utility/services.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/utility/services.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/utility/services.cc
-@@ -74,7 +74,7 @@
+@@ -73,7 +73,7 @@
  extern sandbox::TargetServices* g_utility_target_services;
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -15,25 +15,16 @@ $NetBSD: patch-content_utility_services.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
  #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h"
  #include "sandbox/linux/services/libc_interceptor.h"
  #include "sandbox/policy/mojom/sandbox.mojom.h"
-@@ -102,7 +102,7 @@ extern sandbox::TargetServices* g_utilit
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
+@@ -101,7 +101,7 @@ extern sandbox::TargetServices* g_utilit
+ #endif  // BUILDFLAG(IS_CHROMEOS) && (BUILDFLAG(USE_VAAPI) ||
          // BUILDFLAG(USE_V4L2_CODEC))
  
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  #include "content/common/features.h"
- #include "media/mojo/services/stable_video_decoder_factory_process_service.h"  // nogncheck
-@@ -120,7 +120,7 @@ extern sandbox::TargetServices* g_utilit
- #endif  // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "media/capture/capture_switches.h"
- #include "services/viz/public/cpp/gpu/gpu.h"
- #include "services/viz/public/mojom/gpu.mojom.h"
-@@ -240,7 +240,7 @@ auto RunAudio(mojo::PendingReceiver<audi
+ #include "media/mojo/services/oop_video_decoder_factory_process_service.h"  // nogncheck
+@@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver<audi
        << "task_policy_set TASK_QOS_POLICY";
  #endif
  
@@ -42,26 +33,17 @@ $NetBSD: patch-content_utility_services.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
    auto* command_line = base::CommandLine::ForCurrentProcess();
    if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
        sandbox::mojom::Sandbox::kNoSandbox) {
-@@ -337,7 +337,7 @@ auto RunVideoCapture(
-   auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>(
-       std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault());
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   {
- #else
-@@ -392,7 +392,7 @@ auto RunOOPArcVideoAcceleratorFactorySer
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
-         // BUILDFLAG(USE_V4L2_CODEC))
+@@ -381,7 +381,7 @@ auto RunOOPArcVideoAcceleratorFactorySer
+ #endif  // BUILDFLAG(IS_CHROMEOS) && \
+         // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
- auto RunStableVideoDecoderFactoryProcessService(
-     mojo::PendingReceiver<
-@@ -403,7 +403,7 @@ auto RunStableVideoDecoderFactoryProcess
- #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
+ auto RunOOPVideoDecoderFactoryProcessService(
+     mojo::PendingReceiver<media::mojom::VideoDecoderFactoryProcess> receiver) {
+@@ -391,7 +391,7 @@ auto RunOOPVideoDecoderFactoryProcessSer
+ #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -69,26 +51,17 @@ $NetBSD: patch-content_utility_services.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
  auto RunVideoEncodeAcceleratorProviderFactory(
      mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
          receiver) {
-@@ -426,7 +426,7 @@ void RegisterIOThreadServices(mojo::Serv
+@@ -414,7 +414,7 @@ void RegisterIOThreadServices(mojo::Serv
    // loop of type IO that can get notified when pipes have data.
    services.Add(RunNetworkService);
  
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
-     (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
-   if (base::FeatureList::IsEnabled(
-           features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) {
-@@ -482,7 +482,7 @@ void RegisterMainThreadServices(mojo::Se
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
-         // BUILDFLAG(USE_V4L2_CODEC))
- 
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
-   if (!base::FeatureList::IsEnabled(
-           features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) {
-@@ -491,7 +491,7 @@ void RegisterMainThreadServices(mojo::Se
- #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
+   services.Add(RunOOPVideoDecoderFactoryProcessService);
+ #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
+@@ -467,7 +467,7 @@ void RegisterMainThreadServices(mojo::Se
+ #endif  // BUILDFLAG(IS_CHROMEOS) && \
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc b/chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
index e1589bf4f4..d0d30e6cf9 100644
--- a/chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
+++ b/chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/utility/speech/speech_recognition_sandbox_hook_linux.cc
 @@ -12,11 +12,14 @@
  #include "sandbox/linux/syscall_broker/broker_command.h"
diff --git a/chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h b/chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
index 4a5fd85d0d..4aaf6975dc 100644
--- a/chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
+++ b/chromium/patches/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/utility/speech/speech_recognition_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
index 94b24a50dc..f6298883d3 100644
--- a/chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
+++ b/chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc
 @@ -9,7 +9,7 @@
  
@@ -13,9 +13,9 @@ $NetBSD: patch-content_utility_utility__blink__platform__with__sandbox__support_
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "content/child/child_process_sandbox_support_impl_linux.h"
- #endif
- 
-@@ -17,7 +17,7 @@ namespace content {
+ #elif BUILDFLAG(IS_WIN)
+ #include "content/child/child_process_sandbox_support_impl_win.h"
+@@ -19,7 +19,7 @@ namespace content {
  
  UtilityBlinkPlatformWithSandboxSupportImpl::
      UtilityBlinkPlatformWithSandboxSupportImpl() {
@@ -24,12 +24,12 @@ $NetBSD: patch-content_utility_utility__blink__platform__with__sandbox__support_
    mojo::PendingRemote<font_service::mojom::FontService> font_service;
    UtilityThread::Get()->BindHostReceiver(
        font_service.InitWithNewPipeAndPassReceiver());
-@@ -35,7 +35,7 @@ UtilityBlinkPlatformWithSandboxSupportIm
- 
+@@ -40,7 +40,7 @@ UtilityBlinkPlatformWithSandboxSupportIm
  blink::WebSandboxSupport*
  UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    return sandbox_support_.get();
  #else
    return nullptr;
diff --git a/chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
index 1dfa6135ce..e060738b97 100644
--- a/chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
+++ b/chromium/patches/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/utility/utility_blink_platform_with_sandbox_support_impl.h
-@@ -33,7 +33,7 @@ class UtilityBlinkPlatformWithSandboxSup
-   blink::WebSandboxSupport* GetSandboxSupport() override;
+@@ -34,7 +34,7 @@ class UtilityBlinkPlatformWithSandboxSup
  
   private:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
  #endif
  };
diff --git a/chromium/patches/patch-content_utility_utility__main.cc b/chromium/patches/patch-content_utility_utility__main.cc
index d35fa5414f..9a7cb0feb2 100644
--- a/chromium/patches/patch-content_utility_utility__main.cc
+++ b/chromium/patches/patch-content_utility_utility__main.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-content_utility_utility__main.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/utility/utility_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/utility/utility_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/utility/utility_main.cc
-@@ -37,17 +37,21 @@
+@@ -36,18 +36,22 @@
  #include "services/tracing/public/cpp/trace_startup.h"
  #include "services/video_effects/public/cpp/buildflags.h"
  
@@ -22,50 +22,38 @@ $NetBSD: patch-content_utility_utility__main.cc,v 1.1 2025/02/06 09:58:08 wiz Ex
  #include "content/public/common/content_descriptor_keys.h"
  #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h"
  #include "gpu/config/gpu_info_collector.h"
+ #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h"
  #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h"
 +#if !BUILDFLAG(IS_BSD)
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
  #include "services/audio/audio_sandbox_hook_linux.h"
  #include "services/network/network_sandbox_hook_linux.h"
- // gn check is not smart enough to realize that this include only applies to
-@@ -59,11 +63,16 @@
- #endif
- #endif
+ #include "services/screen_ai/buildflags/buildflags.h"
+@@ -66,7 +70,12 @@
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
--#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_BSD)
 +#include "sandbox/policy/sandbox.h"
 +#include "content/common/gpu_pre_sandbox_hook_bsd.h"
 +#endif
 +
-+#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "services/video_effects/video_effects_sandbox_hook_linux.h"  // nogncheck
- #endif  // BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX)
- 
-@@ -78,7 +87,7 @@
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_LINUX)
  
- #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
--     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)))
-+     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)))
- #include "services/screen_ai/public/cpp/utilities.h"  // nogncheck
- #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h"  // nogncheck
- #endif
-@@ -102,14 +111,14 @@
+@@ -101,7 +110,7 @@
  sandbox::TargetServices* g_utility_target_services = nullptr;
  #endif  // BUILDFLAG(IS_WIN)
  
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
  #include "components/services/on_device_translation/sandbox_hook.h"
- #endif  // BUILDFLAG(IS_LINUX)
- namespace content {
+ #endif  // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX)
+ 
+@@ -109,7 +118,7 @@ namespace content {
  
  namespace {
  
@@ -74,27 +62,7 @@ $NetBSD: patch-content_utility_utility__main.cc,v 1.1 2025/02/06 09:58:08 wiz Ex
  std::vector<std::string> GetNetworkContextsParentDirectories() {
    base::MemoryMappedFile::Region region;
    base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD(
-@@ -136,9 +145,10 @@ std::vector<std::string> GetNetworkConte
-   return dirs;
- }
- 
-+#if !BUILDFLAG(IS_BSD)
- bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) {
-   const bool obtain_gpu_info =
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-       sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-       sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding;
-@@ -153,6 +163,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojo
- 
-   return false;
- }
-+#endif
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(IS_WIN)
-@@ -250,7 +261,8 @@ int UtilityMain(MainFunctionParams param
+@@ -247,7 +256,8 @@ int UtilityMain(MainFunctionParams param
      CHECK(on_device_model::OnDeviceModelService::PreSandboxInit());
    }
  
@@ -104,8 +72,8 @@ $NetBSD: patch-content_utility_utility__main.cc,v 1.1 2025/02/06 09:58:08 wiz Ex
    // Thread type delegate of the process should be registered before first
    // thread type change in ChildProcess constructor. It also needs to be
    // registered before the process has multiple threads, which may race with
-@@ -262,7 +274,7 @@ int UtilityMain(MainFunctionParams param
-   }
+@@ -255,7 +265,7 @@ int UtilityMain(MainFunctionParams param
+   SandboxedProcessThreadTypeHandler::Create();
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -113,18 +81,18 @@ $NetBSD: patch-content_utility_utility__main.cc,v 1.1 2025/02/06 09:58:08 wiz Ex
    // Initializes the sandbox before any threads are created.
    // TODO(jorgelo): move this after GTK initialization when we enable a strict
    // Seccomp-BPF policy.
-@@ -292,7 +304,7 @@ int UtilityMain(MainFunctionParams param
+@@ -287,7 +297,7 @@ int UtilityMain(MainFunctionParams param
        pre_sandbox_hook =
            base::BindOnce(&speech::SpeechRecognitionPreSandboxHook);
        break;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
      case sandbox::mojom::Sandbox::kOnDeviceTranslation:
        pre_sandbox_hook = base::BindOnce(
            &on_device_translation::OnDeviceTranslationSandboxHook);
-@@ -306,13 +318,13 @@ int UtilityMain(MainFunctionParams param
-                              screen_ai::GetBinaryPathSwitch()));
-       break;
+@@ -303,13 +313,13 @@ int UtilityMain(MainFunctionParams param
+ #else
+       NOTREACHED();
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
@@ -133,12 +101,12 @@ $NetBSD: patch-content_utility_utility__main.cc,v 1.1 2025/02/06 09:58:08 wiz Ex
            base::BindOnce(&video_effects::VideoEffectsPreSandboxHook);
        break;
  #endif  // BUILDFLAG(IS_LINUX)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
        pre_sandbox_hook =
            base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -339,6 +351,7 @@ int UtilityMain(MainFunctionParams param
+@@ -336,6 +346,7 @@ int UtilityMain(MainFunctionParams param
      default:
        break;
    }
@@ -146,7 +114,7 @@ $NetBSD: patch-content_utility_utility__main.cc,v 1.1 2025/02/06 09:58:08 wiz Ex
    if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
        (parameters.zygote_child || !pre_sandbox_hook.is_null())) {
      sandbox_options.use_amd_specific_policies =
-@@ -346,6 +359,11 @@ int UtilityMain(MainFunctionParams param
+@@ -343,6 +354,11 @@ int UtilityMain(MainFunctionParams param
      sandbox::policy::Sandbox::Initialize(
          sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
    }
diff --git a/chromium/patches/patch-content_utility_utility__thread__impl.cc b/chromium/patches/patch-content_utility_utility__thread__impl.cc
index 7e73d81c1c..0f649fe58e 100644
--- a/chromium/patches/patch-content_utility_utility__thread__impl.cc
+++ b/chromium/patches/patch-content_utility_utility__thread__impl.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_utility_utility__thread__impl.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/utility/utility_thread_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/utility/utility_thread_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/utility/utility_thread_impl.cc
 @@ -31,7 +31,7 @@
  #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chromium/patches/patch-content_zygote_BUILD.gn b/chromium/patches/patch-content_zygote_BUILD.gn
index bee3e1c658..27c58fadbc 100644
--- a/chromium/patches/patch-content_zygote_BUILD.gn
+++ b/chromium/patches/patch-content_zygote_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_zygote_BUILD.gn,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/zygote/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/zygote/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/zygote/BUILD.gn
 @@ -5,7 +5,7 @@
  import("//build/config/nacl/config.gni")
diff --git a/chromium/patches/patch-content_zygote_zygote__linux.cc b/chromium/patches/patch-content_zygote_zygote__linux.cc
index 59cc10649a..62d7076bdc 100644
--- a/chromium/patches/patch-content_zygote_zygote__linux.cc
+++ b/chromium/patches/patch-content_zygote_zygote__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_zygote_zygote__linux.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/zygote/zygote_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/zygote/zygote_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/zygote/zygote_linux.cc
 @@ -1,6 +1,7 @@
  // Copyright 2012 The Chromium Authors
@@ -12,9 +12,9 @@ $NetBSD: patch-content_zygote_zygote__linux.cc,v 1.1 2025/02/06 09:58:08 wiz Exp
  // found in the LICENSE file.
 +#if 0
  
- #ifdef UNSAFE_BUFFERS_BUILD
- // TODO(crbug.com/342213636): Remove this and spanify to fix the errors.
-@@ -723,3 +724,4 @@ void Zygote::HandleReinitializeLoggingRe
+ #include "content/zygote/zygote_linux.h"
+ 
+@@ -705,3 +706,4 @@ void Zygote::HandleReinitializeLoggingRe
  }
  
  }  // namespace content
diff --git a/chromium/patches/patch-content_zygote_zygote__main__linux.cc b/chromium/patches/patch-content_zygote_zygote__main__linux.cc
index c564aa0029..01cc80d050 100644
--- a/chromium/patches/patch-content_zygote_zygote__main__linux.cc
+++ b/chromium/patches/patch-content_zygote_zygote__main__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-content_zygote_zygote__main__linux.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- content/zygote/zygote_main_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- content/zygote/zygote_main_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ content/zygote/zygote_main_linux.cc
 @@ -11,7 +11,9 @@
  #include <stddef.h>
diff --git a/chromium/patches/patch-device_bluetooth_bluetooth__adapter.cc b/chromium/patches/patch-device_bluetooth_bluetooth__adapter.cc
index cd1cbd1634..94cefe25f8 100644
--- a/chromium/patches/patch-device_bluetooth_bluetooth__adapter.cc
+++ b/chromium/patches/patch-device_bluetooth_bluetooth__adapter.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-device_bluetooth_bluetooth__adapter.cc,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- device/bluetooth/bluetooth_adapter.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- device/bluetooth/bluetooth_adapter.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ device/bluetooth/bluetooth_adapter.cc
 @@ -32,7 +32,7 @@ namespace device {
  BluetoothAdapter::ServiceOptions::ServiceOptions() = default;
diff --git a/chromium/patches/patch-device_bluetooth_cast__bluetooth.gni b/chromium/patches/patch-device_bluetooth_cast__bluetooth.gni
index fe30535cca..119ce3b357 100644
--- a/chromium/patches/patch-device_bluetooth_cast__bluetooth.gni
+++ b/chromium/patches/patch-device_bluetooth_cast__bluetooth.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-device_bluetooth_cast__bluetooth.gni,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- device/bluetooth/cast_bluetooth.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- device/bluetooth/cast_bluetooth.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ device/bluetooth/cast_bluetooth.gni
 @@ -2,5 +2,5 @@ import("//build/config/features.gni")
  
diff --git a/chromium/patches/patch-device_gamepad_BUILD.gn b/chromium/patches/patch-device_gamepad_BUILD.gn
index bb20ff8463..0456109af8 100644
--- a/chromium/patches/patch-device_gamepad_BUILD.gn
+++ b/chromium/patches/patch-device_gamepad_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-device_gamepad_BUILD.gn,v 1.1 2025/02/06 09:58:08 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- device/gamepad/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- device/gamepad/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ device/gamepad/BUILD.gn
-@@ -99,7 +99,7 @@ component("gamepad") {
+@@ -98,7 +98,7 @@ component("gamepad") {
        "hid_writer_linux.cc",
        "hid_writer_linux.h",
      ]
diff --git a/chromium/patches/patch-device_gamepad_gamepad__provider.cc b/chromium/patches/patch-device_gamepad_gamepad__provider.cc
index 70ad7948e0..b23bb31ff6 100644
--- a/chromium/patches/patch-device_gamepad_gamepad__provider.cc
+++ b/chromium/patches/patch-device_gamepad_gamepad__provider.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-device_gamepad_gamepad__provider.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- device/gamepad/gamepad_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- device/gamepad/gamepad_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ device/gamepad/gamepad_provider.cc
-@@ -224,7 +224,7 @@ void GamepadProvider::Initialize(std::un
+@@ -159,7 +159,7 @@ void GamepadProvider::Initialize(std::un
  
    if (!polling_thread_)
      polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread");
diff --git a/chromium/patches/patch-device_gamepad_hid__writer__linux.cc b/chromium/patches/patch-device_gamepad_hid__writer__linux.cc
index 7dceaaa0c9..c7dcb0d7d5 100644
--- a/chromium/patches/patch-device_gamepad_hid__writer__linux.cc
+++ b/chromium/patches/patch-device_gamepad_hid__writer__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-device_gamepad_hid__writer__linux.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- device/gamepad/hid_writer_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- device/gamepad/hid_writer_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ device/gamepad/hid_writer_linux.cc
 @@ -2,6 +2,8 @@
  // Use of this source code is governed by a BSD-style license that can be
diff --git a/chromium/patches/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/chromium/patches/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
index c8630fc7d6..86d55a831e 100644
--- a/chromium/patches/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
+++ b/chromium/patches/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc
-@@ -117,7 +117,7 @@ void EnsureApiBrowserContextKeyedService
+@@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedService
+   MediaPerceptionAPIManager::GetFactoryInstance();
  #endif
-   MessageService::GetFactoryInstance();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
 -    BUILDFLAG(IS_MAC)
 +    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    NetworkingPrivateEventRouterFactory::GetInstance();
  #endif
-   OffscreenDocumentManager::GetFactory();
+   PrinterProviderAPIFactory::GetInstance();
diff --git a/chromium/patches/patch-extensions_browser_api_management_management__api.cc b/chromium/patches/patch-extensions_browser_api_management_management__api.cc
index 58981b9573..78a9d92235 100644
--- a/chromium/patches/patch-extensions_browser_api_management_management__api.cc
+++ b/chromium/patches/patch-extensions_browser_api_management_management__api.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-extensions_browser_api_management_management__api.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/browser/api/management/management_api.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/browser/api/management/management_api.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/browser/api/management/management_api.cc
-@@ -285,7 +285,7 @@ bool PlatformSupportsApprovalFlowForExte
+@@ -286,7 +286,7 @@ bool PlatformSupportsApprovalFlowForExte
  #if BUILDFLAG(IS_CHROMEOS)
    // ChromeOS devices have this feature already shipped.
    return true;
diff --git a/chromium/patches/patch-extensions_browser_api_messaging_message__service.cc b/chromium/patches/patch-extensions_browser_api_messaging_message__service.cc
index 855fc80b5e..35c237a3c3 100644
--- a/chromium/patches/patch-extensions_browser_api_messaging_message__service.cc
+++ b/chromium/patches/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-extensions_browser_api_messaging_message__service.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/browser/api/messaging/message_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/browser/api/messaging/message_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/browser/api/messaging/message_service.cc
-@@ -78,7 +78,7 @@ namespace {
+@@ -81,7 +81,7 @@ namespace {
  const char kReceivingEndDoesntExistError[] =
      "Could not establish connection. Receiving end does not exist.";
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-extensions_browser_api_messaging_message__service.cc,v 1.1 2025/0
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -551,7 +551,7 @@ void MessageService::OpenChannelToNative
+@@ -673,7 +673,7 @@ void MessageService::OpenChannelToNative
      return;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/chromium/patches/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
index 982425f933..8c6bcb094f 100644
--- a/chromium/patches/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
+++ b/chromium/patches/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc
 @@ -12,7 +12,7 @@
  
@@ -24,3 +24,12 @@ $NetBSD: patch-extensions_browser_api_networking__private_networking__private__d
    delegate = std::make_unique<NetworkingPrivateLinux>();
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
    std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create());
+@@ -74,7 +74,7 @@ NetworkingPrivateDelegateFactory::BuildS
+ #endif
+ 
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   if (ui_factory_) {
+     delegate->set_ui_delegate(ui_factory_->CreateDelegate());
+   }
diff --git a/chromium/patches/patch-extensions_common_api___permission__features.json b/chromium/patches/patch-extensions_common_api___permission__features.json
index d9677dcd0d..0240266232 100644
--- a/chromium/patches/patch-extensions_common_api___permission__features.json
+++ b/chromium/patches/patch-extensions_common_api___permission__features.json
@@ -1,21 +1,21 @@
-$NetBSD: patch-extensions_common_api___permission__features.json,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/common/api/_permission_features.json.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/common/api/_permission_features.json.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/common/api/_permission_features.json
-@@ -138,7 +138,7 @@
+@@ -134,7 +134,7 @@
      {
        "channel": "stable",
        "extension_types": ["platform_app"],
--      "platforms": ["chromeos", "lacros", "win", "mac", "linux"],
-+      "platforms": ["chromeos", "lacros", "win", "mac", "linux", "openbsd", "freebsd", "netbsd"],
+-      "platforms": ["chromeos", "win", "mac", "linux"],
++      "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd", "netbsd"],
        "allowlist": [
          "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/387169
          "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/387169
-@@ -432,7 +432,7 @@
+@@ -419,7 +419,7 @@
    }, {
      "channel": "stable",
      "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
@@ -24,12 +24,12 @@ $NetBSD: patch-extensions_common_api___permission__features.json,v 1.1 2025/02/0
      "allowlist": [
        "0DE0F05680A4A056BCEC864ED8DDA84296F82B40",  // http://crbug.com/434651
        "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/293683
-@@ -476,7 +476,7 @@
+@@ -463,7 +463,7 @@
    "networkingPrivate": {
      "channel": "stable",
      "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
--    "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia"],
-+    "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd", "netbsd"],
+-    "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"],
++    "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd", "netbsd"],
      "allowlist": [
        // DO NOT ADD ANY MORE ENTRIES HERE.
        // networkingPrivate is being migrated to networking.onc.
diff --git a/chromium/patches/patch-extensions_common_api_runtime.json b/chromium/patches/patch-extensions_common_api_runtime.json
index 293ab2a2d9..64e6d1da07 100644
--- a/chromium/patches/patch-extensions_common_api_runtime.json
+++ b/chromium/patches/patch-extensions_common_api_runtime.json
@@ -1,10 +1,10 @@
-$NetBSD: patch-extensions_common_api_runtime.json,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/common/api/runtime.json.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/common/api/runtime.json.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/common/api/runtime.json
 @@ -86,6 +86,8 @@
              {"name": "cros", "description": "Specifies the Chrome operating system."},
diff --git a/chromium/patches/patch-extensions_common_command.cc b/chromium/patches/patch-extensions_common_command.cc
index cfaebafcd2..d74b3484d6 100644
--- a/chromium/patches/patch-extensions_common_command.cc
+++ b/chromium/patches/patch-extensions_common_command.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-extensions_common_command.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/common/command.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/common/command.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/common/command.cc
-@@ -286,7 +286,7 @@ std::string Command::CommandPlatform() {
-   return values::kKeybindingPlatformMac;
+@@ -116,7 +116,7 @@ std::string Command::CommandPlatform() {
+   return ui::kKeybindingPlatformMac;
  #elif BUILDFLAG(IS_CHROMEOS)
-   return values::kKeybindingPlatformChromeOs;
+   return ui::kKeybindingPlatformChromeOs;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return values::kKeybindingPlatformLinux;
+   return ui::kKeybindingPlatformLinux;
  #elif BUILDFLAG(IS_FUCHSIA)
    // TODO(crbug.com/40220501): Change this once we decide what string should be
diff --git a/chromium/patches/patch-extensions_common_features_feature.cc b/chromium/patches/patch-extensions_common_features_feature.cc
index e4a2d2f626..6c5e38efd0 100644
--- a/chromium/patches/patch-extensions_common_features_feature.cc
+++ b/chromium/patches/patch-extensions_common_features_feature.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-extensions_common_features_feature.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/common/features/feature.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/common/features/feature.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/common/features/feature.cc
-@@ -34,6 +34,8 @@ Feature::Platform Feature::GetCurrentPla
+@@ -29,6 +29,8 @@ Feature::Platform Feature::GetCurrentPla
    return WIN_PLATFORM;
  #elif BUILDFLAG(IS_FUCHSIA)
    return FUCHSIA_PLATFORM;
diff --git a/chromium/patches/patch-extensions_renderer_bindings_api__binding__util.cc b/chromium/patches/patch-extensions_renderer_bindings_api__binding__util.cc
index 9f1d67722b..467413a7b1 100644
--- a/chromium/patches/patch-extensions_renderer_bindings_api__binding__util.cc
+++ b/chromium/patches/patch-extensions_renderer_bindings_api__binding__util.cc
@@ -1,14 +1,14 @@
-$NetBSD: patch-extensions_renderer_bindings_api__binding__util.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/renderer/bindings/api_binding_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/renderer/bindings/api_binding_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/renderer/bindings/api_binding_util.cc
-@@ -133,7 +133,7 @@ std::string GetPlatformString() {
-   return "lacros";
- #elif BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -129,7 +129,7 @@ void InvalidateContext(v8::Local<v8::Con
+ std::string GetPlatformString() {
+ #if BUILDFLAG(IS_CHROMEOS)
    return "chromeos";
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-extensions_renderer_bindings_argument__spec.cc b/chromium/patches/patch-extensions_renderer_bindings_argument__spec.cc
index 6d712ad5e2..4fba482a1b 100644
--- a/chromium/patches/patch-extensions_renderer_bindings_argument__spec.cc
+++ b/chromium/patches/patch-extensions_renderer_bindings_argument__spec.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-extensions_renderer_bindings_argument__spec.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/renderer/bindings/argument_spec.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/renderer/bindings/argument_spec.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/renderer/bindings/argument_spec.cc
 @@ -18,6 +18,8 @@
  #include "gin/data_object_builder.h"
diff --git a/chromium/patches/patch-extensions_shell_app_shell__main__delegate.cc b/chromium/patches/patch-extensions_shell_app_shell__main__delegate.cc
index aace59457a..7d47b14c99 100644
--- a/chromium/patches/patch-extensions_shell_app_shell__main__delegate.cc
+++ b/chromium/patches/patch-extensions_shell_app_shell__main__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-extensions_shell_app_shell__main__delegate.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/shell/app/shell_main_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/shell/app/shell_main_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/shell/app/shell_main_delegate.cc
-@@ -43,7 +43,7 @@
+@@ -40,7 +40,7 @@
  #if BUILDFLAG(IS_WIN)
  #include "base/base_paths_win.h"
  #include "base/process/process_info.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-extensions_shell_app_shell__main__delegate.cc,v 1.1 2025/02/06 09
  #include "base/nix/xdg_util.h"
  #elif BUILDFLAG(IS_MAC)
  #include "base/base_paths_mac.h"
-@@ -63,7 +63,7 @@ base::FilePath GetDataPath() {
+@@ -60,7 +60,7 @@ base::FilePath GetDataPath() {
    }
  
    base::FilePath data_dir;
diff --git a/chromium/patches/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/chromium/patches/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
index 5e63e73bd1..ccf78addea 100644
--- a/chromium/patches/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
+++ b/chromium/patches/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc
 @@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(co
  bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
    info->os = api::runtime::PlatformOs::kCros;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    info->os = api::runtime::PlatformOs::kLinux;
  #endif
    return true;
diff --git a/chromium/patches/patch-extensions_shell_browser_shell__browser__main__parts.cc b/chromium/patches/patch-extensions_shell_browser_shell__browser__main__parts.cc
index 40a8666de9..6fc382baaf 100644
--- a/chromium/patches/patch-extensions_shell_browser_shell__browser__main__parts.cc
+++ b/chromium/patches/patch-extensions_shell_browser_shell__browser__main__parts.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-extensions_shell_browser_shell__browser__main__parts.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/shell/browser/shell_browser_main_parts.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/shell/browser/shell_browser_main_parts.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/shell/browser/shell_browser_main_parts.cc
-@@ -150,7 +150,7 @@ void ShellBrowserMainParts::PostCreateMa
+@@ -137,7 +137,7 @@ void ShellBrowserMainParts::PostCreateMa
        switches::kAppShellAllowRoaming)) {
      network_controller_->SetCellularAllowRoaming(true);
    }
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // app_shell doesn't need GTK, so the fake input method context can work.
    // See crbug.com/381852 and revision fb69f142.
    // TODO(michaelpg): Verify this works for target environments.
diff --git a/chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.cc b/chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.cc
index 2e1370b6d8..ab52987ff1 100644
--- a/chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.cc
+++ b/chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.cc
@@ -1,17 +1,26 @@
-$NetBSD: patch-extensions_shell_browser_shell__extensions__api__client.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/shell/browser/shell_extensions_api_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/shell/browser/shell_extensions_api_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/shell/browser/shell_extensions_api_client.cc
-@@ -58,7 +58,7 @@ ShellExtensionsAPIClient::CreateDisplayI
+@@ -18,7 +18,7 @@
+ #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h"
+ #include "extensions/shell/browser/shell_web_view_guest_delegate.h"
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h"
+ #endif
+ 
+@@ -56,7 +56,7 @@ ShellExtensionsAPIClient::CreateDisplayI
+   return std::make_unique<ShellDisplayInfoProvider>();
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() {
    if (!file_system_delegate_)
      file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>();
diff --git a/chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.h b/chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.h
index 19dbce2132..c553696793 100644
--- a/chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.h
+++ b/chromium/patches/patch-extensions_shell_browser_shell__extensions__api__client.h
@@ -1,26 +1,25 @@
-$NetBSD: patch-extensions_shell_browser_shell__extensions__api__client.h,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- extensions/shell/browser/shell_extensions_api_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- extensions/shell/browser/shell_extensions_api_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ extensions/shell/browser/shell_extensions_api_client.h
-@@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public 
+@@ -36,14 +36,14 @@ class ShellExtensionsAPIClient : public 
+       content::BrowserContext* browser_context) const override;
+   std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider()
        const override;
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    FileSystemDelegate* GetFileSystemDelegate() override;
  #endif
    MessagingDelegate* GetMessagingDelegate() override;
-@@ -45,7 +45,7 @@ class ShellExtensionsAPIClient : public 
+   FeedbackPrivateDelegate* GetFeedbackPrivateDelegate() override;
+ 
   private:
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    std::unique_ptr<FileSystemDelegate> file_system_delegate_;
  #endif
    std::unique_ptr<MessagingDelegate> messaging_delegate_;
diff --git a/chromium/patches/patch-google__apis_gcm_engine_heartbeat__manager.cc b/chromium/patches/patch-google__apis_gcm_engine_heartbeat__manager.cc
index a8eca7ef91..422c3eab5c 100644
--- a/chromium/patches/patch-google__apis_gcm_engine_heartbeat__manager.cc
+++ b/chromium/patches/patch-google__apis_gcm_engine_heartbeat__manager.cc
@@ -1,35 +1,35 @@
-$NetBSD: patch-google__apis_gcm_engine_heartbeat__manager.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- google_apis/gcm/engine/heartbeat_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- google_apis/gcm/engine/heartbeat_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ google_apis/gcm/engine/heartbeat_manager.cc
-@@ -32,7 +32,7 @@ const int kMinClientHeartbeatIntervalMs 
+@@ -31,7 +31,7 @@ const int kMinClientHeartbeatIntervalMs 
  // Minimum time spent sleeping before we force a new heartbeat.
  const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds.
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // The period at which to check if the heartbeat time has passed. Used to
  // protect against platforms where the timer is delayed by the system being
  // suspended.  Only needed on linux because the other OSes provide a standard
-@@ -191,7 +191,7 @@ void HeartbeatManager::RestartTimer() {
+@@ -190,7 +190,7 @@ void HeartbeatManager::RestartTimer() {
        base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered,
                            weak_ptr_factory_.GetWeakPtr()));
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified
    // when the system is suspending or resuming.  The only one that does not is
    // Linux so we need to poll to check for missed heartbeats.
-@@ -214,7 +214,7 @@ void HeartbeatManager::CheckForMissedHea
+@@ -213,7 +213,7 @@ void HeartbeatManager::CheckForMissedHea
      return;
    }
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Otherwise check again later.
    io_task_runner_->PostDelayedTask(
        FROM_HERE,
diff --git a/chromium/patches/patch-gpu_command__buffer_service_dawn__context__provider.cc b/chromium/patches/patch-gpu_command__buffer_service_dawn__context__provider.cc
index 9dc5b6e841..a65bf08aa4 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_dawn__context__provider.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_dawn__context__provider.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_command__buffer_service_dawn__context__provider.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/dawn_context_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/dawn_context_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/dawn_context_provider.cc
-@@ -302,7 +302,7 @@ wgpu::BackendType DawnContextProvider::G
+@@ -377,7 +377,7 @@ wgpu::BackendType DawnContextProvider::G
    return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12)
               ? wgpu::BackendType::D3D12
               : wgpu::BackendType::D3D11;
diff --git a/chromium/patches/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/chromium/patches/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
index e0faf4b297..788920bee2 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_command__buffer_service_gles2__cmd__decoder.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/gles2_cmd_decoder.cc
-@@ -2879,7 +2879,7 @@ GLES2Decoder* GLES2Decoder::Create(
+@@ -2862,7 +2862,7 @@ GLES2Decoder* GLES2Decoder::Create(
    }
  
  // Allow linux to run fuzzers.
diff --git a/chromium/patches/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc b/chromium/patches/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc
new file mode 100644
index 0000000000..8fdc7edf6f
--- /dev/null
+++ b/chromium/patches/patch-gpu_command__buffer_service_raster__decoder__unittest__context__lost.cc
@@ -0,0 +1,27 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- gpu/command_buffer/service/raster_decoder_unittest_context_lost.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ gpu/command_buffer/service/raster_decoder_unittest_context_lost.cc
+@@ -15,6 +15,18 @@ using ::testing::Return;
+ using ::testing::SaveArg;
+ using ::testing::SetArrayArgument;
+ 
++#ifndef GL_CONTEXT_LOST_KHR
++#define GL_CONTEXT_LOST_KHR 0x0507
++#endif
++
++#ifndef GL_GUILTY_CONTEXT_RESET_KHR
++#define GL_GUILTY_CONTEXT_RESET_KHR 0x8253
++#endif
++
++#ifndef GL_INNOCENT_CONTEXT_RESET_KHR
++#define GL_INNOCENT_CONTEXT_RESET_KHR 0x8254
++#endif
++
+ namespace gpu {
+ namespace raster {
+ 
diff --git a/chromium/patches/patch-gpu_command__buffer_service_shared__context__state.cc b/chromium/patches/patch-gpu_command__buffer_service_shared__context__state.cc
index 09d8a3be53..8f0ecf1b5d 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_shared__context__state.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_shared__context__state.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_command__buffer_service_shared__context__state.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/shared_context_state.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/shared_context_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/shared_context_state.cc
-@@ -56,7 +56,7 @@
+@@ -64,7 +64,7 @@
  #include "gpu/vulkan/vulkan_implementation.h"
  #include "gpu/vulkan/vulkan_util.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-gpu_command__buffer_service_shared__context__state.cc,v 1.1 2025/
  #include "gpu/command_buffer/service/external_semaphore_pool.h"
  #endif
  
-@@ -287,7 +287,7 @@ SharedContextState::SharedContextState(
+@@ -322,7 +322,7 @@ SharedContextState::SharedContextState(
    if (gr_context_type_ == GrContextType::kVulkan) {
      if (vk_context_provider_) {
  #if BUILDFLAG(ENABLE_VULKAN) && \
@@ -24,8 +24,8 @@ $NetBSD: patch-gpu_command__buffer_service_shared__context__state.cc,v 1.1 2025/
        external_semaphore_pool_ = std::make_unique<ExternalSemaphorePool>(this);
  #endif
        use_virtualized_gl_contexts_ = false;
-@@ -320,7 +320,7 @@ SharedContextState::~SharedContextState(
-   transfer_cache_.reset();
+@@ -359,7 +359,7 @@ SharedContextState::~SharedContextState(
+   }
  
  #if BUILDFLAG(ENABLE_VULKAN) && \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN))
diff --git a/chromium/patches/patch-gpu_command__buffer_service_shared__context__state.h b/chromium/patches/patch-gpu_command__buffer_service_shared__context__state.h
index 990ce1e282..3dfb8b53c9 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_shared__context__state.h
+++ b/chromium/patches/patch-gpu_command__buffer_service_shared__context__state.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_command__buffer_service_shared__context__state.h,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/shared_context_state.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/shared_context_state.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/shared_context_state.h
-@@ -222,7 +222,7 @@ class GPU_GLES2_EXPORT SharedContextStat
+@@ -236,7 +236,7 @@ class GPU_GLES2_EXPORT SharedContextStat
      return &memory_type_tracker_;
    }
  #if BUILDFLAG(ENABLE_VULKAN) && \
@@ -15,7 +15,7 @@ $NetBSD: patch-gpu_command__buffer_service_shared__context__state.h,v 1.1 2025/0
    ExternalSemaphorePool* external_semaphore_pool() {
      return external_semaphore_pool_.get();
    }
-@@ -429,7 +429,7 @@ class GPU_GLES2_EXPORT SharedContextStat
+@@ -449,7 +449,7 @@ class GPU_GLES2_EXPORT SharedContextStat
    bool disable_check_reset_status_throttling_for_test_ = false;
  
  #if BUILDFLAG(ENABLE_VULKAN) && \
diff --git a/chromium/patches/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/chromium/patches/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
index 1fdd209aa2..e6476c0b22 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
 @@ -20,7 +20,7 @@ namespace {
  // TODO(penghuang): verify the scanout is the right usage for video playback.
@@ -15,3 +15,12 @@ $NetBSD: patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__b
      SHARED_IMAGE_USAGE_SCANOUT |
  #endif
      SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE |
+@@ -121,7 +121,7 @@ bool AngleVulkanImageBackingFactory::IsG
+   switch (gmb_type) {
+     case gfx::EMPTY_BUFFER:
+       return true;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP: {
+       auto* vulkan_implementation =
+           context_state_->vk_context_provider()->GetVulkanImplementation();
diff --git a/chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
index 6cd63a9b37..0dcd5a76cf 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc,v 1.1 2025/02/06 09:58:09 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
 @@ -57,7 +57,7 @@
  #include "ui/gl/gl_version_info.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-gpu_command__buffer_service_shared__image_external__vk__image__ba
  #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
  #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES)
  #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h"
-@@ -704,7 +704,7 @@ std::unique_ptr<DawnImageRepresentation>
+@@ -702,7 +702,7 @@ std::unique_ptr<DawnImageRepresentation>
      wgpu::BackendType backend_type,
      std::vector<wgpu::TextureFormat> view_formats,
      scoped_refptr<SharedContextState> context_state) {
diff --git a/chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
index 3c98ba358a..f199adef41 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
-@@ -176,7 +176,7 @@ bool IsFormatSupported(viz::SharedImageF
+@@ -143,7 +143,7 @@ bool IsFormatSupported(viz::SharedImageF
  
  SharedImageUsageSet SupportedUsage() {
    SharedImageUsageSet supported_usage =
diff --git a/chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
index 922ff9aa68..05ab2f6e82 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc
 @@ -48,7 +48,7 @@
  #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h"
@@ -15,7 +15,16 @@ $NetBSD: patch-gpu_command__buffer_service_shared__image_shared__image__factory.
  #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h"
  #endif
  
-@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBuffer
+@@ -102,7 +102,7 @@ const char* GmbTypeToString(gfx::GpuMemo
+     case gfx::IO_SURFACE_BUFFER:
+       return "platform";
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP:
+       return "platform";
+ #endif
+@@ -123,7 +123,7 @@ gfx::GpuMemoryBufferType GetNativeBuffer
    return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER;
  #elif BUILDFLAG(IS_ANDROID)
    return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER;
@@ -24,7 +33,7 @@ $NetBSD: patch-gpu_command__buffer_service_shared__image_shared__image__factory.
    return gfx::GpuMemoryBufferType::NATIVE_PIXMAP;
  #elif BUILDFLAG(IS_WIN)
    return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE;
-@@ -315,7 +315,7 @@ SharedImageFactory::SharedImageFactory(
+@@ -326,7 +326,7 @@ SharedImageFactory::SharedImageFactory(
          context_state_, workarounds_);
      factories_.push_back(std::move(ozone_factory));
    }
diff --git a/chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
index d5c6dcc63d..8ff659ffa9 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc
-@@ -605,7 +605,7 @@ bool SharedImageManager::SupportsScanout
+@@ -756,7 +756,7 @@ bool SharedImageManager::SupportsScanout
    return true;
  #elif BUILDFLAG(IS_ANDROID)
    return base::AndroidHardwareBufferCompat::IsSupportAvailable();
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // We are in the process of tightening scanout support on Ozone to be guarded
-   // by overlays being supported rather than merely native pixmaps being
-   // supported, as native pixmap support doesn't always imply that those native
+   return supports_overlays_on_ozone_;
+ #elif BUILDFLAG(IS_WIN)
+   return gl::DirectCompositionTextureSupported();
diff --git a/chromium/patches/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/chromium/patches/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
index c693a90b32..d608407314 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
 @@ -214,7 +214,7 @@ bool WrappedSkImageBacking::Initialize(c
  
diff --git a/chromium/patches/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/chromium/patches/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index e6686c6c5e..b6f6859977 100644
--- a/chromium/patches/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/chromium/patches/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,21 +1,21 @@
-$NetBSD: patch-gpu_command__buffer_service_webgpu__decoder__impl.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1390,7 +1390,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAda
-     force_fallback_adapter = true;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!shared_context_state_->GrContextIsVulkan() &&
-       !shared_context_state_->IsGraphiteDawnVulkan() &&
-       use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) {
-@@ -2075,7 +2075,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
+@@ -1754,7 +1754,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreateP
+       backend_types = {wgpu::BackendType::D3D12};
+ #elif BUILDFLAG(IS_MAC)
+       backend_types = {wgpu::BackendType::Metal};
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       if (shared_context_state_->GrContextIsVulkan() ||
+           shared_context_state_->IsGraphiteDawnVulkan()) {
+         backend_types = {wgpu::BackendType::Vulkan};
+@@ -1996,7 +1996,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
    }
  
  #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
diff --git a/chromium/patches/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/chromium/patches/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
index 6eb54881e7..5343bdd89c 100644
--- a/chromium/patches/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
+++ b/chromium/patches/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
 @@ -32,7 +32,7 @@
  #include "ui/gfx/half_float.h"
diff --git a/chromium/patches/patch-gpu_config_gpu__control__list.cc b/chromium/patches/patch-gpu_config_gpu__control__list.cc
index fe5abfac34..ec5860e659 100644
--- a/chromium/patches/patch-gpu_config_gpu__control__list.cc
+++ b/chromium/patches/patch-gpu_config_gpu__control__list.cc
@@ -1,21 +1,12 @@
-$NetBSD: patch-gpu_config_gpu__control__list.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/config/gpu_control_list.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/config/gpu_control_list.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/config/gpu_control_list.cc
-@@ -277,7 +277,7 @@ bool GpuControlList::More::GLVersionInfo
- GpuControlList::GLType GpuControlList::More::GetDefaultGLType() {
- #if BUILDFLAG(IS_CHROMEOS)
-   return kGLTypeGL;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return kGLTypeGL;
- #elif BUILDFLAG(IS_MAC)
-   return kGLTypeGL;
-@@ -848,7 +848,7 @@ GpuControlList::OsType GpuControlList::G
+@@ -831,7 +831,7 @@ GpuControlList::OsType GpuControlList::G
    return kOsAndroid;
  #elif BUILDFLAG(IS_FUCHSIA)
    return kOsFuchsia;
diff --git a/chromium/patches/patch-gpu_config_gpu__finch__features.cc b/chromium/patches/patch-gpu_config_gpu__finch__features.cc
index 413387bfac..36331564fd 100644
--- a/chromium/patches/patch-gpu_config_gpu__finch__features.cc
+++ b/chromium/patches/patch-gpu_config_gpu__finch__features.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_config_gpu__finch__features.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/config/gpu_finch_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/config/gpu_finch_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/config/gpu_finch_features.cc
-@@ -147,7 +147,8 @@ const base::FeatureParam<std::string>
+@@ -155,7 +155,8 @@ BASE_FEATURE(kAllowHardwareBufferUsageFl
  BASE_FEATURE(kDefaultEnableGpuRasterization,
               "DefaultEnableGpuRasterization",
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/chromium/patches/patch-gpu_config_gpu__info__collector.cc b/chromium/patches/patch-gpu_config_gpu__info__collector.cc
index 3a99bf176b..b2baa0b395 100644
--- a/chromium/patches/patch-gpu_config_gpu__info__collector.cc
+++ b/chromium/patches/patch-gpu_config_gpu__info__collector.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_config_gpu__info__collector.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/config/gpu_info_collector.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/config/gpu_info_collector.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/config/gpu_info_collector.cc
-@@ -362,7 +362,7 @@ void ReportWebGPUAdapterMetrics(dawn::na
+@@ -349,7 +349,7 @@ void ReportWebGPUAdapterMetrics(dawn::na
  void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) {
    static BASE_FEATURE(kCollectWebGPUSupportMetrics,
                        "CollectWebGPUSupportMetrics",
diff --git a/chromium/patches/patch-gpu_config_gpu__test__config.cc b/chromium/patches/patch-gpu_config_gpu__test__config.cc
index d6016003bc..5e9b9918df 100644
--- a/chromium/patches/patch-gpu_config_gpu__test__config.cc
+++ b/chromium/patches/patch-gpu_config_gpu__test__config.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-gpu_config_gpu__test__config.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/config/gpu_test_config.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/config/gpu_test_config.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/config/gpu_test_config.cc
-@@ -29,7 +29,7 @@ GPUTestConfig::OS GetCurrentOS() {
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -27,7 +27,7 @@ namespace {
+ GPUTestConfig::OS GetCurrentOS() {
+ #if BUILDFLAG(IS_CHROMEOS)
    return GPUTestConfig::kOsChromeOS;
- #elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
--    BUILDFLAG(IS_OPENBSD)
-+    BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return GPUTestConfig::kOsLinux;
  #elif BUILDFLAG(IS_WIN)
    int32_t major_version = 0;
diff --git a/chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
index 8dff5a384d..0cb2ad991e 100644
--- a/chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
+++ b/chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_ipc_common_gpu__memory__buffer__support.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/ipc/common/gpu_memory_buffer_support.cc
 @@ -26,7 +26,7 @@
  #include "ui/ozone/public/ozone_platform.h"
diff --git a/chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.h
index 76b903843f..e8c66a12d8 100644
--- a/chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.h
+++ b/chromium/patches/patch-gpu_ipc_common_gpu__memory__buffer__support.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_ipc_common_gpu__memory__buffer__support.h,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/ipc/common/gpu_memory_buffer_support.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/ipc/common/gpu_memory_buffer_support.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/ipc/common/gpu_memory_buffer_support.h
 @@ -21,7 +21,7 @@
  #include "ui/gfx/geometry/size.h"
diff --git a/chromium/patches/patch-gpu_ipc_service_gpu__init.cc b/chromium/patches/patch-gpu_ipc_service_gpu__init.cc
index adb669950a..b0cf9f608c 100644
--- a/chromium/patches/patch-gpu_ipc_service_gpu__init.cc
+++ b/chromium/patches/patch-gpu_ipc_service_gpu__init.cc
@@ -1,12 +1,21 @@
-$NetBSD: patch-gpu_ipc_service_gpu__init.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/ipc/service/gpu_init.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/ipc/service/gpu_init.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/ipc/service/gpu_init.cc
-@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -153,7 +153,7 @@ void InitializePlatformOverlaySettings(G
+ 
+ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CASTOS)
+ bool CanAccessDeviceFile(const GPUInfo& gpu_info) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (gpu_info.gpu.vendor_id != 0x10de ||  // NVIDIA
+       gpu_info.gpu.driver_vendor != "NVIDIA")
+     return true;
+@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(
    enable_watchdog = false;
  #endif
  
@@ -15,7 +24,7 @@ $NetBSD: patch-gpu_ipc_service_gpu__init.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
    bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
  #else   // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
    // For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -424,7 +424,7 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -427,7 +427,7 @@ bool GpuInit::InitializeAndStartSandbox(
    }
  
    bool attempted_startsandbox = false;
@@ -24,7 +33,7 @@ $NetBSD: patch-gpu_ipc_service_gpu__init.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(
      gpu_preferences_.gr_context_type = GrContextType::kGL;
    }
  
@@ -33,7 +42,7 @@ $NetBSD: patch-gpu_ipc_service_gpu__init.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
    // The ContentSandboxHelper is currently the only one implementation of
    // GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -610,7 +610,7 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -586,7 +586,7 @@ bool GpuInit::InitializeAndStartSandbox(
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
        if (gl_use_swiftshader_) {
@@ -42,16 +51,16 @@ $NetBSD: patch-gpu_ipc_service_gpu__init.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -766,7 +766,7 @@ bool GpuInit::InitializeAndStartSandbox(
- 
-   InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
+@@ -754,7 +754,7 @@ bool GpuInit::InitializeAndStartSandbox(
+               ->GetSupportedFormatsForGLNativePixmapImport();
+ #endif  // BUILDFLAG(IS_OZONE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -821,7 +821,7 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -806,7 +806,7 @@ bool GpuInit::InitializeAndStartSandbox(
        }
      }
    }
diff --git a/chromium/patches/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/chromium/patches/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
index ac153db28b..04a819cb59 100644
--- a/chromium/patches/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
+++ b/chromium/patches/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_ipc_service_gpu__memory__buffer__factory.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/ipc/service/gpu_memory_buffer_factory.cc
 @@ -14,7 +14,7 @@
  #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
diff --git a/chromium/patches/patch-gpu_ipc_service_x__util.h b/chromium/patches/patch-gpu_ipc_service_x__util.h
index 8a69a00d30..8cc1192335 100644
--- a/chromium/patches/patch-gpu_ipc_service_x__util.h
+++ b/chromium/patches/patch-gpu_ipc_service_x__util.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_ipc_service_x__util.h,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/ipc/service/x_util.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/ipc/service/x_util.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/ipc/service/x_util.h
 @@ -12,7 +12,7 @@
  #include "gpu/ipc/service/gpu_config.h"
diff --git a/chromium/patches/patch-gpu_vulkan_generate__bindings.py b/chromium/patches/patch-gpu_vulkan_generate__bindings.py
index e8961d0287..da1b5a0fd6 100644
--- a/chromium/patches/patch-gpu_vulkan_generate__bindings.py
+++ b/chromium/patches/patch-gpu_vulkan_generate__bindings.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_vulkan_generate__bindings.py,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/vulkan/generate_bindings.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/vulkan/generate_bindings.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/vulkan/generate_bindings.py
 @@ -271,7 +271,7 @@ VULKAN_DEVICE_FUNCTIONS = [
      ]
diff --git a/chromium/patches/patch-gpu_vulkan_semaphore__handle.cc b/chromium/patches/patch-gpu_vulkan_semaphore__handle.cc
index 5c96b6cfbb..34dcdc9f5e 100644
--- a/chromium/patches/patch-gpu_vulkan_semaphore__handle.cc
+++ b/chromium/patches/patch-gpu_vulkan_semaphore__handle.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_vulkan_semaphore__handle.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/vulkan/semaphore_handle.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/vulkan/semaphore_handle.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/vulkan/semaphore_handle.cc
 @@ -39,7 +39,7 @@ SemaphoreHandle::SemaphoreHandle(gfx::Gp
    // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic.
diff --git a/chromium/patches/patch-gpu_vulkan_vulkan__device__queue.cc b/chromium/patches/patch-gpu_vulkan_vulkan__device__queue.cc
index 26b7ba42c9..d0f5ef670d 100644
--- a/chromium/patches/patch-gpu_vulkan_vulkan__device__queue.cc
+++ b/chromium/patches/patch-gpu_vulkan_vulkan__device__queue.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_vulkan_vulkan__device__queue.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/vulkan/vulkan_device_queue.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/vulkan/vulkan_device_queue.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/vulkan/vulkan_device_queue.cc
-@@ -154,7 +154,7 @@ bool VulkanDeviceQueue::Initialize(
+@@ -156,7 +156,7 @@ bool VulkanDeviceQueue::Initialize(
  
        // In dual-CPU cases, we cannot detect the active GPU correctly on Linux,
        // so don't select GPU device based on the |gpu_info|.
@@ -15,7 +15,7 @@ $NetBSD: patch-gpu_vulkan_vulkan__device__queue.cc,v 1.1 2025/02/06 09:58:10 wiz
      // If gpu_info is provided, the device should match it.
      if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id ||
                       device_properties.deviceID != gpu_info->gpu.device_id)) {
-@@ -297,7 +297,7 @@ bool VulkanDeviceQueue::Initialize(
+@@ -303,7 +303,7 @@ bool VulkanDeviceQueue::Initialize(
    // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler
    // support.
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-gpu_vulkan_vulkan__device__queue.h b/chromium/patches/patch-gpu_vulkan_vulkan__device__queue.h
index 3a1a006e84..549a469b55 100644
--- a/chromium/patches/patch-gpu_vulkan_vulkan__device__queue.h
+++ b/chromium/patches/patch-gpu_vulkan_vulkan__device__queue.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_vulkan_vulkan__device__queue.h,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/vulkan/vulkan_device_queue.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/vulkan/vulkan_device_queue.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/vulkan/vulkan_device_queue.h
-@@ -179,7 +179,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDev
+@@ -182,7 +182,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDev
  #endif
  
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.cc b/chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.cc
index 1b4e5e76db..5b29350e45 100644
--- a/chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.cc
+++ b/chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_vulkan_vulkan__function__pointers.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/vulkan/vulkan_function_pointers.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/vulkan/vulkan_function_pointers.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/vulkan/vulkan_function_pointers.cc
 @@ -1297,7 +1297,7 @@ bool VulkanFunctionPointers::BindDeviceF
      }
diff --git a/chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.h b/chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.h
index 7d5fa8b0db..786352c0c0 100644
--- a/chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.h
+++ b/chromium/patches/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_vulkan_vulkan__function__pointers.h,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/vulkan/vulkan_function_pointers.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/vulkan/vulkan_function_pointers.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/vulkan/vulkan_function_pointers.h
-@@ -322,7 +322,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFu
+@@ -391,7 +391,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFu
    VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
    VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
  
@@ -15,7 +15,7 @@ $NetBSD: patch-gpu_vulkan_vulkan__function__pointers.h,v 1.1 2025/02/06 09:58:10
    VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
        vkGetImageDrmFormatModifierPropertiesEXT;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1336,7 +1336,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR
+@@ -1405,7 +1405,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR
                                                               pPresentInfo);
  }
  
@@ -24,7 +24,7 @@ $NetBSD: patch-gpu_vulkan_vulkan__function__pointers.h,v 1.1 2025/02/06 09:58:10
  ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
      VkDevice device,
      VkImage image,
-@@ -1346,4 +1346,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmForm
+@@ -1415,4 +1415,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmForm
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
diff --git a/chromium/patches/patch-gpu_vulkan_vulkan__image.h b/chromium/patches/patch-gpu_vulkan_vulkan__image.h
index 5273d47389..6d6d4ce6cc 100644
--- a/chromium/patches/patch-gpu_vulkan_vulkan__image.h
+++ b/chromium/patches/patch-gpu_vulkan_vulkan__image.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-gpu_vulkan_vulkan__image.h,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/vulkan/vulkan_image.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/vulkan/vulkan_image.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/vulkan/vulkan_image.h
 @@ -87,7 +87,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanIma
        VkImageUsageFlags usage,
diff --git a/chromium/patches/patch-gpu_vulkan_vulkan__util.cc b/chromium/patches/patch-gpu_vulkan_vulkan__util.cc
index c15cc6efd8..e5c5364ff6 100644
--- a/chromium/patches/patch-gpu_vulkan_vulkan__util.cc
+++ b/chromium/patches/patch-gpu_vulkan_vulkan__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-gpu_vulkan_vulkan__util.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- gpu/vulkan/vulkan_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- gpu/vulkan/vulkan_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ gpu/vulkan/vulkan_util.cc
-@@ -473,7 +473,7 @@ bool CheckVulkanCompatibilities(
+@@ -467,7 +467,7 @@ bool CheckVulkanCompatibilities(
      }
    }
  
diff --git a/chromium/patches/patch-headless_BUILD.gn b/chromium/patches/patch-headless_BUILD.gn
new file mode 100644
index 0000000000..a09ce5eee2
--- /dev/null
+++ b/chromium/patches/patch-headless_BUILD.gn
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- headless/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ headless/BUILD.gn
+@@ -475,7 +475,7 @@ component("headless_non_renderer") {
+     }
+   }
+ 
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     deps += [
+       "//components/crash/content/browser",
+       "//components/crash/core/app",
diff --git a/chromium/patches/patch-headless_lib_browser_headless__browser__main__parts__posix.cc b/chromium/patches/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
index da90371094..29d1b7aaa3 100644
--- a/chromium/patches/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
+++ b/chromium/patches/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-headless_lib_browser_headless__browser__main__parts__posix.cc,v 1.1 2025/02/06 09:58:10 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- headless/lib/browser/headless_browser_main_parts_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- headless/lib/browser/headless_browser_main_parts_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ headless/lib/browser/headless_browser_main_parts_posix.cc
-@@ -21,13 +21,13 @@
+@@ -26,13 +26,13 @@
  #include "content/public/browser/browser_thread.h"
  #include "headless/lib/browser/headless_browser_impl.h"
  
@@ -17,12 +17,12 @@ $NetBSD: patch-headless_lib_browser_headless__browser__main__parts__posix.cc,v 1
  #include "components/os_crypt/sync/os_crypt.h"
  #include "headless/public/switches.h"
  
--#if defined(USE_DBUS)
-+#if defined(USE_DBUS) && !BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(USE_DBUS)
++#if BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_BSD)
  #include "device/bluetooth/dbus/bluez_dbus_manager.h"
  #endif
  
-@@ -161,7 +161,7 @@ class BrowserShutdownHandler {
+@@ -166,7 +166,7 @@ class BrowserShutdownHandler {
  
  }  // namespace
  
@@ -31,15 +31,15 @@ $NetBSD: patch-headless_lib_browser_headless__browser__main__parts__posix.cc,v 1
  constexpr char kProductName[] = "HeadlessChrome";
  #endif
  
-@@ -169,9 +169,9 @@ void HeadlessBrowserMainParts::PostCreat
+@@ -174,9 +174,9 @@ void HeadlessBrowserMainParts::PostCreat
    BrowserShutdownHandler::Install(base::BindOnce(
        &HeadlessBrowserImpl::ShutdownWithExitCode, browser_->GetWeakPtr()));
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  
--#if defined(USE_DBUS)
-+#if defined(USE_DBUS) && !BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(USE_DBUS)
++#if BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_BSD)
    bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr);
  #endif
  
diff --git a/chromium/patches/patch-headless_lib_browser_headless__content__browser__client.cc b/chromium/patches/patch-headless_lib_browser_headless__content__browser__client.cc
index 4d71d48e4e..01aa646f68 100644
--- a/chromium/patches/patch-headless_lib_browser_headless__content__browser__client.cc
+++ b/chromium/patches/patch-headless_lib_browser_headless__content__browser__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-headless_lib_browser_headless__content__browser__client.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- headless/lib/browser/headless_content_browser_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- headless/lib/browser/headless_content_browser_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ headless/lib/browser/headless_content_browser_client.cc
-@@ -56,7 +56,7 @@
+@@ -58,7 +58,7 @@
  #include "content/public/common/content_descriptors.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -15,7 +15,7 @@ $NetBSD: patch-headless_lib_browser_headless__content__browser__client.cc,v 1.1
  #include "components/os_crypt/sync/os_crypt.h"  // nogncheck
  #include "content/public/browser/network_service_util.h"
  #endif
-@@ -488,7 +488,7 @@ void HeadlessContentBrowserClient::Handl
+@@ -520,7 +520,7 @@ void HeadlessContentBrowserClient::Handl
  
  void HeadlessContentBrowserClient::SetEncryptionKey(
      ::network::mojom::NetworkService* network_service) {
diff --git a/chromium/patches/patch-headless_lib_browser_headless__content__browser__client.h b/chromium/patches/patch-headless_lib_browser_headless__content__browser__client.h
index 513e03accc..205366430b 100644
--- a/chromium/patches/patch-headless_lib_browser_headless__content__browser__client.h
+++ b/chromium/patches/patch-headless_lib_browser_headless__content__browser__client.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-headless_lib_browser_headless__content__browser__client.h,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- headless/lib/browser/headless_content_browser_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- headless/lib/browser/headless_content_browser_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ headless/lib/browser/headless_content_browser_client.h
-@@ -45,7 +45,7 @@ class HeadlessContentBrowserClient : pub
+@@ -47,7 +47,7 @@ class HeadlessContentBrowserClient : pub
    CreateDevToolsManagerDelegate() override;
    content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings(
        content::BrowserContext* context) override;
diff --git a/chromium/patches/patch-headless_lib_browser_headless__web__contents__impl.cc b/chromium/patches/patch-headless_lib_browser_headless__web__contents__impl.cc
index 33ef84eaa1..94ce9aafbb 100644
--- a/chromium/patches/patch-headless_lib_browser_headless__web__contents__impl.cc
+++ b/chromium/patches/patch-headless_lib_browser_headless__web__contents__impl.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-headless_lib_browser_headless__web__contents__impl.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- headless/lib/browser/headless_web_contents_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- headless/lib/browser/headless_web_contents_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ headless/lib/browser/headless_web_contents_impl.cc
-@@ -62,7 +62,7 @@ namespace headless {
+@@ -70,7 +70,7 @@ BASE_FEATURE(kPrerender2InHeadlessMode,
  namespace {
  
  void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    content::UpdateFontRendererPreferencesFromSystemSettings(prefs);
  #endif
  
diff --git a/chromium/patches/patch-headless_lib_headless__content__main__delegate.cc b/chromium/patches/patch-headless_lib_headless__content__main__delegate.cc
index 11a7c079d4..f9fc7d0575 100644
--- a/chromium/patches/patch-headless_lib_headless__content__main__delegate.cc
+++ b/chromium/patches/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-headless_lib_headless__content__main__delegate.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- headless/lib/headless_content_main_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- headless/lib/headless_content_main_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ headless/lib/headless_content_main_delegate.cc
 @@ -407,7 +407,7 @@ void HeadlessContentMainDelegate::InitCr
    if (process_type != ::switches::kZygoteProcess) {
diff --git a/chromium/patches/patch-ipc_ipc__channel.h b/chromium/patches/patch-ipc_ipc__channel.h
index 17c60f9652..3881e13848 100644
--- a/chromium/patches/patch-ipc_ipc__channel.h
+++ b/chromium/patches/patch-ipc_ipc__channel.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ipc_ipc__channel.h,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ipc/ipc_channel.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ipc/ipc_channel.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ipc/ipc_channel.h
 @@ -218,7 +218,7 @@ class COMPONENT_EXPORT(IPC) Channel : pu
    static std::string GenerateUniqueRandomChannelID();
diff --git a/chromium/patches/patch-ipc_ipc__channel__common.cc b/chromium/patches/patch-ipc_ipc__channel__common.cc
index b6611f195f..ee362e870f 100644
--- a/chromium/patches/patch-ipc_ipc__channel__common.cc
+++ b/chromium/patches/patch-ipc_ipc__channel__common.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ipc_ipc__channel__common.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ipc/ipc_channel_common.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ipc/ipc_channel_common.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ipc/ipc_channel_common.cc
 @@ -10,7 +10,7 @@
  
diff --git a/chromium/patches/patch-ipc_ipc__channel__mojo.cc b/chromium/patches/patch-ipc_ipc__channel__mojo.cc
index c13d6d5ff8..91de62b28a 100644
--- a/chromium/patches/patch-ipc_ipc__channel__mojo.cc
+++ b/chromium/patches/patch-ipc_ipc__channel__mojo.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ipc_ipc__channel__mojo.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ipc/ipc_channel_mojo.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ipc/ipc_channel_mojo.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ipc/ipc_channel_mojo.cc
 @@ -105,7 +105,7 @@ class ThreadSafeChannelProxy : public mo
  };
diff --git a/chromium/patches/patch-ipc_ipc__message__utils.cc b/chromium/patches/patch-ipc_ipc__message__utils.cc
index c96e937e3d..d681c190cb 100644
--- a/chromium/patches/patch-ipc_ipc__message__utils.cc
+++ b/chromium/patches/patch-ipc_ipc__message__utils.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ipc_ipc__message__utils.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ipc/ipc_message_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ipc/ipc_message_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ipc/ipc_message_utils.cc
 @@ -399,7 +399,7 @@ void ParamTraits<unsigned int>::Log(cons
  }
diff --git a/chromium/patches/patch-ipc_ipc__message__utils.h b/chromium/patches/patch-ipc_ipc__message__utils.h
index 752b5822a1..728aeaf7dc 100644
--- a/chromium/patches/patch-ipc_ipc__message__utils.h
+++ b/chromium/patches/patch-ipc_ipc__message__utils.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ipc_ipc__message__utils.h,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ipc/ipc_message_utils.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ipc/ipc_message_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ipc/ipc_message_utils.h
-@@ -214,7 +214,7 @@ struct ParamTraits<unsigned int> {
+@@ -216,7 +216,7 @@ struct ParamTraits<unsigned int> {
  // Since we want to support Android 32<>64 bit IPC, as long as we don't have
  // these traits for 32 bit ARM then that'll catch any errors.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/chromium/patches/patch-media_BUILD.gn b/chromium/patches/patch-media_BUILD.gn
index 61b1e998af..59ed126b60 100644
--- a/chromium/patches/patch-media_BUILD.gn
+++ b/chromium/patches/patch-media_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_BUILD.gn,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/BUILD.gn
-@@ -97,6 +97,12 @@ config("media_config") {
+@@ -105,6 +105,12 @@ config("media_config") {
        defines += [ "DLOPEN_PULSEAUDIO" ]
      }
    }
diff --git a/chromium/patches/patch-media_audio_BUILD.gn b/chromium/patches/patch-media_audio_BUILD.gn
index b33d33f70f..ab14ee635d 100644
--- a/chromium/patches/patch-media_audio_BUILD.gn
+++ b/chromium/patches/patch-media_audio_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_audio_BUILD.gn,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/audio/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/audio/BUILD.gn
-@@ -268,10 +268,35 @@ source_set("audio") {
+@@ -275,10 +275,35 @@ source_set("audio") {
      deps += [ "//media/base/android:media_jni_headers" ]
    }
  
diff --git a/chromium/patches/patch-media_audio_alsa_audio__manager__alsa.cc b/chromium/patches/patch-media_audio_alsa_audio__manager__alsa.cc
index 38f2a4216f..a95af89d4e 100644
--- a/chromium/patches/patch-media_audio_alsa_audio__manager__alsa.cc
+++ b/chromium/patches/patch-media_audio_alsa_audio__manager__alsa.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_audio_alsa_audio__manager__alsa.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/alsa/audio_manager_alsa.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/audio/alsa/audio_manager_alsa.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/audio/alsa/audio_manager_alsa.cc
-@@ -100,7 +100,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
+@@ -106,7 +106,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
    int card = -1;
  
    // Loop through the physical sound cards to get ALSA device hints.
@@ -16,7 +16,7 @@ $NetBSD: patch-media_audio_alsa_audio__manager__alsa.cc,v 1.1 2025/02/06 09:58:1
      void** hints = NULL;
      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
      if (!error) {
-@@ -112,7 +114,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
+@@ -118,7 +120,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
        DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
                      << wrapper_->StrError(error);
      }
@@ -26,7 +26,7 @@ $NetBSD: patch-media_audio_alsa_audio__manager__alsa.cc,v 1.1 2025/02/06 09:58:1
  }
  
  void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type,
-@@ -195,7 +199,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
+@@ -201,7 +205,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
    // goes through software conversion if needed (e.g. incompatible
    // sample rate).
    // TODO(joi): Should we prefer "hw" instead?
@@ -38,7 +38,7 @@ $NetBSD: patch-media_audio_alsa_audio__manager__alsa.cc,v 1.1 2025/02/06 09:58:1
    return strncmp(kDeviceTypeDesired, device_name,
                   std::size(kDeviceTypeDesired) - 1) == 0;
  }
-@@ -247,7 +255,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
+@@ -253,7 +261,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
    // Loop through the sound cards.
    // Don't use snd_device_name_hint(-1,..) since there is an access violation
    // inside this ALSA API with libasound.so.2.0.0.
@@ -48,7 +48,7 @@ $NetBSD: patch-media_audio_alsa_audio__manager__alsa.cc,v 1.1 2025/02/06 09:58:1
      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
      if (!error) {
        for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
-@@ -271,7 +281,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
+@@ -277,7 +287,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
        DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
                      << wrapper_->StrError(error);
      }
diff --git a/chromium/patches/patch-media_audio_audio__input__device.cc b/chromium/patches/patch-media_audio_audio__input__device.cc
index b9b7a81356..9a710d7864 100644
--- a/chromium/patches/patch-media_audio_audio__input__device.cc
+++ b/chromium/patches/patch-media_audio_audio__input__device.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_audio_audio__input__device.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/audio_input_device.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/audio/audio_input_device.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/audio/audio_input_device.cc
-@@ -269,7 +269,7 @@ void AudioInputDevice::OnStreamCreated(
+@@ -275,7 +275,7 @@ void AudioInputDevice::OnStreamCreated(
  // here. See comments in AliveChecker and PowerObserverHelper for details and
  // todos.
    if (detect_dead_stream_ == DeadStreamDetection::kEnabled) {
diff --git a/chromium/patches/patch-media_audio_audio__output__proxy__unittest.cc b/chromium/patches/patch-media_audio_audio__output__proxy__unittest.cc
index ada7bc780f..b55dcfc1f1 100644
--- a/chromium/patches/patch-media_audio_audio__output__proxy__unittest.cc
+++ b/chromium/patches/patch-media_audio_audio__output__proxy__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_audio_audio__output__proxy__unittest.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/audio_output_proxy_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/audio/audio_output_proxy_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/audio/audio_output_proxy_unittest.cc
 @@ -443,7 +443,11 @@ class AudioOutputProxyTest : public test
      // |stream| is closed at this point. Start() should reopen it again.
diff --git a/chromium/patches/patch-media_audio_pulse_pulse__util.cc b/chromium/patches/patch-media_audio_pulse_pulse__util.cc
index 4c980df63f..c15c02140c 100644
--- a/chromium/patches/patch-media_audio_pulse_pulse__util.cc
+++ b/chromium/patches/patch-media_audio_pulse_pulse__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_audio_pulse_pulse__util.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/pulse/pulse_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/audio/pulse/pulse_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/audio/pulse/pulse_util.cc
 @@ -50,8 +50,12 @@ constexpr char kBrowserDisplayName[] = "
  
diff --git a/chromium/patches/patch-media_audio_sndio_audio__manager__sndio.cc b/chromium/patches/patch-media_audio_sndio_audio__manager__sndio.cc
index b83ead5bc2..2a5d4e650e 100644
--- a/chromium/patches/patch-media_audio_sndio_audio__manager__sndio.cc
+++ b/chromium/patches/patch-media_audio_sndio_audio__manager__sndio.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_audio_sndio_audio__manager__sndio.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/sndio/audio_manager_sndio.cc.orig	2024-12-21 10:25:10.410710748 +0000
+--- media/audio/sndio/audio_manager_sndio.cc.orig	2025-05-08 12:01:57.767307090 +0000
 +++ media/audio/sndio/audio_manager_sndio.cc
 @@ -0,0 +1,213 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-media_audio_sndio_audio__manager__sndio.h b/chromium/patches/patch-media_audio_sndio_audio__manager__sndio.h
index 7905e80c24..bd0ae7972c 100644
--- a/chromium/patches/patch-media_audio_sndio_audio__manager__sndio.h
+++ b/chromium/patches/patch-media_audio_sndio_audio__manager__sndio.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_audio_sndio_audio__manager__sndio.h,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/sndio/audio_manager_sndio.h.orig	2024-12-21 10:25:10.411266407 +0000
+--- media/audio/sndio/audio_manager_sndio.h.orig	2025-05-08 12:01:57.767453152 +0000
 +++ media/audio/sndio/audio_manager_sndio.h
 @@ -0,0 +1,66 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-media_audio_sndio_sndio__input.cc b/chromium/patches/patch-media_audio_sndio_sndio__input.cc
index 5d65a84804..a4469a6951 100644
--- a/chromium/patches/patch-media_audio_sndio_sndio__input.cc
+++ b/chromium/patches/patch-media_audio_sndio_sndio__input.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_audio_sndio_sndio__input.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/sndio/sndio_input.cc.orig	2024-12-21 10:25:10.411774574 +0000
+--- media/audio/sndio/sndio_input.cc.orig	2025-05-08 12:01:57.767584675 +0000
 +++ media/audio/sndio/sndio_input.cc
 @@ -0,0 +1,200 @@
 +// Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-media_audio_sndio_sndio__input.h b/chromium/patches/patch-media_audio_sndio_sndio__input.h
index 633b3f67e1..71900f322b 100644
--- a/chromium/patches/patch-media_audio_sndio_sndio__input.h
+++ b/chromium/patches/patch-media_audio_sndio_sndio__input.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_audio_sndio_sndio__input.h,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/sndio/sndio_input.h.orig	2024-12-21 10:25:10.412355655 +0000
+--- media/audio/sndio/sndio_input.h.orig	2025-05-08 12:01:57.767726248 +0000
 +++ media/audio/sndio/sndio_input.h
 @@ -0,0 +1,91 @@
 +// Copyright 2013 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-media_audio_sndio_sndio__output.cc b/chromium/patches/patch-media_audio_sndio_sndio__output.cc
index a5de21645b..148c2dc98e 100644
--- a/chromium/patches/patch-media_audio_sndio_sndio__output.cc
+++ b/chromium/patches/patch-media_audio_sndio_sndio__output.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_audio_sndio_sndio__output.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/sndio/sndio_output.cc.orig	2024-12-21 10:25:10.412830019 +0000
+--- media/audio/sndio/sndio_output.cc.orig	2025-05-08 12:01:57.767858883 +0000
 +++ media/audio/sndio/sndio_output.cc
 @@ -0,0 +1,187 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-media_audio_sndio_sndio__output.h b/chromium/patches/patch-media_audio_sndio_sndio__output.h
index f87c90e714..5fef34e2a3 100644
--- a/chromium/patches/patch-media_audio_sndio_sndio__output.h
+++ b/chromium/patches/patch-media_audio_sndio_sndio__output.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_audio_sndio_sndio__output.h,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/audio/sndio/sndio_output.h.orig	2024-12-21 10:25:10.413377576 +0000
+--- media/audio/sndio/sndio_output.h.orig	2025-05-08 12:01:57.768000827 +0000
 +++ media/audio/sndio/sndio_output.h
 @@ -0,0 +1,88 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-media_base_audio__latency.cc b/chromium/patches/patch-media_base_audio__latency.cc
index 796800da30..9a07f2af97 100644
--- a/chromium/patches/patch-media_base_audio__latency.cc
+++ b/chromium/patches/patch-media_base_audio__latency.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_base_audio__latency.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/base/audio_latency.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/base/audio_latency.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/base/audio_latency.cc
-@@ -148,7 +148,7 @@ int AudioLatency::GetRtcBufferSize(int s
+@@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int s
    }
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
diff --git a/chromium/patches/patch-media_base_libaom__thread__wrapper.cc b/chromium/patches/patch-media_base_libaom__thread__wrapper.cc
index 2337ba903f..5752c71ec4 100644
--- a/chromium/patches/patch-media_base_libaom__thread__wrapper.cc
+++ b/chromium/patches/patch-media_base_libaom__thread__wrapper.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_base_libaom__thread__wrapper.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/base/libaom_thread_wrapper.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/base/libaom_thread_wrapper.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/base/libaom_thread_wrapper.cc
 @@ -5,17 +5,21 @@
  #include "base/logging.h"
diff --git a/chromium/patches/patch-media_base_libvpx__thread__wrapper.cc b/chromium/patches/patch-media_base_libvpx__thread__wrapper.cc
index 21cb22e0a7..e3cb81a4b3 100644
--- a/chromium/patches/patch-media_base_libvpx__thread__wrapper.cc
+++ b/chromium/patches/patch-media_base_libvpx__thread__wrapper.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_base_libvpx__thread__wrapper.cc,v 1.1 2025/02/06 09:58:11 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/base/libvpx_thread_wrapper.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/base/libvpx_thread_wrapper.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/base/libvpx_thread_wrapper.cc
 @@ -5,11 +5,14 @@
  #include "media/base/libvpx_thread_wrapper.h"
diff --git a/chromium/patches/patch-media_base_media__switches.cc b/chromium/patches/patch-media_base_media__switches.cc
index 322f4b040e..87685eab48 100644
--- a/chromium/patches/patch-media_base_media__switches.cc
+++ b/chromium/patches/patch-media_base_media__switches.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/base/media_switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/base/media_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/base/media_switches.cc
-@@ -21,7 +21,7 @@
+@@ -19,7 +19,7 @@
  #include "ui/gl/gl_features.h"
  #include "ui/gl/gl_utils.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
  #include "base/cpu.h"
  #endif
  
-@@ -61,7 +61,7 @@ const char kReportVp9AsAnUnsupportedMime
+@@ -59,7 +59,7 @@ const char kReportVp9AsAnUnsupportedMime
      "report-vp9-as-an-unsupported-mime-type";
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \
@@ -24,7 +24,7 @@ $NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
  // The Alsa device to use when opening an audio input stream.
  const char kAlsaInputDevice[] = "alsa-input-device";
  // The Alsa device to use when opening an audio stream.
-@@ -375,8 +375,8 @@ BASE_FEATURE(kUseSCContentSharingPicker,
+@@ -358,8 +358,8 @@ BASE_FEATURE(kUseSCContentSharingPicker,
               "UseSCContentSharingPicker",
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_MAC)
@@ -35,7 +35,7 @@ $NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
  // Enables system audio mirroring using pulseaudio.
  BASE_FEATURE(kPulseaudioLoopbackForCast,
               "PulseaudioLoopbackForCast",
-@@ -386,6 +386,31 @@ BASE_FEATURE(kPulseaudioLoopbackForCast,
+@@ -369,6 +369,31 @@ BASE_FEATURE(kPulseaudioLoopbackForCast,
  BASE_FEATURE(kPulseaudioLoopbackForScreenShare,
               "PulseaudioLoopbackForScreenShare",
               base::FEATURE_DISABLED_BY_DEFAULT);
@@ -67,7 +67,7 @@ $NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
  #endif  // BUILDFLAG(IS_LINUX)
  
  // When enabled, MediaCapabilities will check with GPU Video Accelerator
-@@ -674,7 +699,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInP
+@@ -636,7 +661,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInP
  // Show toolbar button that opens dialog for controlling media sessions.
  BASE_FEATURE(kGlobalMediaControls,
               "GlobalMediaControls",
@@ -76,7 +76,7 @@ $NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -697,7 +722,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdated
+@@ -659,7 +684,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdated
  // If enabled, users can request Media Remoting without fullscreen-in-tab.
  BASE_FEATURE(kMediaRemotingWithoutFullscreen,
               "MediaRemotingWithoutFullscreen",
@@ -85,16 +85,16 @@ $NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -709,7 +734,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullsc
+@@ -671,7 +696,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullsc
  BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
               "GlobalMediaControlsPictureInPicture",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -738,7 +763,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -700,7 +725,7 @@ BASE_FEATURE(kUnifiedAutoplay,
               "UnifiedAutoplay",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -103,7 +103,7 @@ $NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
  // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default
  // on chromeos, but needs an experiment on linux.
  BASE_FEATURE(kAcceleratedVideoDecodeLinux,
-@@ -838,7 +863,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
+@@ -800,7 +825,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
               "VSyncMjpegDecoding",
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -112,8 +112,8 @@ $NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
  // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS.
  BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding,
               "V4L2H264TemporalLayerHWEncoding",
-@@ -1453,7 +1478,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDe
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -1361,7 +1386,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecodi
+ );
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -121,7 +121,7 @@ $NetBSD: patch-media_base_media__switches.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
  // Spawn utility processes to perform hardware encode acceleration instead of
  // using the GPU process.
  BASE_FEATURE(kUseOutOfProcessVideoEncoding,
-@@ -1533,7 +1558,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
+@@ -1443,7 +1468,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
               "RecordWebAudioEngagement",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/chromium/patches/patch-media_base_media__switches.h b/chromium/patches/patch-media_base_media__switches.h
index 4855e7d0d0..3731af8d24 100644
--- a/chromium/patches/patch-media_base_media__switches.h
+++ b/chromium/patches/patch-media_base_media__switches.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_base_media__switches.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/base/media_switches.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/base/media_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/base/media_switches.h
-@@ -44,7 +44,7 @@ MEDIA_EXPORT extern const char kDisableB
+@@ -43,7 +43,7 @@ MEDIA_EXPORT extern const char kDisableB
  MEDIA_EXPORT extern const char kReportVp9AsAnUnsupportedMimeType[];
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-media_base_media__switches.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
  MEDIA_EXPORT extern const char kAlsaInputDevice[];
  MEDIA_EXPORT extern const char kAlsaOutputDevice[];
  #endif
-@@ -333,13 +333,26 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatf
+@@ -329,13 +329,26 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMedia
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend);
@@ -44,7 +44,7 @@ $NetBSD: patch-media_base_media__switches.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo);
-@@ -353,7 +366,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspe
+@@ -349,7 +362,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspe
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
@@ -53,7 +53,7 @@ $NetBSD: patch-media_base_media__switches.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux);
-@@ -374,7 +387,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapi
+@@ -371,7 +384,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapi
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -62,8 +62,8 @@ $NetBSD: patch-media_base_media__switches.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
-@@ -511,7 +524,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOu
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding);
+@@ -497,7 +510,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackg
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-media_base_user__input__monitor__unittest.cc b/chromium/patches/patch-media_base_user__input__monitor__unittest.cc
deleted file mode 100644
index 78d57841bd..0000000000
--- a/chromium/patches/patch-media_base_user__input__monitor__unittest.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-media_base_user__input__monitor__unittest.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/base/user_input_monitor_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ media/base/user_input_monitor_unittest.cc
-@@ -13,7 +13,7 @@
- #include "build/build_config.h"
- #include "testing/gtest/include/gtest/gtest.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/files/file_descriptor_watcher_posix.h"
- #endif
- 
-@@ -49,7 +49,7 @@ class UserInputMonitorTest : public test
- }  // namespace
- 
- TEST_F(UserInputMonitorTest, CreatePlatformSpecific) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   base::test::TaskEnvironment task_environment(
-       base::test::TaskEnvironment::MainThreadType::IO);
- #else
-@@ -72,7 +72,7 @@ TEST_F(UserInputMonitorTest, CreatePlatf
- }
- 
- TEST_F(UserInputMonitorTest, CreatePlatformSpecificWithMapping) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   base::test::TaskEnvironment task_environment(
-       base::test::TaskEnvironment::MainThreadType::IO);
- #else
diff --git a/chromium/patches/patch-media_base_video__frame.cc b/chromium/patches/patch-media_base_video__frame.cc
index 4f17820a69..8c8b4d6fd0 100644
--- a/chromium/patches/patch-media_base_video__frame.cc
+++ b/chromium/patches/patch-media_base_video__frame.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_base_video__frame.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/base/video_frame.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/base/video_frame.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/base/video_frame.cc
-@@ -88,7 +88,7 @@ std::string VideoFrame::StorageTypeToStr
+@@ -92,7 +92,7 @@ std::string VideoFrame::StorageTypeToStr
        return "OWNED_MEMORY";
      case VideoFrame::STORAGE_SHMEM:
        return "SHMEM";
@@ -15,7 +15,7 @@ $NetBSD: patch-media_base_video__frame.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
      case VideoFrame::STORAGE_DMABUFS:
        return "DMABUFS";
  #endif
-@@ -103,7 +103,7 @@ std::string VideoFrame::StorageTypeToStr
+@@ -106,7 +106,7 @@ std::string VideoFrame::StorageTypeToStr
  // static
  bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
    return
@@ -24,8 +24,8 @@ $NetBSD: patch-media_base_video__frame.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
        // This is not strictly needed but makes explicit that, at VideoFrame
        // level, DmaBufs are not mappable from userspace.
        storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -401,7 +401,7 @@ VideoFrame::CreateFrameForGpuMemoryBuffe
-                            : shared_image->GetStrideForVideoFrame(i);
+@@ -420,7 +420,7 @@ VideoFrame::CreateFrameForGpuMemoryBuffe
+         plane_size.width() * VideoFrame::BytesPerElement(*format, plane);
    }
    uint64_t modifier = gfx::NativePixmapHandle::kNoModifier;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -33,16 +33,7 @@ $NetBSD: patch-media_base_video__frame.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
    bool is_native_buffer =
        gpu_memory_buffer
            ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER)
-@@ -453,7 +453,7 @@ VideoFrame::CreateFrameForGpuMemoryBuffe
- }
- 
- // static
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- scoped_refptr<VideoFrame> VideoFrame::WrapOOPVDMailbox(
-     VideoPixelFormat format,
-     const gpu::Mailbox& mailbox,
-@@ -769,7 +769,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr
+@@ -938,7 +938,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr
    return frame;
  }
  
@@ -51,16 +42,7 @@ $NetBSD: patch-media_base_video__frame.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
  // static
  scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
      const VideoFrameLayout& layout,
-@@ -1261,7 +1261,7 @@ bool VideoFrame::IsMappable() const {
-   return IsStorageTypeMappable(storage_type_);
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) 
- bool VideoFrame::HasOOPVDMailbox() const {
-   return wrapped_frame_ ? wrapped_frame_->HasOOPVDMailbox()
-                         : !oopvd_mailbox_.IsZero();
-@@ -1490,7 +1490,7 @@ scoped_refptr<gpu::ClientSharedImage> Vi
+@@ -1625,7 +1625,7 @@ scoped_refptr<gpu::ClientSharedImage> Vi
    return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_;
  }
  
diff --git a/chromium/patches/patch-media_base_video__frame.h b/chromium/patches/patch-media_base_video__frame.h
index 9142498bc6..f8d8dca871 100644
--- a/chromium/patches/patch-media_base_video__frame.h
+++ b/chromium/patches/patch-media_base_video__frame.h
@@ -1,39 +1,30 @@
-$NetBSD: patch-media_base_video__frame.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/base/video_frame.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/base/video_frame.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/base/video_frame.h
-@@ -50,7 +50,7 @@
- #include "base/apple/scoped_cftyperef.h"
- #endif  // BUILDFLAG(IS_APPLE)
+@@ -42,7 +42,7 @@
+ #include "ui/gfx/geometry/size.h"
+ #include "ui/gfx/hdr_metadata.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "base/files/scoped_file.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -109,7 +109,7 @@ class MEDIA_EXPORT VideoFrame : public b
+@@ -88,7 +88,7 @@ class MEDIA_EXPORT VideoFrame : public b
      STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
      STORAGE_OWNED_MEMORY = 3,  // VideoFrame has allocated its own data buffer.
      STORAGE_SHMEM = 4,         // Backed by read-only shared memory.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
-     // based on the idea of using this same enum value for both DMA
-     // buffers on Linux and CVPixelBuffers on Mac (which currently use
-@@ -240,7 +240,7 @@ class MEDIA_EXPORT VideoFrame : public b
-       base::TimeDelta timestamp,
-       bool zero_initialize_memory);
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Wraps RegisteredMailboxFrameConverter mailbox with a VideoFrame. This is
-   // used only by ChromeOS/Linux's out-of-process video decoder.
-   // |mailbox_holder_release_cb| will be called with a sync token as the
-@@ -386,7 +386,7 @@ class MEDIA_EXPORT VideoFrame : public b
+     STORAGE_DMABUFS = 5,  // Each plane is stored into a DmaBuf.
+ #endif
+     STORAGE_GPU_MEMORY_BUFFER = 6,
+@@ -435,7 +435,7 @@ class MEDIA_EXPORT VideoFrame : public b
        ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
        base::TimeDelta timestamp);
  
@@ -42,39 +33,21 @@ $NetBSD: patch-media_base_video__frame.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
    // Wraps provided dmabufs
    // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
    // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -551,7 +551,7 @@ class MEDIA_EXPORT VideoFrame : public b
-   // visible_data() etc.
-   bool IsMappable() const;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Returns true if `frame` has `oopvd_mailbox`.
-   bool HasOOPVDMailbox() const;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -717,7 +717,7 @@ class MEDIA_EXPORT VideoFrame : public b
+@@ -748,7 +748,7 @@ class MEDIA_EXPORT VideoFrame : public b
    // wait for the included sync point.
    scoped_refptr<gpu::ClientSharedImage> shared_image() const;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Returns the OOPVD mailbox set by `WrapOOPVDMailbox`.
-   // Only valid to call if this is a NATIVE_TEXTURE frame. Before using the
-   // mailbox, the caller must wait for the included sync point.
-@@ -966,7 +966,7 @@ class MEDIA_EXPORT VideoFrame : public b
-   // VideoFrame.
-   const uint8_t* data_[kMaxPlanes];
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Native texture mailbox, if this frame HasOOPVDMailbox().
-   gpu::Mailbox oopvd_mailbox_;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -995,7 +995,7 @@ class MEDIA_EXPORT VideoFrame : public b
+   // The number of DmaBufs will be equal or less than the number of planes of
+   // the frame. If there are less, this means that the last FD contains the
+   // remaining planes. Should be > 0 for STORAGE_DMABUFS.
+@@ -988,7 +988,7 @@ class MEDIA_EXPORT VideoFrame : public b
    // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame.
    bool is_mappable_si_enabled_ = false;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- 
    // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either
    // equal or less than the number of planes of the frame. If it is less, then
+   // the memory area represented by the last FD contains the remaining planes.
diff --git a/chromium/patches/patch-media_capture_video_create__video__capture__device__factory.cc b/chromium/patches/patch-media_capture_video_create__video__capture__device__factory.cc
index 9b3717311d..d9b80a9ef3 100644
--- a/chromium/patches/patch-media_capture_video_create__video__capture__device__factory.cc
+++ b/chromium/patches/patch-media_capture_video_create__video__capture__device__factory.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-media_capture_video_create__video__capture__device__factory.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/create_video_capture_device_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/create_video_capture_device_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/create_video_capture_device_factory.cc
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
  #include "media/capture/video/fake_video_capture_device_factory.h"
  #include "media/capture/video/file_video_capture_device_factory.h"
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "media/capture/video/linux/video_capture_device_factory_linux.h"
- #elif BUILDFLAG(IS_CHROMEOS_ASH)
+ #elif BUILDFLAG(IS_CHROMEOS)
  #include "media/capture/video/chromeos/public/cros_features.h"
-@@ -56,7 +56,7 @@ CreateFakeVideoCaptureDeviceFactory() {
+@@ -55,7 +55,7 @@ CreateFakeVideoCaptureDeviceFactory() {
  std::unique_ptr<VideoCaptureDeviceFactory>
  CreatePlatformSpecificVideoCaptureDeviceFactory(
      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner);
- #elif BUILDFLAG(IS_CHROMEOS_ASH)
+ #elif BUILDFLAG(IS_CHROMEOS)
    if (base::SysInfo::IsRunningOnChromeOS())
diff --git a/chromium/patches/patch-media_capture_video_fake__video__capture__device__factory.cc b/chromium/patches/patch-media_capture_video_fake__video__capture__device__factory.cc
index 0aaedc2c1e..feb5184029 100644
--- a/chromium/patches/patch-media_capture_video_fake__video__capture__device__factory.cc
+++ b/chromium/patches/patch-media_capture_video_fake__video__capture__device__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_capture_video_fake__video__capture__device__factory.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/fake_video_capture_device_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/fake_video_capture_device_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/fake_video_capture_device_factory.cc
 @@ -231,7 +231,7 @@ void FakeVideoCaptureDeviceFactory::GetD
    int entry_index = 0;
diff --git a/chromium/patches/patch-media_capture_video_file__video__capture__device__factory.cc b/chromium/patches/patch-media_capture_video_file__video__capture__device__factory.cc
index e220056fa9..757998c29f 100644
--- a/chromium/patches/patch-media_capture_video_file__video__capture__device__factory.cc
+++ b/chromium/patches/patch-media_capture_video_file__video__capture__device__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_capture_video_file__video__capture__device__factory.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/file_video_capture_device_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/file_video_capture_device_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/file_video_capture_device_factory.cc
 @@ -52,7 +52,7 @@ void FileVideoCaptureDeviceFactory::GetD
        VideoCaptureApi::WIN_DIRECT_SHOW;
diff --git a/chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.cc b/chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.cc
index 14ec6810c4..189e4cb16e 100644
--- a/chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.cc
+++ b/chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_capture_video_linux_fake__v4l2__impl.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/fake_v4l2_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/fake_v4l2_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/fake_v4l2_impl.cc
-@@ -562,7 +562,7 @@ int FakeV4L2Impl::close(int fd) {
+@@ -569,7 +569,7 @@ int FakeV4L2Impl::close(int fd) {
    return kSuccessReturnValue;
  }
  
diff --git a/chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.h b/chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.h
index ea15259a70..87707ca521 100644
--- a/chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.h
+++ b/chromium/patches/patch-media_capture_video_linux_fake__v4l2__impl.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_capture_video_linux_fake__v4l2__impl.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/fake_v4l2_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/fake_v4l2_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/fake_v4l2_impl.h
 @@ -8,7 +8,13 @@
  #include <map>
diff --git a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.cc
index 7f730f3b42..256b50edc4 100644
--- a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.cc
+++ b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/v4l2_capture_delegate.cc
-@@ -5,8 +5,10 @@
+@@ -10,8 +10,10 @@
  #include "media/capture/video/linux/v4l2_capture_delegate.h"
  
  #include <fcntl.h>
@@ -17,7 +17,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
  #include <poll.h>
  #include <sys/ioctl.h>
  #include <sys/mman.h>
-@@ -29,17 +31,19 @@
+@@ -34,17 +36,19 @@
  #include "media/capture/video/blob_utils.h"
  #include "media/capture/video/linux/video_capture_device_linux.h"
  
@@ -38,7 +38,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
  
  // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the
  // format is introduced to kernel.
-@@ -49,6 +53,14 @@ using media::mojom::MeteringMode;
+@@ -54,6 +58,14 @@ using media::mojom::MeteringMode;
  #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z')
  #endif
  
@@ -53,7 +53,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
  namespace media {
  
  namespace {
-@@ -268,7 +280,7 @@ bool V4L2CaptureDelegate::IsBlockedContr
+@@ -273,7 +285,7 @@ bool V4L2CaptureDelegate::IsBlockedContr
  // static
  bool V4L2CaptureDelegate::IsControllableControl(
      int control_id,
@@ -62,7 +62,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
    const int special_control_id = GetControllingSpecialControl(control_id);
    if (!special_control_id) {
      // The control is not controlled by a special control thus the control is
-@@ -324,7 +336,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate
+@@ -329,7 +341,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate
        is_capturing_(false),
        timeout_count_(0),
        rotation_(rotation) {
@@ -71,16 +71,16 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
    use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
  #endif  // BUILDFLAG(IS_LINUX)
  }
-@@ -451,7 +463,7 @@ void V4L2CaptureDelegate::AllocateAndSta
+@@ -456,7 +468,7 @@ void V4L2CaptureDelegate::AllocateAndSta
  
    client_->OnStarted();
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (use_gpu_buffer_) {
-     v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(
-         std::move(gmb_support_test_));
-@@ -801,7 +813,7 @@ void V4L2CaptureDelegate::SetGPUEnvironm
+     v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>();
+   }
+@@ -800,7 +812,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2C
  
  V4L2CaptureDelegate::~V4L2CaptureDelegate() = default;
  
@@ -89,7 +89,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
    int num_retries = 0;
    for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries;
         ++num_retries) {
-@@ -811,7 +823,7 @@ bool V4L2CaptureDelegate::RunIoctl(int r
+@@ -810,7 +822,7 @@ bool V4L2CaptureDelegate::RunIoctl(int r
    return num_retries != kMaxIOCtrlRetries;
  }
  
@@ -98,7 +98,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
    return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp));
  }
  
-@@ -822,6 +834,7 @@ bool V4L2CaptureDelegate::IsControllable
+@@ -821,6 +833,7 @@ bool V4L2CaptureDelegate::IsControllable
  }
  
  void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() {
@@ -106,7 +106,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
    constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS,
                                        V4L2_CID_AUTO_WHITE_BALANCE,
                                        V4L2_CID_BRIGHTNESS,
-@@ -849,6 +862,7 @@ void V4L2CaptureDelegate::ReplaceControl
+@@ -848,6 +861,7 @@ void V4L2CaptureDelegate::ReplaceControl
                    << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}";
      }
    }
@@ -114,7 +114,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
  }
  
  mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) {
-@@ -1029,7 +1043,11 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1028,7 +1042,11 @@ void V4L2CaptureDelegate::DoCapture() {
  
    pollfd device_pfd = {};
    device_pfd.fd = device_fd_.get();
@@ -126,7 +126,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
  
    const int result =
        HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs));
-@@ -1049,6 +1067,12 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1048,6 +1066,12 @@ void V4L2CaptureDelegate::DoCapture() {
        // in older kernels, and stopping and starting the stream gets the camera
        // out of this bad state. Upgrading the kernel is difficult so this is our
        // way out for now.
@@ -139,7 +139,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
        DLOG(WARNING) << "Restarting camera stream";
        if (!StopStream() || !StartStream())
          return;
-@@ -1056,6 +1080,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1055,6 +1079,7 @@ void V4L2CaptureDelegate::DoCapture() {
            FROM_HERE,
            base::BindOnce(&V4L2CaptureDelegate::DoCapture, GetWeakPtr()));
        return;
@@ -147,7 +147,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
      } else if (timeout_count_ >= kContinuousTimeoutLimit) {
        SetErrorState(
            VideoCaptureError::kV4L2MultipleContinuousTimeoutsWhileReadPolling,
-@@ -1067,6 +1092,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1066,6 +1091,7 @@ void V4L2CaptureDelegate::DoCapture() {
      timeout_count_ = 0;
    }
  
@@ -155,7 +155,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
    // Dequeue events if the driver has filled in some.
    if (device_pfd.revents & POLLPRI) {
      bool controls_changed = false;
-@@ -1102,6 +1128,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1099,6 +1125,7 @@ void V4L2CaptureDelegate::DoCapture() {
        client_->OnCaptureConfigurationChanged();
      }
    }
@@ -163,7 +163,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
  
    // Deenqueue, send and reenqueue a buffer if the driver has filled one in.
    if (device_pfd.revents & POLLIN) {
-@@ -1155,7 +1182,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1152,7 +1179,7 @@ void V4L2CaptureDelegate::DoCapture() {
        // workable on Linux.
  
        // See http://crbug.com/959919.
@@ -172,7 +172,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.cc,v 1.1 2025/0
        if (use_gpu_buffer_) {
          v4l2_gpu_helper_->OnIncomingCapturedData(
              client_.get(), buffer_tracker->start(),
-@@ -1228,7 +1255,7 @@ void V4L2CaptureDelegate::SetErrorState(
+@@ -1226,7 +1253,7 @@ void V4L2CaptureDelegate::SetErrorState(
    client_->OnError(error, from_here, reason);
  }
  
diff --git a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.h b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.h
index ffc73dd809..6f2df79e77 100644
--- a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.h
+++ b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__delegate.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/v4l2_capture_delegate.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/v4l2_capture_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/v4l2_capture_delegate.h
-@@ -23,7 +23,7 @@
+@@ -22,7 +22,7 @@
  #include "media/capture/video/linux/v4l2_capture_device_impl.h"
  #include "media/capture/video/video_capture_device.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.h,v 1.1 2025/02
  #include <sys/videoio.h>
  #else
  #include <linux/videodev2.h>
-@@ -35,7 +35,7 @@ class Location;
+@@ -34,7 +34,7 @@ class Location;
  
  namespace media {
  
@@ -24,16 +24,16 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.h,v 1.1 2025/02
  class V4L2CaptureDelegateGpuHelper;
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -86,7 +86,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
+@@ -85,7 +85,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
    static bool IsBlockedControl(int control_id);
    static bool IsControllableControl(
        int control_id,
 -      const base::RepeatingCallback<int(int, void*)>& do_ioctl);
 +      const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl);
  
-   void SetGPUEnvironmentForTesting(
-       std::unique_ptr<gpu::GpuMemoryBufferSupport> gmb_support);
-@@ -100,10 +100,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
+  private:
+   friend class V4L2CaptureDelegateTest;
+@@ -96,10 +96,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
    // device file descriptor or (re)starting streaming, can fail but works after
    // retrying (https://crbug.com/670262). Returns false if the |request| ioctl
    // fails too many times.
@@ -46,7 +46,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.h,v 1.1 2025/02
  
    // Check whether the control is controllable (and not changed automatically).
    bool IsControllableControl(int control_id);
-@@ -133,7 +133,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
+@@ -129,7 +129,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
                       const base::Location& from_here,
                       const std::string& reason);
  
@@ -55,7 +55,7 @@ $NetBSD: patch-media_capture_video_linux_v4l2__capture__delegate.h,v 1.1 2025/02
    // Systems which describe a "color space" usually map that to one or more of
    // {primary, matrix, transfer, range}. BuildColorSpaceFromv4l2() will use the
    // matched value as first priority. Otherwise, if there is no best matching
-@@ -167,7 +167,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
+@@ -163,7 +163,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate
    // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270.
    int rotation_;
  
diff --git a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device.h b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device.h
index 4df87f200f..04a7c998b0 100644
--- a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device.h
+++ b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-media_capture_video_linux_v4l2__capture__device.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/v4l2_capture_device.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/v4l2_capture_device.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/v4l2_capture_device.h
-@@ -21,7 +21,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice
-  public:
+@@ -23,7 +23,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice
+ 
    virtual int open(const char* device_name, int flags) = 0;
    virtual int close(int fd) = 0;
 -  virtual int ioctl(int fd, int request, void* argp) = 0;
diff --git a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.cc b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
index 8e7dfe7c39..58267c32fd 100644
--- a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
+++ b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_capture_video_linux_v4l2__capture__device__impl.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/v4l2_capture_device_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/v4l2_capture_device_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/v4l2_capture_device_impl.cc
 @@ -22,7 +22,7 @@ int V4L2CaptureDeviceImpl::close(int fd)
    return ::close(fd);
diff --git a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.h b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.h
index eaf061077f..b71dd5306b 100644
--- a/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.h
+++ b/chromium/patches/patch-media_capture_video_linux_v4l2__capture__device__impl.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_capture_video_linux_v4l2__capture__device__impl.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/v4l2_capture_device_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/v4l2_capture_device_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/v4l2_capture_device_impl.h
 @@ -19,7 +19,7 @@ class CAPTURE_EXPORT V4L2CaptureDeviceIm
   public:
diff --git a/chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc b/chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
index a334ec199d..0986881a87 100644
--- a/chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
+++ b/chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/video_capture_device_factory_v4l2.cc
-@@ -23,7 +23,7 @@
+@@ -28,7 +28,7 @@
  #include "media/capture/video/linux/scoped_v4l2_device_fd.h"
  #include "media/capture/video/linux/video_capture_device_linux.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-media_capture_video_linux_video__capture__device__factory__v4l2.c
  #include <sys/videoio.h>
  #else
  #include <linux/videodev2.h>
-@@ -38,6 +38,7 @@ bool CompareCaptureDevices(const VideoCa
+@@ -43,6 +43,7 @@ bool CompareCaptureDevices(const VideoCa
    return a.descriptor < b.descriptor;
  }
  
@@ -23,7 +23,7 @@ $NetBSD: patch-media_capture_video_linux_video__capture__device__factory__v4l2.c
  // USB VID and PID are both 4 bytes long.
  const size_t kVidPidSize = 4;
  const size_t kMaxInterfaceNameSize = 256;
-@@ -70,11 +71,15 @@ std::string ExtractFileNameFromDeviceId(
+@@ -75,11 +76,24 @@ std::string ExtractFileNameFromDeviceId(
    DCHECK(base::StartsWith(device_id, kDevDir, base::CompareCase::SENSITIVE));
    return device_id.substr(strlen(kDevDir), device_id.length());
  }
@@ -34,12 +34,21 @@ $NetBSD: patch-media_capture_video_linux_video__capture__device__factory__v4l2.c
   public:
    void GetDeviceIds(std::vector<std::string>* target_container) override {
 +#if BUILDFLAG(IS_OPENBSD)
-+    target_container->emplace_back("/dev/video");
++    char device[12];
++    int fd;
++    /* unveil(2) limits access to /dev/, try /dev/video[0-7] */
++    for (int n = 0; n < 8; n++) {
++      snprintf(device, sizeof(device), "/dev/video%d", n);
++      if ((fd = open(device, O_RDONLY)) != -1) {
++        close(fd);
++        target_container->emplace_back(device);
++      }
++    }
 +#else
      const base::FilePath path("/dev/");
      base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES,
                                      "video*");
-@@ -82,9 +87,13 @@ class DevVideoFilePathsDeviceProvider
+@@ -87,9 +101,13 @@ class DevVideoFilePathsDeviceProvider
        const base::FileEnumerator::FileInfo info = enumerator.GetInfo();
        target_container->emplace_back(path.value() + info.GetName().value());
      }
@@ -53,7 +62,7 @@ $NetBSD: patch-media_capture_video_linux_video__capture__device__factory__v4l2.c
      const std::string file_name = ExtractFileNameFromDeviceId(device_id);
      std::string usb_id;
      const std::string vid_path =
-@@ -101,9 +110,13 @@ class DevVideoFilePathsDeviceProvider
+@@ -106,9 +124,13 @@ class DevVideoFilePathsDeviceProvider
      }
  
      return usb_id;
@@ -67,7 +76,7 @@ $NetBSD: patch-media_capture_video_linux_video__capture__device__factory__v4l2.c
      const std::string file_name = ExtractFileNameFromDeviceId(device_id);
      const std::string interface_path =
          base::StringPrintf(kInterfacePathTemplate, file_name.c_str());
-@@ -114,6 +127,7 @@ class DevVideoFilePathsDeviceProvider
+@@ -119,6 +141,7 @@ class DevVideoFilePathsDeviceProvider
        return std::string();
      }
      return display_name;
@@ -75,7 +84,7 @@ $NetBSD: patch-media_capture_video_linux_video__capture__device__factory__v4l2.c
    }
  };
  
-@@ -219,7 +233,7 @@ void VideoCaptureDeviceFactoryV4L2::GetD
+@@ -224,7 +247,7 @@ void VideoCaptureDeviceFactoryV4L2::GetD
    std::move(callback).Run(std::move(devices_info));
  }
  
@@ -84,7 +93,7 @@ $NetBSD: patch-media_capture_video_linux_video__capture__device__factory__v4l2.c
    return HANDLE_EINTR(v4l2_->ioctl(fd, request, argp));
  }
  
-@@ -279,6 +293,11 @@ std::vector<float> VideoCaptureDeviceFac
+@@ -284,6 +307,11 @@ std::vector<float> VideoCaptureDeviceFac
          frame_rates.push_back(
              frame_interval.discrete.denominator /
              static_cast<float>(frame_interval.discrete.numerator));
diff --git a/chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h b/chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
index 143bfc211c..d8fb8a892c 100644
--- a/chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
+++ b/chromium/patches/patch-media_capture_video_linux_video__capture__device__factory__v4l2.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_capture_video_linux_video__capture__device__factory__v4l2.h,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/video_capture_device_factory_v4l2.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/video_capture_device_factory_v4l2.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/video_capture_device_factory_v4l2.h
 @@ -51,7 +51,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceF
  
diff --git a/chromium/patches/patch-media_capture_video_linux_video__capture__device__linux.cc b/chromium/patches/patch-media_capture_video_linux_video__capture__device__linux.cc
index 3cf00835bb..587250511a 100644
--- a/chromium/patches/patch-media_capture_video_linux_video__capture__device__linux.cc
+++ b/chromium/patches/patch-media_capture_video_linux_video__capture__device__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_capture_video_linux_video__capture__device__linux.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/linux/video_capture_device_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/linux/video_capture_device_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/linux/video_capture_device_linux.cc
 @@ -15,7 +15,7 @@
  #include "build/build_config.h"
diff --git a/chromium/patches/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc b/chromium/patches/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
index 86e6e3b275..ff77229720 100644
--- a/chromium/patches/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
+++ b/chromium/patches/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/video_capture_buffer_tracker_factory_impl.cc
-@@ -14,7 +14,7 @@
+@@ -13,7 +13,7 @@
  #include "media/capture/video/chromeos/gpu_memory_buffer_tracker_cros.h"
  #elif BUILDFLAG(IS_APPLE)
  #include "media/capture/video/apple/gpu_memory_buffer_tracker_apple.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-media_capture_video_video__capture__buffer__tracker__factory__imp
  #include "media/capture/video/linux/v4l2_gpu_memory_buffer_tracker.h"
  #elif BUILDFLAG(IS_WIN)
  #include "media/capture/video/win/gpu_memory_buffer_tracker_win.h"
-@@ -42,7 +42,7 @@ VideoCaptureBufferTrackerFactoryImpl::Cr
+@@ -41,7 +41,7 @@ VideoCaptureBufferTrackerFactoryImpl::Cr
        return std::make_unique<GpuMemoryBufferTrackerCros>();
  #elif BUILDFLAG(IS_APPLE)
        return std::make_unique<GpuMemoryBufferTrackerApple>();
diff --git a/chromium/patches/patch-media_capture_video_video__capture__device__client.cc b/chromium/patches/patch-media_capture_video_video__capture__device__client.cc
index dc1ddd2084..9dc09ecae1 100644
--- a/chromium/patches/patch-media_capture_video_video__capture__device__client.cc
+++ b/chromium/patches/patch-media_capture_video_video__capture__device__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_capture_video_video__capture__device__client.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/capture/video/video_capture_device_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/capture/video/video_capture_device_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/capture/video/video_capture_device_client.cc
-@@ -169,7 +169,7 @@ FourccAndFlip GetFourccAndFlipFromPixelF
+@@ -172,7 +172,7 @@ FourccAndFlip GetFourccAndFlipFromPixelF
        CHECK(!is_width_odd && !is_height_odd);
        return {libyuv::FOURCC_UYVY};
      case media::PIXEL_FORMAT_RGB24:
diff --git a/chromium/patches/patch-media_cdm_cdm__paths__unittest.cc b/chromium/patches/patch-media_cdm_cdm__paths__unittest.cc
index a6ac82f2b2..8e5a4acf09 100644
--- a/chromium/patches/patch-media_cdm_cdm__paths__unittest.cc
+++ b/chromium/patches/patch-media_cdm_cdm__paths__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_cdm_cdm__paths__unittest.cc,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/cdm/cdm_paths_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/cdm/cdm_paths_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/cdm/cdm_paths_unittest.cc
-@@ -27,7 +27,7 @@ const char kComponentPlatform[] =
+@@ -26,7 +26,7 @@ const char kComponentPlatform[] =
      "win";
  #elif BUILDFLAG(IS_CHROMEOS)
      "cros";
diff --git a/chromium/patches/patch-media_cdm_library__cdm_cdm__paths.gni b/chromium/patches/patch-media_cdm_library__cdm_cdm__paths.gni
index 99d84e9dfa..1374b9286a 100644
--- a/chromium/patches/patch-media_cdm_library__cdm_cdm__paths.gni
+++ b/chromium/patches/patch-media_cdm_library__cdm_cdm__paths.gni
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_cdm_library__cdm_cdm__paths.gni,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/cdm/library_cdm/cdm_paths.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/cdm/library_cdm/cdm_paths.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/cdm/library_cdm/cdm_paths.gni
-@@ -15,7 +15,7 @@ assert(enable_library_cdms)
+@@ -14,7 +14,7 @@ assert(enable_library_cdms)
  # Explicitly define what we use to avoid confusion.
  if (is_chromeos) {
    component_os = "cros"
diff --git a/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py b/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py
index 583d3b1bf8..790580ba21 100644
--- a/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py
+++ b/chromium/patches/patch-media_ffmpeg_scripts_build__ffmpeg.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_ffmpeg_scripts_build__ffmpeg.py,v 1.1 2025/02/06 09:58:12 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/ffmpeg/scripts/build_ffmpeg.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/ffmpeg/scripts/build_ffmpeg.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/ffmpeg/scripts/build_ffmpeg.py
 @@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath(
  SUCCESS_TOKEN = 'THIS_BUILD_WORKED'
diff --git a/chromium/patches/patch-media_ffmpeg_scripts_robo__lib_config.py b/chromium/patches/patch-media_ffmpeg_scripts_robo__lib_config.py
index 39cd9daed3..7e9c54e33a 100644
--- a/chromium/patches/patch-media_ffmpeg_scripts_robo__lib_config.py
+++ b/chromium/patches/patch-media_ffmpeg_scripts_robo__lib_config.py
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_ffmpeg_scripts_robo__lib_config.py,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/ffmpeg/scripts/robo_lib/config.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/ffmpeg/scripts/robo_lib/config.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/ffmpeg/scripts/robo_lib/config.py
-@@ -55,19 +55,13 @@ class RoboConfiguration:
+@@ -56,19 +56,13 @@ class RoboConfiguration:
          self._llvm_path = os.path.join(self.chrome_src(), "third_party",
                                         "llvm-build", "Release+Asserts", "bin")
  
@@ -25,8 +25,8 @@ $NetBSD: patch-media_ffmpeg_scripts_robo__lib_config.py,v 1.1 2025/02/06 09:58:1
 -                shell.log(f"On sushi branch: {self.sushi_branch_name()}")
  
          # Filename that we'll ask generate_gn.py to write git commands to.
-         # TODO: Should this use script_directory, or stay with ffmpeg?  As long as
-@@ -186,9 +180,9 @@ class RoboConfiguration:
+         # TODO: Should this use script_directory, or stay with ffmpeg?  As long
+@@ -187,9 +181,9 @@ class RoboConfiguration:
  
          if re.match(r"i.86", platform.machine()):
              self._host_architecture = "ia32"
@@ -38,7 +38,7 @@ $NetBSD: patch-media_ffmpeg_scripts_robo__lib_config.py,v 1.1 2025/02/06 09:58:1
              self._host_architecture = "arm64"
          elif platform.machine() == "mips32":
              self._host_architecture = "mipsel"
-@@ -223,6 +217,12 @@ class RoboConfiguration:
+@@ -224,6 +218,12 @@ class RoboConfiguration:
          elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system(
          ):
              self._host_operating_system = "win"
@@ -51,7 +51,7 @@ $NetBSD: patch-media_ffmpeg_scripts_robo__lib_config.py,v 1.1 2025/02/06 09:58:1
          else:
              raise ValueError(f"Unsupported platform: {platform.system()}")
  
-@@ -231,8 +231,8 @@ class RoboConfiguration:
+@@ -232,8 +232,8 @@ class RoboConfiguration:
          wd = os.getcwd()
          # Walk up the tree until we find src/AUTHORS
          while wd != "/":
diff --git a/chromium/patches/patch-media_gpu_buffer__validation.cc b/chromium/patches/patch-media_gpu_buffer__validation.cc
deleted file mode 100644
index cd55388ba0..0000000000
--- a/chromium/patches/patch-media_gpu_buffer__validation.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-media_gpu_buffer__validation.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/gpu/buffer_validation.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ media/gpu/buffer_validation.cc
-@@ -15,7 +15,7 @@
- #include "ui/gfx/geometry/size.h"
- #include "ui/gfx/gpu_memory_buffer.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include <sys/types.h>
- #include <unistd.h>
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -23,7 +23,7 @@
- namespace media {
- 
- bool GetFileSize(const int fd, size_t* size) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (fd < 0) {
-     VLOG(1) << "Invalid file descriptor";
-     return false;
-@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle(
-     VLOG(1) << "Unsupported: " << pixel_format;
-     return false;
-   }
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
-   if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
-       num_planes == 0) {
diff --git a/chromium/patches/patch-media_gpu_chromeos_gl__image__processor__backend.cc b/chromium/patches/patch-media_gpu_chromeos_gl__image__processor__backend.cc
index 9cacf7c720..6dacac29d3 100644
--- a/chromium/patches/patch-media_gpu_chromeos_gl__image__processor__backend.cc
+++ b/chromium/patches/patch-media_gpu_chromeos_gl__image__processor__backend.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_gpu_chromeos_gl__image__processor__backend.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/chromeos/gl_image_processor_backend.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/chromeos/gl_image_processor_backend.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/chromeos/gl_image_processor_backend.cc
 @@ -28,6 +28,10 @@
  #include "ui/ozone/public/ozone_platform.h"
diff --git a/chromium/patches/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/chromium/patches/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
index 06ad51b42b..1467a44672 100644
--- a/chromium/patches/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
+++ b/chromium/patches/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_gpu_chromeos_libyuv__image__processor__backend.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/chromeos/libyuv_image_processor_backend.cc
 @@ -53,7 +53,7 @@ static constexpr struct {
  #define CONV(in, out, trans, result) \
diff --git a/chromium/patches/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/chromium/patches/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
index 2f8166c560..4f5cf72174 100644
--- a/chromium/patches/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
+++ b/chromium/patches/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_chromeos_mailbox__video__frame__converter.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/chromeos/mailbox_video_frame_converter.cc
-@@ -67,7 +67,7 @@ viz::SharedImageFormat GetSharedImageFor
+@@ -68,7 +68,7 @@ viz::SharedImageFormat GetSharedImageFor
                      << static_cast<int>(buffer_format);
        NOTREACHED();
    }
diff --git a/chromium/patches/patch-media_gpu_chromeos_platform__video__frame__utils.cc b/chromium/patches/patch-media_gpu_chromeos_platform__video__frame__utils.cc
index d4c1ead459..2b972a00fa 100644
--- a/chromium/patches/patch-media_gpu_chromeos_platform__video__frame__utils.cc
+++ b/chromium/patches/patch-media_gpu_chromeos_platform__video__frame__utils.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_chromeos_platform__video__frame__utils.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/chromeos/platform_video_frame_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/chromeos/platform_video_frame_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/chromeos/platform_video_frame_utils.cc
-@@ -67,7 +67,7 @@ static std::unique_ptr<ui::GbmDevice> Cr
+@@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> Cr
      const base::FilePath dev_path(FILE_PATH_LITERAL(
          base::StrCat({drm_node_file_prefix, base::NumberToString(i)})));
  
@@ -15,3 +15,12 @@ $NetBSD: patch-media_gpu_chromeos_platform__video__frame__utils.cc,v 1.1 2025/02
      const bool is_render_node = base::Contains(drm_node_file_prefix, "render");
  
      // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind
+@@ -193,7 +193,7 @@ class GbmDeviceWrapper {
+       const base::FilePath dev_path(
+           base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+               switches::kRenderNodeOverride));
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC)
+       const bool is_render_node = base::Contains(dev_path.value(), "render");
+ 
+       // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind
diff --git a/chromium/patches/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/chromium/patches/patch-media_gpu_chromeos_video__decoder__pipeline.cc
index c53f9f1e90..05166084d4 100644
--- a/chromium/patches/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/chromium/patches/patch-media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_chromeos_video__decoder__pipeline.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -1095,7 +1095,7 @@ VideoDecoderPipeline::PickDecoderOutputF
+@@ -1122,7 +1122,7 @@ VideoDecoderPipeline::PickDecoderOutputF
    }
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-media_gpu_chromeos_video__decoder__pipeline.cc,v 1.1 2025/02/06 0
    // Linux should always use a custom allocator (to allocate buffers using
    // libva) and a PlatformVideoFramePool.
    CHECK(allocator.has_value());
-@@ -1104,7 +1104,7 @@ VideoDecoderPipeline::PickDecoderOutputF
+@@ -1131,7 +1131,7 @@ VideoDecoderPipeline::PickDecoderOutputF
    // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS.
    main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
        *allocator, VideoFrame::STORAGE_DMABUFS);
@@ -24,7 +24,7 @@ $NetBSD: patch-media_gpu_chromeos_video__decoder__pipeline.cc,v 1.1 2025/02/06 0
    // Linux w/ V4L2 should not use a custom allocator
    // Only tested with video_decode_accelerator_tests
    // TODO(wenst@) Test with full Chromium Browser
-@@ -1286,7 +1286,7 @@ VideoDecoderPipeline::PickDecoderOutputF
+@@ -1305,7 +1305,7 @@ VideoDecoderPipeline::PickDecoderOutputF
               << " VideoFrames";
      auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
  
diff --git a/chromium/patches/patch-media_gpu_gpu__video__decode__accelerator__factory.cc b/chromium/patches/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
new file mode 100644
index 0000000000..0b12a6cf72
--- /dev/null
+++ b/chromium/patches/patch-media_gpu_gpu__video__decode__accelerator__factory.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- media/gpu/gpu_video_decode_accelerator_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ media/gpu/gpu_video_decode_accelerator_factory.cc
+@@ -13,7 +13,7 @@
+ #include "media/gpu/media_gpu_export.h"
+ #include "media/media_buildflags.h"
+ 
+-#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ #include "media/gpu/v4l2/legacy/v4l2_video_decode_accelerator.h"
+ #include "media/gpu/v4l2/v4l2_device.h"
+ #endif
+@@ -29,7 +29,7 @@ GpuVideoDecodeAcceleratorFactory::Create
+   if (gpu_preferences.disable_accelerated_video_decode)
+     return nullptr;
+ 
+-#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++#if BUILDFLAG(USE_V4L2_CODEC) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ 
+   std::unique_ptr<VideoDecodeAccelerator> vda;
+   vda.reset(new V4L2VideoDecodeAccelerator(base::MakeRefCounted<V4L2Device>()));
diff --git a/chromium/patches/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/chromium/patches/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
index 254d382924..d081b90160 100644
--- a/chromium/patches/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
+++ b/chromium/patches/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-media_gpu_gpu__video__encode__accelerator__factory.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -118,7 +118,7 @@ std::vector<VEAFactoryFunction> GetVEAFa
-     return vea_factory_functions;
+@@ -160,7 +160,7 @@ std::vector<VEAFactoryFunction> GetVEAFa
+   }
  
  #if BUILDFLAG(USE_VAAPI)
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA));
+     vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
    }
-@@ -126,7 +126,7 @@ std::vector<VEAFactoryFunction> GetVEAFa
-   vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA));
+@@ -168,7 +168,7 @@ std::vector<VEAFactoryFunction> GetVEAFa
+   vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA));
  #endif
  #elif BUILDFLAG(USE_V4L2_CODEC)
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) {
-     vea_factory_functions.push_back(base::BindRepeating(&CreateV4L2VEA));
+     vea_factory_functions->push_back(base::BindRepeating(&CreateV4L2VEA));
    }
diff --git a/chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
index cf536ad7d1..7603dd7cd3 100644
--- a/chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
+++ b/chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
-@@ -16,7 +16,9 @@
+@@ -17,7 +17,9 @@
  #include "media/gpu/vaapi/vaapi_wrapper.h"
  #endif
  
@@ -16,7 +16,7 @@ $NetBSD: patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux
  
  // TODO(b/195769334): the hardware video decoding sandbox is really only useful
  // when building with VA-API or V4L2 (otherwise, we're not really doing hardware
-@@ -32,6 +34,7 @@ using sandbox::syscall_broker::BrokerFil
+@@ -33,6 +35,7 @@ using sandbox::syscall_broker::BrokerFil
  namespace media {
  namespace {
  
@@ -24,7 +24,7 @@ $NetBSD: patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux
  void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions,
                                bool include_sys_dev_char,
                                bool read_write) {
-@@ -188,6 +191,7 @@ bool HardwareVideoDecodingPreSandboxHook
+@@ -189,6 +192,7 @@ bool HardwareVideoDecodingPreSandboxHook
    NOTREACHED();
  #endif  // BUILDFLAG(USE_V4L2_CODEC)
  }
@@ -32,7 +32,7 @@ $NetBSD: patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux
  
  }  // namespace
  
-@@ -203,6 +207,7 @@ bool HardwareVideoDecodingPreSandboxHook
+@@ -204,6 +208,7 @@ bool HardwareVideoDecodingPreSandboxHook
  //   (at least).
  bool HardwareVideoDecodingPreSandboxHook(
      sandbox::policy::SandboxLinux::Options options) {
@@ -40,7 +40,7 @@ $NetBSD: patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux
    using HardwareVideoDecodingProcessPolicy =
        sandbox::policy::HardwareVideoDecodingProcessPolicy;
    using PolicyType =
-@@ -248,6 +253,7 @@ bool HardwareVideoDecodingPreSandboxHook
+@@ -249,6 +254,7 @@ bool HardwareVideoDecodingPreSandboxHook
    // |permissions| is empty?
    sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess(
        command_set, permissions, options);
diff --git a/chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h b/chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
index d20fd014a1..a22c9b8453 100644
--- a/chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
+++ b/chromium/patches/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_DECODING_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
index 2f93d00562..6bbc01339d 100644
--- a/chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
+++ b/chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc
 @@ -18,12 +18,15 @@
  #include "media/gpu/v4l2/v4l2_device.h"
diff --git a/chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h b/chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
index 8a2895a2d9..97c7359845 100644
--- a/chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
+++ b/chromium/patches/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium/patches/patch-media_gpu_test_raw__video.cc b/chromium/patches/patch-media_gpu_test_raw__video.cc
index df1b57940a..8adc00a070 100644
--- a/chromium/patches/patch-media_gpu_test_raw__video.cc
+++ b/chromium/patches/patch-media_gpu_test_raw__video.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_test_raw__video.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/test/raw_video.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/test/raw_video.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/test/raw_video.cc
-@@ -60,7 +60,7 @@ std::unique_ptr<base::MemoryMappedFile> 
+@@ -61,7 +61,7 @@ std::unique_ptr<base::MemoryMappedFile> 
                               base::File::FLAG_READ | base::File::FLAG_WRITE
  // On Windows FLAG_CREATE_ALWAYS will require FLAG_WRITE, and FLAG_APPEND
  // must not be specified.
diff --git a/chromium/patches/patch-media_gpu_test_video__frame__file__writer.cc b/chromium/patches/patch-media_gpu_test_video__frame__file__writer.cc
index 17e4228efd..abf8b426d4 100644
--- a/chromium/patches/patch-media_gpu_test_video__frame__file__writer.cc
+++ b/chromium/patches/patch-media_gpu_test_video__frame__file__writer.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_test_video__frame__file__writer.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/test/video_frame_file_writer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/test/video_frame_file_writer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/test/video_frame_file_writer.cc
-@@ -26,7 +26,7 @@
+@@ -25,7 +25,7 @@
  #include "testing/gtest/include/gtest/gtest.h"
  #include "ui/gfx/codec/png_codec.h"
  
diff --git a/chromium/patches/patch-media_gpu_test_video__frame__helpers.cc b/chromium/patches/patch-media_gpu_test_video__frame__helpers.cc
index 549db7a079..c01c8dcf54 100644
--- a/chromium/patches/patch-media_gpu_test_video__frame__helpers.cc
+++ b/chromium/patches/patch-media_gpu_test_video__frame__helpers.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_test_video__frame__helpers.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/test/video_frame_helpers.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/test/video_frame_helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/test/video_frame_helpers.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  #include "ui/gfx/buffer_format_util.h"
  #include "ui/gfx/gpu_memory_buffer.h"
  
diff --git a/chromium/patches/patch-media_gpu_test_video__frame__validator.cc b/chromium/patches/patch-media_gpu_test_video__frame__validator.cc
index 5a5efbe884..b42eec007e 100644
--- a/chromium/patches/patch-media_gpu_test_video__frame__validator.cc
+++ b/chromium/patches/patch-media_gpu_test_video__frame__validator.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_test_video__frame__validator.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/test/video_frame_validator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/test/video_frame_validator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/test/video_frame_validator.cc
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
  #include "testing/gtest/include/gtest/gtest.h"
  #include "ui/gfx/gpu_memory_buffer.h"
  
diff --git a/chromium/patches/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/chromium/patches/patch-media_gpu_vaapi_vaapi__video__decoder.cc
index 2c9198fccf..fdf251b2e3 100644
--- a/chromium/patches/patch-media_gpu_vaapi_vaapi__video__decoder.cc
+++ b/chromium/patches/patch-media_gpu_vaapi_vaapi__video__decoder.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_vaapi_vaapi__video__decoder.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -782,7 +782,7 @@ void VaapiVideoDecoder::ApplyResolutionC
+@@ -784,7 +784,7 @@ void VaapiVideoDecoder::ApplyResolutionC
    const gfx::Size decoder_natural_size =
        aspect_ratio_.GetNaturalSize(decoder_visible_rect);
  
diff --git a/chromium/patches/patch-media_gpu_vaapi_vaapi__wrapper.cc b/chromium/patches/patch-media_gpu_vaapi_vaapi__wrapper.cc
index 182baa8599..078c773903 100644
--- a/chromium/patches/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/chromium/patches/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_gpu_vaapi_vaapi__wrapper.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/gpu/vaapi/vaapi_wrapper.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -77,7 +77,7 @@
+@@ -81,7 +81,7 @@
  using media_gpu_vaapi::kModuleVa_prot;
  #endif
  
diff --git a/chromium/patches/patch-media_media__options.gni b/chromium/patches/patch-media_media__options.gni
index 3ac93d0560..c3350bc522 100644
--- a/chromium/patches/patch-media_media__options.gni
+++ b/chromium/patches/patch-media_media__options.gni
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_media__options.gni,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/media_options.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/media_options.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/media_options.gni
-@@ -190,12 +190,18 @@ declare_args() {
+@@ -201,12 +201,18 @@ declare_args() {
    # Enables runtime selection of ALSA library for audio.
    use_alsa = false
  
diff --git a/chromium/patches/patch-media_mojo_mojom_BUILD.gn b/chromium/patches/patch-media_mojo_mojom_BUILD.gn
new file mode 100644
index 0000000000..01efbb4bcd
--- /dev/null
+++ b/chromium/patches/patch-media_mojo_mojom_BUILD.gn
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- media/mojo/mojom/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ media/mojo/mojom/BUILD.gn
+@@ -959,7 +959,7 @@ source_set("test_support") {
+   sources = []
+   deps = []
+ 
+-  if (is_linux || is_chromeos) {
++  if (!is_bsd && (is_linux || is_chromeos)) {
+     sources += [
+       "buffer_handle_test_util.cc",
+       "buffer_handle_test_util.h",
diff --git a/chromium/patches/patch-media_mojo_mojom_stable_BUILD.gn b/chromium/patches/patch-media_mojo_mojom_stable_BUILD.gn
deleted file mode 100644
index eb517e1da2..0000000000
--- a/chromium/patches/patch-media_mojo_mojom_stable_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-media_mojo_mojom_stable_BUILD.gn,v 1.1 2025/02/06 09:58:13 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/mojo/mojom/stable/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
-+++ media/mojo/mojom/stable/BUILD.gn
-@@ -196,7 +196,7 @@ source_set("unit_tests") {
-   } else if (use_v4l2_codec) {
-     deps += [ "//media/gpu/v4l2:v4l2_status" ]
-   }
--  if (is_linux || is_chromeos) {
-+  if ((is_linux || is_chromeos) && !is_bsd) {
-     sources += [
-       "mojom_traits_test_util.cc",
-       "mojom_traits_test_util.h",
diff --git a/chromium/patches/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/chromium/patches/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
deleted file mode 100644
index 9c49ecb509..0000000000
--- a/chromium/patches/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
-@@ -841,7 +841,7 @@ const gfx::GpuMemoryBufferId& StructTrai
-   return input.id;
- }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // static
- gfx::NativePixmapHandle StructTraits<
-     media::stable::mojom::NativeGpuMemoryBufferHandleDataView,
-@@ -862,7 +862,7 @@ bool StructTraits<media::stable::mojom::
- 
-   output->type = gfx::NATIVE_PIXMAP;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (!data.ReadPlatformHandle(&output->native_pixmap_handle))
-     return false;
-   return true;
diff --git a/chromium/patches/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/chromium/patches/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
deleted file mode 100644
index 8d31ca85ae..0000000000
--- a/chromium/patches/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h,v 1.1 2025/02/06 09:58:13 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -695,7 +695,7 @@ struct StructTraits<media::stable::mojom
-   static const gfx::GpuMemoryBufferId& id(
-       const gfx::GpuMemoryBufferHandle& input);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   static gfx::NativePixmapHandle platform_handle(
-       gfx::GpuMemoryBufferHandle& input);
- #else
diff --git a/chromium/patches/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/chromium/patches/patch-media_mojo_mojom_video__frame__mojom__traits.cc
index 57c5a17b99..bf9f5a793e 100644
--- a/chromium/patches/patch-media_mojo_mojom_video__frame__mojom__traits.cc
+++ b/chromium/patches/patch-media_mojo_mojom_video__frame__mojom__traits.cc
@@ -1,35 +1,44 @@
-$NetBSD: patch-media_mojo_mojom_video__frame__mojom__traits.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/mojo/mojom/video_frame_mojom_traits.cc
-@@ -27,7 +27,7 @@
+@@ -24,7 +24,7 @@
  #include "ui/gfx/mojom/color_space_mojom_traits.h"
  #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "base/posix/eintr_wrapper.h"
+ #include "media/gpu/buffer_validation.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -166,7 +166,7 @@ media::mojom::VideoFrameDataPtr MakeVide
+         media::mojom::OpaqueVideoFrameData::New());
+   }
  
-@@ -152,7 +152,7 @@ media::mojom::VideoFrameDataPtr MakeVide
-             std::move(shared_image), std::move(mailbox_holder.sync_token),
-             std::move(mailbox_holder.texture_target),
-             std::move(input->ycbcr_info())));
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   } else if (input->HasOOPVDMailbox()) {
-     return media::mojom::VideoFrameData::NewMailboxData(
-         media::mojom::MailboxVideoFrameData::New(input->oopvd_mailbox()));
-@@ -353,7 +353,7 @@ bool StructTraits<media::mojom::VideoFra
-     frame = media::VideoFrame::WrapExternalGpuMemoryBuffer(
-         visible_rect, natural_size, std::move(gpu_memory_buffer), shared_image,
-         sync_token, base::NullCallback(), timestamp);
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   } else if (data.is_mailbox_data()) {
-     media::mojom::MailboxVideoFrameDataDataView mailbox_data;
-     data.GetMailboxDataDataView(&mailbox_data);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
+     // Duplicates the DMA buffer FDs to a new vector since this cannot take
+     // ownership of the FDs in |input| due to constness.
+@@ -197,7 +197,7 @@ media::mojom::VideoFrameDataPtr MakeVide
+ 
+ }  // namespace
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // static
+ bool StructTraits<
+     media::mojom::ColorPlaneLayoutDataView,
+@@ -436,7 +436,7 @@ bool StructTraits<media::mojom::VideoFra
+     frame = media::VideoFrame::WrapTrackingToken(
+         format, *metadata.tracking_token, coded_size, visible_rect,
+         natural_size, timestamp);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   } else if (data.is_dmabuf_data()) {
+     media::mojom::DmabufVideoFrameDataDataView dmabuf_data;
+     data.GetDmabufDataDataView(&dmabuf_data);
diff --git a/chromium/patches/patch-media_mojo_mojom_video__frame__mojom__traits.h b/chromium/patches/patch-media_mojo_mojom_video__frame__mojom__traits.h
new file mode 100644
index 0000000000..ca4fb89959
--- /dev/null
+++ b/chromium/patches/patch-media_mojo_mojom_video__frame__mojom__traits.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- media/mojo/mojom/video_frame_mojom_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ media/mojo/mojom/video_frame_mojom_traits.h
+@@ -21,7 +21,7 @@
+ 
+ namespace mojo {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ template <>
+ struct StructTraits<media::mojom::ColorPlaneLayoutDataView,
+                     media::ColorPlaneLayout> {
diff --git a/chromium/patches/patch-media_video_fake__gpu__memory__buffer.cc b/chromium/patches/patch-media_video_fake__gpu__memory__buffer.cc
index 2d07ff6275..de57f031f6 100644
--- a/chromium/patches/patch-media_video_fake__gpu__memory__buffer.cc
+++ b/chromium/patches/patch-media_video_fake__gpu__memory__buffer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_video_fake__gpu__memory__buffer.cc,v 1.1 2025/02/06 09:58:13 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/video/fake_gpu_memory_buffer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/video/fake_gpu_memory_buffer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/video/fake_gpu_memory_buffer.cc
 @@ -14,7 +14,7 @@
  #include "media/base/format_utils.h"
@@ -15,30 +15,21 @@ $NetBSD: patch-media_video_fake__gpu__memory__buffer.cc,v 1.1 2025/02/06 09:58:1
  #include <fcntl.h>
  #include <sys/stat.h>
  #include <sys/types.h>
-@@ -63,7 +63,7 @@ class FakeGpuMemoryBufferImpl : public g
+@@ -29,7 +29,7 @@ namespace media {
  
- }  // namespace
+ namespace {
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  base::ScopedFD GetDummyFD() {
    base::ScopedFD fd(open("/dev/zero", O_RDWR));
    DCHECK(fd.is_valid());
-@@ -102,7 +102,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer
-   static base::AtomicSequenceNumber buffer_id_generator;
-   handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext());
+@@ -73,7 +73,7 @@ static base::AtomicSequenceNumber buffer
+ 
+ }  // namespace
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) {
-     const gfx::Size plane_size_in_bytes =
-         VideoFrame::PlaneSize(video_pixel_format_, i, size_);
-@@ -176,7 +176,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemory
-   gfx::GpuMemoryBufferHandle handle;
-   handle.type = gfx::NATIVE_PIXMAP;
-   handle.id = handle_.id;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   handle.native_pixmap_handle =
-       gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
- #endif
+ gfx::GpuMemoryBufferHandle CreatePixmapHandleForTesting(
+     const gfx::Size& size,
+     gfx::BufferFormat format,
diff --git a/chromium/patches/patch-media_video_fake__gpu__memory__buffer.h b/chromium/patches/patch-media_video_fake__gpu__memory__buffer.h
new file mode 100644
index 0000000000..d3ec8682bb
--- /dev/null
+++ b/chromium/patches/patch-media_video_fake__gpu__memory__buffer.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- media/video/fake_gpu_memory_buffer.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ media/video/fake_gpu_memory_buffer.h
+@@ -13,7 +13,7 @@
+ 
+ namespace media {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // This method is used by tests to create a fake pixmap handle instead of
+ // creating a FakeGpuMemoryBuffer. Once all tests are converted to use it,
+ // FakeGpuMemoryBuffer will be removed and this file will be renamed
diff --git a/chromium/patches/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/chromium/patches/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
index f8c37aeae6..9eb8e22652 100644
--- a/chromium/patches/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/chromium/patches/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_video_gpu__memory__buffer__video__frame__pool.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -641,7 +641,7 @@ void GpuMemoryBufferVideoFramePool::Pool
+@@ -647,7 +647,7 @@ void GpuMemoryBufferVideoFramePool::Pool
    }
  
    bool is_software_backed_video_frame = !video_frame->HasSharedImage();
@@ -15,7 +15,7 @@ $NetBSD: patch-media_video_gpu__memory__buffer__video__frame__pool.cc,v 1.1 2025
    is_software_backed_video_frame &= !video_frame->HasDmaBufs();
  #endif
  
-@@ -1049,7 +1049,7 @@ scoped_refptr<VideoFrame> GpuMemoryBuffe
+@@ -1057,7 +1057,7 @@ scoped_refptr<VideoFrame> GpuMemoryBuffe
        media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get());
  #endif
  
@@ -24,12 +24,12 @@ $NetBSD: patch-media_video_gpu__memory__buffer__video__frame__pool.cc,v 1.1 2025
    is_webgpu_compatible =
        handle.native_pixmap_handle.supports_zero_copy_webgpu_import;
  #endif
-@@ -1236,7 +1236,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl:
+@@ -1228,7 +1228,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl:
        si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT;
      }
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      // TODO(crbug.com/40194712): Always add the flag once the
      // OzoneImageBacking is by default turned on.
      if (base::CommandLine::ForCurrentProcess()->HasSwitch(
diff --git a/chromium/patches/patch-media_video_video__encode__accelerator__adapter.cc b/chromium/patches/patch-media_video_video__encode__accelerator__adapter.cc
index 6ffb173a6b..de91a5ddfb 100644
--- a/chromium/patches/patch-media_video_video__encode__accelerator__adapter.cc
+++ b/chromium/patches/patch-media_video_video__encode__accelerator__adapter.cc
@@ -1,26 +1,17 @@
-$NetBSD: patch-media_video_video__encode__accelerator__adapter.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/video/video_encode_accelerator_adapter.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/video/video_encode_accelerator_adapter.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/video/video_encode_accelerator_adapter.cc
-@@ -160,7 +160,7 @@ VideoEncodeAccelerator::Config SetUpVeaC
-     config.input_format = PIXEL_FORMAT_I420;
-   }
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (format != PIXEL_FORMAT_I420 ||
-       !VideoFrame::IsStorageTypeMappable(storage_type)) {
-     // ChromeOS/Linux hardware video encoders supports I420 on-memory
-@@ -519,7 +519,7 @@ void VideoEncodeAcceleratorAdapter::Init
-       profile_, options_, format, first_frame->storage_type(),
-       supported_rc_modes_, required_encoder_type_, is_gpu_supported_format);
+@@ -468,7 +468,7 @@ void VideoEncodeAcceleratorAdapter::Init
  
+   auto format = PIXEL_FORMAT_I420;
+   auto storage_type = VideoEncodeAccelerator::Config::StorageType::kShmem;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // Linux/ChromeOS require a special configuration to use dmabuf storage.
-   // We need to keep sending frames the same way the first frame was sent.
-   // Other platforms will happily mix GpuMemoryBuffer storage with regular
+   // We need to keep sending frames with the same storage type.
+   // Other platforms will happily mix GpuMemoryBuffer storage with shared-mem
diff --git a/chromium/patches/patch-media_video_video__encode__accelerator__adapter__test.cc b/chromium/patches/patch-media_video_video__encode__accelerator__adapter__test.cc
index 76b5355f6b..e4333f6dbb 100644
--- a/chromium/patches/patch-media_video_video__encode__accelerator__adapter__test.cc
+++ b/chromium/patches/patch-media_video_video__encode__accelerator__adapter__test.cc
@@ -1,17 +1,44 @@
-$NetBSD: patch-media_video_video__encode__accelerator__adapter__test.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/video/video_encode_accelerator_adapter_test.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/video/video_encode_accelerator_adapter_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/video/video_encode_accelerator_adapter_test.cc
-@@ -461,7 +461,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest
+@@ -260,7 +260,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest
+       });
+ 
+   VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   expected_input_format = PIXEL_FORMAT_NV12;
+ #endif
+   vea()->SetEncodingCallback(base::BindLambdaForTesting(
+@@ -369,7 +369,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest
+       });
+ 
+   VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   expected_input_format = PIXEL_FORMAT_NV12;
+ #endif
+ 
+@@ -467,7 +467,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest
        CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2));
  
    VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (pixel_format != PIXEL_FORMAT_I420 || !small_frame->IsMappable())
      expected_input_format = PIXEL_FORMAT_NV12;
  #endif
+   const gfx::ColorSpace expected_color_space =
+@@ -674,7 +674,7 @@ TEST_F(VideoEncodeAcceleratorAdapterTest
+       });
+ 
+   VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   expected_input_format = PIXEL_FORMAT_NV12;
+ #endif
+   vea()->SetEncodingCallback(base::BindLambdaForTesting(
diff --git a/chromium/patches/patch-media_webrtc_audio__processor.cc b/chromium/patches/patch-media_webrtc_audio__processor.cc
index 743bd9f516..7201b9ab63 100644
--- a/chromium/patches/patch-media_webrtc_audio__processor.cc
+++ b/chromium/patches/patch-media_webrtc_audio__processor.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-media_webrtc_audio__processor.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/webrtc/audio_processor.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/webrtc/audio_processor.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/webrtc/audio_processor.cc
-@@ -521,7 +521,7 @@ std::optional<double> AudioProcessor::Pr
+@@ -509,7 +509,7 @@ std::optional<double> AudioProcessor::Pr
+   // controller.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
    DCHECK_LE(volume, 1.0);
- #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
--    BUILDFLAG(IS_OPENBSD)
-+    BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // We have a special situation on Linux where the microphone volume can be
    // "higher than maximum". The input volume slider in the sound preference
    // allows the user to set a scaling that is higher than 100%. It means that
diff --git a/chromium/patches/patch-media_webrtc_helpers.cc b/chromium/patches/patch-media_webrtc_helpers.cc
index 95a12f1139..c97d006b4b 100644
--- a/chromium/patches/patch-media_webrtc_helpers.cc
+++ b/chromium/patches/patch-media_webrtc_helpers.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_webrtc_helpers.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/webrtc/helpers.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/webrtc/helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/webrtc/helpers.cc
-@@ -41,14 +41,14 @@ void ConfigAutomaticGainControl(const Au
+@@ -43,14 +43,14 @@ void ConfigAutomaticGainControl(const Au
      return;
    }
  
diff --git a/chromium/patches/patch-media_webrtc_helpers__unittests.cc b/chromium/patches/patch-media_webrtc_helpers__unittests.cc
index 337789668f..eb6581400d 100644
--- a/chromium/patches/patch-media_webrtc_helpers__unittests.cc
+++ b/chromium/patches/patch-media_webrtc_helpers__unittests.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_webrtc_helpers__unittests.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- media/webrtc/helpers_unittests.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- media/webrtc/helpers_unittests.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ media/webrtc/helpers_unittests.cc
-@@ -40,7 +40,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
+@@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
    EXPECT_TRUE(config.echo_canceller.enabled);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-media_webrtc_helpers__unittests.cc,v 1.1 2025/02/06 09:58:14 wiz
    EXPECT_FALSE(config.gain_controller1.enabled);
    EXPECT_TRUE(config.gain_controller2.enabled);
  #elif BUILDFLAG(IS_CASTOS) || BUILDFLAG(IS_CAST_ANDROID)
-@@ -73,7 +73,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
+@@ -66,7 +66,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -24,7 +24,7 @@ $NetBSD: patch-media_webrtc_helpers__unittests.cc,v 1.1 2025/02/06 09:58:14 wiz
  TEST(CreateWebRtcAudioProcessingModuleTest,
       InputVolumeAdjustmentEnabledWithAgc2) {
    ::base::test::ScopedFeatureList feature_list;
-@@ -89,7 +89,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
+@@ -82,7 +82,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
@@ -33,7 +33,7 @@ $NetBSD: patch-media_webrtc_helpers__unittests.cc,v 1.1 2025/02/06 09:58:14 wiz
  TEST(CreateWebRtcAudioProcessingModuleTest,
       CanDisableInputVolumeAdjustmentWithAgc2) {
    ::base::test::ScopedFeatureList feature_list;
-@@ -106,7 +106,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
+@@ -99,7 +99,7 @@ TEST(CreateWebRtcAudioProcessingModuleTe
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-mojo_core_BUILD.gn b/chromium/patches/patch-mojo_core_BUILD.gn
index 9c0f2da9fd..bc99b852d1 100644
--- a/chromium/patches/patch-mojo_core_BUILD.gn
+++ b/chromium/patches/patch-mojo_core_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-mojo_core_BUILD.gn,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- mojo/core/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- mojo/core/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ mojo/core/BUILD.gn
-@@ -161,7 +161,7 @@ source_set("impl_for_embedder") {
+@@ -163,7 +163,7 @@ source_set("impl_for_embedder") {
        ]
      }
  
diff --git a/chromium/patches/patch-mojo_core_channel.cc b/chromium/patches/patch-mojo_core_channel.cc
index 5f7775bb54..d95ea711c1 100644
--- a/chromium/patches/patch-mojo_core_channel.cc
+++ b/chromium/patches/patch-mojo_core_channel.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-mojo_core_channel.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- mojo/core/channel.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- mojo/core/channel.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ mojo/core/channel.cc
-@@ -82,7 +82,11 @@ const size_t kMaxAttachedHandles = 64;
+@@ -83,7 +83,11 @@ const size_t kMaxAttachedHandles = 64;
  const size_t kMaxAttachedHandles = 253;
  #endif  // BUILDFLAG(IS_FUCHSIA)
  
diff --git a/chromium/patches/patch-mojo_core_embedder_features.h b/chromium/patches/patch-mojo_core_embedder_features.h
index 72f49742d0..6b21c76b5f 100644
--- a/chromium/patches/patch-mojo_core_embedder_features.h
+++ b/chromium/patches/patch-mojo_core_embedder_features.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-mojo_core_embedder_features.h,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- mojo/core/embedder/features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- mojo/core/embedder/features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ mojo/core/embedder/features.h
 @@ -16,7 +16,7 @@ namespace core {
  
diff --git a/chromium/patches/patch-mojo_public_cpp_platform_socket__utils__posix.cc b/chromium/patches/patch-mojo_public_cpp_platform_socket__utils__posix.cc
index bb30387d28..127857243f 100644
--- a/chromium/patches/patch-mojo_public_cpp_platform_socket__utils__posix.cc
+++ b/chromium/patches/patch-mojo_public_cpp_platform_socket__utils__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-mojo_public_cpp_platform_socket__utils__posix.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- mojo/public/cpp/platform/socket_utils_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- mojo/public/cpp/platform/socket_utils_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ mojo/public/cpp/platform/socket_utils_posix.cc
 @@ -34,7 +34,7 @@ bool IsRecoverableError() {
  }
diff --git a/chromium/patches/patch-mojo_public_tools_bindings_mojom.gni b/chromium/patches/patch-mojo_public_tools_bindings_mojom.gni
index 0f006b80a6..e1e746d1f8 100644
--- a/chromium/patches/patch-mojo_public_tools_bindings_mojom.gni
+++ b/chromium/patches/patch-mojo_public_tools_bindings_mojom.gni
@@ -1,12 +1,12 @@
-$NetBSD: patch-mojo_public_tools_bindings_mojom.gni,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- mojo/public/tools/bindings/mojom.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- mojo/public/tools/bindings/mojom.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ mojo/public/tools/bindings/mojom.gni
-@@ -776,6 +776,21 @@ template("mojom") {
+@@ -774,6 +774,21 @@ template("mojom") {
        enabled_features += [ "is_apple" ]
      }
  
@@ -25,6 +25,6 @@ $NetBSD: patch-mojo_public_tools_bindings_mojom.gni,v 1.1 2025/02/06 09:58:14 wi
 +      enabled_features += [ "is_bsd" ]
 +    }
 +
-     action(parser_target_name) {
-       allow_remote = true
- 
+     action_outputs = []
+     foreach(base_path, output_file_base_paths) {
+       filename = get_path_info(base_path, "file")
diff --git a/chromium/patches/patch-net_BUILD.gn b/chromium/patches/patch-net_BUILD.gn
index e1641fa63e..b9626757f6 100644
--- a/chromium/patches/patch-net_BUILD.gn
+++ b/chromium/patches/patch-net_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_BUILD.gn,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/BUILD.gn
-@@ -126,7 +126,7 @@ net_configs = [
+@@ -125,7 +125,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
  ]
  
@@ -15,7 +15,7 @@ $NetBSD: patch-net_BUILD.gn,v 1.1 2025/02/06 09:58:14 wiz Exp $
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1287,6 +1287,19 @@ component("net") {
+@@ -1320,6 +1320,19 @@ component("net") {
      ]
    }
  
@@ -35,7 +35,7 @@ $NetBSD: patch-net_BUILD.gn,v 1.1 2025/02/06 09:58:14 wiz Exp $
    if (is_mac) {
      sources += [
        "base/network_notification_thread_mac.cc",
-@@ -1450,7 +1463,7 @@ component("net") {
+@@ -1483,7 +1496,7 @@ component("net") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
@@ -44,16 +44,16 @@ $NetBSD: patch-net_BUILD.gn,v 1.1 2025/02/06 09:58:14 wiz Exp $
      sources += [
        "base/network_interfaces_getifaddrs.cc",
        "base/network_interfaces_getifaddrs.h",
-@@ -2118,7 +2131,7 @@ static_library("test_support") {
+@@ -2182,7 +2195,7 @@ static_library("test_support") {
      ]
    }
  
 -  if (is_linux || is_chromeos || is_android) {
-+  if ((is_linux || is_chromeos || is_android)  && !is_bsd) {
++  if (!is_bsd && (is_linux || is_chromeos || is_android)) {
      sources += [
        "base/address_tracker_linux_test_util.cc",
        "base/address_tracker_linux_test_util.h",
-@@ -2928,14 +2941,14 @@ target(_test_target_type, "net_unittests
+@@ -3001,14 +3014,14 @@ target(_test_target_type, "net_unittests
      ]
    }
  
@@ -70,7 +70,7 @@ $NetBSD: patch-net_BUILD.gn,v 1.1 2025/02/06 09:58:14 wiz Exp $
      sources += [
        "base/address_tracker_linux_unittest.cc",
        "base/network_interfaces_linux_unittest.cc",
-@@ -3028,6 +3041,10 @@ target(_test_target_type, "net_unittests
+@@ -3104,6 +3117,10 @@ target(_test_target_type, "net_unittests
      ]
    }
  
@@ -81,7 +81,7 @@ $NetBSD: patch-net_BUILD.gn,v 1.1 2025/02/06 09:58:14 wiz Exp $
    if (enable_websockets) {
      sources += [
        "server/http_connection_unittest.cc",
-@@ -3094,7 +3111,7 @@ target(_test_target_type, "net_unittests
+@@ -3170,7 +3187,7 @@ target(_test_target_type, "net_unittests
      ]
    }
  
@@ -90,7 +90,7 @@ $NetBSD: patch-net_BUILD.gn,v 1.1 2025/02/06 09:58:14 wiz Exp $
      sources += [ "tools/quic/quic_simple_server_test.cc" ]
    }
  
-@@ -3233,7 +3250,7 @@ target(_test_target_type, "net_unittests
+@@ -3309,7 +3326,7 @@ target(_test_target_type, "net_unittests
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/chromium/patches/patch-net_base_features.cc b/chromium/patches/patch-net_base_features.cc
index b3d9856eb6..e05fb83d9d 100644
--- a/chromium/patches/patch-net_base_features.cc
+++ b/chromium/patches/patch-net_base_features.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_base_features.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/base/features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/base/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/base/features.cc
 @@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCross
  BASE_FEATURE(kAsyncDns,
@@ -15,15 +15,15 @@ $NetBSD: patch-net_base_features.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -522,7 +522,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseU
+@@ -548,7 +548,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseU
               "SpdyHeadersToHttpResponseUseBuilder",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
-+#if BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
 +// No IP_RECVTOS support
- BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT);
-+#else
 +BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT);
++#else
+ BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_ENABLED_BY_DEFAULT);
 +#endif
  
  BASE_FEATURE(kUseNewAlpsCodepointHttp2,
diff --git a/chromium/patches/patch-net_base_mock__network__change__notifier.cc b/chromium/patches/patch-net_base_mock__network__change__notifier.cc
deleted file mode 100644
index 62cfc5ae18..0000000000
--- a/chromium/patches/patch-net_base_mock__network__change__notifier.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-net_base_mock__network__change__notifier.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/base/mock_network_change_notifier.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ net/base/mock_network_change_notifier.cc
-@@ -103,7 +103,7 @@ MockNetworkChangeNotifier::GetCurrentCon
-   return connection_cost_;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- AddressMapOwnerLinux* MockNetworkChangeNotifier::GetAddressMapOwnerInternal() {
-   return address_map_owner_;
- }
diff --git a/chromium/patches/patch-net_base_mock__network__change__notifier.h b/chromium/patches/patch-net_base_mock__network__change__notifier.h
deleted file mode 100644
index 31566498f3..0000000000
--- a/chromium/patches/patch-net_base_mock__network__change__notifier.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-net_base_mock__network__change__notifier.h,v 1.1 2025/02/06 09:58:14 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/base/mock_network_change_notifier.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ net/base/mock_network_change_notifier.h
-@@ -84,7 +84,7 @@ class MockNetworkChangeNotifier : public
-   // use_default_connection_cost_implementation is set to true.
-   ConnectionCost GetCurrentConnectionCost() override;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void SetAddressMapOwnerLinux(AddressMapOwnerLinux* address_map_owner) {
-     address_map_owner_ = address_map_owner;
-   }
-@@ -104,7 +104,7 @@ class MockNetworkChangeNotifier : public
-   bool use_default_connection_cost_implementation_ = false;
-   NetworkChangeNotifier::NetworkList connected_networks_;
-   std::unique_ptr<SystemDnsConfigChangeNotifier> dns_config_notifier_;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   raw_ptr<AddressMapOwnerLinux> address_map_owner_ = nullptr;
- #endif
- };
diff --git a/chromium/patches/patch-net_base_network__change__notifier.cc b/chromium/patches/patch-net_base_network__change__notifier.cc
index df6fec7fa1..b3cd0ec3d1 100644
--- a/chromium/patches/patch-net_base_network__change__notifier.cc
+++ b/chromium/patches/patch-net_base_network__change__notifier.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_base_network__change__notifier.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/base/network_change_notifier.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/base/network_change_notifier.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/base/network_change_notifier.cc
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
  #include "net/base/network_change_notifier_linux.h"
  #elif BUILDFLAG(IS_APPLE)
  #include "net/base/network_change_notifier_apple.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-net_base_network__change__notifier.cc,v 1.1 2025/02/06 09:58:14 w
  #include "net/base/network_change_notifier_passive.h"
  #elif BUILDFLAG(IS_FUCHSIA)
  #include "net/base/network_change_notifier_fuchsia.h"
-@@ -324,6 +324,9 @@ std::unique_ptr<NetworkChangeNotifier> N
+@@ -323,6 +323,9 @@ std::unique_ptr<NetworkChangeNotifier> N
  #elif BUILDFLAG(IS_FUCHSIA)
    return std::make_unique<NetworkChangeNotifierFuchsia>(
        /*require_wlan=*/false);
@@ -25,7 +25,7 @@ $NetBSD: patch-net_base_network__change__notifier.cc,v 1.1 2025/02/06 09:58:14 w
  #else
    NOTIMPLEMENTED();
    return nullptr;
-@@ -522,7 +525,7 @@ base::cstring_view NetworkChangeNotifier
+@@ -519,7 +522,7 @@ base::cstring_view NetworkChangeNotifier
    return kConnectionTypeNames[type];
  }
  
@@ -34,7 +34,7 @@ $NetBSD: patch-net_base_network__change__notifier.cc,v 1.1 2025/02/06 09:58:14 w
  // static
  AddressMapOwnerLinux* NetworkChangeNotifier::GetAddressMapOwner() {
    return g_network_change_notifier
-@@ -868,7 +871,7 @@ NetworkChangeNotifier::NetworkChangeNoti
+@@ -865,7 +868,7 @@ NetworkChangeNotifier::NetworkChangeNoti
    }
  }
  
diff --git a/chromium/patches/patch-net_base_network__change__notifier.h b/chromium/patches/patch-net_base_network__change__notifier.h
index b469fe7e97..c26680b62d 100644
--- a/chromium/patches/patch-net_base_network__change__notifier.h
+++ b/chromium/patches/patch-net_base_network__change__notifier.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_base_network__change__notifier.h,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/base/network_change_notifier.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/base/network_change_notifier.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/base/network_change_notifier.h
 @@ -19,7 +19,7 @@
  #include "net/base/net_export.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-net_base_network__change__notifier.h,v 1.1 2025/02/06 09:58:14 wi
  #include "net/base/address_map_linux.h"
  #endif
  
-@@ -460,7 +460,7 @@ class NET_EXPORT NetworkChangeNotifier {
+@@ -451,7 +451,7 @@ class NET_EXPORT NetworkChangeNotifier {
    // packets sent lazily.
    static bool IsDefaultNetworkActive();
  
@@ -24,7 +24,7 @@ $NetBSD: patch-net_base_network__change__notifier.h,v 1.1 2025/02/06 09:58:14 wi
    // Returns the AddressTrackerLinux if present.
    static AddressMapOwnerLinux* GetAddressMapOwner();
  #endif
-@@ -630,7 +630,7 @@ class NET_EXPORT NetworkChangeNotifier {
+@@ -621,7 +621,7 @@ class NET_EXPORT NetworkChangeNotifier {
        SystemDnsConfigChangeNotifier* system_dns_config_notifier = nullptr,
        bool omit_observers_in_constructor_for_testing = false);
  
diff --git a/chromium/patches/patch-net_base_network__change__notifier__passive.cc b/chromium/patches/patch-net_base_network__change__notifier__passive.cc
index a46eb81915..5c19845bc8 100644
--- a/chromium/patches/patch-net_base_network__change__notifier__passive.cc
+++ b/chromium/patches/patch-net_base_network__change__notifier__passive.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_base_network__change__notifier__passive.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/base/network_change_notifier_passive.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/base/network_change_notifier_passive.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/base/network_change_notifier_passive.cc
-@@ -107,7 +107,7 @@ NetworkChangeNotifierPassive::GetAddress
+@@ -106,7 +106,7 @@ NetworkChangeNotifierPassive::GetAddress
  NetworkChangeNotifier::NetworkChangeCalculatorParams
  NetworkChangeNotifierPassive::NetworkChangeCalculatorParamsPassive() {
    NetworkChangeCalculatorParams params;
diff --git a/chromium/patches/patch-net_base_network__interfaces__posix.h b/chromium/patches/patch-net_base_network__interfaces__posix.h
index 54888c3c15..1e0c791c03 100644
--- a/chromium/patches/patch-net_base_network__interfaces__posix.h
+++ b/chromium/patches/patch-net_base_network__interfaces__posix.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_base_network__interfaces__posix.h,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/base/network_interfaces_posix.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/base/network_interfaces_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/base/network_interfaces_posix.h
 @@ -8,6 +8,8 @@
  // This file provides some basic functionality shared between
diff --git a/chromium/patches/patch-net_base_sockaddr__util__posix.cc b/chromium/patches/patch-net_base_sockaddr__util__posix.cc
index a2b6f395fa..a4c7e49c64 100644
--- a/chromium/patches/patch-net_base_sockaddr__util__posix.cc
+++ b/chromium/patches/patch-net_base_sockaddr__util__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_base_sockaddr__util__posix.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/base/sockaddr_util_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/base/sockaddr_util_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/base/sockaddr_util_posix.cc
-@@ -46,7 +46,8 @@ bool FillUnixAddress(const std::string& 
+@@ -45,7 +45,8 @@ bool FillUnixAddress(const std::string& 
      return true;
    }
  
diff --git a/chromium/patches/patch-net_base_sockaddr__util__posix__unittest.cc b/chromium/patches/patch-net_base_sockaddr__util__posix__unittest.cc
index 0d2ea03974..51d3a340e2 100644
--- a/chromium/patches/patch-net_base_sockaddr__util__posix__unittest.cc
+++ b/chromium/patches/patch-net_base_sockaddr__util__posix__unittest.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_base_sockaddr__util__posix__unittest.cc,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/base/sockaddr_util_posix_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/base/sockaddr_util_posix_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/base/sockaddr_util_posix_unittest.cc
 @@ -88,7 +88,8 @@ TEST(FillUnixAddressTest, AbstractLinuxA
    size_t path_max = MaxPathLength(&storage);
diff --git a/chromium/patches/patch-net_cert_cert__verify__proc.h b/chromium/patches/patch-net_cert_cert__verify__proc.h
index 7ab61fbb4c..9533e7c7ec 100644
--- a/chromium/patches/patch-net_cert_cert__verify__proc.h
+++ b/chromium/patches/patch-net_cert_cert__verify__proc.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_cert_cert__verify__proc.h,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/cert/cert_verify_proc.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/cert/cert_verify_proc.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/cert/cert_verify_proc.h
-@@ -186,7 +186,7 @@ class NET_EXPORT CertVerifyProc
+@@ -182,7 +182,7 @@ class NET_EXPORT CertVerifyProc
      kMaxValue = kChainLengthOne
    };
  
diff --git a/chromium/patches/patch-net_disk__cache_backend__experiment.h b/chromium/patches/patch-net_disk__cache_backend__experiment.h
index 145a337d12..0fa1221b2e 100644
--- a/chromium/patches/patch-net_disk__cache_backend__experiment.h
+++ b/chromium/patches/patch-net_disk__cache_backend__experiment.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_disk__cache_backend__experiment.h,v 1.1 2025/02/06 09:58:14 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/disk_cache/backend_experiment.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/disk_cache/backend_experiment.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/disk_cache/backend_experiment.h
 @@ -14,7 +14,7 @@ namespace disk_cache {
  // default.
diff --git a/chromium/patches/patch-net_disk__cache_simple_simple__file__tracker.cc b/chromium/patches/patch-net_disk__cache_simple_simple__file__tracker.cc
index 9875575780..1c5cd84c8a 100644
--- a/chromium/patches/patch-net_disk__cache_simple_simple__file__tracker.cc
+++ b/chromium/patches/patch-net_disk__cache_simple_simple__file__tracker.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-net_disk__cache_simple_simple__file__tracker.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/disk_cache/simple/simple_file_tracker.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/disk_cache/simple/simple_file_tracker.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/disk_cache/simple/simple_file_tracker.cc
-@@ -35,7 +35,17 @@ void RecordFileDescripterLimiterOp(FileD
- }  // namespace
+@@ -37,7 +37,17 @@ bool SimpleFileTracker::TrackedFiles::In
+ }
  
  SimpleFileTracker::SimpleFileTracker(int file_limit)
 +#if defined(OS_OPENBSD)
diff --git a/chromium/patches/patch-net_dns_BUILD.gn b/chromium/patches/patch-net_dns_BUILD.gn
index 0e15717629..2c26f40482 100644
--- a/chromium/patches/patch-net_dns_BUILD.gn
+++ b/chromium/patches/patch-net_dns_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_dns_BUILD.gn,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/BUILD.gn
-@@ -138,7 +138,7 @@ source_set("dns") {
+@@ -140,7 +140,7 @@ source_set("dns") {
        "dns_config_service_android.cc",
        "dns_config_service_android.h",
      ]
@@ -15,7 +15,7 @@ $NetBSD: patch-net_dns_BUILD.gn,v 1.1 2025/02/06 09:58:15 wiz Exp $
      sources += [
        "dns_config_service_linux.cc",
        "dns_config_service_linux.h",
-@@ -171,7 +171,10 @@ source_set("dns") {
+@@ -173,7 +173,10 @@ source_set("dns") {
      ]
    }
  
@@ -27,7 +27,7 @@ $NetBSD: patch-net_dns_BUILD.gn,v 1.1 2025/02/06 09:58:15 wiz Exp $
  
    public_deps = [
      ":dns_client",
-@@ -179,6 +182,7 @@ source_set("dns") {
+@@ -181,6 +184,7 @@ source_set("dns") {
      ":host_resolver_manager",
      ":mdns_client",
      "//net:net_public_deps",
@@ -35,7 +35,7 @@ $NetBSD: patch-net_dns_BUILD.gn,v 1.1 2025/02/06 09:58:15 wiz Exp $
    ]
  
    allow_circular_includes_from = [
-@@ -447,9 +451,9 @@ source_set("tests") {
+@@ -450,9 +454,9 @@ source_set("tests") {
  
    if (is_android) {
      sources += [ "dns_config_service_android_unittest.cc" ]
diff --git a/chromium/patches/patch-net_dns_address__info.cc b/chromium/patches/patch-net_dns_address__info.cc
index fe32ba2410..f6b72480a6 100644
--- a/chromium/patches/patch-net_dns_address__info.cc
+++ b/chromium/patches/patch-net_dns_address__info.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_address__info.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/address_info.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/address_info.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/address_info.cc
 @@ -83,8 +83,12 @@ AddressInfo::AddressInfoAndResult Addres
      // error.
diff --git a/chromium/patches/patch-net_dns_address__sorter__posix.cc b/chromium/patches/patch-net_dns_address__sorter__posix.cc
index dea77663d2..38fbaa7c9c 100644
--- a/chromium/patches/patch-net_dns_address__sorter__posix.cc
+++ b/chromium/patches/patch-net_dns_address__sorter__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_address__sorter__posix.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/address_sorter_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/address_sorter_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/address_sorter_posix.cc
 @@ -32,6 +32,7 @@
  #include "net/dns/netinet_in_var_ios.h"
diff --git a/chromium/patches/patch-net_dns_dns__config__service__posix.cc b/chromium/patches/patch-net_dns_dns__config__service__posix.cc
index a7eba1627a..c712e18982 100644
--- a/chromium/patches/patch-net_dns_dns__config__service__posix.cc
+++ b/chromium/patches/patch-net_dns_dns__config__service__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_dns__config__service__posix.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/dns_config_service_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/dns_config_service_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/dns_config_service_posix.cc
 @@ -39,6 +39,11 @@
  #include "net/dns/dns_config_watcher_mac.h"
diff --git a/chromium/patches/patch-net_dns_dns__reloader.cc b/chromium/patches/patch-net_dns_dns__reloader.cc
index b64d52dff9..f14fb83f75 100644
--- a/chromium/patches/patch-net_dns_dns__reloader.cc
+++ b/chromium/patches/patch-net_dns_dns__reloader.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_dns__reloader.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/dns_reloader.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/dns_reloader.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/dns_reloader.cc
 @@ -10,6 +10,7 @@
  // - there's not guarantee it exists at all. :(
diff --git a/chromium/patches/patch-net_dns_dns__util.cc b/chromium/patches/patch-net_dns_dns__util.cc
index a8a2d4db97..4fde9fc76f 100644
--- a/chromium/patches/patch-net_dns_dns__util.cc
+++ b/chromium/patches/patch-net_dns_dns__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_dns__util.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/dns_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/dns_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/dns_util.cc
 @@ -29,6 +29,8 @@
  #include "net/dns/public/util.h"
diff --git a/chromium/patches/patch-net_dns_host__resolver__proc.cc b/chromium/patches/patch-net_dns_host__resolver__proc.cc
index eb057d61e9..58b0fc147b 100644
--- a/chromium/patches/patch-net_dns_host__resolver__proc.cc
+++ b/chromium/patches/patch-net_dns_host__resolver__proc.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_host__resolver__proc.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/host_resolver_proc.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/host_resolver_proc.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/host_resolver_proc.cc
 @@ -15,10 +15,6 @@
  #include "net/base/net_errors.h"
diff --git a/chromium/patches/patch-net_dns_public_BUILD.gn b/chromium/patches/patch-net_dns_public_BUILD.gn
index 2c1bedc285..0d7280e675 100644
--- a/chromium/patches/patch-net_dns_public_BUILD.gn
+++ b/chromium/patches/patch-net_dns_public_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_public_BUILD.gn,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/public/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/public/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/public/BUILD.gn
 @@ -78,7 +78,7 @@ source_set("tests") {
      "doh_provider_entry_unittest.cc",
diff --git a/chromium/patches/patch-net_dns_public_resolv__reader.cc b/chromium/patches/patch-net_dns_public_resolv__reader.cc
index 99cdb36aff..d8e595dfd4 100644
--- a/chromium/patches/patch-net_dns_public_resolv__reader.cc
+++ b/chromium/patches/patch-net_dns_public_resolv__reader.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_public_resolv__reader.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/public/resolv_reader.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/public/resolv_reader.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/public/resolv_reader.cc
 @@ -40,7 +40,7 @@ std::optional<std::vector<IPEndPoint>> G
    if (!(res.options & RES_INIT))
diff --git a/chromium/patches/patch-net_dns_public_resolv__reader.h b/chromium/patches/patch-net_dns_public_resolv__reader.h
index cc66e7f6f0..063f2156d6 100644
--- a/chromium/patches/patch-net_dns_public_resolv__reader.h
+++ b/chromium/patches/patch-net_dns_public_resolv__reader.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_public_resolv__reader.h,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/public/resolv_reader.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/public/resolv_reader.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/public/resolv_reader.h
 @@ -5,6 +5,7 @@
  #ifndef NET_DNS_PUBLIC_RESOLV_READER_H_
diff --git a/chromium/patches/patch-net_dns_public_scoped__res__state.cc b/chromium/patches/patch-net_dns_public_scoped__res__state.cc
index b7efbd6d0d..e567db9692 100644
--- a/chromium/patches/patch-net_dns_public_scoped__res__state.cc
+++ b/chromium/patches/patch-net_dns_public_scoped__res__state.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_dns_public_scoped__res__state.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/public/scoped_res_state.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/public/scoped_res_state.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/public/scoped_res_state.cc
-@@ -28,7 +28,7 @@ ScopedResState::~ScopedResState() {
+@@ -33,7 +33,7 @@ ScopedResState::~ScopedResState() {
  #if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
  
    // Prefer res_ndestroy where available.
diff --git a/chromium/patches/patch-net_dns_public_scoped__res__state.h b/chromium/patches/patch-net_dns_public_scoped__res__state.h
index cd8901a591..b4ae860e89 100644
--- a/chromium/patches/patch-net_dns_public_scoped__res__state.h
+++ b/chromium/patches/patch-net_dns_public_scoped__res__state.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_dns_public_scoped__res__state.h,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/dns/public/scoped_res_state.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/dns/public/scoped_res_state.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/dns/public/scoped_res_state.h
 @@ -5,6 +5,7 @@
  #ifndef NET_DNS_PUBLIC_SCOPED_RES_STATE_H_
diff --git a/chromium/patches/patch-net_filter_zstd__source__stream.cc b/chromium/patches/patch-net_filter_zstd__source__stream.cc
index 359800ccc1..a5741659fa 100644
--- a/chromium/patches/patch-net_filter_zstd__source__stream.cc
+++ b/chromium/patches/patch-net_filter_zstd__source__stream.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_filter_zstd__source__stream.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/filter/zstd_source_stream.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/filter/zstd_source_stream.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/filter/zstd_source_stream.cc
 @@ -7,6 +7,7 @@
  #include <algorithm>
diff --git a/chromium/patches/patch-net_http_http__auth__gssapi__posix.cc b/chromium/patches/patch-net_http_http__auth__gssapi__posix.cc
index 5eb410904e..f8917a8979 100644
--- a/chromium/patches/patch-net_http_http__auth__gssapi__posix.cc
+++ b/chromium/patches/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,20 +1,19 @@
-$NetBSD: patch-net_http_http__auth__gssapi__posix.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/http/http_auth_gssapi_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/http/http_auth_gssapi_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/http/http_auth_gssapi_posix.cc
-@@ -375,8 +375,9 @@ base::NativeLibrary GSSAPISharedLibrary:
-     static const char* const kDefaultLibraryNames[] = {
+@@ -366,7 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary:
+   } else {
  #if BUILDFLAG(IS_APPLE)
-       "/System/Library/Frameworks/GSS.framework/GSS"
+     library_names.emplace_back("/System/Library/Frameworks/GSS.framework/GSS");
 -#elif BUILDFLAG(IS_OPENBSD)
--      "libgssapi.so"  // Heimdal - OpenBSD
 +#elif BUILDFLAG(IS_BSD)
-+      "libgssapi_krb5.so.2",  // MIT Kerberos - FreeBSD
-+      "libgssapi.so"          // Heimdal - OpenBSD, FreeBSD
++    // MIT Kerberos - FreeBSD
++    library_names.emplace_back("libgssapi_krb5.so.2");
+     // Heimdal - OpenBSD
+     library_names.emplace_back("libgssapi.so");
  #else
-       "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
-       "libgssapi.so.4",       // Heimdal - Suse10, MDK
diff --git a/chromium/patches/patch-net_http_http__auth__gssapi__posix.h b/chromium/patches/patch-net_http_http__auth__gssapi__posix.h
index a635f2fb04..601730ddff 100644
--- a/chromium/patches/patch-net_http_http__auth__gssapi__posix.h
+++ b/chromium/patches/patch-net_http_http__auth__gssapi__posix.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_http_http__auth__gssapi__posix.h,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/http/http_auth_gssapi_posix.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/http/http_auth_gssapi_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/http/http_auth_gssapi_posix.h
 @@ -21,6 +21,9 @@
  #if BUILDFLAG(IS_APPLE)
diff --git a/chromium/patches/patch-net_http_http__auth__handler__negotiate.cc b/chromium/patches/patch-net_http_http__auth__handler__negotiate.cc
index 769853008e..d80af1337f 100644
--- a/chromium/patches/patch-net_http_http__auth__handler__negotiate.cc
+++ b/chromium/patches/patch-net_http_http__auth__handler__negotiate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_http_http__auth__handler__negotiate.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/http/http_auth_handler_negotiate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/http/http_auth_handler_negotiate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/http/http_auth_handler_negotiate.cc
-@@ -120,7 +120,7 @@ int HttpAuthHandlerNegotiate::Factory::C
+@@ -119,7 +119,7 @@ int HttpAuthHandlerNegotiate::Factory::C
  #elif BUILDFLAG(IS_POSIX)
    if (is_unsupported_)
      return ERR_UNSUPPORTED_AUTH_SCHEME;
diff --git a/chromium/patches/patch-net_http_http__auth__preferences.cc b/chromium/patches/patch-net_http_http__auth__preferences.cc
index b57e22292f..b143e8de55 100644
--- a/chromium/patches/patch-net_http_http__auth__preferences.cc
+++ b/chromium/patches/patch-net_http_http__auth__preferences.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_http_http__auth__preferences.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/http/http_auth_preferences.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/http/http_auth_preferences.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/http/http_auth_preferences.cc
-@@ -39,7 +39,7 @@ std::string HttpAuthPreferences::AuthAnd
+@@ -38,7 +38,7 @@ std::string HttpAuthPreferences::AuthAnd
  }
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/chromium/patches/patch-net_http_http__auth__preferences.h b/chromium/patches/patch-net_http_http__auth__preferences.h
index 9be8bea516..575ef2ee0e 100644
--- a/chromium/patches/patch-net_http_http__auth__preferences.h
+++ b/chromium/patches/patch-net_http_http__auth__preferences.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_http_http__auth__preferences.h,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/http/http_auth_preferences.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/http/http_auth_preferences.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/http/http_auth_preferences.h
-@@ -50,7 +50,7 @@ class NET_EXPORT HttpAuthPreferences {
+@@ -49,7 +49,7 @@ class NET_EXPORT HttpAuthPreferences {
  #if BUILDFLAG(IS_ANDROID)
    virtual std::string AuthAndroidNegotiateAccountType() const;
  #endif
@@ -15,7 +15,7 @@ $NetBSD: patch-net_http_http__auth__preferences.h,v 1.1 2025/02/06 09:58:15 wiz
    virtual bool AllowGssapiLibraryLoad() const;
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
    virtual bool CanUseDefaultCredentials(
-@@ -86,7 +86,7 @@ class NET_EXPORT HttpAuthPreferences {
+@@ -85,7 +85,7 @@ class NET_EXPORT HttpAuthPreferences {
    }
  #endif  // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
  
@@ -24,7 +24,7 @@ $NetBSD: patch-net_http_http__auth__preferences.h,v 1.1 2025/02/06 09:58:15 wiz
    void set_allow_gssapi_library_load(bool allow_gssapi_library_load) {
      allow_gssapi_library_load_ = allow_gssapi_library_load;
    }
-@@ -137,7 +137,7 @@ class NET_EXPORT HttpAuthPreferences {
+@@ -136,7 +136,7 @@ class NET_EXPORT HttpAuthPreferences {
    std::string auth_android_negotiate_account_type_;
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/chromium/patches/patch-net_http_http__network__session.cc b/chromium/patches/patch-net_http_http__network__session.cc
index 6e33d60574..41c852b025 100644
--- a/chromium/patches/patch-net_http_http__network__session.cc
+++ b/chromium/patches/patch-net_http_http__network__session.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_http_http__network__session.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/http/http_network_session.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/http/http_network_session.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/http/http_network_session.cc
 @@ -20,7 +20,9 @@
  #include "build/build_config.h"
diff --git a/chromium/patches/patch-net_proxy__resolution_proxy__config__service.cc b/chromium/patches/patch-net_proxy__resolution_proxy__config__service.cc
index ece7efd9d0..27c617f716 100644
--- a/chromium/patches/patch-net_proxy__resolution_proxy__config__service.cc
+++ b/chromium/patches/patch-net_proxy__resolution_proxy__config__service.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_proxy__resolution_proxy__config__service.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/proxy_resolution/proxy_config_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/proxy_resolution/proxy_config_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/proxy_resolution/proxy_config_service.cc
 @@ -19,20 +19,20 @@
  #include "net/proxy_resolution/proxy_config_service_ios.h"
diff --git a/chromium/patches/patch-net_proxy__resolution_proxy__config__service__linux.cc b/chromium/patches/patch-net_proxy__resolution_proxy__config__service__linux.cc
index ae6af8d9c7..95f0e31f06 100644
--- a/chromium/patches/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/chromium/patches/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_proxy__resolution_proxy__config__service__linux.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/proxy_resolution/proxy_config_service_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/proxy_resolution/proxy_config_service_linux.cc
 @@ -11,7 +11,9 @@
  
@@ -24,7 +24,7 @@ $NetBSD: patch-net_proxy__resolution_proxy__config__service__linux.cc,v 1.1 2025
  // Converts |value| from a decimal string to an int. If there was a failure
  // parsing, returns |default_value|.
  int StringToIntOrDefault(std::string_view value, int default_value) {
-@@ -1038,6 +1041,7 @@ class SettingGetterImplKDE : public Prox
+@@ -1048,6 +1051,7 @@ class SettingGetterImplKDE : public Prox
    // events on.
    scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
  };
@@ -32,7 +32,7 @@ $NetBSD: patch-net_proxy__resolution_proxy__config__service__linux.cc,v 1.1 2025
  
  }  // namespace
  
-@@ -1256,9 +1260,11 @@ ProxyConfigServiceLinux::Delegate::Deleg
+@@ -1266,9 +1270,11 @@ ProxyConfigServiceLinux::Delegate::Deleg
      case base::nix::DESKTOP_ENVIRONMENT_KDE4:
      case base::nix::DESKTOP_ENVIRONMENT_KDE5:
      case base::nix::DESKTOP_ENVIRONMENT_KDE6:
diff --git a/chromium/patches/patch-net_quic_quic__network__transaction__unittest.cc b/chromium/patches/patch-net_quic_quic__network__transaction__unittest.cc
new file mode 100644
index 0000000000..483d7bd665
--- /dev/null
+++ b/chromium/patches/patch-net_quic_quic__network__transaction__unittest.cc
@@ -0,0 +1,34 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- net/quic/quic_network_transaction_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ net/quic/quic_network_transaction_unittest.cc
+@@ -5202,10 +5202,10 @@ TEST_P(QuicNetworkTransactionTest, RstSt
+ 
+ TEST_P(QuicNetworkTransactionTest, BrokenAlternateProtocol) {
+   // Alternate-protocol job
+-  std::unique_ptr<quic::QuicEncryptedPacket> close(
++  std::unique_ptr<quic::QuicEncryptedPacket> test_close(
+       ConstructServerConnectionClosePacket(1));
+   MockRead quic_reads[] = {
+-      MockRead(ASYNC, close->data(), close->length()),
++      MockRead(ASYNC, test_close->data(), test_close->length()),
+       MockRead(ASYNC, ERR_IO_PENDING),  // No more data to read
+       MockRead(ASYNC, OK),              // EOF
+   };
+@@ -5248,10 +5248,10 @@ TEST_P(QuicNetworkTransactionTest,
+   http_server_properties_ = std::make_unique<HttpServerProperties>();
+ 
+   // Alternate-protocol job
+-  std::unique_ptr<quic::QuicEncryptedPacket> close(
++  std::unique_ptr<quic::QuicEncryptedPacket> test_close(
+       ConstructServerConnectionClosePacket(1));
+   MockRead quic_reads[] = {
+-      MockRead(ASYNC, close->data(), close->length()),
++      MockRead(ASYNC, test_close->data(), test_close->length()),
+       MockRead(ASYNC, ERR_IO_PENDING),  // No more data to read
+       MockRead(ASYNC, OK),              // EOF
+   };
diff --git a/chromium/patches/patch-net_socket_socket__posix.cc b/chromium/patches/patch-net_socket_socket__posix.cc
deleted file mode 100644
index b46c6009c5..0000000000
--- a/chromium/patches/patch-net_socket_socket__posix.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-net_socket_socket__posix.cc,v 1.1 2025/02/06 09:58:15 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- net/socket/socket_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ net/socket/socket_posix.cc
-@@ -516,7 +516,7 @@ void SocketPosix::ReadCompleted() {
- }
- 
- int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   // Disable SIGPIPE for this write. Although Chromium globally disables
-   // SIGPIPE, the net stack may be used in other consumers which do not do
-   // this. MSG_NOSIGNAL is a Linux-only API. On OS X, this is a setsockopt on
diff --git a/chromium/patches/patch-net_socket_socks5__client__socket.cc b/chromium/patches/patch-net_socket_socks5__client__socket.cc
index cec7b6132e..fe1d488a22 100644
--- a/chromium/patches/patch-net_socket_socks5__client__socket.cc
+++ b/chromium/patches/patch-net_socket_socks5__client__socket.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_socket_socks5__client__socket.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/socket/socks5_client_socket.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/socket/socks5_client_socket.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/socket/socks5_client_socket.cc
-@@ -24,6 +24,9 @@
+@@ -23,6 +23,9 @@
  #include "net/log/net_log_event_type.h"
  #include "net/traffic_annotation/network_traffic_annotation.h"
  
diff --git a/chromium/patches/patch-net_socket_tcp__socket__posix.cc b/chromium/patches/patch-net_socket_tcp__socket__posix.cc
index b2b896dfa7..c241d4b48c 100644
--- a/chromium/patches/patch-net_socket_tcp__socket__posix.cc
+++ b/chromium/patches/patch-net_socket_tcp__socket__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_socket_tcp__socket__posix.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/socket/tcp_socket_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/socket/tcp_socket_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/socket/tcp_socket_posix.cc
 @@ -98,6 +98,17 @@ bool SetTCPKeepAlive(int fd, bool enable
        PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
diff --git a/chromium/patches/patch-net_socket_udp__socket__posix.cc b/chromium/patches/patch-net_socket_udp__socket__posix.cc
index 0711e325b8..76d1feb5f8 100644
--- a/chromium/patches/patch-net_socket_udp__socket__posix.cc
+++ b/chromium/patches/patch-net_socket_udp__socket__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_socket_udp__socket__posix.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/socket/udp_socket_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/socket/udp_socket_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/socket/udp_socket_posix.cc
 @@ -78,6 +78,32 @@ constexpr int kBindRetries = 10;
  constexpr int kPortStart = 1024;
@@ -39,7 +39,7 @@ $NetBSD: patch-net_socket_udp__socket__posix.cc,v 1.1 2025/02/06 09:58:16 wiz Ex
  int GetSocketFDHash(int fd) {
    return fd ^ 1595649551;
  }
-@@ -522,12 +548,17 @@ int UDPSocketPosix::SetRecvTos() {
+@@ -527,12 +553,17 @@ int UDPSocketPosix::SetRecvTos() {
  #endif  // BUILDFLAG(IS_APPLE)
    }
  
@@ -58,7 +58,7 @@ $NetBSD: patch-net_socket_udp__socket__posix.cc,v 1.1 2025/02/06 09:58:16 wiz Ex
    if (confirm) {
      sendto_flags_ |= MSG_CONFIRM;
    } else {
-@@ -548,7 +579,7 @@ int UDPSocketPosix::SetBroadcast(bool br
+@@ -553,7 +584,7 @@ int UDPSocketPosix::SetBroadcast(bool br
    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
    int value = broadcast ? 1 : 0;
    int rv;
@@ -67,7 +67,7 @@ $NetBSD: patch-net_socket_udp__socket__posix.cc,v 1.1 2025/02/06 09:58:16 wiz Ex
    // SO_REUSEPORT on OSX permits multiple processes to each receive
    // UDP multicast or broadcast datagrams destined for the bound
    // port.
-@@ -849,9 +880,17 @@ int UDPSocketPosix::SetMulticastOptions(
+@@ -854,9 +885,17 @@ int UDPSocketPosix::SetMulticastOptions(
    if (multicast_interface_ != 0) {
      switch (addr_family_) {
        case AF_INET: {
@@ -85,8 +85,8 @@ $NetBSD: patch-net_socket_udp__socket__posix.cc,v 1.1 2025/02/06 09:58:16 wiz Ex
          int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
                              reinterpret_cast<const char*>(&mreq), sizeof(mreq));
          if (rv)
-@@ -886,7 +925,7 @@ int UDPSocketPosix::DoBind(const IPEndPo
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -891,7 +930,7 @@ int UDPSocketPosix::DoBind(const IPEndPo
+ #if BUILDFLAG(IS_CHROMEOS)
    if (last_error == EINVAL)
      return ERR_ADDRESS_IN_USE;
 -#elif BUILDFLAG(IS_APPLE)
@@ -94,7 +94,7 @@ $NetBSD: patch-net_socket_udp__socket__posix.cc,v 1.1 2025/02/06 09:58:16 wiz Ex
    if (last_error == EADDRNOTAVAIL)
      return ERR_ADDRESS_IN_USE;
  #endif
-@@ -914,9 +953,17 @@ int UDPSocketPosix::JoinGroup(const IPAd
+@@ -919,9 +958,17 @@ int UDPSocketPosix::JoinGroup(const IPAd
      case IPAddress::kIPv4AddressSize: {
        if (addr_family_ != AF_INET)
          return ERR_ADDRESS_INVALID;
@@ -112,7 +112,7 @@ $NetBSD: patch-net_socket_udp__socket__posix.cc,v 1.1 2025/02/06 09:58:16 wiz Ex
        memcpy(&mreq.imr_multiaddr, group_address.bytes().data(),
               IPAddress::kIPv4AddressSize);
        int rv = setsockopt(socket_, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-@@ -954,9 +1001,17 @@ int UDPSocketPosix::LeaveGroup(const IPA
+@@ -958,9 +1005,17 @@ int UDPSocketPosix::LeaveGroup(const IPA
      case IPAddress::kIPv4AddressSize: {
        if (addr_family_ != AF_INET)
          return ERR_ADDRESS_INVALID;
diff --git a/chromium/patches/patch-net_socket_udp__socket__unittest.cc b/chromium/patches/patch-net_socket_udp__socket__unittest.cc
index a012c63bc9..c780978637 100644
--- a/chromium/patches/patch-net_socket_udp__socket__unittest.cc
+++ b/chromium/patches/patch-net_socket_udp__socket__unittest.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_socket_udp__socket__unittest.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/socket/udp_socket_unittest.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/socket/udp_socket_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/socket/udp_socket_unittest.cc
-@@ -372,7 +372,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
+@@ -371,7 +371,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
    EXPECT_EQ(second_packet, received);
  }
  
@@ -15,7 +15,7 @@ $NetBSD: patch-net_socket_udp__socket__unittest.cc,v 1.1 2025/02/06 09:58:16 wiz
  // - MacOS: requires root permissions on OSX 10.7+.
  // - Android: devices attached to testbots don't have default network, so
  // broadcasting to 255.255.255.255 returns error -109 (Address not reachable).
-@@ -683,7 +683,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFrag
+@@ -682,7 +682,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFrag
      EXPECT_THAT(rv, IsOk());
  
      rv = client.SetDoNotFragment();
@@ -24,7 +24,7 @@ $NetBSD: patch-net_socket_udp__socket__unittest.cc,v 1.1 2025/02/06 09:58:16 wiz
      // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia.
      EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
  #else
-@@ -705,7 +705,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFrag
+@@ -704,7 +704,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFrag
      EXPECT_THAT(rv, IsOk());
  
      rv = server.SetDoNotFragment();
@@ -33,7 +33,7 @@ $NetBSD: patch-net_socket_udp__socket__unittest.cc,v 1.1 2025/02/06 09:58:16 wiz
      // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia.
      EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
  #else
-@@ -764,7 +764,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup
+@@ -770,7 +770,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup
  
  // TODO(crbug.com/40620614): failing on device on iOS 12.2.
  // TODO(crbug.com/40189274): flaky on Mac 11.
@@ -42,12 +42,12 @@ $NetBSD: patch-net_socket_udp__socket__unittest.cc,v 1.1 2025/02/06 09:58:16 wiz
  #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress
  #else
  #define MAYBE_SharedMulticastAddress SharedMulticastAddress
-@@ -818,7 +818,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMultic
+@@ -824,7 +824,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMultic
                                  NetLogSource());
    ASSERT_THAT(client_socket.Connect(send_address), IsOk());
  
--#if !BUILDFLAG(IS_CHROMEOS_ASH)
-+#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
+-#if !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
    // Send a message via the multicast group. That message is expected be be
    // received by both receving sockets.
    //
diff --git a/chromium/patches/patch-net_third__party_quiche_BUILD.gn b/chromium/patches/patch-net_third__party_quiche_BUILD.gn
index ddc617d9b8..0361287f90 100644
--- a/chromium/patches/patch-net_third__party_quiche_BUILD.gn
+++ b/chromium/patches/patch-net_third__party_quiche_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_third__party_quiche_BUILD.gn,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/third_party/quiche/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/third_party/quiche/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/third_party/quiche/BUILD.gn
-@@ -29,7 +29,7 @@ import("//net/third_party/quiche/src/bui
+@@ -28,7 +28,7 @@ import("//net/third_party/quiche/src/bui
  import("//testing/libfuzzer/fuzzer_test.gni")
  import("//third_party/protobuf/proto_library.gni")
  
diff --git a/chromium/patches/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/chromium/patches/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
index 09748d583d..9de7e8636e 100644
--- a/chromium/patches/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/chromium/patches/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-net_tools_cert__verify__tool_cert__verify__tool.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/tools/cert_verify_tool/cert_verify_tool.cc
 @@ -35,7 +35,7 @@
  #include "third_party/boringssl/src/pki/trust_store.h"
@@ -24,7 +24,7 @@ $NetBSD: patch-net_tools_cert__verify__tool_cert__verify__tool.cc,v 1.1 2025/02/
    // On Linux, use a fixed ProxyConfigService, since the default one
    // depends on glib.
    //
-@@ -580,7 +580,7 @@ int main(int argc, char** argv) {
+@@ -582,7 +582,7 @@ int main(int argc, char** argv) {
    std::string impls_str = command_line.GetSwitchValueASCII("impls");
    if (impls_str.empty()) {
      // Default value.
diff --git a/chromium/patches/patch-net_tools_net__watcher_net__watcher.cc b/chromium/patches/patch-net_tools_net__watcher_net__watcher.cc
index 158690bb0d..5a4175d8a1 100644
--- a/chromium/patches/patch-net_tools_net__watcher_net__watcher.cc
+++ b/chromium/patches/patch-net_tools_net__watcher_net__watcher.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_tools_net__watcher_net__watcher.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/tools/net_watcher/net_watcher.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/tools/net_watcher/net_watcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/tools/net_watcher/net_watcher.cc
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
  #include "net/proxy_resolution/proxy_config_service.h"
  #include "net/proxy_resolution/proxy_config_with_annotation.h"
  
@@ -15,16 +15,25 @@ $NetBSD: patch-net_tools_net__watcher_net__watcher.cc,v 1.1 2025/02/06 09:58:16
  #include "net/base/network_change_notifier_linux.h"
  #endif
  
-@@ -44,7 +44,7 @@ namespace {
+@@ -41,7 +41,7 @@
+ 
+ namespace {
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Flag to specifies which network interfaces to ignore. Interfaces should
  // follow as a comma seperated list.
  const char kIgnoreNetifFlag[] = "ignore-netif";
-@@ -163,7 +163,7 @@ int main(int argc, char* argv[]) {
+@@ -143,7 +143,7 @@ class NetWatcher :
+ }  // namespace
+ 
+ int main(int argc, char* argv[]) {
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   base::apple::ScopedNSAutoreleasePool pool;
+ #endif
+   base::AtExitManager exit_manager;
+@@ -160,7 +160,7 @@ int main(int argc, char* argv[]) {
  
    NetWatcher net_watcher;
  
diff --git a/chromium/patches/patch-net_traffic__annotation_network__traffic__annotation.h b/chromium/patches/patch-net_traffic__annotation_network__traffic__annotation.h
index 6480524e92..a3b1c84fd4 100644
--- a/chromium/patches/patch-net_traffic__annotation_network__traffic__annotation.h
+++ b/chromium/patches/patch-net_traffic__annotation_network__traffic__annotation.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_traffic__annotation_network__traffic__annotation.h,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/traffic_annotation/network_traffic_annotation.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/traffic_annotation/network_traffic_annotation.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/traffic_annotation/network_traffic_annotation.h
-@@ -378,7 +378,7 @@ struct MutablePartialNetworkTrafficAnnot
+@@ -374,7 +374,7 @@ struct MutablePartialNetworkTrafficAnnot
  }  // namespace net
  
  // Placeholder for unannotated usages.
@@ -15,12 +15,12 @@ $NetBSD: patch-net_traffic__annotation_network__traffic__annotation.h,v 1.1 2025
  #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \
    net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.")
  #endif
-@@ -392,7 +392,7 @@ struct MutablePartialNetworkTrafficAnnot
- // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if !BUILDFLAG(IS_WIN) && \
--    !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+@@ -385,7 +385,7 @@ struct MutablePartialNetworkTrafficAnnot
+ //
+ // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or
+ // TRAFFIC_ANNOTATION_FOR_TESTS.
+-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
  
  #define NO_TRAFFIC_ANNOTATION_YET \
    net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.")
diff --git a/chromium/patches/patch-net_url__request_url__request__context.cc b/chromium/patches/patch-net_url__request_url__request__context.cc
index 1c0afb64f6..a0b7022b22 100644
--- a/chromium/patches/patch-net_url__request_url__request__context.cc
+++ b/chromium/patches/patch-net_url__request_url__request__context.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-net_url__request_url__request__context.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/url_request/url_request_context.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/url_request/url_request_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/url_request/url_request_context.cc
-@@ -121,7 +121,7 @@ const HttpNetworkSessionContext* URLRequ
- // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if !BUILDFLAG(IS_WIN) && \
--    !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+@@ -119,7 +119,7 @@ const HttpNetworkSessionContext* URLRequ
+   return &network_session->context();
+ }
+ 
+-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
  std::unique_ptr<URLRequest> URLRequestContext::CreateRequest(
      const GURL& url,
      RequestPriority priority,
diff --git a/chromium/patches/patch-net_url__request_url__request__context.h b/chromium/patches/patch-net_url__request_url__request__context.h
index 18d80fbc3d..c136ec3f2f 100644
--- a/chromium/patches/patch-net_url__request_url__request__context.h
+++ b/chromium/patches/patch-net_url__request_url__request__context.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-net_url__request_url__request__context.h,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/url_request/url_request_context.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/url_request/url_request_context.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/url_request/url_request_context.h
-@@ -91,7 +91,7 @@ class NET_EXPORT URLRequestContext final
- // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if !BUILDFLAG(IS_WIN) && \
--    !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+@@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext final
+   // session.
+   const HttpNetworkSessionContext* GetNetworkSessionContext() const;
+ 
+-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
    // This function should not be used in Chromium, please use the version with
    // NetworkTrafficAnnotationTag in the future.
    //
diff --git a/chromium/patches/patch-net_url__request_url__request__context__builder.cc b/chromium/patches/patch-net_url__request_url__request__context__builder.cc
index 167764c2d7..c0e65943ef 100644
--- a/chromium/patches/patch-net_url__request_url__request__context__builder.cc
+++ b/chromium/patches/patch-net_url__request_url__request__context__builder.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-net_url__request_url__request__context__builder.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- net/url_request/url_request_context_builder.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- net/url_request/url_request_context_builder.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ net/url_request/url_request_context_builder.cc
-@@ -446,7 +446,7 @@ std::unique_ptr<URLRequestContext> URLRe
+@@ -441,7 +441,7 @@ std::unique_ptr<URLRequestContext> URLRe
    }
  
    if (!proxy_resolution_service_) {
diff --git a/chromium/patches/patch-net_websockets_websocket__basic__stream__adapters__test.cc b/chromium/patches/patch-net_websockets_websocket__basic__stream__adapters__test.cc
new file mode 100644
index 0000000000..9a76322dfc
--- /dev/null
+++ b/chromium/patches/patch-net_websockets_websocket__basic__stream__adapters__test.cc
@@ -0,0 +1,21 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- net/websockets/websocket_basic_stream_adapters_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ net/websockets/websocket_basic_stream_adapters_test.cc
+@@ -1098,10 +1098,10 @@ TEST_F(WebSocketSpdyStreamAdapterTest,
+        OnCloseOkShouldBeTranslatedToConnectionClose) {
+   spdy::SpdySerializedFrame response_headers(
+       spdy_util_.ConstructSpdyResponseHeaders(1, ResponseHeaders(), false));
+-  spdy::SpdySerializedFrame close(
++  spdy::SpdySerializedFrame test_close(
+       spdy_util_.ConstructSpdyRstStream(1, spdy::ERROR_CODE_NO_ERROR));
+   MockRead reads[] = {CreateMockRead(response_headers, 1),
+-                      CreateMockRead(close, 2), MockRead(ASYNC, 0, 3)};
++                      CreateMockRead(test_close, 2), MockRead(ASYNC, 0, 3)};
+   spdy::SpdySerializedFrame request_headers(spdy_util_.ConstructSpdyHeaders(
+       1, RequestHeaders(), DEFAULT_PRIORITY, false));
+   MockWrite writes[] = {CreateMockWrite(request_headers, 0)};
diff --git a/chromium/patches/patch-pdf_pdfium_pdfium__engine.cc b/chromium/patches/patch-pdf_pdfium_pdfium__engine.cc
index f09aa0d26a..9a0cefe166 100644
--- a/chromium/patches/patch-pdf_pdfium_pdfium__engine.cc
+++ b/chromium/patches/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-pdf_pdfium_pdfium__engine.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- pdf/pdfium/pdfium_engine.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- pdf/pdfium/pdfium_engine.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ pdf/pdfium/pdfium_engine.cc
-@@ -99,7 +99,7 @@
+@@ -111,7 +111,7 @@
  #include "ui/accessibility/ax_features.mojom-features.h"
  #endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-pdf_pdfium_pdfium__engine.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
  #include "pdf/pdfium/pdfium_font_linux.h"
  #endif
  
-@@ -528,7 +528,7 @@ void InitializeSDK(bool enable_v8,
+@@ -567,7 +567,7 @@ void InitializeSDK(bool enable_v8,
  
    FPDF_InitLibraryWithConfig(&config);
  
diff --git a/chromium/patches/patch-ppapi_tests_test__utils.h b/chromium/patches/patch-ppapi_tests_test__utils.h
index a9a5c560b9..6f38973191 100644
--- a/chromium/patches/patch-ppapi_tests_test__utils.h
+++ b/chromium/patches/patch-ppapi_tests_test__utils.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ppapi_tests_test__utils.h,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ppapi/tests/test_utils.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ppapi/tests/test_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ppapi/tests/test_utils.h
 @@ -314,6 +314,8 @@ do { \
  #define PPAPI_OS_FREEBSD 1
diff --git a/chromium/patches/patch-printing_backend_cups__ipp__helper.cc b/chromium/patches/patch-printing_backend_cups__ipp__helper.cc
index 6c2d2d982a..2500612822 100644
--- a/chromium/patches/patch-printing_backend_cups__ipp__helper.cc
+++ b/chromium/patches/patch-printing_backend_cups__ipp__helper.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-printing_backend_cups__ipp__helper.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/backend/cups_ipp_helper.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/backend/cups_ipp_helper.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/backend/cups_ipp_helper.cc
-@@ -202,7 +202,7 @@ void ExtractResolutions(const CupsOption
+@@ -201,7 +201,7 @@ void ExtractResolutions(const CupsOption
    // Provide a default DPI if no valid DPI is found.
  #if BUILDFLAG(IS_MAC)
    constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi);
diff --git a/chromium/patches/patch-printing_backend_print__backend__cups.cc b/chromium/patches/patch-printing_backend_print__backend__cups.cc
index 14a52544cc..3adce42159 100644
--- a/chromium/patches/patch-printing_backend_print__backend__cups.cc
+++ b/chromium/patches/patch-printing_backend_print__backend__cups.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-printing_backend_print__backend__cups.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/backend/print_backend_cups.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/backend/print_backend_cups.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/backend/print_backend_cups.cc
-@@ -33,7 +33,7 @@
+@@ -29,7 +29,7 @@
  #include "printing/mojom/print.mojom.h"
  #include "url/gurl.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-printing_backend_print__backend__cups.cc,v 1.1 2025/02/06 09:58:1
  #include "base/feature_list.h"
  #include "printing/backend/cups_connection.h"
  #include "printing/backend/print_backend_cups_ipp.h"
-@@ -63,7 +63,7 @@ int CaptureCupsDestCallback(void* data, 
+@@ -59,7 +59,7 @@ int CaptureCupsDestCallback(void* data, 
    return 1;  // Keep going.
  }
  
@@ -24,7 +24,7 @@ $NetBSD: patch-printing_backend_print__backend__cups.cc,v 1.1 2025/02/06 09:58:1
  // This may be removed when Amazon Linux 2 reaches EOL (30 Jun 2025).
  bool AreNewerCupsFunctionsAvailable() {
    return cupsFindDestDefault && cupsFindDestSupported && cupsUserAgent &&
-@@ -292,7 +292,7 @@ bool PrintBackendCUPS::IsValidPrinter(co
+@@ -286,7 +286,7 @@ bool PrintBackendCUPS::IsValidPrinter(co
  #if !BUILDFLAG(IS_CHROMEOS)
  scoped_refptr<PrintBackend> PrintBackend::CreateInstanceImpl(
      const std::string& locale) {
diff --git a/chromium/patches/patch-printing_mojom_printing__context__mojom__traits.cc b/chromium/patches/patch-printing_mojom_printing__context__mojom__traits.cc
index f0006d9727..dca341abfd 100644
--- a/chromium/patches/patch-printing_mojom_printing__context__mojom__traits.cc
+++ b/chromium/patches/patch-printing_mojom_printing__context__mojom__traits.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-printing_mojom_printing__context__mojom__traits.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/mojom/printing_context_mojom_traits.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/mojom/printing_context_mojom_traits.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/mojom/printing_context_mojom_traits.cc
 @@ -19,7 +19,7 @@
  #include "base/numerics/safe_conversions.h"
diff --git a/chromium/patches/patch-printing_mojom_printing__context__mojom__traits.h b/chromium/patches/patch-printing_mojom_printing__context__mojom__traits.h
index b9f9852e58..d530ca4784 100644
--- a/chromium/patches/patch-printing_mojom_printing__context__mojom__traits.h
+++ b/chromium/patches/patch-printing_mojom_printing__context__mojom__traits.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-printing_mojom_printing__context__mojom__traits.h,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/mojom/printing_context_mojom_traits.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/mojom/printing_context_mojom_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/mojom/printing_context_mojom_traits.h
 @@ -166,7 +166,7 @@ struct StructTraits<printing::mojom::Pri
      return s.pages_per_sheet();
diff --git a/chromium/patches/patch-printing_mojom_printing__context__mojom__traits__unittest.cc b/chromium/patches/patch-printing_mojom_printing__context__mojom__traits__unittest.cc
new file mode 100644
index 0000000000..6fa34e6318
--- /dev/null
+++ b/chromium/patches/patch-printing_mojom_printing__context__mojom__traits__unittest.cc
@@ -0,0 +1,71 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- printing/mojom/printing_context_mojom_traits_unittest.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ printing/mojom/printing_context_mojom_traits_unittest.cc
+@@ -79,7 +79,7 @@ base::Value::Dict GenerateSampleSystemPr
+     data.Set(kMacSystemPrintDialogDataDestinationLocation, "/foo/bar.pdf");
+   }
+ 
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   data.Set(kLinuxSystemPrintDialogDataPrinter, "printer-name");
+   data.Set(kLinuxSystemPrintDialogDataPrintSettings, "print-settings-foo");
+   data.Set(kLinuxSystemPrintDialogDataPageSetup, "page-setup-bar");
+@@ -114,7 +114,7 @@ const PageMargins kPrintSettingsCustomMa
+                                                       /*top=*/30,
+                                                       /*bottom=*/35);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ PrintSettings::AdvancedSettings GenerateSampleAdvancedSettings() {
+   PrintSettings::AdvancedSettings advanced_settings;
+   advanced_settings.emplace("advanced-setting-A", base::Value("setting-A"));
+@@ -207,7 +207,7 @@ PrintSettings GenerateSamplePrintSetting
+   settings.set_device_name(kPrintSettingsDeviceName);
+   settings.set_requested_media(kPrintSettingsRequestedMedia);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   PrintSettings::AdvancedSettings& advanced_settings =
+       settings.advanced_settings();
+   for (const auto& item : kPrintSettingsAdvancedSettings)
+@@ -545,7 +545,7 @@ TEST(PrintingContextMojomTraitsTest,
+ 
+   EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet1);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings);
+ #endif
+ 
+@@ -598,7 +598,7 @@ TEST(PrintingContextMojomTraitsTest,
+                                kPrintSettingsCustomMarginsInPoints));
+   EXPECT_EQ(output.pages_per_sheet(), kPrintSettingsPagesPerSheet2);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   EXPECT_EQ(output.advanced_settings(), kPrintSettingsAdvancedSettings);
+ #endif
+ 
+@@ -637,7 +637,7 @@ TEST(PrintingContextMojomTraitsTest,
+   EXPECT_EQ(output.page_setup_device_units(), kInput.page_setup_device_units());
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ TEST(PrintingContextMojomTraitsTest,
+      TestSerializeAndDeserializePrintSettingsEmptyAdvancedSettings) {
+   PrintSettings input = GenerateSamplePrintSettingsDefaultMargins();
+@@ -835,7 +835,7 @@ TEST(
+ }
+ #endif  // BUILDFLAG(IS_MAC)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ TEST(
+     PrintingContextMojomTraitsTest,
+     TestSerializeAndDeserializePrintSettingsSystemPrintDialogPrinterInvalidDataType) {
diff --git a/chromium/patches/patch-printing_print__settings.cc b/chromium/patches/patch-printing_print__settings.cc
index b21a05eefc..83cb3c3ba7 100644
--- a/chromium/patches/patch-printing_print__settings.cc
+++ b/chromium/patches/patch-printing_print__settings.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-printing_print__settings.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/print_settings.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/print_settings.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/print_settings.cc
 @@ -319,7 +319,7 @@ PrintSettings& PrintSettings::operator=(
  #endif
diff --git a/chromium/patches/patch-printing_print__settings.h b/chromium/patches/patch-printing_print__settings.h
index d070412325..27a8cddae1 100644
--- a/chromium/patches/patch-printing_print__settings.h
+++ b/chromium/patches/patch-printing_print__settings.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-printing_print__settings.h,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/print_settings.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/print_settings.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/print_settings.h
 @@ -25,7 +25,7 @@
  #include "base/values.h"
diff --git a/chromium/patches/patch-printing_print__settings__conversion.cc b/chromium/patches/patch-printing_print__settings__conversion.cc
index 811d654eec..37e79e8ebf 100644
--- a/chromium/patches/patch-printing_print__settings__conversion.cc
+++ b/chromium/patches/patch-printing_print__settings__conversion.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-printing_print__settings__conversion.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/print_settings_conversion.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/print_settings_conversion.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/print_settings_conversion.cc
 @@ -285,7 +285,7 @@ std::unique_ptr<PrintSettings> PrintSett
      settings->set_is_modifiable(is_modifiable.value());
diff --git a/chromium/patches/patch-printing_printing__context__linux.cc b/chromium/patches/patch-printing_printing__context__linux.cc
index b19f1314f4..c6a7102885 100644
--- a/chromium/patches/patch-printing_printing__context__linux.cc
+++ b/chromium/patches/patch-printing_printing__context__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-printing_printing__context__linux.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/printing_context_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/printing_context_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/printing_context_linux.cc
 @@ -23,7 +23,7 @@
  #endif
diff --git a/chromium/patches/patch-printing_printing__features.cc b/chromium/patches/patch-printing_printing__features.cc
index ee3cdf3b26..485448fc35 100644
--- a/chromium/patches/patch-printing_printing__features.cc
+++ b/chromium/patches/patch-printing_printing__features.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-printing_printing__features.cc,v 1.1 2025/02/06 09:58:16 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/printing_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/printing_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/printing_features.cc
-@@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr,
+@@ -26,12 +26,12 @@ BASE_FEATURE(kApiPrintingMarginsAndScale
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -21,3 +21,12 @@ $NetBSD: patch-printing_printing__features.cc,v 1.1 2025/02/06 09:58:16 wiz Exp
               base::FEATURE_DISABLED_BY_DEFAULT
  #else
               base::FEATURE_ENABLED_BY_DEFAULT
+@@ -81,7 +81,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf,
+ // out-of-process.
+ BASE_FEATURE(kEnableOopPrintDrivers,
+              "EnableOopPrintDrivers",
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium/patches/patch-printing_printing__features.h b/chromium/patches/patch-printing_printing__features.h
index 37732781ab..787a1e04d1 100644
--- a/chromium/patches/patch-printing_printing__features.h
+++ b/chromium/patches/patch-printing_printing__features.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-printing_printing__features.h,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/printing_features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/printing_features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/printing_features.h
-@@ -22,7 +22,7 @@ COMPONENT_EXPORT(PRINTING_BASE)
- BASE_DECLARE_FEATURE(kAddPrinterViaPrintscanmgr);
+@@ -24,7 +24,7 @@ COMPONENT_EXPORT(PRINTING_BASE)
+ BASE_DECLARE_FEATURE(kApiPrintingMarginsAndScale);
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
diff --git a/chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc b/chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
index d12ca12d7d..2c6c7cf1c4 100644
--- a/chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
+++ b/chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-printing_sandbox_print__backend__sandbox__hook__linux.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/sandbox/print_backend_sandbox_hook_linux.cc
 @@ -10,20 +10,27 @@
  #include "base/path_service.h"
diff --git a/chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.h b/chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
index 7c5bbcb377..9b0a0505f3 100644
--- a/chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
+++ b/chromium/patches/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-printing_sandbox_print__backend__sandbox__hook__linux.h,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- printing/sandbox/print_backend_sandbox_hook_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- printing/sandbox/print_backend_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ printing/sandbox/print_backend_sandbox_hook_linux.h
 @@ -5,8 +5,13 @@
  #ifndef PRINTING_SANDBOX_PRINT_BACKEND_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium/patches/patch-remoting_base_chromoting__event.cc b/chromium/patches/patch-remoting_base_chromoting__event.cc
index 45303847ea..f351b87df4 100644
--- a/chromium/patches/patch-remoting_base_chromoting__event.cc
+++ b/chromium/patches/patch-remoting_base_chromoting__event.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-remoting_base_chromoting__event.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/base/chromoting_event.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/base/chromoting_event.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/base/chromoting_event.cc
-@@ -192,7 +192,7 @@ void ChromotingEvent::AddSystemInfo() {
+@@ -191,7 +191,7 @@ void ChromotingEvent::AddSystemInfo() {
    SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture());
    SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion());
    SetString(kWebAppVersionKey, STRINGIZE(VERSION));
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    Os os = Os::CHROMOTING_LINUX;
- #elif BUILDFLAG(IS_CHROMEOS_ASH)
+ #elif BUILDFLAG(IS_CHROMEOS)
    Os os = Os::CHROMOTING_CHROMEOS;
diff --git a/chromium/patches/patch-remoting_base_host__settings.cc b/chromium/patches/patch-remoting_base_host__settings.cc
index 6cc647646c..b7b5e5c2ec 100644
--- a/chromium/patches/patch-remoting_base_host__settings.cc
+++ b/chromium/patches/patch-remoting_base_host__settings.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_base_host__settings.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/base/host_settings.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/base/host_settings.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/base/host_settings.cc
 @@ -7,7 +7,7 @@
  #include "base/no_destructor.h"
diff --git a/chromium/patches/patch-remoting_client_display_sys__opengl.h b/chromium/patches/patch-remoting_client_display_sys__opengl.h
deleted file mode 100644
index 6cb0dfc24a..0000000000
--- a/chromium/patches/patch-remoting_client_display_sys__opengl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-remoting_client_display_sys__opengl.h,v 1.1 2025/02/06 09:58:17 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/client/display/sys_opengl.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ remoting/client/display/sys_opengl.h
-@@ -9,7 +9,7 @@
- 
- #if BUILDFLAG(IS_IOS)
- #include <OpenGLES/ES3/gl.h>
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #define GL_GLEXT_PROTOTYPES
- #include <GL/gl.h>
- #include <GL/glext.h>
diff --git a/chromium/patches/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/chromium/patches/patch-remoting_codec_webrtc__video__encoder__vpx.cc
index 250087e9ca..8dc5297310 100644
--- a/chromium/patches/patch-remoting_codec_webrtc__video__encoder__vpx.cc
+++ b/chromium/patches/patch-remoting_codec_webrtc__video__encoder__vpx.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-remoting_codec_webrtc__video__encoder__vpx.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/codec/webrtc_video_encoder_vpx.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/codec/webrtc_video_encoder_vpx.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/codec/webrtc_video_encoder_vpx.cc
-@@ -93,7 +93,7 @@ void SetVp8CodecParameters(vpx_codec_enc
+@@ -92,7 +92,7 @@ void SetVp8CodecParameters(vpx_codec_enc
                             const webrtc::DesktopSize& size) {
    SetCommonCodecParameters(config, size);
  
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On Linux, using too many threads for VP8 encoding has been linked to high
    // CPU usage on machines that are under stress. See http://crbug.com/1151148.
    // 5/3/2022 update: Perf testing has shown that doubling the number of threads
diff --git a/chromium/patches/patch-remoting_host_base_desktop__environment__options.cc b/chromium/patches/patch-remoting_host_base_desktop__environment__options.cc
index a3ef53fbb0..1705e5694d 100644
--- a/chromium/patches/patch-remoting_host_base_desktop__environment__options.cc
+++ b/chromium/patches/patch-remoting_host_base_desktop__environment__options.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-remoting_host_base_desktop__environment__options.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/base/desktop_environment_options.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/base/desktop_environment_options.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/base/desktop_environment_options.cc
-@@ -99,7 +99,7 @@ bool DesktopEnvironmentOptions::capture_
+@@ -109,7 +109,7 @@ bool DesktopEnvironmentOptions::capture_
    // TODO(joedow): Determine whether we can migrate additional platforms to
    // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then
    // clean up DesktopCapturerProxy::Core::CreateCapturer().
diff --git a/chromium/patches/patch-remoting_host_base_switches.cc b/chromium/patches/patch-remoting_host_base_switches.cc
index fd9a9e5c18..31f707145a 100644
--- a/chromium/patches/patch-remoting_host_base_switches.cc
+++ b/chromium/patches/patch-remoting_host_base_switches.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_base_switches.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/base/switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/base/switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/base/switches.cc
 @@ -23,13 +23,13 @@ const char kProcessTypeEvaluateCapabilit
  const char kProcessTypeFileChooser[] = "file_chooser";
diff --git a/chromium/patches/patch-remoting_host_base_switches.h b/chromium/patches/patch-remoting_host_base_switches.h
index 8980961a14..5fda1b37be 100644
--- a/chromium/patches/patch-remoting_host_base_switches.h
+++ b/chromium/patches/patch-remoting_host_base_switches.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_base_switches.h,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/base/switches.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/base/switches.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/base/switches.h
 @@ -35,13 +35,13 @@ extern const char kProcessTypeRdpDesktop
  extern const char kProcessTypeEvaluateCapability[];
diff --git a/chromium/patches/patch-remoting_host_basic__desktop__environment.cc b/chromium/patches/patch-remoting_host_basic__desktop__environment.cc
deleted file mode 100644
index a49362a077..0000000000
--- a/chromium/patches/patch-remoting_host_basic__desktop__environment.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-remoting_host_basic__desktop__environment.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/basic_desktop_environment.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ remoting/host/basic_desktop_environment.cc
-@@ -195,7 +195,7 @@ std::unique_ptr<DesktopCapturer> BasicDe
-   scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner;
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   capture_task_runner = ui_task_runner_;
--#elif BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_WAYLAND)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_WAYLAND)
-   // Each capturer instance should get its own thread so the capturers don't
-   // compete with each other in multistream mode.
-   capture_task_runner = base::ThreadPool::CreateSingleThreadTaskRunner(
diff --git a/chromium/patches/patch-remoting_host_chromoting__host.cc b/chromium/patches/patch-remoting_host_chromoting__host.cc
index 1f6c35904c..521cf77b1b 100644
--- a/chromium/patches/patch-remoting_host_chromoting__host.cc
+++ b/chromium/patches/patch-remoting_host_chromoting__host.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-remoting_host_chromoting__host.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/chromoting_host.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/chromoting_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/chromoting_host.cc
-@@ -132,7 +132,7 @@ void ChromotingHost::Start(const std::st
+@@ -137,7 +137,7 @@ void ChromotingHost::Start(const std::st
        &ChromotingHost::OnIncomingSession, base::Unretained(this)));
  }
  
diff --git a/chromium/patches/patch-remoting_host_chromoting__host.h b/chromium/patches/patch-remoting_host_chromoting__host.h
index 3c6a498c76..4d5e6583de 100644
--- a/chromium/patches/patch-remoting_host_chromoting__host.h
+++ b/chromium/patches/patch-remoting_host_chromoting__host.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-remoting_host_chromoting__host.h,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/chromoting_host.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/chromoting_host.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/chromoting_host.h
-@@ -33,7 +33,7 @@
+@@ -36,7 +36,7 @@
  #include "remoting/protocol/session_manager.h"
  #include "remoting/protocol/transport_context.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-remoting_host_chromoting__host.h,v 1.1 2025/02/06 09:58:17 wiz Ex
  #include "remoting/host/chromoting_host_services_server.h"
  #endif
  
-@@ -99,7 +99,7 @@ class ChromotingHost : public ClientSess
+@@ -112,7 +112,7 @@ class ChromotingHost : public ClientSess
    // This method can only be called once during the lifetime of this object.
    void Start(const std::string& host_owner);
  
@@ -24,7 +24,7 @@ $NetBSD: patch-remoting_host_chromoting__host.h,v 1.1 2025/02/06 09:58:17 wiz Ex
    // Starts running the ChromotingHostServices server and listening for incoming
    // IPC binding requests.
    // Currently only Linux runs the ChromotingHostServices server on the host
-@@ -203,7 +203,7 @@ class ChromotingHost : public ClientSess
+@@ -222,7 +222,7 @@ class ChromotingHost : public ClientSess
    // List of host extensions.
    std::vector<std::unique_ptr<HostExtension>> extensions_;
  
diff --git a/chromium/patches/patch-remoting_host_chromoting__host__context.cc b/chromium/patches/patch-remoting_host_chromoting__host__context.cc
index 9ae3079c73..faf8ce831a 100644
--- a/chromium/patches/patch-remoting_host_chromoting__host__context.cc
+++ b/chromium/patches/patch-remoting_host_chromoting__host__context.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-remoting_host_chromoting__host__context.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/chromoting_host_context.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/chromoting_host_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/chromoting_host_context.cc
-@@ -293,7 +293,7 @@ std::unique_ptr<ChromotingHostContext> C
+@@ -335,7 +335,7 @@ std::unique_ptr<ChromotingHostContext> C
    // on a UI thread.
    scoped_refptr<AutoThreadTaskRunner> input_task_runner =
        AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner,
diff --git a/chromium/patches/patch-remoting_host_chromoting__host__services__client.cc b/chromium/patches/patch-remoting_host_chromoting__host__services__client.cc
index 404716ea70..bb89c0a851 100644
--- a/chromium/patches/patch-remoting_host_chromoting__host__services__client.cc
+++ b/chromium/patches/patch-remoting_host_chromoting__host__services__client.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_chromoting__host__services__client.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/chromoting_host_services_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/chromoting_host_services_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/chromoting_host_services_client.cc
 @@ -59,7 +59,7 @@ mojo::PendingRemote<mojom::ChromotingHos
  
diff --git a/chromium/patches/patch-remoting_host_client__session.cc b/chromium/patches/patch-remoting_host_client__session.cc
index 9950b094e3..4a08e69ede 100644
--- a/chromium/patches/patch-remoting_host_client__session.cc
+++ b/chromium/patches/patch-remoting_host_client__session.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-remoting_host_client__session.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/client_session.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/client_session.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/client_session.cc
-@@ -161,7 +161,7 @@ void ClientSession::NotifyClientResoluti
-   if (desktop_environment_options_.enable_curtaining()) {
+@@ -188,7 +188,7 @@ void ClientSession::NotifyClientResoluti
+   if (effective_policies_.curtain_required.value_or(false)) {
      dpi_vector.set(resolution.x_dpi(), resolution.y_dpi());
    }
 -#elif BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-remoting_host_crash_crash__file__uploader.cc b/chromium/patches/patch-remoting_host_crash_crash__file__uploader.cc
index d3fc390fd9..b56c5d92f4 100644
--- a/chromium/patches/patch-remoting_host_crash_crash__file__uploader.cc
+++ b/chromium/patches/patch-remoting_host_crash_crash__file__uploader.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_crash_crash__file__uploader.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/crash/crash_file_uploader.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/crash/crash_file_uploader.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/crash/crash_file_uploader.cc
 @@ -44,7 +44,7 @@ constexpr char kMinidumpFileName[] = "du
  
diff --git a/chromium/patches/patch-remoting_host_desktop__and__cursor__conditional__composer.cc b/chromium/patches/patch-remoting_host_desktop__and__cursor__conditional__composer.cc
deleted file mode 100644
index ce1dde4831..0000000000
--- a/chromium/patches/patch-remoting_host_desktop__and__cursor__conditional__composer.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-remoting_host_desktop__and__cursor__conditional__composer.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/desktop_and_cursor_conditional_composer.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ remoting/host/desktop_and_cursor_conditional_composer.cc
-@@ -7,7 +7,7 @@
- #include "base/functional/bind.h"
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/linux/wayland_utils.h"
- #endif
- 
-@@ -96,7 +96,7 @@ bool DesktopAndCursorConditionalComposer
- }
- 
- bool DesktopAndCursorConditionalComposer::SupportsFrameCallbacks() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return IsRunningWayland();
- #else
-   return false;
diff --git a/chromium/patches/patch-remoting_host_desktop__capturer__proxy.cc b/chromium/patches/patch-remoting_host_desktop__capturer__proxy.cc
deleted file mode 100644
index dc0569ecf1..0000000000
--- a/chromium/patches/patch-remoting_host_desktop__capturer__proxy.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-remoting_host_desktop__capturer__proxy.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/desktop_capturer_proxy.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ remoting/host/desktop_capturer_proxy.cc
-@@ -26,7 +26,7 @@
- #include "remoting/host/chromeos/frame_sink_desktop_capturer.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/environment.h"
- #include "base/nix/xdg_util.h"
- #include "remoting/host/linux/wayland_desktop_capturer.h"
-@@ -91,7 +91,7 @@ void DesktopCapturerProxy::Core::CreateC
- 
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   capturer_ = std::make_unique<FrameSinkDesktopCapturer>();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   static base::nix::SessionType session_type = base::nix::SessionType::kUnset;
-   if (session_type == base::nix::SessionType::kUnset) {
-     std::unique_ptr<base::Environment> env = base::Environment::Create();
-@@ -298,7 +298,7 @@ void DesktopCapturerProxy::OnMetadata(we
- bool DesktopCapturerProxy::SupportsFrameCallbacks() {
-   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return IsRunningWayland();
- #else
-   return false;
diff --git a/chromium/patches/patch-remoting_host_desktop__capturer__wrapper.cc b/chromium/patches/patch-remoting_host_desktop__capturer__wrapper.cc
deleted file mode 100644
index aae074daa3..0000000000
--- a/chromium/patches/patch-remoting_host_desktop__capturer__wrapper.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-remoting_host_desktop__capturer__wrapper.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/desktop_capturer_wrapper.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ remoting/host/desktop_capturer_wrapper.cc
-@@ -13,7 +13,7 @@
- #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
- #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/linux/wayland_desktop_capturer.h"
- #include "remoting/host/linux/wayland_utils.h"
- #endif
-@@ -33,7 +33,7 @@ void DesktopCapturerWrapper::CreateCaptu
-     SourceId id) {
-   DCHECK(!capturer_);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (IsRunningWayland()) {
-     capturer_ = std::make_unique<WaylandDesktopCapturer>(options);
-   } else {
-@@ -112,7 +112,7 @@ void DesktopCapturerWrapper::OnCaptureRe
- bool DesktopCapturerWrapper::SupportsFrameCallbacks() {
-   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return capturer_ && IsRunningWayland();
- #else
-   return false;
diff --git a/chromium/patches/patch-remoting_host_evaluate__capability.cc b/chromium/patches/patch-remoting_host_evaluate__capability.cc
index 9e87451ef4..073af827e1 100644
--- a/chromium/patches/patch-remoting_host_evaluate__capability.cc
+++ b/chromium/patches/patch-remoting_host_evaluate__capability.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_evaluate__capability.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/evaluate_capability.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/evaluate_capability.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/evaluate_capability.cc
 @@ -56,7 +56,7 @@ base::FilePath BuildHostBinaryPath() {
    }
diff --git a/chromium/patches/patch-remoting_host_host__attributes.cc b/chromium/patches/patch-remoting_host_host__attributes.cc
index 17db1124c1..82965abd66 100644
--- a/chromium/patches/patch-remoting_host_host__attributes.cc
+++ b/chromium/patches/patch-remoting_host_host__attributes.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-remoting_host_host__attributes.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/host_attributes.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/host_attributes.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/host_attributes.cc
-@@ -105,7 +105,7 @@ std::string GetHostAttributes() {
+@@ -103,7 +103,7 @@ std::string GetHostAttributes() {
    if (media::InitializeMediaFoundation()) {
      result.push_back("HWEncoder");
    }
diff --git a/chromium/patches/patch-remoting_host_host__details.cc b/chromium/patches/patch-remoting_host_host__details.cc
index ab2cd914a8..185704d281 100644
--- a/chromium/patches/patch-remoting_host_host__details.cc
+++ b/chromium/patches/patch-remoting_host_host__details.cc
@@ -1,17 +1,35 @@
-$NetBSD: patch-remoting_host_host__details.cc,v 1.1 2025/02/06 09:58:17 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/host_details.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/host_details.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/host_details.cc
-@@ -23,7 +23,7 @@ std::string GetHostOperatingSystemName()
+@@ -7,7 +7,7 @@
+ #include "base/system/sys_info.h"
+ #include "build/build_config.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/linux_util.h"
+ #endif
+ 
+@@ -22,7 +22,7 @@ std::string GetHostOperatingSystemName()
    return "Mac";
- #elif BUILDFLAG(IS_CHROMEOS_ASH)
+ #elif BUILDFLAG(IS_CHROMEOS)
    return "ChromeOS";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return "Linux";
  #elif BUILDFLAG(IS_ANDROID)
    return "Android";
+@@ -34,7 +34,7 @@ std::string GetHostOperatingSystemName()
+ // Get the host Operating System Version, removing the need to check for OS
+ // definitions and keeps the format used consistent.
+ std::string GetHostOperatingSystemVersion() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return base::GetLinuxDistro();
+ #else
+   return base::SysInfo::OperatingSystemVersion();
diff --git a/chromium/patches/patch-remoting_host_host__main.cc b/chromium/patches/patch-remoting_host_host__main.cc
index 7174d66e21..7b2c341720 100644
--- a/chromium/patches/patch-remoting_host_host__main.cc
+++ b/chromium/patches/patch-remoting_host_host__main.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-remoting_host_host__main.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/host_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/host_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/host_main.cc
-@@ -50,7 +50,7 @@ int FileChooserMain();
+@@ -55,7 +55,7 @@ int FileChooserMain();
  int RdpDesktopSessionMain();
  int UrlForwarderConfiguratorMain();
  #endif  // BUILDFLAG(IS_WIN)
@@ -15,7 +15,7 @@ $NetBSD: patch-remoting_host_host__main.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
  int XSessionChooserMain();
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -63,7 +63,7 @@ const char kUsageMessage[] =
+@@ -68,7 +68,7 @@ const char kUsageMessage[] =
      "\n"
      "Options:\n"
  
@@ -24,7 +24,7 @@ $NetBSD: patch-remoting_host_host__main.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
      "  --audio-pipe-name=<pipe> - Sets the pipe name to capture audio on "
      "Linux.\n"
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -156,7 +156,7 @@ MainRoutineFn SelectMainRoutine(const st
+@@ -161,7 +161,7 @@ MainRoutineFn SelectMainRoutine(const st
    } else if (process_type == kProcessTypeUrlForwarderConfigurator) {
      main_routine = &UrlForwarderConfiguratorMain;
  #endif  // BUILDFLAG(IS_WIN)
@@ -33,9 +33,9 @@ $NetBSD: patch-remoting_host_host__main.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
    } else if (process_type == kProcessTypeXSessionChooser) {
      main_routine = &XSessionChooserMain;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -222,7 +222,7 @@ int HostMain(int argc, char** argv) {
-   // be initialized first, so that the preference for crash-reporting can be
-   // looked up in the config file.
+@@ -229,7 +229,7 @@ int HostMain(int argc, char** argv) {
+   // Note that we enable crash reporting only if the user has opted in to having
+   // the crash reports uploaded.
    if (IsUsageStatsAllowed()) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-remoting_host_ipc__constants.cc b/chromium/patches/patch-remoting_host_ipc__constants.cc
index 8042a5fcfc..0f0304f6bf 100644
--- a/chromium/patches/patch-remoting_host_ipc__constants.cc
+++ b/chromium/patches/patch-remoting_host_ipc__constants.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_ipc__constants.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/ipc_constants.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/ipc_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/ipc_constants.cc
 @@ -17,7 +17,7 @@ namespace remoting {
  
diff --git a/chromium/patches/patch-remoting_host_it2me_it2me__host.cc b/chromium/patches/patch-remoting_host_it2me_it2me__host.cc
deleted file mode 100644
index 552e8aaa78..0000000000
--- a/chromium/patches/patch-remoting_host_it2me_it2me__host.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-remoting_host_it2me_it2me__host.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/it2me/it2me_host.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ remoting/host/it2me/it2me_host.cc
-@@ -58,7 +58,7 @@
- #include "remoting/host/chromeos/features.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/linux/wayland_manager.h"
- #include "remoting/host/linux/wayland_utils.h"
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -184,7 +184,7 @@ void It2MeHost::Connect(
- 
-   OnPolicyUpdate(std::move(policies));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (IsRunningWayland()) {
-     WaylandManager::Get()->Init(host_context_->ui_task_runner());
-   }
-@@ -318,7 +318,7 @@ void It2MeHost::ConnectOnNetworkThread(
- 
-   // Set up the desktop environment options.
-   DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault());
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (IsRunningWayland()) {
-     options.desktop_capture_options()->set_prefer_cursor_embedded(true);
-   }
diff --git a/chromium/patches/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/chromium/patches/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
index 85ba5792ce..dc92f792f8 100644
--- a/chromium/patches/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
+++ b/chromium/patches/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_it2me_it2me__native__messaging__host__main.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/it2me/it2me_native_messaging_host_main.cc
 @@ -30,7 +30,7 @@
  #include "remoting/host/resources.h"
@@ -15,16 +15,16 @@ $NetBSD: patch-remoting_host_it2me_it2me__native__messaging__host__main.cc,v 1.1
  #if defined(REMOTING_USE_X11)
  #include <gtk/gtk.h>
  #include "base/linux_util.h"
-@@ -77,7 +77,7 @@ bool CurrentProcessHasUiAccess() {
+@@ -75,7 +75,7 @@ bool CurrentProcessHasUiAccess() {
  // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and
  // runs the task executor until It2MeNativeMessagingHost signals shutdown.
  int It2MeNativeMessagingHostMain(int argc, char** argv) {
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   if (!IsRunningWayland()) {
-     // Initialize Xlib for multi-threaded use, allowing non-Chromium code to
-     // use X11 safely (such as the WebRTC capturer, GTK ...)
-@@ -125,7 +125,7 @@ int It2MeNativeMessagingHostMain(int arg
+   // Initialize Xlib for multi-threaded use, allowing non-Chromium code to
+   // use X11 safely (such as the WebRTC capturer, GTK ...)
+   x11::InitXlib();
+@@ -121,7 +121,7 @@ int It2MeNativeMessagingHostMain(int arg
  
    remoting::LoadResources("");
  
@@ -33,21 +33,21 @@ $NetBSD: patch-remoting_host_it2me_it2me__native__messaging__host__main.cc,v 1.1
    // Required for any calls into GTK functions, such as the Disconnect and
    // Continue windows. Calling with nullptr arguments because we don't have
    // any command line arguments for gtk to consume.
-@@ -257,7 +257,7 @@ int It2MeNativeMessagingHostMain(int arg
+@@ -249,7 +249,7 @@ int It2MeNativeMessagingHostMain(int arg
        PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(),
                                            context->management_service());
  
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
    scoped_refptr<AutoThreadTaskRunner> input_task_runner;
-   if (!IsRunningWayland()) {
-     // Create an X11EventSource on all UI threads, so the global X11 connection
-@@ -284,7 +284,7 @@ int It2MeNativeMessagingHostMain(int arg
+   // Create an X11EventSource on all UI threads, so the global X11 connection
+   // (x11::Connection::Get()) can dispatch X events.
+@@ -273,7 +273,7 @@ int It2MeNativeMessagingHostMain(int arg
    // Run the loop until channel is alive.
    run_loop.Run();
  
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   if (!IsRunningWayland()) {
-     input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() {
-                                   delete ui::X11EventSource::GetInstance();
+   input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() {
+                                 delete ui::X11EventSource::GetInstance();
+                               }));
diff --git a/chromium/patches/patch-remoting_host_me2me__desktop__environment.cc b/chromium/patches/patch-remoting_host_me2me__desktop__environment.cc
index 0a42c5738e..527e550895 100644
--- a/chromium/patches/patch-remoting_host_me2me__desktop__environment.cc
+++ b/chromium/patches/patch-remoting_host_me2me__desktop__environment.cc
@@ -1,20 +1,20 @@
-$NetBSD: patch-remoting_host_me2me__desktop__environment.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/me2me_desktop_environment.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/me2me_desktop_environment.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/me2me_desktop_environment.cc
-@@ -108,7 +108,7 @@ std::string Me2MeDesktopEnvironment::Get
+@@ -112,7 +112,7 @@ std::string Me2MeDesktopEnvironment::Get
      capabilities += protocol::kRemoteWebAuthnCapability;
    }
  
 -#if BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
-   if (!IsRunningWayland()) {
-     capabilities += " ";
-     capabilities += protocol::kMultiStreamCapability;
+   capabilities += " ";
+   capabilities += protocol::kMultiStreamCapability;
+ 
 @@ -150,7 +150,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnv
    // properly under Xvfb.
    mutable_desktop_capture_options()->set_use_update_notifications(true);
@@ -24,16 +24,7 @@ $NetBSD: patch-remoting_host_me2me__desktop__environment.cc,v 1.1 2025/02/06 09:
    // Setting this option to false means that the capture differ wrapper will not
    // be used when the X11 capturer is selected. This reduces the X11 capture
    // time by a few milliseconds per frame and is safe because we can rely on
-@@ -159,7 +159,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnv
-   mutable_desktop_capture_options()->set_detect_updated_region(false);
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (IsRunningWayland()) {
-     mutable_desktop_capture_options()->set_prefer_cursor_embedded(false);
-   }
-@@ -184,7 +184,7 @@ bool Me2MeDesktopEnvironment::Initialize
+@@ -178,7 +178,7 @@ bool Me2MeDesktopEnvironment::Initialize
  
    // Otherwise, if the session is shared with the local user start monitoring
    // the local input and create the in-session UI.
diff --git a/chromium/patches/patch-remoting_host_mojo__caller__security__checker.cc b/chromium/patches/patch-remoting_host_mojo__caller__security__checker.cc
index 4f6656c75c..5d4e5161df 100644
--- a/chromium/patches/patch-remoting_host_mojo__caller__security__checker.cc
+++ b/chromium/patches/patch-remoting_host_mojo__caller__security__checker.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_mojo__caller__security__checker.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/mojo_caller_security_checker.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/mojo_caller_security_checker.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/mojo_caller_security_checker.cc
 @@ -37,7 +37,7 @@
  namespace remoting {
@@ -13,7 +13,7 @@ $NetBSD: patch-remoting_host_mojo__caller__security__checker.cc,v 1.1 2025/02/06
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  constexpr auto kAllowedCallerProgramNames =
-     base::MakeFixedFlatSet<base::FilePath::StringPieceType>({
+     base::MakeFixedFlatSet<base::FilePath::StringViewType>({
          "remote-open-url",
 @@ -98,7 +98,7 @@ bool IsTrustedMojoEndpoint(
    return true;
diff --git a/chromium/patches/patch-remoting_host_mouse__cursor__monitor__proxy.cc b/chromium/patches/patch-remoting_host_mouse__cursor__monitor__proxy.cc
deleted file mode 100644
index 806bc93d2b..0000000000
--- a/chromium/patches/patch-remoting_host_mouse__cursor__monitor__proxy.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-remoting_host_mouse__cursor__monitor__proxy.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- remoting/host/mouse_cursor_monitor_proxy.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ remoting/host/mouse_cursor_monitor_proxy.cc
-@@ -73,7 +73,7 @@ void MouseCursorMonitorProxy::Core::Crea
- 
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   mouse_cursor_monitor_ = std::make_unique<MouseCursorMonitorAura>();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (IsRunningWayland()) {
-     mouse_cursor_monitor_ = webrtc::MouseCursorMonitor::Create(options);
-   } else {
diff --git a/chromium/patches/patch-remoting_host_policy__watcher.cc b/chromium/patches/patch-remoting_host_policy__watcher.cc
index 44211ff2dc..f048febf3d 100644
--- a/chromium/patches/patch-remoting_host_policy__watcher.cc
+++ b/chromium/patches/patch-remoting_host_policy__watcher.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-remoting_host_policy__watcher.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/policy_watcher.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/policy_watcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/policy_watcher.cc
-@@ -178,7 +178,7 @@ base::Value::Dict PolicyWatcher::GetDefa
+@@ -177,7 +177,7 @@ base::Value::Dict PolicyWatcher::GetDefa
               true);
    result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false);
  #endif
diff --git a/chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__client.cc b/chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__client.cc
index 33f58f54cf..f78c2c6da7 100644
--- a/chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__client.cc
+++ b/chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__client.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_remote__open__url_remote__open__url__client.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/remote_open_url/remote_open_url_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/remote_open_url/remote_open_url_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/remote_open_url/remote_open_url_client.cc
 @@ -18,7 +18,7 @@
  #include "remoting/host/mojom/chromoting_host_services.mojom.h"
diff --git a/chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__util.cc b/chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__util.cc
index aa6c998134..ff598f7f88 100644
--- a/chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__util.cc
+++ b/chromium/patches/patch-remoting_host_remote__open__url_remote__open__url__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_remote__open__url_remote__open__url__util.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/remote_open_url/remote_open_url_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/remote_open_url/remote_open_url_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/remote_open_url/remote_open_url_util.cc
 @@ -29,7 +29,7 @@ const wchar_t kRegisteredApplicationsKey
  #endif  // BUILDFLAG(IS_WIN)
diff --git a/chromium/patches/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc b/chromium/patches/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
index eabe7aeaa2..4d8ff395c0 100644
--- a/chromium/patches/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
+++ b/chromium/patches/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_remote__open__url_url__forwarder__configurator.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/remote_open_url/url_forwarder_configurator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/remote_open_url/url_forwarder_configurator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/remote_open_url/url_forwarder_configurator.cc
 @@ -12,7 +12,7 @@ UrlForwarderConfigurator::UrlForwarderCo
  
diff --git a/chromium/patches/patch-remoting_host_remoting__me2me__host.cc b/chromium/patches/patch-remoting_host_remoting__me2me__host.cc
index 07ec05c20c..269e402d13 100644
--- a/chromium/patches/patch-remoting_host_remoting__me2me__host.cc
+++ b/chromium/patches/patch-remoting_host_remoting__me2me__host.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-remoting_host_remoting__me2me__host.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/remoting_me2me_host.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/remoting_me2me_host.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/remoting_me2me_host.cc
-@@ -146,7 +146,7 @@
+@@ -138,7 +138,7 @@
  #include "remoting/host/mac/permission_utils.h"
  #endif  // BUILDFLAG(IS_APPLE)
  
@@ -14,33 +14,26 @@ $NetBSD: patch-remoting_host_remoting__me2me__host.cc,v 1.1 2025/02/06 09:58:18
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #if defined(REMOTING_USE_X11)
  #include <gtk/gtk.h>
- #endif  // defined(REMOTING_USE_X11)
-@@ -157,13 +157,13 @@
+ 
+@@ -148,7 +148,7 @@
  #endif  // defined(REMOTING_USE_X11)
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "base/linux_util.h"
- #include "remoting/host/audio_capturer_linux.h"
+ #include "remoting/host/linux/audio_capturer_linux.h"
  #include "remoting/host/linux/certificate_watcher.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/host_utmp_logger.h"
- #endif
- 
-@@ -177,7 +177,7 @@
- #include "remoting/host/win/session_desktop_environment.h"
+@@ -163,7 +163,7 @@
+ #include "remoting/host/pairing_registry_delegate_win.h"
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/linux/wayland_manager.h"
- #include "remoting/host/linux/wayland_utils.h"
+ #include "remoting/host/host_utmp_logger.h"
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -205,7 +205,7 @@ const char kApplicationName[] = "chromot
+ 
+@@ -196,7 +196,7 @@ const char kApplicationName[] = "chromot
  const char kStdinConfigPath[] = "-";
  #endif  // !defined(REMOTING_MULTI_PROCESS)
  
@@ -49,7 +42,7 @@ $NetBSD: patch-remoting_host_remoting__me2me__host.cc,v 1.1 2025/02/06 09:58:18
  // The command line switch used to pass name of the pipe to capture audio on
  // linux.
  const char kAudioPipeSwitchName[] = "audio-pipe-name";
-@@ -448,7 +448,7 @@ class HostProcess : public ConfigWatcher
+@@ -441,7 +441,7 @@ class HostProcess : public ConfigWatcher
    std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_;
  #endif
  
@@ -58,16 +51,16 @@ $NetBSD: patch-remoting_host_remoting__me2me__host.cc,v 1.1 2025/02/06 09:58:18
    // Watch for certificate changes and kill the host when changes occur
    std::unique_ptr<CertificateWatcher> cert_watcher_;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -515,7 +515,7 @@ class HostProcess : public ConfigWatcher
+@@ -506,7 +506,7 @@ class HostProcess : public ConfigWatcher
+   std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_;
  
-   std::unique_ptr<HostStatusLogger> host_status_logger_;
    std::unique_ptr<HostEventLogger> host_event_logger_;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
  #endif
    std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
-@@ -834,7 +834,7 @@ void HostProcess::StartOnNetworkThread()
+@@ -825,7 +825,7 @@ void HostProcess::StartOnNetworkThread()
  void HostProcess::ShutdownOnNetworkThread() {
    DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
    config_watcher_.reset();
@@ -76,32 +69,25 @@ $NetBSD: patch-remoting_host_remoting__me2me__host.cc,v 1.1 2025/02/06 09:58:18
    cert_watcher_.reset();
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  }
-@@ -905,7 +905,7 @@ void HostProcess::CreateAuthenticatorFac
-             context_->url_loader_factory(), service_account_email_,
-             oauth_refresh_token_));
+@@ -902,7 +902,7 @@ void HostProcess::CreateAuthenticatorFac
+             context_->create_client_cert_store_callback(),
+             service_account_email_, oauth_refresh_token_));
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      if (!cert_watcher_) {
        cert_watcher_ = std::make_unique<CertificateWatcher>(
            base::BindRepeating(&HostProcess::ShutdownHost,
-@@ -1047,13 +1047,13 @@ void HostProcess::StartOnUiThread() {
+@@ -1044,7 +1044,7 @@ void HostProcess::StartOnUiThread() {
        base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
        base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
  
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (IsRunningWayland()) {
-     WaylandManager::Get()->Init(context_->ui_task_runner());
-   }
- #endif  // BUILDFLAG(IS_LINUX)
- 
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // If an audio pipe is specific on the command-line then initialize
    // AudioCapturerLinux to capture from it.
    base::FilePath audio_pipe_name =
-@@ -1130,7 +1130,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1123,7 +1123,7 @@ void HostProcess::ShutdownOnUiThread() {
    // It is now safe for the HostProcess to be deleted.
    self_ = nullptr;
  
@@ -110,7 +96,7 @@ $NetBSD: patch-remoting_host_remoting__me2me__host.cc,v 1.1 2025/02/06 09:58:18
    // Cause the global AudioPipeReader to be freed, otherwise the audio
    // thread will remain in-use and prevent the process from exiting.
    // TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1138,7 +1138,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1131,7 +1131,7 @@ void HostProcess::ShutdownOnUiThread() {
    AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -119,34 +105,25 @@ $NetBSD: patch-remoting_host_remoting__me2me__host.cc,v 1.1 2025/02/06 09:58:18
    context_->input_task_runner()->PostTask(
        FROM_HERE,
        base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
-@@ -1592,7 +1592,7 @@ bool HostProcess::OnUsernamePolicyUpdate
-   // Returns false: never restart the host after this policy update.
-   DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   std::optional<bool> host_username_match_required =
-       policies.FindBool(policy::key::kRemoteAccessHostMatchUsername);
-   if (!host_username_match_required.has_value()) {
-@@ -1866,7 +1866,7 @@ void HostProcess::StartHost() {
+@@ -1873,7 +1873,7 @@ void HostProcess::StartHost() {
      corp_host_status_logger_->StartObserving(*session_manager);
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_);
+   desktop_environment_options_.set_enable_remote_webauthn(true);
  #endif
+ #if BUILDFLAG(IS_WIN)
+@@ -1900,7 +1900,7 @@ void HostProcess::StartHost() {
  
-@@ -1886,7 +1886,7 @@ void HostProcess::StartHost() {
-   host_status_logger_ = std::make_unique<HostStatusLogger>(
-       host_->status_monitor(), log_to_server_.get());
+   host_->AddExtension(std::make_unique<TestEchoExtension>());
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (cmd_line->HasSwitch(kEnableUtempter)) {
      host_utmp_logger_ =
-@@ -1922,7 +1922,7 @@ void HostProcess::StartHost() {
+@@ -1936,7 +1936,7 @@ void HostProcess::StartHost() {
    // addresses.
    host_->Start(*host_owner_emails_.begin());
  
@@ -155,7 +132,7 @@ $NetBSD: patch-remoting_host_remoting__me2me__host.cc,v 1.1 2025/02/06 09:58:18
    // For Windows, ChromotingHostServices connections are handled by the daemon
    // process, then the message pipe is forwarded to the network process.
    host_->StartChromotingHostServices();
-@@ -2069,7 +2069,7 @@ int HostProcessMain() {
+@@ -2081,7 +2081,7 @@ int HostProcessMain() {
    HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
  
@@ -164,7 +141,7 @@ $NetBSD: patch-remoting_host_remoting__me2me__host.cc,v 1.1 2025/02/06 09:58:18
  #if defined(REMOTING_USE_X11)
    // Initialize Xlib for multi-threaded use, allowing non-Chromium code to
    // use X11 safely (such as the WebRTC capturer, GTK ...)
-@@ -2118,7 +2118,7 @@ int HostProcessMain() {
+@@ -2144,7 +2144,7 @@ int HostProcessMain() {
    std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
        net::NetworkChangeNotifier::CreateIfNeeded());
  
diff --git a/chromium/patches/patch-remoting_host_session__policies__from__dict.cc b/chromium/patches/patch-remoting_host_session__policies__from__dict.cc
new file mode 100644
index 0000000000..0ff257d49e
--- /dev/null
+++ b/chromium/patches/patch-remoting_host_session__policies__from__dict.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- remoting/host/session_policies_from_dict.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ remoting/host/session_policies_from_dict.cc
+@@ -75,7 +75,7 @@ std::optional<SessionPolicies> SessionPo
+   session_policies.curtain_required =
+       dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain);
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   session_policies.host_username_match_required =
+       dict.FindBool(policy::key::kRemoteAccessHostMatchUsername);
+ #endif
diff --git a/chromium/patches/patch-remoting_host_setup_start__host__main.cc b/chromium/patches/patch-remoting_host_setup_start__host__main.cc
index 7a1acedb2c..665aaa52e3 100644
--- a/chromium/patches/patch-remoting_host_setup_start__host__main.cc
+++ b/chromium/patches/patch-remoting_host_setup_start__host__main.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-remoting_host_setup_start__host__main.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/setup/start_host_main.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/setup/start_host_main.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/setup/start_host_main.cc
-@@ -38,7 +38,7 @@
+@@ -45,7 +45,7 @@
  #include <unistd.h>
  #endif  // BUILDFLAG(IS_POSIX)
  
diff --git a/chromium/patches/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc b/chromium/patches/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
index 5db2903991..688eb5aea1 100644
--- a/chromium/patches/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
+++ b/chromium/patches/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc
 @@ -10,7 +10,7 @@
  #include "base/strings/utf_string_conversions.h"
@@ -23,8 +23,8 @@ $NetBSD: patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  
  constexpr auto kAllowedCallerPrograms =
-     base::MakeFixedFlatSet<base::FilePath::StringPieceType>({
-@@ -82,7 +82,7 @@ bool IsLaunchedByTrustedProcess() {
+     base::MakeFixedFlatSet<base::FilePath::StringViewType>({
+@@ -83,7 +83,7 @@ bool IsLaunchedByTrustedProcess() {
  #if !defined(NDEBUG)
    // Just return true on debug builds for the convenience of development.
    return true;
diff --git a/chromium/patches/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/chromium/patches/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
index d0169a6ef4..f2a65c5f3a 100644
--- a/chromium/patches/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
+++ b/chromium/patches/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc
 @@ -30,7 +30,7 @@
  #include "base/task/thread_pool.h"
diff --git a/chromium/patches/patch-remoting_protocol_webrtc__video__stream.cc b/chromium/patches/patch-remoting_protocol_webrtc__video__stream.cc
index 1f7639df7a..f05dae7861 100644
--- a/chromium/patches/patch-remoting_protocol_webrtc__video__stream.cc
+++ b/chromium/patches/patch-remoting_protocol_webrtc__video__stream.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-remoting_protocol_webrtc__video__stream.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- remoting/protocol/webrtc_video_stream.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- remoting/protocol/webrtc_video_stream.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ remoting/protocol/webrtc_video_stream.cc
 @@ -267,7 +267,7 @@ WebrtcVideoStream::WebrtcVideoStream(con
      : session_options_(session_options) {
  // TODO(joedow): Dig into the threading model on other platforms to see if they
  // can also be updated to run on a dedicated thread.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    core_task_runner_ = base::ThreadPool::CreateSingleThreadTaskRunner(
        {base::TaskPriority::HIGHEST},
        base::SingleThreadTaskRunnerThreadMode::DEDICATED);
diff --git a/chromium/patches/patch-remoting_signaling_ftl__host__device__id__provider.cc b/chromium/patches/patch-remoting_signaling_ftl__host__device__id__provider.cc
new file mode 100644
index 0000000000..ba71e59587
--- /dev/null
+++ b/chromium/patches/patch-remoting_signaling_ftl__host__device__id__provider.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- remoting/signaling/ftl_host_device_id_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ remoting/signaling/ftl_host_device_id_provider.cc
+@@ -16,7 +16,7 @@ constexpr char kDeviceIdPrefix[] = "crd-
+ constexpr char kDeviceIdPrefix[] = "crd-mac-host-";
+ #elif BUILDFLAG(IS_CHROMEOS)
+ constexpr char kDeviceIdPrefix[] = "crd-cros-host-";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr char kDeviceIdPrefix[] = "crd-linux-host-";
+ #else
+ constexpr char kDeviceIdPrefix[] = "crd-unknown-host-";
diff --git a/chromium/patches/patch-sandbox_BUILD.gn b/chromium/patches/patch-sandbox_BUILD.gn
index 3a4407e42b..548e78ca15 100644
--- a/chromium/patches/patch-sandbox_BUILD.gn
+++ b/chromium/patches/patch-sandbox_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_BUILD.gn,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/BUILD.gn
 @@ -49,7 +49,7 @@ group("sandbox") {
        "//sandbox/mac:system_services",
diff --git a/chromium/patches/patch-sandbox_features.gni b/chromium/patches/patch-sandbox_features.gni
index dcd9f754cd..7d85e9f030 100644
--- a/chromium/patches/patch-sandbox_features.gni
+++ b/chromium/patches/patch-sandbox_features.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_features.gni,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/features.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/features.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/features.gni
 @@ -6,7 +6,7 @@
  # currently.
diff --git a/chromium/patches/patch-sandbox_linux_BUILD.gn b/chromium/patches/patch-sandbox_linux_BUILD.gn
index 703e85cfad..c739ef872c 100644
--- a/chromium/patches/patch-sandbox_linux_BUILD.gn
+++ b/chromium/patches/patch-sandbox_linux_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_linux_BUILD.gn,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/linux/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/linux/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/linux/BUILD.gn
 @@ -12,11 +12,11 @@ if (is_android) {
  }
@@ -21,7 +21,7 @@ $NetBSD: patch-sandbox_linux_BUILD.gn,v 1.1 2025/02/06 09:58:18 wiz Exp $
  
    # On Android, use plain GTest.
    use_base_test_suite = is_linux || is_chromeos
-@@ -380,6 +380,17 @@ component("sandbox_services") {
+@@ -369,6 +369,17 @@ component("sandbox_services") {
        "services/libc_interceptor.h",
      ]
    }
diff --git a/chromium/patches/patch-sandbox_linux_services_init__process__reaper.cc b/chromium/patches/patch-sandbox_linux_services_init__process__reaper.cc
index 7324d3ca85..70b1a27018 100644
--- a/chromium/patches/patch-sandbox_linux_services_init__process__reaper.cc
+++ b/chromium/patches/patch-sandbox_linux_services_init__process__reaper.cc
@@ -1,20 +1,20 @@
-$NetBSD: patch-sandbox_linux_services_init__process__reaper.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/linux/services/init_process_reaper.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/linux/services/init_process_reaper.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/linux/services/init_process_reaper.cc
-@@ -2,6 +2,7 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
+@@ -7,6 +7,7 @@
+ #pragma allow_unsafe_libc_calls
+ #endif
  
 +#if 0
  #include "sandbox/linux/services/init_process_reaper.h"
  
  #include <signal.h>
-@@ -100,3 +101,4 @@ bool CreateInitProcessReaper(base::OnceC
+@@ -105,3 +106,4 @@ bool CreateInitProcessReaper(base::OnceC
  }
  
  }  // namespace sandbox.
diff --git a/chromium/patches/patch-sandbox_linux_services_libc__interceptor.cc b/chromium/patches/patch-sandbox_linux_services_libc__interceptor.cc
index b5ceddbce0..edc33fbe15 100644
--- a/chromium/patches/patch-sandbox_linux_services_libc__interceptor.cc
+++ b/chromium/patches/patch-sandbox_linux_services_libc__interceptor.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_linux_services_libc__interceptor.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/linux/services/libc_interceptor.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/linux/services/libc_interceptor.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/linux/services/libc_interceptor.cc
 @@ -17,7 +17,9 @@
  #include <stddef.h>
diff --git a/chromium/patches/patch-sandbox_policy_BUILD.gn b/chromium/patches/patch-sandbox_policy_BUILD.gn
index 802de0df95..b8cb47dac4 100644
--- a/chromium/patches/patch-sandbox_policy_BUILD.gn
+++ b/chromium/patches/patch-sandbox_policy_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-sandbox_policy_BUILD.gn,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/policy/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/policy/BUILD.gn
-@@ -50,7 +50,7 @@ component("policy") {
+@@ -43,7 +43,7 @@ component("policy") {
        "//third_party/jni_zero",
      ]
    }
@@ -15,7 +15,7 @@ $NetBSD: patch-sandbox_policy_BUILD.gn,v 1.1 2025/02/06 09:58:18 wiz Exp $
      sources += [
        "linux/bpf_audio_policy_linux.cc",
        "linux/bpf_audio_policy_linux.h",
-@@ -129,6 +129,38 @@ component("policy") {
+@@ -114,6 +114,38 @@ component("policy") {
        "//sandbox/linux:suid_sandbox_client",
      ]
    }
@@ -51,6 +51,6 @@ $NetBSD: patch-sandbox_policy_BUILD.gn,v 1.1 2025/02/06 09:58:18 wiz Exp $
 +      "//ui/gfx/x",
 +    ]
 +  }
-   if (is_chromeos_ash) {
+   if (is_chromeos) {
      sources += [
        "linux/bpf_ime_policy_linux.cc",
diff --git a/chromium/patches/patch-sandbox_policy_features.cc b/chromium/patches/patch-sandbox_policy_features.cc
index b5fee3c091..663765cb0d 100644
--- a/chromium/patches/patch-sandbox_policy_features.cc
+++ b/chromium/patches/patch-sandbox_policy_features.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-sandbox_policy_features.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/policy/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/policy/features.cc
-@@ -20,7 +20,11 @@ namespace sandbox::policy::features {
+@@ -19,7 +19,11 @@ namespace sandbox::policy::features {
  // (Only causes an effect when feature kNetworkServiceInProcess is disabled.)
  BASE_FEATURE(kNetworkServiceSandbox,
               "NetworkServiceSandbox",
@@ -18,12 +18,3 @@ $NetBSD: patch-sandbox_policy_features.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  // Enables a fine-grained seccomp-BPF syscall filter for the network service.
-@@ -132,7 +136,7 @@ BASE_FEATURE(kSpectreVariant2Mitigation,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Enabling the kNetworkServiceSandbox feature automatically enables Spectre
- // variant 2 mitigations in the network service. This can lead to performance
- // regressions, so enabling this feature will turn off the Spectre Variant 2
diff --git a/chromium/patches/patch-sandbox_policy_features.h b/chromium/patches/patch-sandbox_policy_features.h
deleted file mode 100644
index a33cef4924..0000000000
--- a/chromium/patches/patch-sandbox_policy_features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-sandbox_policy_features.h,v 1.1 2025/02/06 09:58:18 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- sandbox/policy/features.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ sandbox/policy/features.h
-@@ -45,7 +45,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATU
- SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVariant2Mitigation);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(
-     kForceDisableSpectreVariant2MitigationInNetworkService);
- 
diff --git a/chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
index b2ce95b6b3..2edf380275 100644
--- a/chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
+++ b/chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_policy_freebsd_sandbox__freebsd.cc,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig	2024-12-21 10:25:10.566911261 +0000
+--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig	2025-05-08 12:01:57.800207748 +0000
 +++ sandbox/policy/freebsd/sandbox_freebsd.cc
 @@ -0,0 +1,211 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.h b/chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.h
index 53826ac84c..f72a240533 100644
--- a/chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.h
+++ b/chromium/patches/patch-sandbox_policy_freebsd_sandbox__freebsd.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_policy_freebsd_sandbox__freebsd.h,v 1.1 2025/02/06 09:58:18 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/freebsd/sandbox_freebsd.h.orig	2024-12-21 10:25:10.567580901 +0000
+--- sandbox/policy/freebsd/sandbox_freebsd.h.orig	2025-05-08 12:01:57.800356194 +0000
 +++ sandbox/policy/freebsd/sandbox_freebsd.h
 @@ -0,0 +1,276 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-sandbox_policy_mojom_sandbox.mojom b/chromium/patches/patch-sandbox_policy_mojom_sandbox.mojom
index ac60477413..46fca4b07f 100644
--- a/chromium/patches/patch-sandbox_policy_mojom_sandbox.mojom
+++ b/chromium/patches/patch-sandbox_policy_mojom_sandbox.mojom
@@ -1,14 +1,14 @@
-$NetBSD: patch-sandbox_policy_mojom_sandbox.mojom,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/mojom/sandbox.mojom.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/policy/mojom/sandbox.mojom.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/policy/mojom/sandbox.mojom
-@@ -81,6 +81,15 @@ enum Sandbox {
-   [EnableIf=is_fuchsia]
-   kVideoCapture,
+@@ -74,6 +74,15 @@ enum Sandbox {
+   // Minimally privileged sandbox on Fuchsia.
+   [EnableIf=is_fuchsia] kVideoCapture,
  
 +  [EnableIf=is_openbsd]
 +  kVideoCapture,
@@ -21,4 +21,4 @@ $NetBSD: patch-sandbox_policy_mojom_sandbox.mojom,v 1.1 2025/02/06 09:58:19 wiz
 +
    // Allows access to file contents and Windows APIs for parsing icons from PE
    // files.
-   [EnableIf=is_win]
+   [EnableIf=is_win] kIconReader,
diff --git a/chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.cc b/chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.cc
index 34c31de184..ebbe2262b3 100644
--- a/chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.cc
+++ b/chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_policy_netbsd_sandbox__netbsd.cc,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/netbsd/sandbox_netbsd.cc.orig	2024-12-21 10:25:10.569003712 +0000
+--- sandbox/policy/netbsd/sandbox_netbsd.cc.orig	2025-05-08 12:01:57.800681701 +0000
 +++ sandbox/policy/netbsd/sandbox_netbsd.cc
 @@ -0,0 +1,211 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.h b/chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.h
index 1614dc8bf7..41c0fafe2c 100644
--- a/chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.h
+++ b/chromium/patches/patch-sandbox_policy_netbsd_sandbox__netbsd.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_policy_netbsd_sandbox__netbsd.h,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/netbsd/sandbox_netbsd.h.orig	2024-12-21 10:25:10.569588425 +0000
+--- sandbox/policy/netbsd/sandbox_netbsd.h.orig	2025-05-08 12:01:57.800829546 +0000
 +++ sandbox/policy/netbsd/sandbox_netbsd.h
 @@ -0,0 +1,276 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
index b292a76c10..44f26baec4 100644
--- a/chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
+++ b/chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_policy_openbsd_sandbox__openbsd.cc,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig	2024-12-21 10:25:10.570415628 +0000
+--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig	2025-05-08 12:01:57.801035963 +0000
 +++ sandbox/policy/openbsd/sandbox_openbsd.cc
 @@ -0,0 +1,392 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -339,7 +339,7 @@ $NetBSD: patch-sandbox_policy_openbsd_sandbox__openbsd.cc,v 1.1 2025/02/06 09:58
 +      break;
 +    case sandbox::mojom::Sandbox::kGpu:
 +    case sandbox::mojom::Sandbox::kOnDeviceModelExecution:
-+      SetPledge("stdio drm rpath flock cpath wpath prot_exec recvfd sendfd tmppath", NULL);
++      SetPledge("stdio drm inet rpath flock cpath wpath prot_exec recvfd sendfd tmppath unix", NULL);
 +      break;
 +#if BUILDFLAG(ENABLE_PPAPI)
 +    case sandbox::mojom::Sandbox::kPpapi:
diff --git a/chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.h b/chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.h
index 520c224b90..08a507baef 100644
--- a/chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.h
+++ b/chromium/patches/patch-sandbox_policy_openbsd_sandbox__openbsd.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_policy_openbsd_sandbox__openbsd.h,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/openbsd/sandbox_openbsd.h.orig	2024-12-21 10:25:10.571038055 +0000
+--- sandbox/policy/openbsd/sandbox_openbsd.h.orig	2025-05-08 12:01:57.801196132 +0000
 +++ sandbox/policy/openbsd/sandbox_openbsd.h
 @@ -0,0 +1,280 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-sandbox_policy_sandbox.cc b/chromium/patches/patch-sandbox_policy_sandbox.cc
index 62280ede3b..d53c98734e 100644
--- a/chromium/patches/patch-sandbox_policy_sandbox.cc
+++ b/chromium/patches/patch-sandbox_policy_sandbox.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_policy_sandbox.cc,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/sandbox.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/policy/sandbox.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/policy/sandbox.cc
 @@ -18,6 +18,10 @@
  #include "sandbox/policy/linux/sandbox_linux.h"
diff --git a/chromium/patches/patch-sandbox_policy_sandbox.h b/chromium/patches/patch-sandbox_policy_sandbox.h
index 7dc253dd7f..5fc044d0f7 100644
--- a/chromium/patches/patch-sandbox_policy_sandbox.h
+++ b/chromium/patches/patch-sandbox_policy_sandbox.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-sandbox_policy_sandbox.h,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/sandbox.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/policy/sandbox.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/policy/sandbox.h
 @@ -12,6 +12,14 @@
  #include "sandbox/policy/linux/sandbox_linux.h"
diff --git a/chromium/patches/patch-sandbox_policy_sandbox__type.cc b/chromium/patches/patch-sandbox_policy_sandbox__type.cc
index 408b7f2632..ba78d87b1c 100644
--- a/chromium/patches/patch-sandbox_policy_sandbox__type.cc
+++ b/chromium/patches/patch-sandbox_policy_sandbox__type.cc
@@ -1,53 +1,50 @@
-$NetBSD: patch-sandbox_policy_sandbox__type.cc,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/sandbox_type.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/policy/sandbox_type.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/policy/sandbox_type.cc
-@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sa
+@@ -38,7 +38,7 @@ constexpr char kPpapiSandbox[] = "ppapi"
  #endif
-     case Sandbox::kAudio:
-       return false;
+ 
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ constexpr char kPrintBackendSandbox[] = "print_backend";
+ constexpr char kScreenAISandbox[] = "screen_ai";
+ #endif
+@@ -56,15 +56,15 @@ constexpr char kWindowsSystemProxyResolv
+ constexpr char kMirroringSandbox[] = "mirroring";
+ #endif  // BUILDFLAG(IS_MAC)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr char kVideoEffectsSandbox[] = "video_effects";
+ #endif
+ 
 -#if BUILDFLAG(IS_FUCHSIA)
 +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     case Sandbox::kVideoCapture:
-       return false;
- #endif
-@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sa
- #if BUILDFLAG(IS_MAC)
-     case Sandbox::kMirroring:
+ constexpr char kVideoCaptureSandbox[] = "video_capture";
  #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-     case Sandbox::kHardwareVideoDecoding:
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -73,7 +73,7 @@ bool IsUnsandboxedSandboxType(Sandbox sa
-     case Sandbox::kLibassistant:
- #endif  // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
- #endif  // // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | BUILDFLAG(IS_BSD)
-     case Sandbox::kZygoteIntermediateSandbox:
-     case Sandbox::kHardwareVideoEncoding:
- #endif
-@@ -81,10 +81,10 @@ bool IsUnsandboxedSandboxType(Sandbox sa
-     case Sandbox::kScreenAI:
- #endif
-     case Sandbox::kSpeechRecognition:
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     case Sandbox::kVideoEffects:
- #endif
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ constexpr char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding";
+ constexpr char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding";
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -78,7 +78,7 @@ constexpr char kLibassistantSandbox[] = 
+ #endif  // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-     case Sandbox::kOnDeviceTranslation:
- #endif
-       return false;
-@@ -136,7 +136,7 @@ void SetCommandLineFlagsForSandboxType(b
- #endif
+ constexpr char kOnDeviceTranslationSandbox[] = "on_device_translation";
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+ 
+@@ -140,7 +140,7 @@ void SetCommandLineFlagsForSandboxType(b
+     case Sandbox::kCdm:
      case Sandbox::kPrintCompositor:
      case Sandbox::kAudio:
 -#if BUILDFLAG(IS_FUCHSIA)
@@ -55,20 +52,22 @@ $NetBSD: patch-sandbox_policy_sandbox__type.cc,v 1.1 2025/02/06 09:58:19 wiz Exp
      case Sandbox::kVideoCapture:
  #endif
  #if BUILDFLAG(IS_WIN)
-@@ -147,10 +147,10 @@ void SetCommandLineFlagsForSandboxType(b
+@@ -151,7 +151,7 @@ void SetCommandLineFlagsForSandboxType(b
      case Sandbox::kMediaFoundationCdm:
      case Sandbox::kWindowsSystemProxyResolver:
  #endif  // BUILDFLAG(IS_WIN)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-     case Sandbox::kHardwareVideoDecoding:
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     case Sandbox::kHardwareVideoDecoding:
      case Sandbox::kHardwareVideoEncoding:
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -168,10 +168,10 @@ void SetCommandLineFlagsForSandboxType(b
+@@ -167,15 +167,15 @@ void SetCommandLineFlagsForSandboxType(b
+     case Sandbox::kMirroring:
+ #endif  // BUILDFLAG(IS_MAC)
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     case Sandbox::kPrintBackend:
      case Sandbox::kScreenAI:
  #endif
      case Sandbox::kSpeechRecognition:
@@ -81,7 +80,7 @@ $NetBSD: patch-sandbox_policy_sandbox__type.cc,v 1.1 2025/02/06 09:58:19 wiz Exp
      case Sandbox::kOnDeviceTranslation:
  #endif
        DCHECK(command_line->GetSwitchValueASCII(switches::kProcessType) ==
-@@ -181,7 +181,7 @@ void SetCommandLineFlagsForSandboxType(b
+@@ -185,7 +185,7 @@ void SetCommandLineFlagsForSandboxType(b
            switches::kServiceSandboxType,
            StringFromUtilitySandboxType(sandbox_type));
        break;
@@ -90,7 +89,7 @@ $NetBSD: patch-sandbox_policy_sandbox__type.cc,v 1.1 2025/02/06 09:58:19 wiz Exp
      case Sandbox::kZygoteIntermediateSandbox:
        break;
  #endif
-@@ -221,7 +221,7 @@ sandbox::mojom::Sandbox SandboxTypeFromC
+@@ -225,7 +225,7 @@ sandbox::mojom::Sandbox SandboxTypeFromC
      return Sandbox::kUtility;
    }
  
@@ -100,43 +99,45 @@ $NetBSD: patch-sandbox_policy_sandbox__type.cc,v 1.1 2025/02/06 09:58:19 wiz Exp
    if (process_type == switches::kZygoteProcessType)
      return Sandbox::kZygoteIntermediateSandbox;
 @@ -267,7 +267,7 @@ std::string StringFromUtilitySandboxType
-       return switches::kUtilitySandbox;
+       return kUtilitySandbox;
      case Sandbox::kAudio:
-       return switches::kAudioSandbox;
+       return kAudioSandbox;
 -#if BUILDFLAG(IS_FUCHSIA)
 +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
      case Sandbox::kVideoCapture:
-       return switches::kVideoCaptureSandbox;
+       return kVideoCaptureSandbox;
  #endif
-@@ -281,11 +281,11 @@ std::string StringFromUtilitySandboxType
+@@ -278,17 +278,17 @@ std::string StringFromUtilitySandboxType
+     case Sandbox::kSpeechRecognition:
+       return kSpeechRecognitionSandbox;
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     case Sandbox::kPrintBackend:
+       return kPrintBackendSandbox;
      case Sandbox::kScreenAI:
-       return switches::kScreenAISandbox;
+       return kScreenAISandbox;
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      case Sandbox::kVideoEffects:
-       return switches::kVideoEffectsSandbox;
+       return kVideoEffectsSandbox;
  #endif
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
      case Sandbox::kOnDeviceTranslation:
-       return switches::kOnDeviceTranslationSandbox;
+       return kOnDeviceTranslationSandbox;
  #endif
-@@ -305,11 +305,11 @@ std::string StringFromUtilitySandboxType
+@@ -308,7 +308,7 @@ std::string StringFromUtilitySandboxType
      case Sandbox::kMirroring:
-       return switches::kMirroringSandbox;
+       return kMirroringSandbox;
  #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-     case Sandbox::kHardwareVideoDecoding:
-       return switches::kHardwareVideoDecodingSandbox;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     case Sandbox::kHardwareVideoDecoding:
+       return kHardwareVideoDecodingSandbox;
      case Sandbox::kHardwareVideoEncoding:
-       return switches::kHardwareVideoEncodingSandbox;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -328,7 +328,7 @@ std::string StringFromUtilitySandboxType
+@@ -329,7 +329,7 @@ std::string StringFromUtilitySandboxType
        // The following are not utility processes so should not occur.
      case Sandbox::kRenderer:
      case Sandbox::kGpu:
@@ -145,34 +146,36 @@ $NetBSD: patch-sandbox_policy_sandbox__type.cc,v 1.1 2025/02/06 09:58:19 wiz Exp
      case Sandbox::kZygoteIntermediateSandbox:
  #endif
        NOTREACHED();
-@@ -399,25 +399,25 @@ sandbox::mojom::Sandbox UtilitySandboxTy
-   if (sandbox_string == switches::kScreenAISandbox)
+@@ -407,7 +407,7 @@ sandbox::mojom::Sandbox UtilitySandboxTy
+     return Sandbox::kSpeechRecognition;
+   }
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   if (sandbox_string == kPrintBackendSandbox) {
+     return Sandbox::kPrintBackend;
+   }
+@@ -415,7 +415,7 @@ sandbox::mojom::Sandbox UtilitySandboxTy
      return Sandbox::kScreenAI;
+   }
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (sandbox_string == switches::kVideoEffectsSandbox) {
+   if (sandbox_string == kVideoEffectsSandbox) {
      return Sandbox::kVideoEffects;
    }
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   if (sandbox_string == switches::kOnDeviceTranslationSandbox) {
+@@ -425,12 +425,12 @@ sandbox::mojom::Sandbox UtilitySandboxTy
      return Sandbox::kOnDeviceTranslation;
    }
  #endif
 -#if BUILDFLAG(IS_FUCHSIA)
 +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   if (sandbox_string == switches::kVideoCaptureSandbox)
+   if (sandbox_string == kVideoCaptureSandbox) {
      return Sandbox::kVideoCapture;
+   }
  #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-   if (sandbox_string == switches::kHardwareVideoDecodingSandbox)
-     return Sandbox::kHardwareVideoDecoding;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (sandbox_string == switches::kHardwareVideoEncodingSandbox)
-     return Sandbox::kHardwareVideoEncoding;
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+   if (sandbox_string == kHardwareVideoDecodingSandbox) {
+     return Sandbox::kHardwareVideoDecoding;
+   }
diff --git a/chromium/patches/patch-sandbox_policy_switches.cc b/chromium/patches/patch-sandbox_policy_switches.cc
index d4167ff123..6f77e48a3d 100644
--- a/chromium/patches/patch-sandbox_policy_switches.cc
+++ b/chromium/patches/patch-sandbox_policy_switches.cc
@@ -1,34 +1,12 @@
-$NetBSD: patch-sandbox_policy_switches.cc,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/policy/switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/policy/switches.cc
-@@ -55,10 +55,10 @@ const char kWindowsSystemProxyResolverSa
- const char kMirroringSandbox[] = "mirroring";
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- const char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding";
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding";
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -71,7 +71,7 @@ const char kLibassistantSandbox[] = "lib
- #endif  // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- const char kOnDeviceTranslationSandbox[] = "on_device_translation";
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
- 
-@@ -102,7 +102,9 @@ const char kGpuSandboxFailuresFatal[] = 
+@@ -37,7 +37,9 @@ const char kGpuSandboxFailuresFatal[] = 
  // Meant to be used as a browser-level switch for testing purposes only.
  const char kNoSandbox[] = "no-sandbox";
  
diff --git a/chromium/patches/patch-sandbox_policy_switches.h b/chromium/patches/patch-sandbox_policy_switches.h
index 157585cc41..1a8e46d5eb 100644
--- a/chromium/patches/patch-sandbox_policy_switches.h
+++ b/chromium/patches/patch-sandbox_policy_switches.h
@@ -1,34 +1,12 @@
-$NetBSD: patch-sandbox_policy_switches.h,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- sandbox/policy/switches.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- sandbox/policy/switches.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ sandbox/policy/switches.h
-@@ -58,10 +58,10 @@ SANDBOX_POLICY_EXPORT extern const char 
- SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[];
- #endif  // BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- SANDBOX_POLICY_EXPORT extern const char kHardwareVideoDecodingSandbox[];
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[];
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -74,7 +74,7 @@ SANDBOX_POLICY_EXPORT extern const char 
- #endif  // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- SANDBOX_POLICY_EXPORT extern const char kOnDeviceTranslationSandbox[];
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
- 
-@@ -87,7 +87,8 @@ SANDBOX_POLICY_EXPORT extern const char 
+@@ -23,7 +23,8 @@ SANDBOX_POLICY_EXPORT extern const char 
  SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[];
  SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[];
  SANDBOX_POLICY_EXPORT extern const char kNoSandbox[];
diff --git a/chromium/patches/patch-services_audio_audio__sandbox__hook__linux.cc b/chromium/patches/patch-services_audio_audio__sandbox__hook__linux.cc
index f0d45d14fe..0bb6a75e3e 100644
--- a/chromium/patches/patch-services_audio_audio__sandbox__hook__linux.cc
+++ b/chromium/patches/patch-services_audio_audio__sandbox__hook__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_audio_audio__sandbox__hook__linux.cc,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/audio/audio_sandbox_hook_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/audio/audio_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/audio/audio_sandbox_hook_linux.cc
 @@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions(
  }
diff --git a/chromium/patches/patch-services_audio_audio__sandbox__hook__linux.h b/chromium/patches/patch-services_audio_audio__sandbox__hook__linux.h
index b3dcfbf76c..dd820d1c9e 100644
--- a/chromium/patches/patch-services_audio_audio__sandbox__hook__linux.h
+++ b/chromium/patches/patch-services_audio_audio__sandbox__hook__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_audio_audio__sandbox__hook__linux.h,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/audio/audio_sandbox_hook_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/audio/audio_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/audio/audio_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium/patches/patch-services_device_BUILD.gn b/chromium/patches/patch-services_device_BUILD.gn
index 41a8e9f84f..415cb5c2e8 100644
--- a/chromium/patches/patch-services_device_BUILD.gn
+++ b/chromium/patches/patch-services_device_BUILD.gn
@@ -1,17 +1,17 @@
-$NetBSD: patch-services_device_BUILD.gn,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/BUILD.gn
-@@ -15,7 +15,7 @@ if (is_android) {
+@@ -13,7 +13,7 @@ if (is_android) {
  }
  
  is_serial_enabled_platform =
--    is_win || ((is_linux || is_chromeos) && use_udev) || is_mac
-+    is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac
+-    is_win || ((is_linux || is_chromeos) && use_udev) || is_mac || is_android
++    is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac || is_android
  
  source_set("lib") {
    # This should be visible only to embedders of the Device Service, and the
diff --git a/chromium/patches/patch-services_device_geolocation_location__provider__manager.cc b/chromium/patches/patch-services_device_geolocation_location__provider__manager.cc
index 48b21cf393..108f1cd1b9 100644
--- a/chromium/patches/patch-services_device_geolocation_location__provider__manager.cc
+++ b/chromium/patches/patch-services_device_geolocation_location__provider__manager.cc
@@ -1,14 +1,14 @@
-$NetBSD: patch-services_device_geolocation_location__provider__manager.cc,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/geolocation/location_provider_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/geolocation/location_provider_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/geolocation/location_provider_manager.cc
-@@ -87,7 +87,7 @@ LocationProviderManager::LocationProvide
- #if BUILDFLAG(IS_ANDROID)
-   // On Android, default to using the platform location provider.
+@@ -91,7 +91,7 @@ LocationProviderManager::LocationProvide
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
+   // On Android and iOS, default to using the platform location provider.
    provider_manager_mode_ = kPlatformOnly;
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-services_device_hid_BUILD.gn b/chromium/patches/patch-services_device_hid_BUILD.gn
index 07b11c0aae..fbda27c974 100644
--- a/chromium/patches/patch-services_device_hid_BUILD.gn
+++ b/chromium/patches/patch-services_device_hid_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_device_hid_BUILD.gn,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/hid/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/hid/BUILD.gn
-@@ -36,7 +36,33 @@ source_set("hid") {
+@@ -34,7 +34,33 @@ source_set("hid") {
      "//services/device/public/mojom",
    ]
  
diff --git a/chromium/patches/patch-services_device_hid_hid__connection__fido.cc b/chromium/patches/patch-services_device_hid_hid__connection__fido.cc
index cd5e7193e2..30d6e30771 100644
--- a/chromium/patches/patch-services_device_hid_hid__connection__fido.cc
+++ b/chromium/patches/patch-services_device_hid_hid__connection__fido.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__connection__fido.cc,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_connection_fido.cc.orig	2024-12-21 10:25:10.579061446 +0000
+--- services/device/hid/hid_connection_fido.cc.orig	2025-05-08 12:01:57.802603323 +0000
 +++ services/device/hid/hid_connection_fido.cc
 @@ -0,0 +1,216 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/chromium/patches/patch-services_device_hid_hid__connection__fido.h b/chromium/patches/patch-services_device_hid_hid__connection__fido.h
index 6de14dd0d3..752e74ff73 100644
--- a/chromium/patches/patch-services_device_hid_hid__connection__fido.h
+++ b/chromium/patches/patch-services_device_hid_hid__connection__fido.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__connection__fido.h,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_connection_fido.h.orig	2024-12-21 10:25:10.579833055 +0000
+--- services/device/hid/hid_connection_fido.h.orig	2025-05-08 12:01:57.802753492 +0000
 +++ services/device/hid/hid_connection_fido.h
 @@ -0,0 +1,60 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/chromium/patches/patch-services_device_hid_hid__connection__freebsd.cc b/chromium/patches/patch-services_device_hid_hid__connection__freebsd.cc
index 668e6495e2..28a364a26d 100644
--- a/chromium/patches/patch-services_device_hid_hid__connection__freebsd.cc
+++ b/chromium/patches/patch-services_device_hid_hid__connection__freebsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__connection__freebsd.cc,v 1.1 2025/02/06 09:58:19 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_connection_freebsd.cc.orig	2024-12-21 10:25:10.580356867 +0000
+--- services/device/hid/hid_connection_freebsd.cc.orig	2025-05-08 12:01:57.802888863 +0000
 +++ services/device/hid/hid_connection_freebsd.cc
 @@ -0,0 +1,240 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
@@ -52,7 +52,7 @@ $NetBSD: patch-services_device_hid_hid__connection__freebsd.cc,v 1.1 2025/02/06
 +  // Must be called on a thread that has a base::MessageLoopForIO.
 +  void Start() {
 +    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+    base::internal::AssertBlockingAllowed();
++    base::AssertBlockingAllowed();
 +
 +    file_watcher_ = base::FileDescriptorWatcher::WatchReadable(
 +        fd_.get(), base::BindRepeating(&BlockingTaskRunnerHelper::OnFileCanReadWithoutBlocking,
diff --git a/chromium/patches/patch-services_device_hid_hid__connection__freebsd.h b/chromium/patches/patch-services_device_hid_hid__connection__freebsd.h
index b53cf19930..c34d1f0acf 100644
--- a/chromium/patches/patch-services_device_hid_hid__connection__freebsd.h
+++ b/chromium/patches/patch-services_device_hid_hid__connection__freebsd.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__connection__freebsd.h,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_connection_freebsd.h.orig	2024-12-21 10:25:10.580936830 +0000
+--- services/device/hid/hid_connection_freebsd.h.orig	2025-05-08 12:01:57.803039954 +0000
 +++ services/device/hid/hid_connection_freebsd.h
 @@ -0,0 +1,67 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-services_device_hid_hid__service.cc b/chromium/patches/patch-services_device_hid_hid__service.cc
index aa37edf376..c0acd2b42b 100644
--- a/chromium/patches/patch-services_device_hid_hid__service.cc
+++ b/chromium/patches/patch-services_device_hid_hid__service.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__service.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/hid/hid_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/hid/hid_service.cc
 @@ -20,12 +20,18 @@
  
diff --git a/chromium/patches/patch-services_device_hid_hid__service__fido.cc b/chromium/patches/patch-services_device_hid_hid__service__fido.cc
index e6690f0497..d3e65c0bcf 100644
--- a/chromium/patches/patch-services_device_hid_hid__service__fido.cc
+++ b/chromium/patches/patch-services_device_hid_hid__service__fido.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__service__fido.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_service_fido.cc.orig	2024-12-21 10:25:10.582076644 +0000
+--- services/device/hid/hid_service_fido.cc.orig	2025-05-08 12:01:57.803318400 +0000
 +++ services/device/hid/hid_service_fido.cc
 @@ -0,0 +1,396 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/chromium/patches/patch-services_device_hid_hid__service__fido.h b/chromium/patches/patch-services_device_hid_hid__service__fido.h
index af3d150ec8..08a78889d9 100644
--- a/chromium/patches/patch-services_device_hid_hid__service__fido.h
+++ b/chromium/patches/patch-services_device_hid_hid__service__fido.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__service__fido.h,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_service_fido.h.orig	2024-12-21 10:25:10.582731757 +0000
+--- services/device/hid/hid_service_fido.h.orig	2025-05-08 12:01:57.803484139 +0000
 +++ services/device/hid/hid_service_fido.h
 @@ -0,0 +1,65 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/chromium/patches/patch-services_device_hid_hid__service__freebsd.cc b/chromium/patches/patch-services_device_hid_hid__service__freebsd.cc
index a3d6ee2567..d6ed898995 100644
--- a/chromium/patches/patch-services_device_hid_hid__service__freebsd.cc
+++ b/chromium/patches/patch-services_device_hid_hid__service__freebsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__service__freebsd.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_service_freebsd.cc.orig	2024-12-21 10:25:10.583221765 +0000
+--- services/device/hid/hid_service_freebsd.cc.orig	2025-05-08 12:01:57.803625652 +0000
 +++ services/device/hid/hid_service_freebsd.cc
 @@ -0,0 +1,395 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
@@ -112,7 +112,7 @@ $NetBSD: patch-services_device_hid_hid__service__freebsd.cc,v 1.1 2025/02/06 09:
 +
 +  bool HaveReadWritePermissions(std::string device_id) {
 +    std::string device_node = "/dev/" + device_id;
-+    base::internal::AssertBlockingAllowed();
++    base::AssertBlockingAllowed();
 +
 +    base::FilePath device_path(device_node);
 +    base::File device_file;
@@ -136,7 +136,7 @@ $NetBSD: patch-services_device_hid_hid__service__freebsd.cc,v 1.1 2025/02/06 09:
 +
 +    std::vector<uint8_t> report_descriptor;
 +
-+    base::internal::AssertBlockingAllowed();
++    base::AssertBlockingAllowed();
 +
 +    base::FilePath device_path(device_node);
 +    base::File device_file;
@@ -202,7 +202,7 @@ $NetBSD: patch-services_device_hid_hid__service__freebsd.cc,v 1.1 2025/02/06 09:
 + private:
 +
 +  void CheckPendingPermissionChange() {
-+    base::internal::AssertBlockingAllowed();
++    base::AssertBlockingAllowed();
 +    std::map<std::string, int>::iterator it;
 +    for (it = permissions_checks_attempts_.begin(); it != permissions_checks_attempts_.end();) {
 +      std::string device_name = it->first;
@@ -228,7 +228,7 @@ $NetBSD: patch-services_device_hid_hid__service__freebsd.cc,v 1.1 2025/02/06 09:
 +  }
 +
 +  void SetupDevdMonitor() {
-+    base::internal::AssertBlockingAllowed();
++    base::AssertBlockingAllowed();
 +
 +    int devd_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
 +    if (devd_fd < 0)
diff --git a/chromium/patches/patch-services_device_hid_hid__service__freebsd.h b/chromium/patches/patch-services_device_hid_hid__service__freebsd.h
index a51c13e0cf..c07d5629ba 100644
--- a/chromium/patches/patch-services_device_hid_hid__service__freebsd.h
+++ b/chromium/patches/patch-services_device_hid_hid__service__freebsd.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__service__freebsd.h,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_service_freebsd.h.orig	2024-12-21 10:25:10.584262403 +0000
+--- services/device/hid/hid_service_freebsd.h.orig	2025-05-08 12:01:57.803789187 +0000
 +++ services/device/hid/hid_service_freebsd.h
 @@ -0,0 +1,49 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-services_device_hid_hid__service__netbsd.cc b/chromium/patches/patch-services_device_hid_hid__service__netbsd.cc
index f3a4b76cf4..db1cfc20c6 100644
--- a/chromium/patches/patch-services_device_hid_hid__service__netbsd.cc
+++ b/chromium/patches/patch-services_device_hid_hid__service__netbsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__service__netbsd.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_service_netbsd.cc.orig	2024-12-21 10:25:10.584948247 +0000
+--- services/device/hid/hid_service_netbsd.cc.orig	2025-05-08 12:01:57.803926431 +0000
 +++ services/device/hid/hid_service_netbsd.cc
 @@ -0,0 +1,27 @@
 +// Copyright 2022 The Chromium Authors
diff --git a/chromium/patches/patch-services_device_hid_hid__service__netbsd.h b/chromium/patches/patch-services_device_hid_hid__service__netbsd.h
index 5aed790173..d2db01d60e 100644
--- a/chromium/patches/patch-services_device_hid_hid__service__netbsd.h
+++ b/chromium/patches/patch-services_device_hid_hid__service__netbsd.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_hid_hid__service__netbsd.h,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/hid/hid_service_netbsd.h.orig	2024-12-21 10:25:10.585482674 +0000
+--- services/device/hid/hid_service_netbsd.h.orig	2025-05-08 12:01:57.804059488 +0000
 +++ services/device/hid/hid_service_netbsd.h
 @@ -0,0 +1,33 @@
 +// Copyright 2022 The Chromium Authors
diff --git a/chromium/patches/patch-services_device_public_cpp_device__features.cc b/chromium/patches/patch-services_device_public_cpp_device__features.cc
new file mode 100644
index 0000000000..cdaa04fc39
--- /dev/null
+++ b/chromium/patches/patch-services_device_public_cpp_device__features.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- services/device/public/cpp/device_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ services/device/public/cpp/device_features.cc
+@@ -135,7 +135,7 @@ bool IsOsLevelGeolocationPermissionSuppo
+ 
+ // Controls whether Chrome will try to automatically detach kernel drivers when
+ // a USB interface is busy.
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kAutomaticUsbDetach,
+              "AutomaticUsbDetach",
+              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium/patches/patch-services_device_public_cpp_device__features.h b/chromium/patches/patch-services_device_public_cpp_device__features.h
new file mode 100644
index 0000000000..6bb2b336de
--- /dev/null
+++ b/chromium/patches/patch-services_device_public_cpp_device__features.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- services/device/public/cpp/device_features.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ services/device/public/cpp/device_features.h
+@@ -53,7 +53,7 @@ extern const DEVICE_FEATURES_EXPORT
+ 
+ DEVICE_FEATURES_EXPORT bool IsOsLevelGeolocationPermissionSupportEnabled();
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ DEVICE_FEATURES_EXPORT BASE_DECLARE_FEATURE(kAutomaticUsbDetach);
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/chromium/patches/patch-services_device_public_cpp_generic__sensor_sensor__reading.h b/chromium/patches/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
index d9e4e88bf0..96be1d57f6 100644
--- a/chromium/patches/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
+++ b/chromium/patches/patch-services_device_public_cpp_generic__sensor_sensor__reading.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_public_cpp_generic__sensor_sensor__reading.h,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/public/cpp/generic_sensor/sensor_reading.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/public/cpp/generic_sensor/sensor_reading.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/public/cpp/generic_sensor/sensor_reading.h
 @@ -8,6 +8,8 @@
  #include <stddef.h>
diff --git a/chromium/patches/patch-services_device_public_mojom_BUILD.gn b/chromium/patches/patch-services_device_public_mojom_BUILD.gn
index 0a5482fe9e..5068c72939 100644
--- a/chromium/patches/patch-services_device_public_mojom_BUILD.gn
+++ b/chromium/patches/patch-services_device_public_mojom_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_device_public_mojom_BUILD.gn,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/public/mojom/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/public/mojom/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/public/mojom/BUILD.gn
-@@ -98,7 +98,7 @@ mojom("device_service") {
+@@ -96,7 +96,7 @@ mojom("device_service") {
    enable_js_fuzzing = false
  
    enabled_features = []
diff --git a/chromium/patches/patch-services_device_serial_BUILD.gn b/chromium/patches/patch-services_device_serial_BUILD.gn
index 001cdf4d03..56f18ec0c1 100644
--- a/chromium/patches/patch-services_device_serial_BUILD.gn
+++ b/chromium/patches/patch-services_device_serial_BUILD.gn
@@ -1,17 +1,17 @@
-$NetBSD: patch-services_device_serial_BUILD.gn,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/serial/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/serial/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/serial/BUILD.gn
-@@ -5,7 +5,7 @@
- import("//build/config/chromeos/ui_mode.gni")
+@@ -4,7 +4,7 @@
+ 
  import("//build/config/features.gni")
  
--if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac) {
-+if (is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac) {
+-if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac || is_android) {
++if (is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac || is_android) {
    config("platform_support") {
      visibility = [ ":serial" ]
      if (is_win) {
diff --git a/chromium/patches/patch-services_device_serial_serial__device__enumerator.cc b/chromium/patches/patch-services_device_serial_serial__device__enumerator.cc
index 90b9dd2efb..d81508a699 100644
--- a/chromium/patches/patch-services_device_serial_serial__device__enumerator.cc
+++ b/chromium/patches/patch-services_device_serial_serial__device__enumerator.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_serial_serial__device__enumerator.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/serial/serial_device_enumerator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/serial/serial_device_enumerator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/serial/serial_device_enumerator.cc
 @@ -13,7 +13,7 @@
  #include "build/build_config.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-services_device_serial_serial__device__enumerator.cc,v 1.1 2025/0
  #include "services/device/serial/serial_device_enumerator_linux.h"
  #elif BUILDFLAG(IS_MAC)
  #include "services/device/serial/serial_device_enumerator_mac.h"
-@@ -26,7 +26,7 @@ namespace device {
+@@ -28,7 +28,7 @@ namespace device {
  // static
  std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create(
      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
diff --git a/chromium/patches/patch-services_device_serial_serial__io__handler__posix.cc b/chromium/patches/patch-services_device_serial_serial__io__handler__posix.cc
index 2c2ea44a1e..77f45a0d9f 100644
--- a/chromium/patches/patch-services_device_serial_serial__io__handler__posix.cc
+++ b/chromium/patches/patch-services_device_serial_serial__io__handler__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_serial_serial__io__handler__posix.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/serial/serial_io_handler_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/serial/serial_io_handler_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/serial/serial_io_handler_posix.cc
 @@ -73,7 +73,7 @@ bool BitrateToSpeedConstant(int bitrate,
      BITRATE_TO_SPEED_CASE(9600)
diff --git a/chromium/patches/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/chromium/patches/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
index e647bf20f1..00b6684354 100644
--- a/chromium/patches/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
+++ b/chromium/patches/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
@@ -1,20 +1,22 @@
-$NetBSD: patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
-@@ -136,7 +136,11 @@ class TimeZoneMonitorLinuxImpl
+@@ -131,9 +131,12 @@ class TimeZoneMonitorLinuxImpl
      // false positives are harmless, assuming the false positive rate is
      // reasonable.
-     const char* const kFilesToWatch[] = {
+     const auto kFilesToWatch = std::to_array<const char*>({
+-        "/etc/localtime",
 +#if BUILDFLAG(IS_BSD)
 +        "@PKG_SYSCONFBASE@/localtime",
 +#else
-         "/etc/localtime", "/etc/timezone", "/etc/TZ",
+         "/etc/timezone",
+         "/etc/TZ",
 +#endif
-     };
+     });
      for (size_t index = 0; index < std::size(kFilesToWatch); ++index) {
        file_path_watchers_.push_back(std::make_unique<base::FilePathWatcher>());
diff --git a/chromium/patches/patch-services_device_usb_BUILD.gn b/chromium/patches/patch-services_device_usb_BUILD.gn
index a3f5cc8ed8..3aa5456f13 100644
--- a/chromium/patches/patch-services_device_usb_BUILD.gn
+++ b/chromium/patches/patch-services_device_usb_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_device_usb_BUILD.gn,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/usb/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/usb/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/usb/BUILD.gn
-@@ -91,7 +91,7 @@ static_library("usb") {
+@@ -90,7 +90,7 @@ static_library("usb") {
      deps += [ "//third_party/re2" ]
    }
  
@@ -15,7 +15,7 @@ $NetBSD: patch-services_device_usb_BUILD.gn,v 1.1 2025/02/06 09:58:20 wiz Exp $
      # These sources and deps are required for libusb.
      # TODO(crbug.com/40136337) Remove these sources.
      sources += [
-@@ -114,6 +114,13 @@ static_library("usb") {
+@@ -113,6 +113,13 @@ static_library("usb") {
      deps += [ "//third_party/libusb" ]
    }
  
@@ -29,7 +29,7 @@ $NetBSD: patch-services_device_usb_BUILD.gn,v 1.1 2025/02/06 09:58:20 wiz Exp $
    if (is_linux || is_chromeos) {
      sources += [
        "usb_device_linux.cc",
-@@ -135,7 +142,7 @@ static_library("usb") {
+@@ -134,7 +141,7 @@ static_library("usb") {
      deps += [ "//device/udev_linux" ]
    }
  
diff --git a/chromium/patches/patch-services_device_usb_usb__device__handle__usbfs.cc b/chromium/patches/patch-services_device_usb_usb__device__handle__usbfs.cc
new file mode 100644
index 0000000000..43855a93de
--- /dev/null
+++ b/chromium/patches/patch-services_device_usb_usb__device__handle__usbfs.cc
@@ -0,0 +1,44 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- services/device/usb/usb_device_handle_usbfs.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ services/device/usb/usb_device_handle_usbfs.cc
+@@ -39,7 +39,7 @@
+ #include "chromeos/dbus/permission_broker/permission_broker_client.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "services/device/public/cpp/device_features.h"
+ #include "services/device/usb/usb_interface_detach_allowlist.h"
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+@@ -271,7 +271,7 @@ bool UsbDeviceHandleUsbfs::BlockingTaskR
+   return true;
+ }
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool UsbDeviceHandleUsbfs::BlockingTaskRunnerHelper::DetachInterface(
+     int interface_number,
+     const CombinedInterfaceInfo& interface_info) {
+@@ -599,7 +599,7 @@ void UsbDeviceHandleUsbfs::ClaimInterfac
+     return;
+   }
+ #endif
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
+     const mojom::UsbConfigurationInfo* config =
+         device_->GetActiveConfiguration();
+@@ -945,7 +945,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterf
+     return;
+   }
+ #endif
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) {
+     helper_.AsyncCall(&BlockingTaskRunnerHelper::ReattachInterface)
+         .WithArgs(interface_number)
diff --git a/chromium/patches/patch-services_device_usb_usb__device__handle__usbfs.h b/chromium/patches/patch-services_device_usb_usb__device__handle__usbfs.h
new file mode 100644
index 0000000000..ee9b9e824f
--- /dev/null
+++ b/chromium/patches/patch-services_device_usb_usb__device__handle__usbfs.h
@@ -0,0 +1,44 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- services/device/usb/usb_device_handle_usbfs.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ services/device/usb/usb_device_handle_usbfs.h
+@@ -19,7 +19,7 @@
+ #include "base/threading/sequence_bound.h"
+ #include "services/device/usb/usb_device_handle.h"
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/containers/flat_set.h"
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+ 
+@@ -215,7 +215,7 @@ class UsbDeviceHandleUsbfs::BlockingTask
+   bool ClearHalt(uint8_t endpoint_address);
+   void DiscardUrb(Transfer* transfer);
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Detach the interface from a kernel driver before ClaimInterface
+   virtual bool DetachInterface(int interface_number,
+                                const CombinedInterfaceInfo& interfaceInfo);
+@@ -228,7 +228,7 @@ class UsbDeviceHandleUsbfs::BlockingTask
+   // Called when |fd_| is writable without blocking.
+   void OnFileCanWriteWithoutBlocking();
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Called from |DetachInterface|.
+   std::string GetKernelDriver(int interface_number) const;
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+@@ -240,7 +240,7 @@ class UsbDeviceHandleUsbfs::BlockingTask
+   std::unique_ptr<base::FileDescriptorWatcher::Controller> watch_controller_;
+   SEQUENCE_CHECKER(sequence_checker_);
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // All interfaces that have been detached from kernel drivers
+   base::flat_set<int> detached_interfaces_;
+ #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-services_device_usb_usb__service.cc b/chromium/patches/patch-services_device_usb_usb__service.cc
index f3cfc35198..adef7e9815 100644
--- a/chromium/patches/patch-services_device_usb_usb__service.cc
+++ b/chromium/patches/patch-services_device_usb_usb__service.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_usb_usb__service.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/usb/usb_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/device/usb/usb_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/device/usb/usb_service.cc
 @@ -21,12 +21,16 @@
  
diff --git a/chromium/patches/patch-services_device_usb_usb__service__fake.cc b/chromium/patches/patch-services_device_usb_usb__service__fake.cc
index 3ce71a7177..ca322d19d1 100644
--- a/chromium/patches/patch-services_device_usb_usb__service__fake.cc
+++ b/chromium/patches/patch-services_device_usb_usb__service__fake.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_usb_usb__service__fake.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/usb/usb_service_fake.cc.orig	2024-12-21 10:25:10.592547281 +0000
+--- services/device/usb/usb_service_fake.cc.orig	2025-05-08 12:01:57.805774080 +0000
 +++ services/device/usb/usb_service_fake.cc
 @@ -0,0 +1,49 @@
 +// Copyright 2014 The Chromium Authors
diff --git a/chromium/patches/patch-services_device_usb_usb__service__fake.h b/chromium/patches/patch-services_device_usb_usb__service__fake.h
index 9c876c07db..3183951b80 100644
--- a/chromium/patches/patch-services_device_usb_usb__service__fake.h
+++ b/chromium/patches/patch-services_device_usb_usb__service__fake.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_device_usb_usb__service__fake.h,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/device/usb/usb_service_fake.h.orig	2024-12-21 10:25:10.593061594 +0000
+--- services/device/usb/usb_service_fake.h.orig	2025-05-08 12:01:57.805907437 +0000
 +++ services/device/usb/usb_service_fake.h
 @@ -0,0 +1,48 @@
 +// Copyright 2015 The Chromium Authors
diff --git a/chromium/patches/patch-services_network_BUILD.gn b/chromium/patches/patch-services_network_BUILD.gn
index de2bd82301..0dac6b97f8 100644
--- a/chromium/patches/patch-services_network_BUILD.gn
+++ b/chromium/patches/patch-services_network_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_network_BUILD.gn,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/BUILD.gn
-@@ -401,7 +401,6 @@ if (is_linux || is_chromeos) {
+@@ -400,7 +400,6 @@ if (is_linux || is_chromeos) {
      ]
      deps = [
        "//base:base",
diff --git a/chromium/patches/patch-services_network_network__context.cc b/chromium/patches/patch-services_network_network__context.cc
index 60fbe0ac1e..05ed9cd9c7 100644
--- a/chromium/patches/patch-services_network_network__context.cc
+++ b/chromium/patches/patch-services_network_network__context.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_network_network__context.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/network_context.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/network_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/network_context.cc
-@@ -589,7 +589,7 @@ NetworkContext::NetworkContextHttpAuthPr
+@@ -607,7 +607,7 @@ NetworkContext::NetworkContextHttpAuthPr
  NetworkContext::NetworkContextHttpAuthPreferences::
      ~NetworkContextHttpAuthPreferences() = default;
  
@@ -15,7 +15,7 @@ $NetBSD: patch-services_network_network__context.cc,v 1.1 2025/02/06 09:58:20 wi
  bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
      const {
    if (network_service_) {
-@@ -2444,7 +2444,7 @@ void NetworkContext::OnHttpAuthDynamicPa
+@@ -2557,7 +2557,7 @@ void NetworkContext::OnHttpAuthDynamicPa
        http_auth_dynamic_network_service_params->android_negotiate_account_type);
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/chromium/patches/patch-services_network_network__context.h b/chromium/patches/patch-services_network_network__context.h
index 8c923b94b0..f6f0007974 100644
--- a/chromium/patches/patch-services_network_network__context.h
+++ b/chromium/patches/patch-services_network_network__context.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_network_network__context.h,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/network_context.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/network_context.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/network_context.h
-@@ -696,7 +696,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
+@@ -715,7 +715,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
     public:
      explicit NetworkContextHttpAuthPreferences(NetworkService* network_service);
      ~NetworkContextHttpAuthPreferences() override;
diff --git a/chromium/patches/patch-services_network_network__sandbox__hook__linux.cc b/chromium/patches/patch-services_network_network__sandbox__hook__linux.cc
index 3af22a548e..c570d72ea3 100644
--- a/chromium/patches/patch-services_network_network__sandbox__hook__linux.cc
+++ b/chromium/patches/patch-services_network_network__sandbox__hook__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_network_network__sandbox__hook__linux.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/network_sandbox_hook_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/network_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/network_sandbox_hook_linux.cc
 @@ -15,11 +15,14 @@
  #include "sandbox/linux/syscall_broker/broker_file_permission.h"
diff --git a/chromium/patches/patch-services_network_network__sandbox__hook__linux.h b/chromium/patches/patch-services_network_network__sandbox__hook__linux.h
index bd0f9c0b81..898d99d0ec 100644
--- a/chromium/patches/patch-services_network_network__sandbox__hook__linux.h
+++ b/chromium/patches/patch-services_network_network__sandbox__hook__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_network_network__sandbox__hook__linux.h,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/network_sandbox_hook_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/network_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/network_sandbox_hook_linux.h
 @@ -6,7 +6,11 @@
  #define SERVICES_NETWORK_NETWORK_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium/patches/patch-services_network_network__service.cc b/chromium/patches/patch-services_network_network__service.cc
index 1ddb95ba9d..04b207a90c 100644
--- a/chromium/patches/patch-services_network_network__service.cc
+++ b/chromium/patches/patch-services_network_network__service.cc
@@ -1,21 +1,26 @@
-$NetBSD: patch-services_network_network__service.cc,v 1.1 2025/02/06 09:58:20 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/network_service.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/network_service.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/network_service.cc
-@@ -99,7 +99,7 @@
+@@ -103,11 +103,11 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
  #endif
  
--#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \
-+#if ((BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)) || \
-     BUILDFLAG(IS_CHROMEOS_LACROS)
- 
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS)
  #include "components/os_crypt/sync/key_storage_config_linux.h"
-@@ -977,7 +977,7 @@ void NetworkService::SetExplicitlyAllowe
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "services/network/network_change_notifier_passive_factory.h"
+ #endif
+ 
+@@ -1016,7 +1016,7 @@ void NetworkService::SetExplicitlyAllowe
    net::SetExplicitlyAllowedPorts(ports);
  }
  
@@ -24,7 +29,7 @@ $NetBSD: patch-services_network_network__service.cc,v 1.1 2025/02/06 09:58:20 wi
  void NetworkService::SetGssapiLibraryLoadObserver(
      mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
          gssapi_library_load_observer) {
-@@ -1059,7 +1059,7 @@ NetworkService::CreateHttpAuthHandlerFac
+@@ -1116,7 +1116,7 @@ NetworkService::CreateHttpAuthHandlerFac
    );
  }
  
diff --git a/chromium/patches/patch-services_network_network__service.h b/chromium/patches/patch-services_network_network__service.h
index ca2d6bd20a..f79f6cfcb5 100644
--- a/chromium/patches/patch-services_network_network__service.h
+++ b/chromium/patches/patch-services_network_network__service.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_network_network__service.h,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/network_service.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/network_service.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/network_service.h
-@@ -238,7 +238,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
+@@ -250,7 +250,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
        const std::vector<ContentSettingPatternSource>& settings) override;
  
    void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override;
@@ -15,7 +15,7 @@ $NetBSD: patch-services_network_network__service.h,v 1.1 2025/02/06 09:58:21 wiz
    void SetGssapiLibraryLoadObserver(
        mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
            gssapi_library_load_observer) override;
-@@ -264,7 +264,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
+@@ -291,7 +291,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
    std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory(
        NetworkContext* network_context);
  
@@ -24,7 +24,7 @@ $NetBSD: patch-services_network_network__service.h,v 1.1 2025/02/06 09:58:21 wiz
    // This is called just before a GSSAPI library may be loaded.
    void OnBeforeGssapiLibraryLoad();
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -498,7 +498,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
+@@ -547,7 +547,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) 
    // leaking stale listeners between tests.
    std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_;
  
diff --git a/chromium/patches/patch-services_network_public_cpp_BUILD.gn b/chromium/patches/patch-services_network_public_cpp_BUILD.gn
index a6a3a76c92..b307f0f568 100644
--- a/chromium/patches/patch-services_network_public_cpp_BUILD.gn
+++ b/chromium/patches/patch-services_network_public_cpp_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_network_public_cpp_BUILD.gn,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/public/cpp/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/public/cpp/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/public/cpp/BUILD.gn
-@@ -481,7 +481,7 @@ component("cpp_base") {
+@@ -621,7 +621,7 @@ component("cpp_base") {
      sources += [ "transferable_directory_fuchsia.cc" ]
    }
  
@@ -15,7 +15,7 @@ $NetBSD: patch-services_network_public_cpp_BUILD.gn,v 1.1 2025/02/06 09:58:21 wi
      sources += [
        "network_interface_change_listener_mojom_traits.cc",
        "network_interface_change_listener_mojom_traits.h",
-@@ -591,7 +591,7 @@ source_set("tests") {
+@@ -742,7 +742,7 @@ source_set("tests") {
      "x_frame_options_parser_unittest.cc",
    ]
  
diff --git a/chromium/patches/patch-services_network_public_cpp_features.cc b/chromium/patches/patch-services_network_public_cpp_features.cc
index 37f37605ef..0e526ed8ba 100644
--- a/chromium/patches/patch-services_network_public_cpp_features.cc
+++ b/chromium/patches/patch-services_network_public_cpp_features.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_network_public_cpp_features.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/public/cpp/features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/public/cpp/features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/public/cpp/features.cc
-@@ -127,7 +127,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
+@@ -125,7 +125,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
  BASE_FEATURE(kDnsOverHttpsUpgrade,
               "DnsOverHttpsUpgrade",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/chromium/patches/patch-services_network_public_mojom_BUILD.gn b/chromium/patches/patch-services_network_public_mojom_BUILD.gn
index f39168f5ca..cbd0ddd94c 100644
--- a/chromium/patches/patch-services_network_public_mojom_BUILD.gn
+++ b/chromium/patches/patch-services_network_public_mojom_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_network_public_mojom_BUILD.gn,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/public/mojom/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/public/mojom/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/public/mojom/BUILD.gn
-@@ -491,11 +491,11 @@ mojom("url_loader_base") {
+@@ -674,11 +674,11 @@ mojom("url_loader_base") {
    }
  
    enabled_features = []
@@ -20,7 +20,7 @@ $NetBSD: patch-services_network_public_mojom_BUILD.gn,v 1.1 2025/02/06 09:58:21
      # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does
      # not include lacros.
      enabled_features += [ "use_network_interface_change_listener" ]
-@@ -1493,7 +1493,7 @@ mojom("mojom") {
+@@ -1765,7 +1765,7 @@ mojom("mojom") {
      }
    }
  
diff --git a/chromium/patches/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h b/chromium/patches/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
index 6f3d98f777..cd54c762cd 100644
--- a/chromium/patches/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
+++ b/chromium/patches/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/network/shared_dictionary/shared_dictionary_writer_in_memory.h
 @@ -9,6 +9,8 @@
  #include <string>
diff --git a/chromium/patches/patch-services_on__device__model_on__device__model__service.h b/chromium/patches/patch-services_on__device__model_on__device__model__service.h
index 277ee1202c..6d3cf8d06b 100644
--- a/chromium/patches/patch-services_on__device__model_on__device__model__service.h
+++ b/chromium/patches/patch-services_on__device__model_on__device__model__service.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_on__device__model_on__device__model__service.h,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/on_device_model/on_device_model_service.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/on_device_model/on_device_model_service.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/on_device_model/on_device_model_service.h
 @@ -31,6 +31,10 @@ class OnDeviceModelInternalImpl;
  class TsHolder;
diff --git a/chromium/patches/patch-services_on__device__model_pre__sandbox__init.cc b/chromium/patches/patch-services_on__device__model_pre__sandbox__init.cc
index 2508bb01cb..8c1711d913 100644
--- a/chromium/patches/patch-services_on__device__model_pre__sandbox__init.cc
+++ b/chromium/patches/patch-services_on__device__model_pre__sandbox__init.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_on__device__model_pre__sandbox__init.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/on_device_model/pre_sandbox_init.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/on_device_model/pre_sandbox_init.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/on_device_model/pre_sandbox_init.cc
 @@ -14,7 +14,7 @@
  #include "services/on_device_model/ml/chrome_ml.h"  // nogncheck
@@ -33,7 +33,7 @@ $NetBSD: patch-services_on__device__model_pre__sandbox__init.cc,v 1.1 2025/02/06
    // Warm any relevant drivers before attempting to bring up the sandbox. For
    // good measure we initialize a device instance for any adapter with an
    // appropriate backend on top of any integrated or discrete GPU.
-@@ -101,7 +101,7 @@ bool OnDeviceModelService::PreSandboxIni
+@@ -102,7 +102,7 @@ bool OnDeviceModelService::PreSandboxIni
    return true;
  }
  
diff --git a/chromium/patches/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/chromium/patches/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
index 174bfb9b03..279515236b 100644
--- a/chromium/patches/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
+++ b/chromium/patches/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
 @@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(con
                                       uint32_t shared_resident_kb) {
@@ -23,8 +23,8 @@ $NetBSD: patch-services_resource__coordinator_memory__instrumentation_queued__re
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    os_dump->private_footprint_swap_kb =
        internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
- #endif
-@@ -219,7 +219,7 @@ void QueuedRequestDispatcher::SetUpAndDi
+   os_dump->mappings_count = internal_os_dump.mappings_count;
+@@ -222,7 +222,7 @@ void QueuedRequestDispatcher::SetUpAndDi
  
  // On most platforms each process can dump data about their own process
  // so ask each process to do so Linux is special see below.
@@ -33,7 +33,7 @@ $NetBSD: patch-services_resource__coordinator_memory__instrumentation_queued__re
      request->pending_responses.insert({client_info.pid, ResponseType::kOSDump});
      client->RequestOSMemoryDump(request->memory_map_option(),
                                  {base::kNullProcessId},
-@@ -234,7 +234,7 @@ void QueuedRequestDispatcher::SetUpAndDi
+@@ -237,7 +237,7 @@ void QueuedRequestDispatcher::SetUpAndDi
  
  // In some cases, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -42,7 +42,7 @@ $NetBSD: patch-services_resource__coordinator_memory__instrumentation_queued__re
    std::vector<base::ProcessId> pids;
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = base::kNullProcessId;
-@@ -280,7 +280,7 @@ void QueuedRequestDispatcher::SetUpAndDi
+@@ -283,7 +283,7 @@ void QueuedRequestDispatcher::SetUpAndDi
      const OsCallback& os_callback) {
  // On Linux, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -51,7 +51,7 @@ $NetBSD: patch-services_resource__coordinator_memory__instrumentation_queued__re
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = 0;
    for (const auto& client_info : clients) {
-@@ -330,7 +330,7 @@ QueuedRequestDispatcher::FinalizeVmRegio
+@@ -333,7 +333,7 @@ QueuedRequestDispatcher::FinalizeVmRegio
      // each client process provides 1 OS dump, % the case where the client is
      // disconnected mid dump.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
@@ -60,7 +60,7 @@ $NetBSD: patch-services_resource__coordinator_memory__instrumentation_queued__re
      for (auto& kv : extra_os_dumps) {
        auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first;
        DCHECK(results.find(pid) == results.end());
-@@ -391,7 +391,7 @@ void QueuedRequestDispatcher::Finalize(Q
+@@ -394,7 +394,7 @@ void QueuedRequestDispatcher::Finalize(Q
      // crash). In the latter case (OS_LINUX) we expect the full map to come
      // from the browser process response.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
diff --git a/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
index 7ea4e8e6e5..56637b1714 100644
--- a/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
+++ b/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn
-@@ -29,10 +29,14 @@ component("memory_instrumentation") {
+@@ -27,10 +27,14 @@ component("memory_instrumentation") {
      sources += [ "os_metrics_win.cc" ]
    }
  
diff --git a/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
index 70e4dd4b3a..c89cb692c0 100644
--- a/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
+++ b/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
@@ -1,23 +1,23 @@
-$NetBSD: patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h
-@@ -53,7 +53,7 @@ class COMPONENT_EXPORT(
-                                     mojom::RawOSMemDump*);
-   static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId);
+@@ -57,7 +57,7 @@ class COMPONENT_EXPORT(
+   static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(
+       base::ProcessHandle);
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    static void SetProcSmapsForTesting(FILE*);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
          // BUILDFLAG(IS_ANDROID)
-@@ -70,7 +70,7 @@ class COMPONENT_EXPORT(
-   static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId);
- #endif
+@@ -79,7 +79,7 @@ class COMPONENT_EXPORT(
+   GetMemoryInfo(base::ProcessHandle handle);
+ #endif  // !BUILDFLAG(IS_APPLE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc b/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
index f2b2a7623d..e54473ab34 100644
--- a/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
+++ b/chromium/patches/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig	2024-12-21 10:25:10.608586521 +0000
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig	2025-05-08 12:01:57.808722109 +0000
 +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc
 @@ -0,0 +1,66 @@
 +// Copyright 2022 The Chromium Authors. All rights reserved.
diff --git a/chromium/patches/patch-services_screen__ai_public_cpp_utilities.cc b/chromium/patches/patch-services_screen__ai_public_cpp_utilities.cc
index 8950d82e0a..57b19e6f85 100644
--- a/chromium/patches/patch-services_screen__ai_public_cpp_utilities.cc
+++ b/chromium/patches/patch-services_screen__ai_public_cpp_utilities.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_screen__ai_public_cpp_utilities.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/screen_ai/public/cpp/utilities.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/screen_ai/public/cpp/utilities.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/screen_ai/public/cpp/utilities.cc
 @@ -18,7 +18,7 @@ namespace screen_ai {
  
diff --git a/chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
index 5d9b433c80..b8d9c45c57 100644
--- a/chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
+++ b/chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
-@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(base::FilePa
+@@ -58,6 +58,7 @@ bool ScreenAIPreSandboxHook(base::FilePa
      }
    }
  
@@ -14,7 +14,7 @@ $NetBSD: patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc,v
    auto* instance = sandbox::policy::SandboxLinux::GetInstance();
  
    std::vector<BrokerFilePermission> permissions{
-@@ -75,6 +76,7 @@ bool ScreenAIPreSandboxHook(base::FilePa
+@@ -79,6 +80,7 @@ bool ScreenAIPreSandboxHook(base::FilePa
                              sandbox::syscall_broker::COMMAND_OPEN}),
        permissions, options);
    instance->EngageNamespaceSandboxIfPossible();
diff --git a/chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
index c68e8fb216..3200a02aac 100644
--- a/chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
+++ b/chromium/patches/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h
 @@ -6,7 +6,13 @@
  #define SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium/patches/patch-services_service__manager_BUILD.gn b/chromium/patches/patch-services_service__manager_BUILD.gn
index 1af58c218f..4d4ce8fceb 100644
--- a/chromium/patches/patch-services_service__manager_BUILD.gn
+++ b/chromium/patches/patch-services_service__manager_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-services_service__manager_BUILD.gn,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/service_manager/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/service_manager/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/service_manager/BUILD.gn
-@@ -66,7 +66,7 @@ source_set("service_manager") {
+@@ -65,7 +65,7 @@ source_set("service_manager") {
      ]
    }
  
diff --git a/chromium/patches/patch-services_service__manager_public_cpp_service__executable_BUILD.gn b/chromium/patches/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
index 962093be57..cc03ba5486 100644
--- a/chromium/patches/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
+++ b/chromium/patches/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_service__manager_public_cpp_service__executable_BUILD.gn,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/service_manager/public/cpp/service_executable/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/service_manager/public/cpp/service_executable/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/service_manager/public/cpp/service_executable/BUILD.gn
 @@ -22,7 +22,7 @@ source_set("support") {
      "//services/service_manager/public/mojom",
diff --git a/chromium/patches/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/chromium/patches/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
index e12b0222b9..9731521f64 100644
--- a/chromium/patches/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
+++ b/chromium/patches/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc
 @@ -38,7 +38,7 @@
  #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h"
diff --git a/chromium/patches/patch-services_tracing_public_cpp_system__metrics__sampler.cc b/chromium/patches/patch-services_tracing_public_cpp_system__metrics__sampler.cc
new file mode 100644
index 0000000000..f889aaa271
--- /dev/null
+++ b/chromium/patches/patch-services_tracing_public_cpp_system__metrics__sampler.cc
@@ -0,0 +1,19 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- services/tracing/public/cpp/system_metrics_sampler.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ services/tracing/public/cpp/system_metrics_sampler.cc
+@@ -176,8 +176,8 @@ void SystemMetricsSampler::ProcessSample
+     TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"),
+                   "PhysicalMemoryFootprint",
+                   memory_info->physical_footprint_bytes);
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)) && defined(notyet)
+     TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"), "VmSwapMemory",
+                   memory_info->vm_swap_bytes);
+     TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"), "RssAnonMemory",
diff --git a/chromium/patches/patch-services_video__capture_public_mojom_video__capture__service.mojom b/chromium/patches/patch-services_video__capture_public_mojom_video__capture__service.mojom
index 51a7f9f738..0d238c8efd 100644
--- a/chromium/patches/patch-services_video__capture_public_mojom_video__capture__service.mojom
+++ b/chromium/patches/patch-services_video__capture_public_mojom_video__capture__service.mojom
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_video__capture_public_mojom_video__capture__service.mojom,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/video_capture/public/mojom/video_capture_service.mojom.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/video_capture/public/mojom/video_capture_service.mojom.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/video_capture/public/mojom/video_capture_service.mojom
 @@ -25,10 +25,10 @@ interface AcceleratorFactory {
        pending_receiver<chromeos_camera.mojom.MjpegDecodeAccelerator> jda);
diff --git a/chromium/patches/patch-services_video__capture_video__capture__service__impl.cc b/chromium/patches/patch-services_video__capture_video__capture__service__impl.cc
deleted file mode 100644
index 7e55247be4..0000000000
--- a/chromium/patches/patch-services_video__capture_video__capture__service__impl.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-services_video__capture_video__capture__service__impl.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/video_capture/video_capture_service_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ services/video_capture/video_capture_service_impl.cc
-@@ -43,7 +43,7 @@
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "media/capture/capture_switches.h"
- #include "media/capture/video/video_capture_gpu_channel_host.h"
- #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
-@@ -112,7 +112,7 @@ class VideoCaptureServiceImpl::GpuDepend
- };
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- // Intended usage of this class is to create viz::Gpu in utility process and
- // connect to viz::GpuClient of browser process, which will call to Gpu service.
- // Also, this class holds the viz::ContextProvider to listen and monitor Gpu
-@@ -334,7 +334,7 @@ void VideoCaptureServiceImpl::LazyInitia
-     gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>();
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   {
- #else
-@@ -468,7 +468,7 @@ void VideoCaptureServiceImpl::OnGpuInfoU
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) {
-   viz_gpu_ = std::move(viz_gpu);
- }
diff --git a/chromium/patches/patch-services_video__capture_video__capture__service__impl.h b/chromium/patches/patch-services_video__capture_video__capture__service__impl.h
deleted file mode 100644
index 6b1fe3c66d..0000000000
--- a/chromium/patches/patch-services_video__capture_video__capture__service__impl.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-services_video__capture_video__capture__service__impl.h,v 1.1 2025/02/06 09:58:21 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- services/video_capture/video_capture_service_impl.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ services/video_capture/video_capture_service_impl.h
-@@ -28,7 +28,7 @@
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "services/viz/public/cpp/gpu/gpu.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
-         // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC)
-@@ -77,7 +77,7 @@ class VideoCaptureServiceImpl : public m
-   void OnGpuInfoUpdate(const CHROME_LUID& luid) override;
- #endif
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
-         // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC)
-@@ -123,7 +123,7 @@ class VideoCaptureServiceImpl : public m
- #endif
- 
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \
--    BUILDFLAG(IS_MAC)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-   class VizGpuContextProvider;
-   std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_;
-   std::unique_ptr<viz::Gpu> viz_gpu_;
diff --git a/chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.cc b/chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
index 873b536860..af6d5654cb 100644
--- a/chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
+++ b/chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_video__effects_video__effects__sandbox__hook__linux.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/video_effects/video_effects_sandbox_hook_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/video_effects/video_effects_sandbox_hook_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/video_effects/video_effects_sandbox_hook_linux.cc
 @@ -6,7 +6,13 @@
  
@@ -17,7 +17,7 @@ $NetBSD: patch-services_video__effects_video__effects__sandbox__hook__linux.cc,v
 +#else
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
- #include "services/on_device_model/ml/chrome_ml.h"
+ #include "services/on_device_model/ml/chrome_ml_holder.h"
  
  namespace video_effects {
 @@ -29,8 +35,10 @@ bool VideoEffectsPreSandboxHook(
diff --git a/chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.h b/chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.h
index bc64684b70..8b1349d208 100644
--- a/chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.h
+++ b/chromium/patches/patch-services_video__effects_video__effects__sandbox__hook__linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_video__effects_video__effects__sandbox__hook__linux.h,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- services/video_effects/video_effects_sandbox_hook_linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- services/video_effects/video_effects_sandbox_hook_linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ services/video_effects/video_effects_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef SERVICES_VIDEO_EFFECTS_VIDEO_EFFECTS_SANDBOX_HOOK_LINUX_H_
diff --git a/chromium/patches/patch-services_viz_public_mojom_BUILD.gn b/chromium/patches/patch-services_viz_public_mojom_BUILD.gn
new file mode 100644
index 0000000000..e7e17431c5
--- /dev/null
+++ b/chromium/patches/patch-services_viz_public_mojom_BUILD.gn
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- services/viz/public/mojom/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ services/viz/public/mojom/BUILD.gn
+@@ -56,7 +56,7 @@ mojom("mojom") {
+ 
+   # Used in thread.mojom
+   enabled_features = []
+-  if (is_fuchsia || is_apple) {
++  if (is_fuchsia || is_apple || is_bsd) {
+     enabled_features += [ "thread_id_is_64_bit" ]
+   } else {
+     enabled_features += [ "thread_id_is_32_bit" ]
diff --git a/chromium/patches/patch-skia_ext_SkMemory__new__handler.cpp b/chromium/patches/patch-skia_ext_SkMemory__new__handler.cpp
index 1fdfefd934..6c60175153 100644
--- a/chromium/patches/patch-skia_ext_SkMemory__new__handler.cpp
+++ b/chromium/patches/patch-skia_ext_SkMemory__new__handler.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-skia_ext_SkMemory__new__handler.cpp,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- skia/ext/SkMemory_new_handler.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- skia/ext/SkMemory_new_handler.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ skia/ext/SkMemory_new_handler.cpp
-@@ -19,7 +19,7 @@
+@@ -24,7 +24,7 @@
  #include <windows.h>
  #elif BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -15,7 +15,7 @@ $NetBSD: patch-skia_ext_SkMemory__new__handler.cpp,v 1.1 2025/02/06 09:58:21 wiz
  #include <malloc.h>
  #endif
  
-@@ -105,7 +105,7 @@ static void* malloc_nothrow(size_t size,
+@@ -110,7 +110,7 @@ static void* malloc_nothrow(size_t size,
    // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
    // doesn't work as intended everywhere.
    void* result;
diff --git a/chromium/patches/patch-skia_ext_font__utils.cc b/chromium/patches/patch-skia_ext_font__utils.cc
index 0af330c62d..2c31b9500b 100644
--- a/chromium/patches/patch-skia_ext_font__utils.cc
+++ b/chromium/patches/patch-skia_ext_font__utils.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-skia_ext_font__utils.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- skia/ext/font_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- skia/ext/font_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ skia/ext/font_utils.cc
-@@ -19,7 +19,7 @@
+@@ -21,7 +21,7 @@
  #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h"
  #endif
  
@@ -14,13 +14,13 @@ $NetBSD: patch-skia_ext_font__utils.cc,v 1.1 2025/02/06 09:58:21 wiz Exp $
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "third_party/skia/include/ports/SkFontConfigInterface.h"
  #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h"
- #endif
-@@ -60,7 +60,7 @@ static sk_sp<SkFontMgr> fontmgr_factory(
-   return SkFontMgr_New_Android(nullptr);
+ #include "third_party/skia/include/ports/SkFontScanner_Fontations.h"
+@@ -67,7 +67,7 @@ static sk_sp<SkFontMgr> fontmgr_factory(
+   }
  #elif BUILDFLAG(IS_APPLE)
    return SkFontMgr_New_CoreText(nullptr);
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
-   return fci ? SkFontMgr_New_FCI(std::move(fci)) : nullptr;
- #elif BUILDFLAG(IS_FUCHSIA)
+   if (base::FeatureList::IsEnabled(skia::kFontationsLinuxSystemFonts)) {
+     return fci ? SkFontMgr_New_FCI(std::move(fci),
diff --git a/chromium/patches/patch-skia_ext_platform__canvas.h b/chromium/patches/patch-skia_ext_platform__canvas.h
deleted file mode 100644
index a3204286b3..0000000000
--- a/chromium/patches/patch-skia_ext_platform__canvas.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-skia_ext_platform__canvas.h,v 1.1 2025/02/06 09:58:21 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- skia/ext/platform_canvas.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ skia/ext/platform_canvas.h
-@@ -58,7 +58,7 @@ SK_API HDC GetNativeDrawingContext(SkCan
- 
- #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-     defined(__sun) || defined(ANDROID) || defined(__APPLE__) ||             \
--    defined(__Fuchsia__)
-+    defined(__Fuchsia__) || defined(__NetBSD__)
- // Construct a canvas from the given memory region. The memory is not cleared
- // first. @data must be, at least, @height * StrideForWidth(@width) bytes.
- SK_API std::unique_ptr<SkCanvas> CreatePlatformCanvasWithPixels(
diff --git a/chromium/patches/patch-skia_ext_skcolorspace__trfn.cc b/chromium/patches/patch-skia_ext_skcolorspace__trfn.cc
index babd54fe85..e66bdc3a7e 100644
--- a/chromium/patches/patch-skia_ext_skcolorspace__trfn.cc
+++ b/chromium/patches/patch-skia_ext_skcolorspace__trfn.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-skia_ext_skcolorspace__trfn.cc,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- skia/ext/skcolorspace_trfn.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- skia/ext/skcolorspace_trfn.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ skia/ext/skcolorspace_trfn.cc
-@@ -7,6 +7,8 @@
- #pragma allow_unsafe_buffers
- #endif
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
  
 +#include <cmath>
 +
  #include "skia/ext/skcolorspace_trfn.h"
  
- #include <cmath>
+ #include <array>
diff --git a/chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h b/chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h
index c1e4aa779d..1cd087230e 100644
--- a/chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h
+++ b/chromium/patches/patch-third__party_abseil-cpp_absl_base_config.h
@@ -1,27 +1,28 @@
-$NetBSD: patch-third__party_abseil-cpp_absl_base_config.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/abseil-cpp/absl/base/config.h.orig	2024-12-17 18:58:49.000000000 +0100
+--- third_party/abseil-cpp/absl/base/config.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/abseil-cpp/absl/base/config.h
-@@ -412,7 +412,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES
+@@ -409,7 +409,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES
  #ifdef ABSL_HAVE_SCHED_YIELD
  #error ABSL_HAVE_SCHED_YIELD cannot be directly set
  #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \
 -    defined(__VXWORKS__)
-+    defined(__VXWORKS__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
++    defined(__VXWORKS__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
++    defined(__NetBSD__)
  #define ABSL_HAVE_SCHED_YIELD 1
  #endif
  
-@@ -427,7 +427,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES
+@@ -424,7 +425,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMES
  // platforms.
  #ifdef ABSL_HAVE_SEMAPHORE_H
  #error ABSL_HAVE_SEMAPHORE_H cannot be directly set
 -#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__)
 +#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__) || \
-+    defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
++    defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
  #define ABSL_HAVE_SEMAPHORE_H 1
  #endif
  
diff --git a/chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc b/chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc
index b3451137c4..4cb9a19ce6 100644
--- a/chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc
+++ b/chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/abseil-cpp/absl/base/internal/raw_logging.cc
 @@ -44,7 +44,7 @@
  #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
diff --git a/chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
index 0581310f79..90a21f7cbf 100644
--- a/chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
+++ b/chromium/patches/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc
 @@ -30,7 +30,7 @@
  #include <sys/syscall.h>
diff --git a/chromium/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/chromium/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
index 364c046000..b14712b7e7 100644
--- a/chromium/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
+++ b/chromium/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
@@ -1,18 +1,18 @@
-$NetBSD: patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
 @@ -35,7 +35,8 @@
  #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
      !defined(__native_client__) && !defined(__asmjs__) &&             \
      !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) &&   \
--    !defined(__VXWORKS__) && !defined(__hexagon__)
-+    !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__FreeBSD__) && \
-+    !defined(__NetBSD__)
+-    !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__XTENSA__)
++    !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__XTENSA__) && \
++    !defined(__FreeBSD__) && !defined(__NetBSD__)
  #define ABSL_HAVE_ELF_MEM_IMAGE 1
  #endif
  
diff --git a/chromium/patches/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc b/chromium/patches/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc
index 6130e5ca53..f5938f7dd1 100644
--- a/chromium/patches/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc
+++ b/chromium/patches/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc
 @@ -19,7 +19,8 @@
  #endif
diff --git a/chromium/patches/patch-third__party_afl_src_afl-fuzz.c b/chromium/patches/patch-third__party_afl_src_afl-fuzz.c
index 82b76322e8..9a70ba2686 100644
--- a/chromium/patches/patch-third__party_afl_src_afl-fuzz.c
+++ b/chromium/patches/patch-third__party_afl_src_afl-fuzz.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_afl_src_afl-fuzz.c,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/afl/src/afl-fuzz.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/afl/src/afl-fuzz.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/afl/src/afl-fuzz.c
 @@ -58,7 +58,8 @@
  #include <sys/ioctl.h>
diff --git a/chromium/patches/patch-third__party_angle_BUILD.gn b/chromium/patches/patch-third__party_angle_BUILD.gn
index b94738a794..510226f3d0 100644
--- a/chromium/patches/patch-third__party_angle_BUILD.gn
+++ b/chromium/patches/patch-third__party_angle_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_angle_BUILD.gn,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/BUILD.gn
-@@ -354,7 +354,6 @@ config("extra_warnings") {
+@@ -355,7 +355,6 @@ config("extra_warnings") {
        "-Wtautological-type-limit-compare",
        "-Wundefined-reinterpret-cast",
        "-Wunneeded-internal-declaration",
@@ -14,7 +14,7 @@ $NetBSD: patch-third__party_angle_BUILD.gn,v 1.1 2025/02/06 09:58:22 wiz Exp $
        "-Wsuggest-destructor-override",
        "-Wsuggest-override",
  
-@@ -531,7 +530,7 @@ template("angle_common_lib") {
+@@ -532,7 +531,7 @@ template("angle_common_lib") {
        all_dependent_configs = [ ":angle_disable_pool_alloc" ]
      }
  
@@ -23,7 +23,7 @@ $NetBSD: patch-third__party_angle_BUILD.gn,v 1.1 2025/02/06 09:58:22 wiz Exp $
        libs = [ "dl" ]
      }
  
-@@ -686,6 +685,9 @@ angle_static_library("angle_gpu_info_uti
+@@ -687,6 +686,9 @@ angle_static_library("angle_gpu_info_uti
          "Xi",
          "Xext",
        ]
diff --git a/chromium/patches/patch-third__party_angle_src_common_platform.h b/chromium/patches/patch-third__party_angle_src_common_platform.h
index 8a048693d1..8e40b8edbf 100644
--- a/chromium/patches/patch-third__party_angle_src_common_platform.h
+++ b/chromium/patches/patch-third__party_angle_src_common_platform.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_angle_src_common_platform.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/common/platform.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/common/platform.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/common/platform.h
-@@ -26,8 +26,19 @@
+@@ -23,8 +23,19 @@
  #elif defined(__linux__) || defined(EMSCRIPTEN)
  #    define ANGLE_PLATFORM_LINUX 1
  #    define ANGLE_PLATFORM_POSIX 1
diff --git a/chromium/patches/patch-third__party_angle_src_common_platform__helpers.h b/chromium/patches/patch-third__party_angle_src_common_platform__helpers.h
index 78dee3d335..ed27dc35d9 100644
--- a/chromium/patches/patch-third__party_angle_src_common_platform__helpers.h
+++ b/chromium/patches/patch-third__party_angle_src_common_platform__helpers.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_angle_src_common_platform__helpers.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/common/platform_helpers.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/common/platform_helpers.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/common/platform_helpers.h
 @@ -62,7 +62,7 @@ inline constexpr bool IsIOS()
  
diff --git a/chromium/patches/patch-third__party_angle_src_common_system__utils.cpp b/chromium/patches/patch-third__party_angle_src_common_system__utils.cpp
index 55a4b5fc81..76613997f5 100644
--- a/chromium/patches/patch-third__party_angle_src_common_system__utils.cpp
+++ b/chromium/patches/patch-third__party_angle_src_common_system__utils.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_angle_src_common_system__utils.cpp,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/common/system_utils.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/common/system_utils.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/common/system_utils.cpp
 @@ -25,7 +25,7 @@ namespace angle
  {
diff --git a/chromium/patches/patch-third__party_angle_src_common_system__utils__linux.cpp b/chromium/patches/patch-third__party_angle_src_common_system__utils__linux.cpp
index 80a3f5967b..ebe402326b 100644
--- a/chromium/patches/patch-third__party_angle_src_common_system__utils__linux.cpp
+++ b/chromium/patches/patch-third__party_angle_src_common_system__utils__linux.cpp
@@ -1,14 +1,14 @@
-$NetBSD: patch-third__party_angle_src_common_system__utils__linux.cpp,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/common/system_utils_linux.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/common/system_utils_linux.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/common/system_utils_linux.cpp
-@@ -15,8 +15,15 @@
- 
- #include <array>
+@@ -15,10 +15,17 @@
+ #include <sys/types.h>
+ #include <unistd.h>
  
 +#if ANGLE_PLATFORM_OPENBSD
 +#include <pthread_np.h>
@@ -16,13 +16,15 @@ $NetBSD: patch-third__party_angle_src_common_system__utils__linux.cpp,v 1.1 2025
 +#include <pthread.h>
 +#endif
 +
+ #include <array>
+ 
  namespace angle
  {
 +#if ANGLE_PLATFORM_LINUX
  std::string GetExecutablePath()
  {
      // We cannot use lstat to get the size of /proc/self/exe as it always returns 0
-@@ -32,6 +39,7 @@ std::string GetExecutablePath()
+@@ -34,6 +41,7 @@ std::string GetExecutablePath()
      path[result] = '\0';
      return path;
  }
@@ -30,10 +32,10 @@ $NetBSD: patch-third__party_angle_src_common_system__utils__linux.cpp,v 1.1 2025
  
  std::string GetExecutableDirectory()
  {
-@@ -56,6 +64,12 @@ void SetCurrentThreadName(const char *na
- {
+@@ -59,6 +67,12 @@ void SetCurrentThreadName(const char *na
      // There's a 15-character (16 including '\0') limit.  If the name is too big (and ERANGE is
-     // returned), just ignore the name.
+     // returned), name will be ignored.
+     ASSERT(strlen(name) < 16);
 +#if ANGLE_PLATFORM_OPENBSD
 +    pthread_set_name_np(pthread_self(), name);
 +#elif ANGLE_PLATFORM_NETBSD
diff --git a/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h b/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
index dd81d48657..4c7284237a 100644
--- a/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
+++ b/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h
 @@ -15,6 +15,13 @@
  namespace angle
diff --git a/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp b/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
index 4f4f04a6c8..75ae3e11f5 100644
--- a/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
+++ b/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp
 @@ -12,6 +12,11 @@
  #include <pci/pci.h>
diff --git a/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp b/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
index ebebf87a0c..10e5815ca6 100644
--- a/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
+++ b/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp
 @@ -71,6 +71,24 @@ bool GetPCIDevicesWithLibPCI(std::vector
  
diff --git a/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp b/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
index ca056a6255..d66bf6211e 100644
--- a/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
+++ b/chromium/patches/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp
 @@ -8,6 +8,10 @@
  
diff --git a/chromium/patches/patch-third__party_angle_src_libANGLE_Display.cpp b/chromium/patches/patch-third__party_angle_src_libANGLE_Display.cpp
index 62351660ae..f4f642f29a 100644
--- a/chromium/patches/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/chromium/patches/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,22 +1,22 @@
-$NetBSD: patch-third__party_angle_src_libANGLE_Display.cpp,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/libANGLE/Display.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/libANGLE/Display.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/libANGLE/Display.cpp
-@@ -60,7 +60,7 @@
+@@ -58,7 +58,7 @@
+ #        include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
+ #    elif ANGLE_ENABLE_CGL
  #        include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
- #    elif ANGLE_ENABLE_EAGL
- #        include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
 -#    elif defined(ANGLE_PLATFORM_LINUX)
 +#    elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
  #        include "libANGLE/renderer/gl/egl/DisplayEGL.h"
  #        if defined(ANGLE_USE_X11)
  #            include "libANGLE/renderer/gl/glx/DisplayGLX_api.h"
-@@ -416,7 +416,7 @@ rx::DisplayImpl *CreateDisplayFromAttrib
-             impl = new rx::DisplayEAGL(state);
+@@ -422,7 +422,7 @@ rx::DisplayImpl *CreateDisplayFromAttrib
+             impl = new rx::DisplayCGL(state);
              break;
  
 -#    elif defined(ANGLE_PLATFORM_LINUX)
@@ -24,7 +24,7 @@ $NetBSD: patch-third__party_angle_src_libANGLE_Display.cpp,v 1.1 2025/02/06 09:5
  #        if defined(ANGLE_USE_GBM)
              if (platformType == 0)
              {
-@@ -462,7 +462,7 @@ rx::DisplayImpl *CreateDisplayFromAttrib
+@@ -468,7 +468,7 @@ rx::DisplayImpl *CreateDisplayFromAttrib
  #if defined(ANGLE_ENABLE_OPENGL)
  #    if defined(ANGLE_PLATFORM_WINDOWS)
              impl = new rx::DisplayWGL(state);
@@ -33,7 +33,7 @@ $NetBSD: patch-third__party_angle_src_libANGLE_Display.cpp,v 1.1 2025/02/06 09:5
  #        if defined(ANGLE_USE_GBM)
              if (platformType == 0)
              {
-@@ -513,7 +513,7 @@ rx::DisplayImpl *CreateDisplayFromAttrib
+@@ -519,7 +519,7 @@ rx::DisplayImpl *CreateDisplayFromAttrib
                  impl = rx::CreateVulkanWin32Display(state);
              }
              break;
@@ -42,7 +42,16 @@ $NetBSD: patch-third__party_angle_src_libANGLE_Display.cpp,v 1.1 2025/02/06 09:5
  #        if defined(ANGLE_USE_GBM)
              if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
              {
-@@ -2131,7 +2131,7 @@ static ClientExtensions GenerateClientEx
+@@ -2133,7 +2133,7 @@ static ClientExtensions GenerateClientEx
+     extensions.platformWaylandEXT = true;
+ #endif
+ 
+-#if defined(ANGLE_PLATFORM_LINUX) && (defined(ANGLE_ENABLE_OPENGL) || defined(ANGLE_ENABLE_VULKAN))
++#if (defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)) && (defined(ANGLE_ENABLE_OPENGL) || defined(ANGLE_ENABLE_VULKAN))
+     extensions.platformSurfacelessMESA = true;
+ #endif
+ 
+@@ -2180,7 +2180,7 @@ static ClientExtensions GenerateClientEx
      extensions.x11Visual = true;
  #endif
  
diff --git a/chromium/patches/patch-third__party_angle_src_libANGLE_formatutils.cpp b/chromium/patches/patch-third__party_angle_src_libANGLE_formatutils.cpp
deleted file mode 100644
index 309d670778..0000000000
--- a/chromium/patches/patch-third__party_angle_src_libANGLE_formatutils.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-third__party_angle_src_libANGLE_formatutils.cpp,v 1.1 2025/02/06 09:58:22 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/angle/src/libANGLE/formatutils.cpp.orig	2024-12-17 17:58:49.000000000 +0000
-+++ third_party/angle/src/libANGLE/formatutils.cpp
-@@ -1475,7 +1475,7 @@ static InternalFormatInfoMap BuildIntern
-     AddYUVFormat(&map,  GL_G8_B8R8_2PLANE_420_UNORM_ANGLE,            true,   8,   8,  8,   0,  0,  GL_G8_B8R8_2PLANE_420_UNORM_ANGLE,    GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          NeverSupported, NeverSupported);
-     AddYUVFormat(&map,  GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE,           true,   8,   8,  8,   0,  0,  GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE,   GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          NeverSupported, NeverSupported);
- 
--#if defined(ANGLE_PLATFORM_LINUX)
-+#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
-     // From GL_OES_required_internalformat
-     // The |shared| bit shouldn't be 2. But given this hits assertion when bits
-     // are checked, it's fine to have this bit set as 2 as a workaround.
diff --git a/chromium/patches/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp b/chromium/patches/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
index 22e3470bff..e6050fac4f 100644
--- a/chromium/patches/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
+++ b/chromium/patches/patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
 @@ -144,10 +144,10 @@ bool FunctionsGLX::initialize(Display *x
      // which a GLXWindow was ever created.
diff --git a/chromium/patches/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/chromium/patches/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
index 97fa701cf2..3d26e939df 100644
--- a/chromium/patches/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
+++ b/chromium/patches/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
 @@ -23,7 +23,7 @@ bool IsVulkanWin32DisplayAvailable();
  DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state);
diff --git a/chromium/patches/patch-third__party_angle_util_BUILD.gn b/chromium/patches/patch-third__party_angle_util_BUILD.gn
index 853b798207..2ca89a9dd0 100644
--- a/chromium/patches/patch-third__party_angle_util_BUILD.gn
+++ b/chromium/patches/patch-third__party_angle_util_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_angle_util_BUILD.gn,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/angle/util/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/angle/util/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/angle/util/BUILD.gn
-@@ -311,7 +311,7 @@ foreach(is_shared_library,
+@@ -332,7 +332,7 @@ foreach(is_shared_library,
      ]
      libs = []
  
diff --git a/chromium/patches/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/chromium/patches/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
index c5b02e2c57..3244368b14 100644
--- a/chromium/patches/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
+++ b/chromium/patches/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc
-@@ -68,7 +68,7 @@ bool StructTraits<blink::mojom::Renderer
+@@ -77,7 +77,7 @@ bool StructTraits<blink::mojom::Renderer
  
    out->send_subresource_notification = data.send_subresource_notification();
  
diff --git a/chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
index ec22e5f405..d955c8c43c 100644
--- a/chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
+++ b/chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h
 @@ -65,7 +65,7 @@ struct BLINK_COMMON_EXPORT RendererPrefe
    UserAgentOverride user_agent_override;
diff --git a/chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
index 8f22167819..6f3f03fcba 100644
--- a/chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
+++ b/chromium/patches/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h
-@@ -166,7 +166,7 @@ struct BLINK_COMMON_EXPORT
+@@ -180,7 +180,7 @@ struct BLINK_COMMON_EXPORT
      return data.send_subresource_notification;
    }
  
diff --git a/chromium/patches/patch-third__party_blink_public_platform_platform.h b/chromium/patches/patch-third__party_blink_public_platform_platform.h
index a417b687fc..94680857bd 100644
--- a/chromium/patches/patch-third__party_blink_public_platform_platform.h
+++ b/chromium/patches/patch-third__party_blink_public_platform_platform.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_public_platform_platform.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/public/platform/platform.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/public/platform/platform.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/public/platform/platform.h
-@@ -374,7 +374,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -372,7 +372,7 @@ class BLINK_PLATFORM_EXPORT Platform {
      return nullptr;
    }
  
diff --git a/chromium/patches/patch-third__party_blink_public_platform_web__vector.h b/chromium/patches/patch-third__party_blink_public_platform_web__vector.h
deleted file mode 100644
index 6f0acc1d6c..0000000000
--- a/chromium/patches/patch-third__party_blink_public_platform_web__vector.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-third__party_blink_public_platform_web__vector.h,v 1.1 2025/02/06 09:58:22 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/public/platform/web_vector.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ third_party/blink/public/platform/web_vector.h
-@@ -86,7 +86,7 @@ class WebVector {
-   // The vector can be populated using reserve() and emplace_back().
-   WebVector() = default;
- 
--#if defined(ARCH_CPU_64_BITS)
-+#if defined(ARCH_CPU_64_BITS) || defined(__OpenBSD__)
-   // Create a vector with |size| default-constructed elements. We define
-   // a constructor with size_t otherwise we'd have a duplicate define.
-   explicit WebVector(size_t size) : data_(size) {}
diff --git a/chromium/patches/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/chromium/patches/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
index 45938f2235..f88abb4d29 100644
--- a/chromium/patches/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
+++ b/chromium/patches/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
 @@ -30,7 +30,7 @@ def init(root_src_dir, enable_style_form
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py b/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
index c31769e740..09ae94ab7b 100644
--- a/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
+++ b/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_build_scripts_gperf.py,v 1.1 2025/04/10 20:07:52 wiz Exp $
+$NetBSD$
 
-Remove workarounds that are not needed any longer with gperf 3.2.
-https://bugs.gentoo.org/953436
-https://bugs.gentoo.org/attachment.cgi?id=924201&action=diff
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/build/scripts/gperf.py.orig	2025-04-10 10:26:39.919526849 +0000
+--- third_party/blink/renderer/build/scripts/gperf.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/build/scripts/gperf.py
 @@ -28,24 +28,6 @@ def generate_gperf(gperf_path, gperf_inp
              stdout=subprocess.PIPE,
diff --git a/chromium/patches/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py b/chromium/patches/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
index 5db34b276f..5eba45c246 100644
--- a/chromium/patches/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
+++ b/chromium/patches/patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py
@@ -1,16 +1,16 @@
-$NetBSD: patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/build/scripts/run_with_pythonpath.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/build/scripts/run_with_pythonpath.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/build/scripts/run_with_pythonpath.py
 @@ -22,6 +22,7 @@ def main():
          existing_pp = (
              os.pathsep + env['PYTHONPATH']) if 'PYTHONPATH' in env else ''
          env['PYTHONPATH'] = os.pathsep.join(python_paths) + existing_pp
-+    env['LD_LIBRARY_PATH'] = "${WRKSRC}/out/Release"
++    env['LD_LIBRARY_PATH'] = "@WRKSRC@/out/Release"
      sys.exit(subprocess.call([sys.executable] + args, env=env))
  
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_controller_blink__initializer.cc b/chromium/patches/patch-third__party_blink_renderer_controller_blink__initializer.cc
index 27cf431186..007c4c4214 100644
--- a/chromium/patches/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_controller_blink__initializer.cc,v 1.1 2025/02/06 09:58:22 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/controller/blink_initializer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -81,12 +81,12 @@
+@@ -82,12 +82,12 @@
  #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
  #endif
  
@@ -21,7 +21,7 @@ $NetBSD: patch-third__party_blink_renderer_controller_blink__initializer.cc,v 1.
  #include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
  #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
  #endif
-@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterInterface
+@@ -256,7 +256,7 @@ void BlinkInitializer::RegisterInterface
        main_thread_task_runner);
  #endif
  
@@ -30,8 +30,8 @@ $NetBSD: patch-third__party_blink_renderer_controller_blink__initializer.cc,v 1.
    binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
        ConvertToBaseRepeatingCallback(
            CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -302,7 +302,7 @@ void BlinkInitializer::RegisterMemoryWat
- #endif
+@@ -304,7 +304,7 @@ void BlinkInitializer::RegisterMemoryWat
+   MemorySaverController::Initialize();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
 -    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
diff --git a/chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
index 9b9df9c653..d3e766b52d 100644
--- a/chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc
-@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileD
+@@ -133,15 +133,17 @@ void MemoryUsageMonitorPosix::ResetFileD
  
  void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file,
                                             base::File status_file) {
diff --git a/chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
index 69fd8b549e..07ec0e16bb 100644
--- a/chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
+++ b/chromium/patches/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.h
 @@ -13,7 +13,7 @@
  #include "third_party/blink/renderer/controller/controller_export.h"
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/chromium/patches/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
index b598f0363c..83c6677ca7 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_core_editing_editing__behavior.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/editing/editing_behavior.cc
 @@ -304,7 +304,7 @@ bool EditingBehavior::ShouldInsertCharac
    // unexpected behaviour
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc b/chromium/patches/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
index 306f351bac..5c8353ed41 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_core_execution__context_navigator__base.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/execution_context/navigator_base.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/execution_context/navigator_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/execution_context/navigator_base.cc
 @@ -31,7 +31,7 @@ String GetReducedNavigatorPlatform() {
    return "Win32";
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/chromium/patches/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
index 858897367d..07a1d20de7 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-third__party_blink_renderer_core_exported_web__view__impl.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -428,7 +428,7 @@ SkFontHinting RendererPreferencesToSkiaH
+@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDela
+ #if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN)
+ SkFontHinting RendererPreferencesToSkiaHinting(
      const blink::RendererPreferences& prefs) {
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (!prefs.should_antialias_text) {
      // When anti-aliasing is off, GTK maps all non-zero hinting settings to
      // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3415,7 +3415,7 @@ void WebViewImpl::UpdateFontRenderingFro
+@@ -3421,7 +3421,7 @@ void WebViewImpl::UpdateFontRenderingFro
+       gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE);
+   WebFontRenderStyle::SetSubpixelPositioning(
        renderer_preferences_.use_subpixel_positioning);
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \
-     !BUILDFLAG(IS_ANDROID)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (!renderer_preferences_.system_font_family_name.empty()) {
      WebFontRenderStyle::SetSystemFontFamily(blink::WebString::FromUTF8(
+         renderer_preferences_.system_font_family_name));
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/chromium/patches/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
index 9da28f3b0a..8c9aad9a2d 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_core_frame_web__frame__test.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6474,7 +6474,7 @@ TEST_F(WebFrameTest, DISABLED_PositionFo
+@@ -6471,7 +6471,7 @@ TEST_F(WebFrameTest, DISABLED_PositionFo
  }
  
  #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -15,7 +15,7 @@ $NetBSD: patch-third__party_blink_renderer_core_frame_web__frame__test.cc,v 1.1
  // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable.
  // TODO(crbug.com/1317375): Build these tests on all platforms.
  #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \
-@@ -6883,7 +6883,7 @@ TEST_F(CompositedSelectionBoundsTest, La
+@@ -6880,7 +6880,7 @@ TEST_F(CompositedSelectionBoundsTest, La
  TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) {
    RunTest("composited_selection_bounds_large_selection_noscroll.html");
  }
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/chromium/patches/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
index 1c9d7762c9..8d6c039cf9 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -55,7 +55,7 @@ constexpr base::TimeDelta kEncodeRowSlac
+@@ -51,7 +51,7 @@ constexpr base::TimeDelta kEncodeRowSlac
  
  /* The value is based on user statistics on Nov 2017. */
  #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/chromium/patches/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
index adedcacfc4..c28a4a5530 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
@@ -1,15 +1,15 @@
-$NetBSD: patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
 @@ -192,7 +192,7 @@ InspectorMemoryAgent::GetSamplingProfile
  
  Vector<String> InspectorMemoryAgent::Symbolize(
-     const WebVector<const void*>& addresses) {
+     const std::vector<const void*>& addresses) {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // TODO(alph): Move symbolization to the client.
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_layout_layout__view.cc b/chromium/patches/patch-third__party_blink_renderer_core_layout_layout__view.cc
index 54a8a09431..5df71bf004 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_core_layout_layout__view.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/layout/layout_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/layout/layout_view.cc
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@
  #include "ui/display/screen_info.h"
  #include "ui/gfx/geometry/quad_f.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-third__party_blink_renderer_core_layout_layout__view.cc,v 1.1 202
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -769,7 +769,7 @@ void LayoutView::LayoutRoot() {
+@@ -785,7 +785,7 @@ void LayoutView::LayoutRoot() {
      intrinsic_logical_widths_ = LogicalWidth();
    }
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/chromium/patches/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
new file mode 100644
index 0000000000..bae575ab44
--- /dev/null
+++ b/chromium/patches/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ third_party/blink/renderer/core/loader/mixed_content_checker.cc
+@@ -485,7 +485,7 @@ bool MixedContentChecker::ShouldBlockFet
+   switch (context_type) {
+     case mojom::blink::MixedContentContextType::kOptionallyBlockable:
+ 
+-#if (BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)) && \
++#if (BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \
+     BUILDFLAG(ENABLE_CAST_RECEIVER)
+       // Fuchsia WebEngine can be configured to allow loading Mixed Content from
+       // an insecure IP address. This is a workaround to revert Fuchsia Cast
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc b/chromium/patches/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
index 43df60e4f4..4b3afbb1a9 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
-@@ -553,7 +553,7 @@ bool OriginTrialContext::CanEnableTrialF
+@@ -573,7 +573,7 @@ bool OriginTrialContext::CanEnableTrialF
    }
  
    if (trial_name == "TranslationAPI") {
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     return base::FeatureList::IsEnabled(features::kEnableTranslationAPI);
+     return base::FeatureList::IsEnabled(features::kTranslationAPI);
  #else
      return false;
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_page_context__menu__controller.cc b/chromium/patches/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
new file mode 100644
index 0000000000..45b0e15f1f
--- /dev/null
+++ b/chromium/patches/patch-third__party_blink_renderer_core_page_context__menu__controller.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- third_party/blink/renderer/core/page/context_menu_controller.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ third_party/blink/renderer/core/page/context_menu_controller.cc
+@@ -641,7 +641,7 @@ bool ContextMenuController::ShowContextM
+     if (potential_image_node != nullptr &&
+         IsA<HTMLCanvasElement>(potential_image_node)) {
+       data.media_type = mojom::blink::ContextMenuDataMediaType::kCanvas;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       // TODO(crbug.com/40902474): Support reading from the WebGPU front buffer
+       // on Linux and remove the below code, which results in "Copy Image" and
+       // "Save Image To" being grayed out in the context menu.
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/chromium/patches/patch-third__party_blink_renderer_core_paint_paint__layer.cc
index 3e98095899..2ebb84d00d 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_paint_paint__layer.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_paint_paint__layer.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_core_paint_paint__layer.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -120,7 +120,7 @@ namespace blink {
+@@ -124,7 +124,7 @@ namespace blink {
  
  namespace {
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/chromium/patches/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
index 22cd328d37..98617ae71f 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
-@@ -148,7 +148,7 @@ bool ScrollbarThemeAura::SupportsDragSna
+@@ -146,7 +146,7 @@ bool ScrollbarThemeAura::SupportsDragSna
+ // Disable snapback on desktop Linux to better integrate with the desktop
+ // behavior. Typically, Linux apps do not implement scrollbar snapback (this
  // is true for at least GTK and QT apps).
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return false;
  #else
    return true;
-@@ -418,7 +418,7 @@ bool ScrollbarThemeAura::ShouldCenterOnT
+@@ -423,7 +423,7 @@ ScrollbarPart ScrollbarThemeAura::PartsT
+ 
+ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,
                                               const WebMouseEvent& event) const {
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (event.button == WebPointerProperties::Button::kMiddle)
      return true;
  #endif
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor.h
index 829783318f..ea927364c1 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor.h
+++ b/chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_core_xml_xslt__processor.h,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/xml/xslt_processor.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/xml/xslt_processor.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/xml/xslt_processor.h
 @@ -77,7 +77,11 @@ class XSLTProcessor final : public Scrip
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
index 835cb8120d..1a556fb466 100644
--- a/chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-@@ -71,7 +71,11 @@ void XSLTProcessor::GenericErrorFunc(voi
+@@ -68,7 +68,11 @@ void XSLTProcessor::GenericErrorFunc(voi
    // It would be nice to do something with this error message.
  }
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
index 3b243d088e..35a8dd5f28 100644
--- a/chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/modules/media/audio/audio_device_factory.cc
-@@ -35,7 +35,7 @@ namespace {
+@@ -33,7 +33,7 @@ namespace {
+ // Set when the default factory is overridden.
  AudioDeviceFactory* g_factory_override = nullptr;
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Due to driver deadlock issues on Windows (http://crbug/422522) there is a
  // chance device authorization response is never received from the browser side.
  // In this case we will time out, to avoid renderer hang forever waiting for
diff --git a/chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
index b105fe2188..0c3c95f48e 100644
--- a/chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
-@@ -874,7 +874,7 @@ TEST_F(AudioRendererMixerManagerTest, Mi
+@@ -857,7 +857,7 @@ TEST_F(AudioRendererMixerManagerTest, Mi
              mixer->get_output_params_for_testing().sample_rate());
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
diff --git a/chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc b/chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
index 72ff265307..c5aa71ad36 100644
--- a/chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc
 @@ -542,6 +542,7 @@ void RTCDataChannel::send(Blob* data, Ex
    pending_messages_.push_back(message);
diff --git a/chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
index 8eab619cd6..16f6a621d4 100644
--- a/chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
 @@ -304,7 +304,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED
    SetupRenderer(kDefaultOutputDeviceId);
diff --git a/chromium/patches/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/chromium/patches/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
index 7fa49a634b..0896803c00 100644
--- a/chromium/patches/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
-@@ -469,7 +469,7 @@ class AudioWorkletThreadPriorityTest
+@@ -465,7 +465,7 @@ class AudioWorkletThreadPriorityTest
  
      // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL
      // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting.
diff --git a/chromium/patches/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/chromium/patches/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
index f023c0a6fc..29f05b2b4b 100644
--- a/chromium/patches/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6321,7 +6321,7 @@ void WebGLRenderingContextBase::TexImage
+@@ -6338,7 +6338,7 @@ void WebGLRenderingContextBase::TexImage
    constexpr bool kAllowZeroCopyImages = true;
  #endif
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc b/chromium/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
new file mode 100644
index 0000000000..e852f7c843
--- /dev/null
+++ b/chromium/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__canvas__context.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ third_party/blink/renderer/modules/webgpu/gpu_canvas_context.cc
+@@ -207,7 +207,7 @@ bool GPUCanvasContext::PaintRenderingRes
+ 
+   scoped_refptr<WebGPUMailboxTexture> front_buffer_texture;
+   if (source_buffer == kFrontBuffer) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // By returning false here the canvas will show up as black in the scenarios
+     // that copy the front buffer, such as printing.
+     // TODO(crbug.com/40902474): Support concurrent SharedImage reads via Dawn
diff --git a/chromium/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/chromium/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
index 8d676008b3..ce5e4a54d8 100644
--- a/chromium/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -788,7 +788,7 @@ bool GPUQueue::CopyFromCanvasSourceImage
+@@ -812,7 +812,7 @@ bool GPUQueue::CopyFromCanvasSourceImage
  // on linux platform.
  // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES
  // backend is failing for unknown reasons.
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_BUILD.gn b/chromium/patches/patch-third__party_blink_renderer_platform_BUILD.gn
index a4f978a434..ed12df94fa 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_platform_BUILD.gn,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/BUILD.gn
-@@ -2021,7 +2021,7 @@ static_library("test_support") {
+@@ -2046,7 +2046,7 @@ static_library("test_support") {
    ]
  
    # fuzzed_data_provider may not work with a custom toolchain.
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
index a28265ba55..8e2efb95bd 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_platform_fonts_font__cache.cc,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/fonts/font_cache.cc
-@@ -81,7 +81,7 @@ extern const char kNotoColorEmojiCompat[
+@@ -82,7 +82,7 @@ extern const char kNotoColorEmojiCompat[
  
  SkFontMgr* FontCache::static_font_manager_ = nullptr;
  
@@ -15,7 +15,7 @@ $NetBSD: patch-third__party_blink_renderer_platform_fonts_font__cache.cc,v 1.1 2
  float FontCache::device_scale_factor_ = 1.0;
  #endif
  
-@@ -132,7 +132,7 @@ const FontPlatformData* FontCache::Syste
+@@ -133,7 +133,7 @@ const FontPlatformData* FontCache::Syste
      const FontDescription& font_description) {
    const AtomicString& family = FontCache::SystemFontFamily();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.h
index 2d0b92d863..f27fb77098 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.h
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__cache.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_platform_fonts_font__cache.h,v 1.1 2025/02/06 09:58:23 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/fonts/font_cache.h
 @@ -55,7 +55,7 @@
  #include "third_party/skia/include/core/SkFontMgr.h"
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__description.cc
index 1762049d68..e1eb43ebc0 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__description.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__description.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_platform_fonts_font__description.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/fonts/font_description.cc
-@@ -44,7 +44,7 @@
+@@ -41,7 +41,7 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
  #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-third__party_blink_renderer_platform_fonts_font__description.cc,v
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -282,7 +282,7 @@ FontCacheKey FontDescription::CacheKey(
+@@ -280,7 +280,7 @@ FontCacheKey FontDescription::CacheKey(
        static_cast<unsigned>(fields_.orientation_) << 1 |            // bit 2-3
        static_cast<unsigned>(fields_.subpixel_text_position_);       // bit 1
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
index 46614d385c..1e1d26eac2 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_platform_fonts_font__metrics.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/fonts/font_metrics.cc
 @@ -39,7 +39,7 @@
  namespace blink {
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
deleted file mode 100644
index 0fcfec0670..0000000000
--- a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ third_party/blink/renderer/platform/fonts/font_platform_data.cc
-@@ -54,7 +54,7 @@
- namespace blink {
- namespace {
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Getting the system font render style takes a significant amount of time on
- // Linux because looking up fonts using fontconfig can be very slow. We fetch
- // the render style for each font family and text size, while it's very
-@@ -133,7 +133,7 @@ FontPlatformData::FontPlatformData(sk_sp
-   style_ = WebFontRenderStyle::GetDefault();
- #if !BUILDFLAG(IS_WIN)
-   WebFontRenderStyle system_style;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   bool override_font_name_and_size =
-       base::FeatureList::IsEnabled(kOptimizeLinuxFonts);
- #else
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
index 7f02ae9f45..e0adfcb5bf 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc
 @@ -9,7 +9,7 @@
  #if BUILDFLAG(IS_ANDROID)
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
index e54e839f80..bec906e512 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
 @@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkStri
-   return AtomicString::FromUTF8(str.c_str(), str.size());
+   return AtomicString::FromUTF8(std::string_view(str.begin(), str.end()));
  }
  
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/chromium/patches/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
index a706498783..bae3787465 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
 @@ -71,8 +71,12 @@ void BeginFrameProvider::CreateComposito
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc b/chromium/patches/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
index 43aaa3c60c..706396b061 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc
@@ -1,15 +1,15 @@
-$NetBSD: patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc
-@@ -49,7 +49,7 @@ scoped_refptr<StaticBitmapImage> MakeAcc
+@@ -47,7 +47,7 @@ scoped_refptr<StaticBitmapImage> MakeAcc
+ 
    const auto paint_image = source->PaintImageForCurrentFrame();
-   const auto image_info = paint_image.GetSkImageInfo().makeWH(
-       source->Size().width(), source->Size().height());
+   const auto image_info = paint_image.GetSkImageInfo();
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // TODO(b/330865436): On Linux, CanvasResourceProvider doesn't always check
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/chromium/patches/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
index 43b362f102..861a21e1c2 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -438,7 +438,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+@@ -421,7 +421,7 @@ void VideoFrameSubmitter::OnBeginFrame(
      auto& details = timing_details.find(frame_token)->value;
      auto& feedback = details.presentation_feedback;
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc b/chromium/patches/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
index 89830130f9..ac6038c7c1 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc
 @@ -14,7 +14,9 @@
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/chromium/patches/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
index 56279966ae..e60df2434e 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
@@ -1,23 +1,23 @@
-$NetBSD: patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc
-@@ -260,12 +260,12 @@ SupportedFormats GetSupportedFormatsInte
-       supported_formats.scalability_modes.push_back(profile.scalability_modes);
+@@ -324,12 +324,12 @@ SupportedFormats GetSupportedFormatsInte
+       supported_formats.profiles.push_back(profile.profile);
        supported_formats.sdp_formats.push_back(std::move(*format));
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #if BUILDFLAG(IS_WIN)
        const bool kShouldAddH264Cbp =
            base::FeatureList::IsEnabled(kMediaFoundationH264CbpEncoding) &&
            profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
        const bool kShouldAddH264Cbp =
            profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE;
  #endif
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/chromium/patches/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
index e72e922272..db494f6f88 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_platform_runtime__enabled__features.json5,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -388,7 +388,7 @@
+@@ -434,7 +434,7 @@
        name: "AppTitle",
        status: "experimental",
        origin_trial_feature_name: "AppTitle",
@@ -15,7 +15,16 @@ $NetBSD: patch-third__party_blink_renderer_platform_runtime__enabled__features.j
        base_feature: "WebAppEnableAppTitle",
      },
      {
-@@ -1845,7 +1845,7 @@
+@@ -1698,7 +1698,7 @@
+       name: "DocumentIsolationPolicy",
+       status: "experimental",
+       origin_trial_feature_name: "DocumentIsolationPolicy",
+-      origin_trial_os: ["win", "mac", "linux", "chromeos"],
++      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd", "netbsd"],
+       base_feature: "none",
+     },
+     {
+@@ -1943,7 +1943,7 @@
        base_feature: "none",
        public: true,
        origin_trial_feature_name: "FedCmMultipleIdentityProviders",
@@ -24,16 +33,16 @@ $NetBSD: patch-third__party_blink_renderer_platform_runtime__enabled__features.j
        origin_trial_allows_third_party: true,
      },
      {
-@@ -3233,7 +3233,7 @@
+@@ -3331,7 +3331,7 @@
        // Tracking bug for the implementation: https://crbug.com/1462930
        name: "PermissionElement",
        origin_trial_feature_name: "PermissionElement",
--      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
-+      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd", "netbsd"],
+-      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "android"],
++      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "android", "openbsd", "freebsd", "netbsd"],
        status: "experimental",
        public: true,
        base_feature_status: "enabled",
-@@ -3369,7 +3369,7 @@
+@@ -3475,7 +3475,7 @@
      {
        name: "PrivateNetworkAccessPermissionPrompt",
        origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt",
@@ -42,7 +51,7 @@ $NetBSD: patch-third__party_blink_renderer_platform_runtime__enabled__features.j
        status: "stable",
        public: true,
        base_feature: "none",
-@@ -4384,7 +4384,7 @@
+@@ -4636,7 +4636,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -51,7 +60,7 @@ $NetBSD: patch-third__party_blink_renderer_platform_runtime__enabled__features.j
      },
      // Enables using policy-controlled feature "usb-unrestricted" to allow
      // isolated context to access protected USB interface classes and to
-@@ -4549,7 +4549,7 @@
+@@ -4811,7 +4811,7 @@
      {
        name: "WebAppScopeExtensions",
        origin_trial_feature_name: "WebAppScopeExtensions",
@@ -60,12 +69,12 @@ $NetBSD: patch-third__party_blink_renderer_platform_runtime__enabled__features.j
        status: "experimental",
        base_feature: "none",
      },
-@@ -4592,7 +4592,7 @@
-       status: "experimental",
-       base_feature: "none",
-       origin_trial_feature_name: "WebAppUrlHandling",
--      origin_trial_os: ["win", "mac", "linux"],
-+      origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd", "netbsd"],
-     },
+@@ -5086,7 +5086,7 @@
      {
-       // WebAssembly JS Promise Integration,
+       name: "WebIdentityDigitalCredentials",
+       origin_trial_feature_name: "WebIdentityDigitalCredentials",
+-      origin_trial_os: ["android", "win", "mac", "linux", "chromeos"],
++      origin_trial_os: ["android", "win", "mac", "linux", "chromeos", "openbsd", "freebsd", "netbsd"],
+       origin_trial_allows_third_party: true,
+       implied_by: ["WebIdentityDigitalCredentialsCreation"],
+       public: true,
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/chromium/patches/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
index c6740f5e1f..d679d9eee4 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_platform_scheduler_common_thread.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/scheduler/common/thread.cc
 @@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThrea
              "Compositor");
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc b/chromium/patches/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
index 76183b4071..8436e125f6 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc
 @@ -27,7 +27,7 @@ BlinkCategorizedWorkerPoolDelegate& Blin
  
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_wtf_container__annotations.h b/chromium/patches/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
index 3881873a1f..11365c8808 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_blink_renderer_platform_wtf_container__annotations.h,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/wtf/container_annotations.h
-@@ -12,7 +12,7 @@
+@@ -11,7 +11,7 @@
  // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86
  // once the crashes there have been fixed: http://crbug.com/461406
  #if defined(ADDRESS_SANITIZER) &&                      \
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_wtf_math__extras.h b/chromium/patches/patch-third__party_blink_renderer_platform_wtf_math__extras.h
index 292e0fbd8b..214a174aa7 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_wtf_math__extras.h
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_wtf_math__extras.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_platform_wtf_math__extras.h,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/wtf/math_extras.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/wtf/math_extras.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/wtf/math_extras.h
 @@ -128,6 +128,10 @@ constexpr float Grad2turn(float g) {
    return g * (1.0f / 400.0f);
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/chromium/patches/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
index a64702bb46..dd74625cf7 100644
--- a/chromium/patches/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
+++ b/chromium/patches/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_blink_renderer_platform_wtf_stack__util.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/blink/renderer/platform/wtf/stack_util.cc
 @@ -23,6 +23,13 @@
  extern "C" void* __libc_stack_end;  // NOLINT
@@ -66,7 +66,7 @@ $NetBSD: patch-third__party_blink_renderer_platform_wtf_stack__util.cc,v 1.1 202
    pthread_attr_destroy(&attr);
  #endif
  #if defined(__GLIBC__)
-@@ -154,6 +164,13 @@ void* GetStackStart() {
+@@ -152,6 +162,13 @@ void* GetStackStart() {
    ::GetCurrentThreadStackLimits(&lowLimit, &highLimit);
    return reinterpret_cast<void*>(highLimit);
  #endif
diff --git a/chromium/patches/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc b/chromium/patches/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc
deleted file mode 100644
index 0a5811ad7d..0000000000
--- a/chromium/patches/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-@@ -323,7 +323,7 @@ void TextCodecICU::CreateICUConverter() 
-   DCHECK(!converter_icu_);
- 
- #if defined(USING_SYSTEM_ICU)
--  const char* name = encoding_.GetName();
-+  const AtomicString& name = encoding_.GetName();
-   needs_gbk_fallbacks_ =
-       name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3];
- #endif
-@@ -448,7 +448,7 @@ String TextCodecICU::Decode(base::span<c
-   // <http://bugs.webkit.org/show_bug.cgi?id=17014>
-   // Simplified Chinese pages use the code A3A0 to mean "full-width space", but
-   // ICU decodes it as U+E5E5.
--  if (!strcmp(encoding_.GetName(), "GBK")) {
-+  if (!strcmp(encoding_.GetName().Utf8().c_str(), "GBK")) {
-     if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
-       resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
-     // Make GBK compliant to the encoding spec and align with GB18030
-@@ -611,6 +611,7 @@ static void GbkUrlEscapedEntityCallack(
-                               code_point, reason, err);
- }
- 
-+#if !BUILDFLAG(IS_BSD)
- static void GbkCallbackSubstitute(const void* context,
-                                   UConverterFromUnicodeArgs* from_unicode_args,
-                                   const UChar* code_units,
-@@ -628,6 +629,7 @@ static void GbkCallbackSubstitute(const 
-   UCNV_FROM_U_CALLBACK_SUBSTITUTE(context, from_unicode_args, code_units,
-                                   length, code_point, reason, err);
- }
-+#endif
- #endif  // USING_SYSTEM_ICU
- 
- static void NotReachedEntityCallback(const void* context,
diff --git a/chromium/patches/patch-third__party_brotli_common_platform.h b/chromium/patches/patch-third__party_brotli_common_platform.h
index 827f532eb8..d56c46714b 100644
--- a/chromium/patches/patch-third__party_brotli_common_platform.h
+++ b/chromium/patches/patch-third__party_brotli_common_platform.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_brotli_common_platform.h,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/brotli/common/platform.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/brotli/common/platform.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/brotli/common/platform.h
 @@ -28,7 +28,7 @@
  #include <brotli/port.h>
diff --git a/chromium/patches/patch-third__party_cpuinfo_cpuinfo.gni b/chromium/patches/patch-third__party_cpuinfo_cpuinfo.gni
index 7862f8e663..ac4e39da6f 100644
--- a/chromium/patches/patch-third__party_cpuinfo_cpuinfo.gni
+++ b/chromium/patches/patch-third__party_cpuinfo_cpuinfo.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_cpuinfo_cpuinfo.gni,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/cpuinfo/cpuinfo.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/cpuinfo/cpuinfo.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/cpuinfo/cpuinfo.gni
 @@ -8,7 +8,7 @@ use_cpuinfo =
      current_cpu != "s390" && current_cpu != "s390x" &&
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/chromium/patches/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
index 186f2821ec..e3b360ba42 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni
 @@ -61,7 +61,7 @@ if (crashpad_is_in_chromium) {
    crashpad_is_ios = is_ios
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_client_BUILD.gn b/chromium/patches/patch-third__party_crashpad_crashpad_client_BUILD.gn
index b7bc532552..c946be07db 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_client_BUILD.gn
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_client_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_crashpad_crashpad_client_BUILD.gn,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/client/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/client/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/client/BUILD.gn
-@@ -137,6 +137,13 @@ static_library("common") {
+@@ -134,6 +134,13 @@ static_library("common") {
    if (crashpad_is_win) {
      sources += [ "crash_report_database_win.cc" ]
    }
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc b/chromium/patches/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
index 233b71f765..fbee12c35e 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc,v 1.1 2025/02/06 09:58:24 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig	2024-12-21 10:25:10.726262463 +0000
+--- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig	2025-05-08 12:01:57.832282915 +0000
 +++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc
 @@ -0,0 +1,40 @@
 +// Copyright 2017 The Crashpad Authors. All rights reserved.
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc b/chromium/patches/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
index 7c1b5c17e3..1b7ad068b4 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
 @@ -159,6 +159,12 @@ std::string MinidumpMiscInfoDebugBuildSt
    static constexpr char kOS[] = "win";
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_address__types.h b/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_address__types.h
index fd8a508c9f..1354258c8a 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_address__types.h
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_address__types.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_util_misc_address__types.h,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/util/misc/address_types.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/util/misc/address_types.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/util/misc/address_types.h
 @@ -25,7 +25,7 @@
  #include <mach/mach_types.h>
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_capture__context.h b/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
index 9c2433f8c3..f1f1932cb8 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_util_misc_capture__context.h,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/util/misc/capture_context.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/util/misc/capture_context.h
 @@ -21,7 +21,8 @@
  #include <mach/mach.h>
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_metrics.cc b/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
index 8638ebd108..ba38276789 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_util_misc_metrics.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/util/misc/metrics.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/util/misc/metrics.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/util/misc/metrics.cc
 @@ -25,7 +25,7 @@
  #define METRICS_OS_NAME "Win"
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_uuid.cc b/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
index ecb8dbc79d..9c5f96fbbd 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_util_misc_uuid.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/util/misc/uuid.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/util/misc/uuid.cc
 @@ -110,7 +110,7 @@ bool UUID::InitializeWithNew() {
    InitializeFromBytes(uuid);
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc b/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
index 8117886e37..94ec9054fa 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/util/posix/close_multiple.cc
 @@ -73,7 +73,7 @@ void CloseNowOrOnExec(int fd, bool ebadf
  // This is an advantage over looping over all possible file descriptors, because
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc b/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
index 6b2445e400..2d9a70d95b 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc
 @@ -25,7 +25,7 @@ void DropPrivileges() {
    gid_t gid = getgid();
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_signals.cc
index d29458666b..2ba5cc714a 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_signals.cc
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_signals.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_util_posix_signals.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/util/posix/signals.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/util/posix/signals.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/util/posix/signals.cc
 @@ -51,7 +51,7 @@ constexpr int kCrashSignals[] = {
  #if defined(SIGEMT)
diff --git a/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
index ad4b7a323e..6be2dfa6e9 100644
--- a/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
+++ b/chromium/patches/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc
 @@ -68,7 +68,7 @@ constexpr const char* kSignalNames[] = {
      "INFO",
diff --git a/chromium/patches/patch-third__party_crc32c_BUILD.gn b/chromium/patches/patch-third__party_crc32c_BUILD.gn
index 31836ef622..fd04df162e 100644
--- a/chromium/patches/patch-third__party_crc32c_BUILD.gn
+++ b/chromium/patches/patch-third__party_crc32c_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_crc32c_BUILD.gn,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/crc32c/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/crc32c/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/crc32c/BUILD.gn
 @@ -46,7 +46,7 @@ config("crc32c_config") {
    }
diff --git a/chromium/patches/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/chromium/patches/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
index add682b027..4184ebead7 100644
--- a/chromium/patches/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
+++ b/chromium/patches/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_dawn_include_dawn_native_VulkanBackend.h,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/dawn/include/dawn/native/VulkanBackend.h
 @@ -83,7 +83,8 @@ struct ExternalImageExportInfoVk : Exter
  };
diff --git a/chromium/patches/patch-third__party_dawn_src_dawn_common_Platform.h b/chromium/patches/patch-third__party_dawn_src_dawn_common_Platform.h
index 3c0ea6b882..0876c2b429 100644
--- a/chromium/patches/patch-third__party_dawn_src_dawn_common_Platform.h
+++ b/chromium/patches/patch-third__party_dawn_src_dawn_common_Platform.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_dawn_src_dawn_common_Platform.h,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/dawn/src/dawn/common/Platform.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/dawn/src/dawn/common/Platform.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/dawn/src/dawn/common/Platform.h
-@@ -59,6 +59,11 @@
+@@ -60,6 +60,11 @@
  #error "Unsupported Windows platform."
  #endif
  
diff --git a/chromium/patches/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/chromium/patches/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
index 0d2a00a21a..94c26f9e64 100644
--- a/chromium/patches/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
+++ b/chromium/patches/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp
-@@ -56,7 +56,7 @@ constexpr char kSwiftshaderLibName[] = "
+@@ -57,7 +57,7 @@ constexpr char kSwiftshaderLibName[] = "
  #endif
  
  #if DAWN_PLATFORM_IS(LINUX)
diff --git a/chromium/patches/patch-third__party_ffmpeg_BUILD.gn b/chromium/patches/patch-third__party_ffmpeg_BUILD.gn
index 3a4f239327..864fae25e0 100644
--- a/chromium/patches/patch-third__party_ffmpeg_BUILD.gn
+++ b/chromium/patches/patch-third__party_ffmpeg_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_ffmpeg_BUILD.gn,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/ffmpeg/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/ffmpeg/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/ffmpeg/BUILD.gn
 @@ -350,7 +350,6 @@ target(link_target_type, "ffmpeg_interna
        libs += [
diff --git a/chromium/patches/patch-third__party_ffmpeg_libavcodec_x86_cabac.h b/chromium/patches/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
index d0a56be1bc..eb362dd7b1 100644
--- a/chromium/patches/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
+++ b/chromium/patches/patch-third__party_ffmpeg_libavcodec_x86_cabac.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_ffmpeg_libavcodec_x86_cabac.h,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/ffmpeg/libavcodec/x86/cabac.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/ffmpeg/libavcodec/x86/cabac.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/ffmpeg/libavcodec/x86/cabac.h
 @@ -31,7 +31,8 @@
  
diff --git a/chromium/patches/patch-third__party_ffmpeg_libavutil_cpu.c b/chromium/patches/patch-third__party_ffmpeg_libavutil_cpu.c
index e1e229c170..bc70ac1550 100644
--- a/chromium/patches/patch-third__party_ffmpeg_libavutil_cpu.c
+++ b/chromium/patches/patch-third__party_ffmpeg_libavutil_cpu.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_ffmpeg_libavutil_cpu.c,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/ffmpeg/libavutil/cpu.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/ffmpeg/libavutil/cpu.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/ffmpeg/libavutil/cpu.c
 @@ -38,10 +38,7 @@
  #if HAVE_GETPROCESSAFFINITYMASK || HAVE_WINRT
diff --git a/chromium/patches/patch-third__party_ffmpeg_libavutil_mem.c b/chromium/patches/patch-third__party_ffmpeg_libavutil_mem.c
index eb0eadb0b5..ee4ad6532b 100644
--- a/chromium/patches/patch-third__party_ffmpeg_libavutil_mem.c
+++ b/chromium/patches/patch-third__party_ffmpeg_libavutil_mem.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_ffmpeg_libavutil_mem.c,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/ffmpeg/libavutil/mem.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/ffmpeg/libavutil/mem.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/ffmpeg/libavutil/mem.c
 @@ -33,9 +33,6 @@
  #include <stdlib.h>
diff --git a/chromium/patches/patch-third__party_ffmpeg_libavutil_random__seed.c b/chromium/patches/patch-third__party_ffmpeg_libavutil_random__seed.c
index 6166e5cd2a..4cdd53fce1 100644
--- a/chromium/patches/patch-third__party_ffmpeg_libavutil_random__seed.c
+++ b/chromium/patches/patch-third__party_ffmpeg_libavutil_random__seed.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_ffmpeg_libavutil_random__seed.c,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/ffmpeg/libavutil/random_seed.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/ffmpeg/libavutil/random_seed.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/ffmpeg/libavutil/random_seed.c
 @@ -20,6 +20,10 @@
  
diff --git a/chromium/patches/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm b/chromium/patches/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
index 0638f29c8f..863a6f89c1 100644
--- a/chromium/patches/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
+++ b/chromium/patches/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_ffmpeg_libavutil_x86_x86inc.asm,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/ffmpeg/libavutil/x86/x86inc.asm
 @@ -46,6 +46,12 @@
      %endif
diff --git a/chromium/patches/patch-third__party_fontconfig_include_config.h b/chromium/patches/patch-third__party_fontconfig_include_config.h
index c32727f15c..cdc43f9d5c 100644
--- a/chromium/patches/patch-third__party_fontconfig_include_config.h
+++ b/chromium/patches/patch-third__party_fontconfig_include_config.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_fontconfig_include_config.h,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/fontconfig/include/config.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/fontconfig/include/config.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/fontconfig/include/config.h
 @@ -13,7 +13,7 @@
  
diff --git a/chromium/patches/patch-third__party_fontconfig_src_src_fccompat.c b/chromium/patches/patch-third__party_fontconfig_src_src_fccompat.c
index ea9769647e..3a23cf1d3f 100644
--- a/chromium/patches/patch-third__party_fontconfig_src_src_fccompat.c
+++ b/chromium/patches/patch-third__party_fontconfig_src_src_fccompat.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_fontconfig_src_src_fccompat.c,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/fontconfig/src/src/fccompat.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/fontconfig/src/src/fccompat.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/fontconfig/src/src/fccompat.c
 @@ -184,7 +184,9 @@ FcRandom(void)
  {
diff --git a/chromium/patches/patch-third__party_ipcz_src_BUILD.gn b/chromium/patches/patch-third__party_ipcz_src_BUILD.gn
new file mode 100644
index 0000000000..31dd211fe2
--- /dev/null
+++ b/chromium/patches/patch-third__party_ipcz_src_BUILD.gn
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- third_party/ipcz/src/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ third_party/ipcz/src/BUILD.gn
+@@ -7,7 +7,7 @@ import("//build_overrides/ipcz.gni")
+ import("//testing/libfuzzer/fuzzer_test.gni")
+ import("//testing/test.gni")
+ 
+-enable_multiprocess_tests = is_linux
++enable_multiprocess_tests = is_linux && !is_bsd
+ 
+ buildflag_header("test_buildflags") {
+   header = "test_buildflags.h"
diff --git a/chromium/patches/patch-third__party_ipcz_src_reference__drivers_random.cc b/chromium/patches/patch-third__party_ipcz_src_reference__drivers_random.cc
index 9b3e394d1f..81e808ef01 100644
--- a/chromium/patches/patch-third__party_ipcz_src_reference__drivers_random.cc
+++ b/chromium/patches/patch-third__party_ipcz_src_reference__drivers_random.cc
@@ -1,55 +1,26 @@
-$NetBSD: patch-third__party_ipcz_src_reference__drivers_random.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/ipcz/src/reference_drivers/random.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/ipcz/src/reference_drivers/random.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/ipcz/src/reference_drivers/random.cc
-@@ -14,7 +14,8 @@
- #include <windows.h>
- #elif BUILDFLAG(IS_FUCHSIA)
- #include <zircon/syscalls.h>
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) && \
-+         !BUILDFLAG(IS_NETBSD)
- #include <asm/unistd.h>
- #include <sys/syscall.h>
- #include <unistd.h>
-@@ -25,7 +26,7 @@
- #include <nacl/nacl_random.h>
- #endif
- 
--#if BUILDFLAG(IS_POSIX)
-+#if BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_NETBSD)
- #include <errno.h>
- #include <fcntl.h>
- #include <unistd.h>
-@@ -55,7 +56,7 @@ decltype(&ProcessPrng) GetProcessPrng() 
+@@ -55,7 +55,7 @@ decltype(&ProcessPrng) GetProcessPrng() 
  }
  #endif
  
 -#if defined(OS_POSIX) && !BUILDFLAG(IS_MAC)
-+#if (defined(OS_POSIX) && !BUILDFLAG(IS_MAC)) || BUILDFLAG(IS_NETBSD)
++#if defined(OS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
  void RandomBytesFromDevUrandom(absl::Span<uint8_t> destination) {
    static int urandom_fd = [] {
      for (;;) {
-@@ -86,7 +87,8 @@ void RandomBytes(absl::Span<uint8_t> des
-   process_prng_fn(destination.data(), destination.size());
- #elif BUILDFLAG(IS_FUCHSIA)
-   zx_cprng_draw(destination.data(), destination.size());
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) && \
-+         !BUILDFLAG(IS_NETBSD)
-   while (!destination.empty()) {
-     ssize_t result =
-         syscall(__NR_getrandom, destination.data(), destination.size(), 0);
-@@ -102,7 +104,7 @@ void RandomBytes(absl::Span<uint8_t> des
- #elif BUILDFLAG(IS_MAC)
+@@ -99,7 +99,7 @@ void RandomBytes(absl::Span<uint8_t> des
+       return;
+     }
+   }
+-#elif BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    const bool ok = getentropy(destination.data(), destination.size()) == 0;
    ABSL_ASSERT(ok);
--#elif BUILDFLAG(IS_IOS)
-+#elif BUILDFLAG(IS_IOS) || BUILDFLAG(IS_NETBSD)
-   RandomBytesFromDevUrandom(destination);
- #elif BUILDFLAG(IS_NACL)
-   while (!destination.empty()) {
+ #elif BUILDFLAG(IS_IOS)
diff --git a/chromium/patches/patch-third__party_ipcz_src_standalone_base_logging.cc b/chromium/patches/patch-third__party_ipcz_src_standalone_base_logging.cc
index a95b9f54b4..5a4a95d62a 100644
--- a/chromium/patches/patch-third__party_ipcz_src_standalone_base_logging.cc
+++ b/chromium/patches/patch-third__party_ipcz_src_standalone_base_logging.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_ipcz_src_standalone_base_logging.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/ipcz/src/standalone/base/logging.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/ipcz/src/standalone/base/logging.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/ipcz/src/standalone/base/logging.cc
-@@ -50,6 +50,9 @@ LogMessage::LogMessage(const char* file,
+@@ -55,6 +55,9 @@ LogMessage::LogMessage(const char* file,
  #elif BUILDFLAG(IS_ANDROID)
    stream_ << getpid() << ":" << gettid() << ":";
    const char* trimmed_file = strrchr(file, '/') + 1;
diff --git a/chromium/patches/patch-third__party_leveldatabase_env__chromium.cc b/chromium/patches/patch-third__party_leveldatabase_env__chromium.cc
index 1a48c47932..8386195e26 100644
--- a/chromium/patches/patch-third__party_leveldatabase_env__chromium.cc
+++ b/chromium/patches/patch-third__party_leveldatabase_env__chromium.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_leveldatabase_env__chromium.cc,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/leveldatabase/env_chromium.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/leveldatabase/env_chromium.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/leveldatabase/env_chromium.cc
 @@ -329,7 +329,8 @@ ChromiumWritableFile::ChromiumWritableFi
  
diff --git a/chromium/patches/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/chromium/patches/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
index bc696380e0..95b9a399d3 100644
--- a/chromium/patches/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+++ b/chromium/patches/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c,v 1.1 2025/02/06 09:58:25 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c
 @@ -127,10 +127,46 @@ static int arm_get_cpu_caps(void) {
    return flags;
diff --git a/chromium/patches/patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h b/chromium/patches/patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h
new file mode 100644
index 0000000000..3856e7b571
--- /dev/null
+++ b/chromium/patches/patch-third__party_libc++_src_include_____locale__dir_locale__base__api.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- third_party/libc++/src/include/__locale_dir/locale_base_api.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ third_party/libc++/src/include/__locale_dir/locale_base_api.h
+@@ -113,7 +113,7 @@
+ 
+ #if defined(__APPLE__)
+ #  include <__locale_dir/support/apple.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #  include <__locale_dir/support/freebsd.h>
+ #elif defined(_LIBCPP_MSVCRT_LIKE)
+ #  include <__locale_dir/support/windows.h>
diff --git a/chromium/patches/patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h b/chromium/patches/patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h
new file mode 100644
index 0000000000..62170a4754
--- /dev/null
+++ b/chromium/patches/patch-third__party_libc++_src_include_____locale__dir_support_bsd__like.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- third_party/libc++/src/include/__locale_dir/support/bsd_like.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ third_party/libc++/src/include/__locale_dir/support/bsd_like.h
+@@ -24,7 +24,11 @@
+ #  include <wctype.h>
+ #endif
+ 
++#if defined(__NetBSD__)
++#include <locale.h>
++#else
+ #include <xlocale.h>
++#endif
+ 
+ #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+ #  pragma GCC system_header
diff --git a/chromium/patches/patch-third__party_libc++_src_src_chrono.cpp b/chromium/patches/patch-third__party_libc++_src_src_chrono.cpp
index fc6ed8ab10..f73876ac48 100644
--- a/chromium/patches/patch-third__party_libc++_src_src_chrono.cpp
+++ b/chromium/patches/patch-third__party_libc++_src_src_chrono.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_libc++_src_src_chrono.cpp,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libc++/src/src/chrono.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libc++/src/src/chrono.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libc++/src/src/chrono.cpp
-@@ -34,7 +34,7 @@
+@@ -38,7 +38,7 @@
  // OpenBSD and GPU do not have a fully conformant suite of POSIX timers, but
  // it does have clock_gettime and CLOCK_MONOTONIC which is all we need.
  #if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || defined(__AMDGPU__) ||                      \
diff --git a/chromium/patches/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp b/chromium/patches/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
index 36819bcefc..3b3e7618d1 100644
--- a/chromium/patches/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
+++ b/chromium/patches/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libc++/src/src/filesystem/filesystem_clock.cpp
-@@ -30,7 +30,7 @@
+@@ -35,7 +35,7 @@
  #endif
  
  #if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__AMDGPU__) || defined(__NVPTX__) ||                        \
diff --git a/chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h b/chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
index 3b29b646f1..844b62b0dc 100644
--- a/chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
+++ b/chromium/patches/patch-third__party_libc++abi_src_src_cxa__guard__impl.h
@@ -1,16 +1,15 @@
-$NetBSD: patch-third__party_libc++abi_src_src_cxa__guard__impl.h,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libc++abi/src/src/cxa_guard_impl.h.orig	2024-12-17 18:58:49.000000000 +0100
+--- third_party/libc++abi/src/src/cxa_guard_impl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libc++abi/src/src/cxa_guard_impl.h
-@@ -425,7 +425,18 @@ void PlatformFutexWake(int* addr) {
+@@ -425,6 +425,17 @@ void PlatformFutexWake(int* addr) {
    __tsan_release(addr);
    futex(reinterpret_cast<volatile uint32_t*>(addr), WAKE, INT_MAX, NULL, NULL);
  }
--#elif defined(SYS_futex)
 +/*#elif defined(__NetBSD__)
 +void PlatformFutexWait(int* addr, int expect) {
 +  constexpr int WAIT = 0;
@@ -22,7 +21,6 @@ $NetBSD: patch-third__party_libc++abi_src_src_cxa__guard__impl.h,v 1.1 2025/02/0
 +  __tsan_release(addr);
 +  syscall(SYS___futex, addr, WAKE, INT_MAX, NULL, NULL, 0, 0);
 +}*/
-+#elif defined(SYS_futex) && !defined(__NetBSD__)
+ #elif defined(SYS_futex)
  void PlatformFutexWait(int* addr, int expect) {
    constexpr int WAIT = 0;
-   syscall(SYS_futex, addr, WAIT, expect, 0);
diff --git a/chromium/patches/patch-third__party_libdrm_src_xf86drmMode.c b/chromium/patches/patch-third__party_libdrm_src_xf86drmMode.c
index f6eb91acdc..d32a46c1df 100644
--- a/chromium/patches/patch-third__party_libdrm_src_xf86drmMode.c
+++ b/chromium/patches/patch-third__party_libdrm_src_xf86drmMode.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libdrm_src_xf86drmMode.c,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libdrm/src/xf86drmMode.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libdrm/src/xf86drmMode.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libdrm/src/xf86drmMode.c
 @@ -976,7 +976,7 @@ drm_public int drmCheckModesettingSuppor
  	}
diff --git a/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
index c70f62790d..fbf2c6c836 100644
--- a/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
+++ b/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h
 @@ -22,7 +22,8 @@
  #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
diff --git a/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
index 026b4a2e82..7fbeb64966 100644
--- a/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
+++ b/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h
 @@ -22,7 +22,8 @@
  #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
diff --git a/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
index da638eae13..4a49450347 100644
--- a/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
+++ b/chromium/patches/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h
 @@ -22,8 +22,8 @@
  // Note that I18N_PHONENUMBERS_NO_THREAD_SAFETY must be defined only to let the
diff --git a/chromium/patches/patch-third__party_libsync_src_include_sync_sync.h b/chromium/patches/patch-third__party_libsync_src_include_sync_sync.h
index c03ff199ea..920fbe5606 100644
--- a/chromium/patches/patch-third__party_libsync_src_include_sync_sync.h
+++ b/chromium/patches/patch-third__party_libsync_src_include_sync_sync.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libsync_src_include_sync_sync.h,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libsync/src/include/sync/sync.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libsync/src/include/sync/sync.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libsync/src/include/sync/sync.h
 @@ -22,7 +22,9 @@
  #include <sys/cdefs.h>
diff --git a/chromium/patches/patch-third__party_libsync_src_sync.c b/chromium/patches/patch-third__party_libsync_src_sync.c
index bdb6c26daf..be5e204601 100644
--- a/chromium/patches/patch-third__party_libsync_src_sync.c
+++ b/chromium/patches/patch-third__party_libsync_src_sync.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libsync_src_sync.c,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libsync/src/sync.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libsync/src/sync.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libsync/src/sync.c
 @@ -17,8 +17,8 @@
   */
diff --git a/chromium/patches/patch-third__party_libusb_BUILD.gn b/chromium/patches/patch-third__party_libusb_BUILD.gn
index 58f9804d7f..0e88814857 100644
--- a/chromium/patches/patch-third__party_libusb_BUILD.gn
+++ b/chromium/patches/patch-third__party_libusb_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libusb_BUILD.gn,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libusb/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libusb/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libusb/BUILD.gn
 @@ -3,7 +3,7 @@
  # found in the LICENSE file.
diff --git a/chromium/patches/patch-third__party_libusb_src_libusb_core.c b/chromium/patches/patch-third__party_libusb_src_libusb_core.c
index d099cb8633..1bfcbccd92 100644
--- a/chromium/patches/patch-third__party_libusb_src_libusb_core.c
+++ b/chromium/patches/patch-third__party_libusb_src_libusb_core.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libusb_src_libusb_core.c,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libusb/src/libusb/core.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libusb/src/libusb/core.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libusb/src/libusb/core.c
 @@ -448,7 +448,7 @@ libusb_free_device_list(list, 1);
   * which grows when required. it can be freed once discovery has completed,
diff --git a/chromium/patches/patch-third__party_libusb_src_libusb_os_threads__posix.c b/chromium/patches/patch-third__party_libusb_src_libusb_os_threads__posix.c
index 4eba36c6b7..173dfa39b3 100644
--- a/chromium/patches/patch-third__party_libusb_src_libusb_os_threads__posix.c
+++ b/chromium/patches/patch-third__party_libusb_src_libusb_os_threads__posix.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libusb_src_libusb_os_threads__posix.c,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libusb/src/libusb/os/threads_posix.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libusb/src/libusb/os/threads_posix.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libusb/src/libusb/os/threads_posix.c
 @@ -19,9 +19,11 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/chromium/patches/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c b/chromium/patches/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
index 07e4cc3c39..597c03f1ce 100644
--- a/chromium/patches/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
+++ b/chromium/patches/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c
 @@ -120,10 +120,24 @@ static int arm_get_cpu_caps(void) {
    return flags;
diff --git a/chromium/patches/patch-third__party_lzma__sdk_C_CpuArch.c b/chromium/patches/patch-third__party_lzma__sdk_C_CpuArch.c
index af602d74f3..bd980ee387 100644
--- a/chromium/patches/patch-third__party_lzma__sdk_C_CpuArch.c
+++ b/chromium/patches/patch-third__party_lzma__sdk_C_CpuArch.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_lzma__sdk_C_CpuArch.c,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/lzma_sdk/C/CpuArch.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/lzma_sdk/C/CpuArch.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/lzma_sdk/C/CpuArch.c
-@@ -412,12 +412,40 @@ BoolInt CPU_IsSupported_SHA1(void) { ret
+@@ -854,6 +854,34 @@ BoolInt CPU_IsSupported_SHA1(void) { ret
  BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; }
  BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; }
  
@@ -41,10 +41,3 @@ $NetBSD: patch-third__party_lzma__sdk_C_CpuArch.c,v 1.1 2025/02/06 09:58:26 wiz
  
  #else // __APPLE__
  
- #include <sys/auxv.h>
- 
--#if !defined(ARMV8_OS_FUCHSIA)
-+#if !defined(ARMV8_OS_FUCHSIA) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- #define USE_HWCAP
- #endif // !defined(ARMV8_OS_FUCHSIA)
- 
diff --git a/chromium/patches/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc b/chromium/patches/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
index a3c1dfda3c..28ef634861 100644
--- a/chromium/patches/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
+++ b/chromium/patches/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/material_color_utilities/src/cpp/palettes/tones.cc
 @@ -14,6 +14,8 @@
   * limitations under the License.
diff --git a/chromium/patches/patch-third__party_nasm_BUILD.gn b/chromium/patches/patch-third__party_nasm_BUILD.gn
index d7e862c5c1..87ad020eb2 100644
--- a/chromium/patches/patch-third__party_nasm_BUILD.gn
+++ b/chromium/patches/patch-third__party_nasm_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_nasm_BUILD.gn,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/nasm/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/nasm/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/nasm/BUILD.gn
 @@ -63,6 +63,13 @@ config("nasm_config") {
  
diff --git a/chromium/patches/patch-third__party_nasm_config_config-linux.h b/chromium/patches/patch-third__party_nasm_config_config-linux.h
index 3e5bdf9447..f1e7b8aa13 100644
--- a/chromium/patches/patch-third__party_nasm_config_config-linux.h
+++ b/chromium/patches/patch-third__party_nasm_config_config-linux.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_nasm_config_config-linux.h,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/nasm/config/config-linux.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/nasm/config/config-linux.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/nasm/config/config-linux.h
 @@ -160,7 +160,7 @@
  
diff --git a/chromium/patches/patch-third__party_node_node.gni b/chromium/patches/patch-third__party_node_node.gni
index 0c7a00a3b3..f959723149 100644
--- a/chromium/patches/patch-third__party_node_node.gni
+++ b/chromium/patches/patch-third__party_node_node.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_node_node.gni,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/node/node.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/node/node.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/node/node.gni
 @@ -22,7 +22,7 @@ template("node") {
  
@@ -15,3 +15,20 @@ $NetBSD: patch-third__party_node_node.gni,v 1.1 2025/02/06 09:58:26 wiz Exp $
        inputs += [ "//third_party/node/linux/node-linux-x64/bin/node" ]
      }
      if (is_win && host_os == "win") {
+@@ -35,16 +35,5 @@ template("node") {
+         inputs += [ "//third_party/node/mac/node-darwin-x64/bin/node" ]
+       }
+     }
+-
+-    # Automatically add a dependency to ":check_version" to ensure NodeJS is
+-    # always running the expected version, except when the ':check_version'
+-    # target itself is running in which case it shouldn't depend on itself.
+-    if (get_label_info(":" + target_name, "label_no_toolchain") !=
+-        "//third_party/node:check_version") {
+-      if (!defined(deps)) {
+-        deps = []
+-      }
+-      deps += [ "//third_party/node:check_version" ]
+-    }
+   }
+ }
diff --git a/chromium/patches/patch-third__party_node_node.py b/chromium/patches/patch-third__party_node_node.py
index 29b815228e..fdb8feadf2 100644
--- a/chromium/patches/patch-third__party_node_node.py
+++ b/chromium/patches/patch-third__party_node_node.py
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_node_node.py,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/node/node.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/node/node.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/node/node.py
-@@ -21,6 +21,9 @@ def GetBinaryPath():
+@@ -20,6 +20,9 @@ def GetBinaryPath():
    return os_path.join(os_path.dirname(__file__), *{
      'Darwin': (darwin_path, darwin_name, 'bin', 'node'),
      'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
diff --git a/chromium/patches/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/chromium/patches/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
index 23e0cf69a5..a8b7b435af 100644
--- a/chromium/patches/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
+++ b/chromium/patches/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp
 @@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies
      {"ForteMT", "Forte"},
diff --git a/chromium/patches/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/chromium/patches/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
index 8796e49b1e..9cafcd2213 100644
--- a/chromium/patches/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
+++ b/chromium/patches/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp
 @@ -20,7 +20,7 @@
  #include "core/fxge/fx_font.h"
@@ -15,15 +15,17 @@ $NetBSD: patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp,v 1.1 202
  #error "Included on the wrong platform"
  #endif
  
-@@ -173,9 +173,8 @@ class CLinuxPlatform : public CFX_GEModu
+@@ -173,10 +173,9 @@ class CLinuxPlatform : public CFX_GEModu
    std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override {
      auto pInfo = std::make_unique<CFX_LinuxFontInfo>();
      if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) {
 -      pInfo->AddPath("/usr/share/fonts");
 -      pInfo->AddPath("/usr/share/X11/fonts/Type1");
 -      pInfo->AddPath("/usr/share/X11/fonts/TTF");
-+      pInfo->AddPath("/usr/X11R6/lib/X11/fonts/Type1");
-+      pInfo->AddPath("/usr/X11R6/lib/X11/fonts/TTF");
-       pInfo->AddPath("/usr/local/share/fonts");
+-      pInfo->AddPath("/usr/local/share/fonts");
++      pInfo->AddPath("@X11BASE@/lib/X11/fonts/Type1");
++      pInfo->AddPath("@X11BASE@/lib/X11/fonts/TTF");
++      pInfo->AddPath("@PREFIX@/share/fonts");
      }
      return pInfo;
+   }
diff --git a/chromium/patches/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/chromium/patches/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
index 733a4ee3a6..a4022f374b 100644
--- a/chromium/patches/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
+++ b/chromium/patches/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_pdfium_fxjs_fx__date__helpers.cpp,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/pdfium/fxjs/fx_date_helpers.cpp
 @@ -39,6 +39,11 @@ double GetLocalTZA() {
      return 0;
diff --git a/chromium/patches/patch-third__party_pdfium_pdfium.gni b/chromium/patches/patch-third__party_pdfium_pdfium.gni
index 72fc2f8286..49eee11b59 100644
--- a/chromium/patches/patch-third__party_pdfium_pdfium.gni
+++ b/chromium/patches/patch-third__party_pdfium_pdfium.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_pdfium_pdfium.gni,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/pdfium/pdfium.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/pdfium/pdfium.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/pdfium/pdfium.gni
 @@ -42,7 +42,7 @@ declare_args() {
    # PDFium will use PartitionAlloc partitions to separate strings, scalars,
diff --git a/chromium/patches/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp b/chromium/patches/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
index 2fcd939391..e35938197e 100644
--- a/chromium/patches/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
+++ b/chromium/patches/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp
 @@ -6,12 +6,16 @@
  
diff --git a/chromium/patches/patch-third__party_perfetto_include_perfetto_base_build__config.h b/chromium/patches/patch-third__party_perfetto_include_perfetto_base_build__config.h
index a05a2eab7e..55b0ec4fde 100644
--- a/chromium/patches/patch-third__party_perfetto_include_perfetto_base_build__config.h
+++ b/chromium/patches/patch-third__party_perfetto_include_perfetto_base_build__config.h
@@ -1,72 +1,76 @@
-$NetBSD: patch-third__party_perfetto_include_perfetto_base_build__config.h,v 1.1 2025/02/06 09:58:26 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/include/perfetto/base/build_config.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/include/perfetto/base/build_config.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/include/perfetto/base/build_config.h
 @@ -27,6 +27,7 @@
  #if defined(__ANDROID__)
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
-@@ -38,6 +39,7 @@
+@@ -41,6 +42,7 @@
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 1
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
-@@ -51,9 +53,10 @@
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 1
+@@ -62,9 +64,10 @@
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE_TVOS() 0
  #endif
 -#elif defined(__linux__)
 +#elif defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 1
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 1
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
-@@ -64,6 +67,8 @@
+@@ -78,6 +81,7 @@
+ #elif defined(__QNXNTO__)
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1
++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
+@@ -91,6 +95,7 @@
  #elif defined(_WIN32)
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
-@@ -74,6 +79,8 @@
+@@ -104,6 +109,7 @@
  #elif defined(__EMSCRIPTEN__)
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
-@@ -87,6 +94,8 @@
+@@ -120,6 +126,7 @@
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1
-@@ -94,6 +103,8 @@
+@@ -130,6 +137,7 @@
  #elif defined(__native_client__)
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
  #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0
diff --git a/chromium/patches/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/chromium/patches/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
index 18d1d39248..d181016380 100644
--- a/chromium/patches/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
+++ b/chromium/patches/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_perfetto_include_perfetto_base_thread__utils.h,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/include/perfetto/base/thread_utils.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/include/perfetto/base/thread_utils.h
-@@ -34,6 +34,7 @@ __declspec(dllimport) unsigned long __st
+@@ -37,6 +37,7 @@ __declspec(dllimport) unsigned long __st
  #include <sys/syscall.h>
  #include <sys/types.h>
  #include <unistd.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-third__party_perfetto_include_perfetto_base_thread__utils.h,v 1.1
  #else
  #include <pthread.h>
  #endif
-@@ -46,6 +47,11 @@ using PlatformThreadId = pid_t;
+@@ -50,6 +51,11 @@ using PlatformThreadId = pid_t;
  inline PlatformThreadId GetThreadId() {
    return gettid();
  }
diff --git a/chromium/patches/patch-third__party_perfetto_include_perfetto_base_time.h b/chromium/patches/patch-third__party_perfetto_include_perfetto_base_time.h
index 8ffc12bcb4..30113bb5e3 100644
--- a/chromium/patches/patch-third__party_perfetto_include_perfetto_base_time.h
+++ b/chromium/patches/patch-third__party_perfetto_include_perfetto_base_time.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_perfetto_include_perfetto_base_time.h,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/include/perfetto/base/time.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/include/perfetto/base/time.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/include/perfetto/base/time.h
-@@ -199,6 +199,9 @@ inline TimeNanos GetTimeInternalNs(clock
+@@ -227,6 +227,9 @@ inline TimeNanos GetTimeInternalNs(clock
  // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
  // during suspend (when supported).
  inline TimeNanos GetBootTimeNs() {
@@ -16,7 +16,7 @@ $NetBSD: patch-third__party_perfetto_include_perfetto_base_time.h,v 1.1 2025/02/
    // Determine if CLOCK_BOOTTIME is available on the first call.
    static const clockid_t kBootTimeClockSource = [] {
      struct timespec ts = {};
-@@ -206,6 +209,7 @@ inline TimeNanos GetBootTimeNs() {
+@@ -234,6 +237,7 @@ inline TimeNanos GetBootTimeNs() {
      return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource;
    }();
    return GetTimeInternalNs(kBootTimeClockSource);
@@ -24,7 +24,7 @@ $NetBSD: patch-third__party_perfetto_include_perfetto_base_time.h,v 1.1 2025/02/
  }
  
  inline TimeNanos GetWallTimeNs() {
-@@ -213,7 +217,13 @@ inline TimeNanos GetWallTimeNs() {
+@@ -241,7 +245,13 @@ inline TimeNanos GetWallTimeNs() {
  }
  
  inline TimeNanos GetWallTimeRawNs() {
diff --git a/chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h b/chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
index 3cc2390037..c4a2ffe1bc 100644
--- a/chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
+++ b/chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/include/perfetto/ext/base/event_fd.h
-@@ -55,6 +55,8 @@ class EventFd {
+@@ -58,6 +58,8 @@ class EventFd {
    // On Mac and other non-Linux UNIX platforms a pipe-based fallback is used.
    // The write end of the wakeup pipe.
    ScopedFile write_fd_;
diff --git a/chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h b/chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
index 78fe64cf65..f61e1b4240 100644
--- a/chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
+++ b/chromium/patches/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h
 @@ -41,9 +41,10 @@
  namespace perfetto {
diff --git a/chromium/patches/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h b/chromium/patches/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
index 50580cb6c8..c2f4e950e6 100644
--- a/chromium/patches/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
+++ b/chromium/patches/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h
 @@ -249,7 +249,7 @@ class PERFETTO_EXPORT_COMPONENT LegacyTr
  // are different. E.g. on Mac size_t is considered a different type from
diff --git a/chromium/patches/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto b/chromium/patches/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
index 88a8d1787e..f9aad0d996 100644
--- a/chromium/patches/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
+++ b/chromium/patches/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto
 @@ -10,7 +10,7 @@ message V4l2QbufFtraceEvent {
    optional uint32 field = 2;
diff --git a/chromium/patches/patch-third__party_perfetto_src_base_clock__snapshots.cc b/chromium/patches/patch-third__party_perfetto_src_base_clock__snapshots.cc
index 809b0c44ed..f43dd298f9 100644
--- a/chromium/patches/patch-third__party_perfetto_src_base_clock__snapshots.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_base_clock__snapshots.cc
@@ -1,18 +1,16 @@
-$NetBSD: patch-third__party_perfetto_src_base_clock__snapshots.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/base/clock_snapshots.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/base/clock_snapshots.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/base/clock_snapshots.cc
-@@ -26,7 +26,8 @@ ClockSnapshotVector CaptureClockSnapshot
-   ClockSnapshotVector snapshot_data;
+@@ -27,6 +27,7 @@ ClockSnapshotVector CaptureClockSnapshot
  #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \
      !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) &&   \
--    !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL)
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) &&  \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
+     !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) &&  \
++    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) &&  \
+     !PERFETTO_BUILDFLAG(PERFETTO_OS_QNX)
    struct {
      clockid_t id;
-     protos::pbzero::BuiltinClock type;
diff --git a/chromium/patches/patch-third__party_perfetto_src_base_event__fd.cc b/chromium/patches/patch-third__party_perfetto_src_base_event__fd.cc
index cc7a22680e..57cd46e073 100644
--- a/chromium/patches/patch-third__party_perfetto_src_base_event__fd.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_base_event__fd.cc
@@ -1,27 +1,27 @@
-$NetBSD: patch-third__party_perfetto_src_base_event__fd.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/base/event_fd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/base/event_fd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/base/event_fd.cc
-@@ -22,7 +22,8 @@
- #if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
- #include <Windows.h>
+@@ -24,7 +24,8 @@
  #include <synchapi.h>
+ #elif PERFETTO_BUILDFLAG(PERFETTO_OS_QNX)
+ #include <unistd.h>
 -#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
 +#elif (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \
 +    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
      PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
  #include <sys/eventfd.h>
  #include <unistd.h>
-@@ -57,7 +58,8 @@ void EventFd::Clear() {
+@@ -59,7 +60,8 @@ void EventFd::Clear() {
      PERFETTO_DFATAL("EventFd::Clear()");
  }
  
--#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#elif (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \
+-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
++#elif (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
 +    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
      PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
  
diff --git a/chromium/patches/patch-third__party_perfetto_src_base_periodic__task.cc b/chromium/patches/patch-third__party_perfetto_src_base_periodic__task.cc
index 3494863df8..b3f7b5c8df 100644
--- a/chromium/patches/patch-third__party_perfetto_src_base_periodic__task.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_base_periodic__task.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-third__party_perfetto_src_base_periodic__task.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/base/periodic_task.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/base/periodic_task.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/base/periodic_task.cc
 @@ -24,7 +24,7 @@
  #include "perfetto/base/time.h"
  #include "perfetto/ext/base/file_utils.h"
  
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
      (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19)
  #include <sys/timerfd.h>
  #endif
@@ -19,8 +19,8 @@ $NetBSD: patch-third__party_perfetto_src_base_periodic__task.cc,v 1.1 2025/02/06
  }
  
  ScopedPlatformHandle CreateTimerFd(const PeriodicTask::Args& args) {
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
      (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19)
    ScopedPlatformHandle tfd(
        timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK));
diff --git a/chromium/patches/patch-third__party_perfetto_src_base_string__utils.cc b/chromium/patches/patch-third__party_perfetto_src_base_string__utils.cc
index 3d87ce9597..e8935b2d68 100644
--- a/chromium/patches/patch-third__party_perfetto_src_base_string__utils.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_base_string__utils.cc
@@ -1,21 +1,18 @@
-$NetBSD: patch-third__party_perfetto_src_base_string__utils.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/base/string_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/base/string_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/base/string_utils.cc
-@@ -38,9 +38,10 @@ namespace base {
- 
+@@ -39,7 +39,8 @@ namespace base {
  // Locale-independant as possible version of strtod.
  double StrToD(const char* nptr, char** endptr) {
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
-     PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
-+    PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
++    (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
++    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
    static auto c_locale = newlocale(LC_ALL, "C", nullptr);
    return strtod_l(nptr, endptr, c_locale);
- #else
diff --git a/chromium/patches/patch-third__party_perfetto_src_base_subprocess__posix.cc b/chromium/patches/patch-third__party_perfetto_src_base_subprocess__posix.cc
index 9ac57e8a17..408a32335b 100644
--- a/chromium/patches/patch-third__party_perfetto_src_base_subprocess__posix.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_base_subprocess__posix.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-third__party_perfetto_src_base_subprocess__posix.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/base/subprocess_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/base/subprocess_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/base/subprocess_posix.cc
 @@ -35,7 +35,8 @@
  #include <thread>
  #include <tuple>
  
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
 +    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
      PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
  #include <sys/prctl.h>
@@ -20,8 +20,8 @@ $NetBSD: patch-third__party_perfetto_src_base_subprocess__posix.cc,v 1.1 2025/02
  // Don't add any dynamic allocation in this function. This will be invoked
  // under a fork(), potentially in a state where the allocator lock is held.
  void __attribute__((noreturn)) ChildProcess(ChildProcessArgs* args) {
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
 +    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
      PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
    // In no case we want a child process to outlive its parent process. This is
diff --git a/chromium/patches/patch-third__party_perfetto_src_base_test_vm__test__utils.cc b/chromium/patches/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
index d82772c5b2..933656f836 100644
--- a/chromium/patches/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_base_test_vm__test__utils.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_perfetto_src_base_test_vm__test__utils.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/base/test/vm_test_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/base/test/vm_test_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/base/test/vm_test_utils.cc
 @@ -91,7 +91,7 @@ bool IsMapped(void* start, size_t size) 
    // Fuchsia doesn't yet support paging (b/119503290).
diff --git a/chromium/patches/patch-third__party_perfetto_src_base_thread__task__runner.cc b/chromium/patches/patch-third__party_perfetto_src_base_thread__task__runner.cc
index f3eabcdcba..936045030e 100644
--- a/chromium/patches/patch-third__party_perfetto_src_base_thread__task__runner.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_base_thread__task__runner.cc
@@ -1,20 +1,18 @@
-$NetBSD: patch-third__party_perfetto_src_base_thread__task__runner.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/base/thread_task_runner.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/base/thread_task_runner.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/base/thread_task_runner.cc
-@@ -27,8 +27,9 @@
+@@ -27,7 +27,8 @@
  #include "perfetto/ext/base/thread_utils.h"
  #include "perfetto/ext/base/unix_task_runner.h"
  
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
++    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
  #include <sys/prctl.h>
  #endif
- 
diff --git a/chromium/patches/patch-third__party_perfetto_src_base_unix__socket.cc b/chromium/patches/patch-third__party_perfetto_src_base_unix__socket.cc
index de8d2bfd53..c8a481883d 100644
--- a/chromium/patches/patch-third__party_perfetto_src_base_unix__socket.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_base_unix__socket.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_perfetto_src_base_unix__socket.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/base/unix_socket.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/base/unix_socket.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/base/unix_socket.cc
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  #include <unistd.h>
  #endif
  
@@ -15,12 +15,12 @@ $NetBSD: patch-third__party_perfetto_src_base_unix__socket.cc,v 1.1 2025/02/06 0
  #include <sys/ucred.h>
  #endif
  
-@@ -917,15 +917,27 @@ void UnixSocket::ReadPeerCredentialsPosi
-     return;
-   PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore);
- 
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+@@ -977,15 +977,27 @@ void UnixSocket::ReadPeerCredentialsPosi
+   int res = getpeereid(fd, &peer_uid_, nullptr);
+   PERFETTO_CHECK(res == 0);
+   // There is no pid when obtaining peer credentials for QNX
+-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
++#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
      PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
 +#if PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
 +  struct sockpeercred user_cred;
diff --git a/chromium/patches/patch-third__party_perfetto_src_base_utils.cc b/chromium/patches/patch-third__party_perfetto_src_base_utils.cc
index a94231389a..255b16a86f 100644
--- a/chromium/patches/patch-third__party_perfetto_src_base_utils.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_base_utils.cc
@@ -1,24 +1,22 @@
-$NetBSD: patch-third__party_perfetto_src_base_utils.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/base/utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/base/utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/base/utils.cc
-@@ -38,8 +38,9 @@
+@@ -38,7 +38,8 @@
  #include <mach/vm_page_size.h>
  #endif
  
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
++    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
  #include <sys/prctl.h>
  
- #ifndef PR_GET_TAGGED_ADDR_CTRL
-@@ -278,14 +279,22 @@ void Daemonize(std::function<int()> pare
+@@ -279,14 +280,22 @@ void Daemonize(std::function<int()> pare
  
  std::string GetCurExecutablePath() {
    std::string self_path;
@@ -43,15 +41,13 @@ $NetBSD: patch-third__party_perfetto_src_base_utils.cc,v 1.1 2025/02/06 09:58:27
  #elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)
    uint32_t size = 0;
    PERFETTO_CHECK(_NSGetExecutablePath(nullptr, &size));
-@@ -337,8 +346,9 @@ void AlignedFree(void* ptr) {
+@@ -338,7 +347,8 @@ void AlignedFree(void* ptr) {
  }
  
  bool IsSyncMemoryTaggingEnabled() {
--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
--    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
-+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \
-+    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \
++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
++    !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
    // Compute only once per lifetime of the process.
    static bool cached_value = [] {
-     const int res = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0);
diff --git a/chromium/patches/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc b/chromium/patches/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
index 3890847713..276272f73e 100644
--- a/chromium/patches/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc
@@ -1,14 +1,14 @@
-$NetBSD: patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc
 @@ -62,7 +62,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
      case FtraceEvent::kV4l2QbufFieldNumber: {
-       V4l2QbufFtraceEvent::Decoder pb_evt(bytes.data, bytes.size);
+       V4l2QbufFtraceEvent::Decoder pb_evt(bytes);
        BufferEvent evt;
 -      evt.device_minor = pb_evt.minor();
 +      evt.device_minor = pb_evt.gminor();
@@ -17,7 +17,7 @@ $NetBSD: patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2_
        evt.bytesused = pb_evt.bytesused();
 @@ -103,7 +103,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
      case FtraceEvent::kV4l2DqbufFieldNumber: {
-       V4l2DqbufFtraceEvent::Decoder pb_evt(bytes.data, bytes.size);
+       V4l2DqbufFtraceEvent::Decoder pb_evt(bytes);
        BufferEvent evt;
 -      evt.device_minor = pb_evt.minor();
 +      evt.device_minor = pb_evt.gminor();
@@ -26,7 +26,7 @@ $NetBSD: patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2_
        evt.bytesused = pb_evt.bytesused();
 @@ -149,7 +149,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
      case FtraceEvent::kVb2V4l2BufQueueFieldNumber: {
-       Vb2V4l2BufQueueFtraceEvent::Decoder pb_evt(bytes.data, bytes.size);
+       Vb2V4l2BufQueueFtraceEvent::Decoder pb_evt(bytes);
        BufferEvent evt;
 -      evt.device_minor = pb_evt.minor();
 +      evt.device_minor = pb_evt.gminor();
@@ -35,7 +35,7 @@ $NetBSD: patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2_
        evt.bytesused = std::nullopt;
 @@ -180,7 +180,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
      case FtraceEvent::kVb2V4l2BufDoneFieldNumber: {
-       Vb2V4l2BufDoneFtraceEvent::Decoder pb_evt(bytes.data, bytes.size);
+       Vb2V4l2BufDoneFtraceEvent::Decoder pb_evt(bytes);
        BufferEvent evt;
 -      evt.device_minor = pb_evt.minor();
 +      evt.device_minor = pb_evt.gminor();
@@ -44,7 +44,7 @@ $NetBSD: patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2_
        evt.bytesused = std::nullopt;
 @@ -211,7 +211,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
      case FtraceEvent::kVb2V4l2QbufFieldNumber: {
-       Vb2V4l2QbufFtraceEvent::Decoder pb_evt(bytes.data, bytes.size);
+       Vb2V4l2QbufFtraceEvent::Decoder pb_evt(bytes);
        BufferEvent evt;
 -      evt.device_minor = pb_evt.minor();
 +      evt.device_minor = pb_evt.gminor();
@@ -53,7 +53,7 @@ $NetBSD: patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2_
        evt.bytesused = std::nullopt;
 @@ -242,7 +242,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_
      case FtraceEvent::kVb2V4l2DqbufFieldNumber: {
-       Vb2V4l2DqbufFtraceEvent::Decoder pb_evt(bytes.data, bytes.size);
+       Vb2V4l2DqbufFtraceEvent::Decoder pb_evt(bytes);
        BufferEvent evt;
 -      evt.device_minor = pb_evt.minor();
 +      evt.device_minor = pb_evt.gminor();
diff --git a/chromium/patches/patch-third__party_perfetto_src_tracing_ipc_memfd.cc b/chromium/patches/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
index 02532f81ab..d9b7f9243a 100644
--- a/chromium/patches/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_tracing_ipc_memfd.cc
@@ -1,18 +1,18 @@
-$NetBSD: patch-third__party_perfetto_src_tracing_ipc_memfd.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/tracing/ipc/memfd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/tracing/ipc/memfd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/tracing/ipc/memfd.cc
 @@ -20,7 +20,8 @@
  
  #define PERFETTO_MEMFD_ENABLED()             \
    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
--      PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX)
-+      (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \
-+      !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD))
+-  PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX)
++  (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \
++  !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD))
  
  #if PERFETTO_MEMFD_ENABLED()
  
diff --git a/chromium/patches/patch-third__party_perfetto_src_tracing_platform__posix.cc b/chromium/patches/patch-third__party_perfetto_src_tracing_platform__posix.cc
index 3ab47effc2..74496c34e1 100644
--- a/chromium/patches/patch-third__party_perfetto_src_tracing_platform__posix.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_tracing_platform__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_perfetto_src_tracing_platform__posix.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/tracing/platform_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/tracing/platform_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/tracing/platform_posix.cc
 @@ -110,12 +110,13 @@ std::unique_ptr<base::TaskRunner> Platfo
  }
diff --git a/chromium/patches/patch-third__party_perfetto_src_tracing_track.cc b/chromium/patches/patch-third__party_perfetto_src_tracing_track.cc
index 0990a1829b..791b6721f2 100644
--- a/chromium/patches/patch-third__party_perfetto_src_tracing_track.cc
+++ b/chromium/patches/patch-third__party_perfetto_src_tracing_track.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_perfetto_src_tracing_track.cc,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/perfetto/src/tracing/track.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/perfetto/src/tracing/track.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/perfetto/src/tracing/track.cc
 @@ -60,8 +60,9 @@ protos::gen::TrackDescriptor ProcessTrac
    auto desc = Track::Serialize();
@@ -18,7 +18,7 @@ $NetBSD: patch-third__party_perfetto_src_tracing_track.cc,v 1.1 2025/02/06 09:58
    std::string cmdline;
    if (base::ReadFile("/proc/self/cmdline", &cmdline)) {
      // Since cmdline is a zero-terminated list of arguments, this ends up
-@@ -155,7 +156,7 @@ namespace internal {
+@@ -170,7 +171,7 @@ namespace internal {
  namespace {
  
  uint64_t GetProcessStartTime() {
diff --git a/chromium/patches/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/chromium/patches/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
index 9d1239198b..66eb2a7cc1 100644
--- a/chromium/patches/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
+++ b/chromium/patches/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h
-@@ -122,7 +122,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
+@@ -99,7 +99,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
  
  #undef GOOGLE_PROTOBUF_PLATFORM_ERROR
  
diff --git a/chromium/patches/patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h b/chromium/patches/patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h
index be8e6ff46b..2e9fd85e5e 100644
--- a/chromium/patches/patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h
+++ b/chromium/patches/patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_skia_src_gpu_ganesh_GrAutoLocaleSetter.h,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/skia/src/gpu/ganesh/GrAutoLocaleSetter.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/skia/src/gpu/ganesh/GrAutoLocaleSetter.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/skia/src/gpu/ganesh/GrAutoLocaleSetter.h
 @@ -27,7 +27,7 @@
  #define HAVE_XLOCALE 0
diff --git a/chromium/patches/patch-third__party_skia_src_ports_SkMemory__malloc.cpp b/chromium/patches/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
index b0b333bac8..11a8f052e5 100644
--- a/chromium/patches/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
+++ b/chromium/patches/patch-third__party_skia_src_ports_SkMemory__malloc.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_skia_src_ports_SkMemory__malloc.cpp,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/skia/src/ports/SkMemory_malloc.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/skia/src/ports/SkMemory_malloc.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/skia/src/ports/SkMemory_malloc.cpp
 @@ -15,7 +15,8 @@
  
diff --git a/chromium/patches/patch-third__party_skia_src_ports_SkOSFile__posix.cpp b/chromium/patches/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
index 5d604592d2..f2fded1582 100644
--- a/chromium/patches/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
+++ b/chromium/patches/patch-third__party_skia_src_ports_SkOSFile__posix.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_skia_src_ports_SkOSFile__posix.cpp,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/skia/src/ports/SkOSFile_posix.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/skia/src/ports/SkOSFile_posix.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/skia/src/ports/SkOSFile_posix.cpp
 @@ -25,7 +25,7 @@
  #endif
diff --git a/chromium/patches/patch-third__party_speech-dispatcher_libspeechd__version.h b/chromium/patches/patch-third__party_speech-dispatcher_libspeechd__version.h
index cc4ea41982..ab24be69f4 100644
--- a/chromium/patches/patch-third__party_speech-dispatcher_libspeechd__version.h
+++ b/chromium/patches/patch-third__party_speech-dispatcher_libspeechd__version.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_speech-dispatcher_libspeechd__version.h,v 1.1 2025/02/06 09:58:27 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/speech-dispatcher/libspeechd_version.h.orig	2024-12-21 10:25:10.792904662 +0000
+--- third_party/speech-dispatcher/libspeechd_version.h.orig	2025-05-08 12:01:57.846080414 +0000
 +++ third_party/speech-dispatcher/libspeechd_version.h
 @@ -0,0 +1,29 @@
 +/*
diff --git a/chromium/patches/patch-third__party_speech-dispatcher_speechd__types.h b/chromium/patches/patch-third__party_speech-dispatcher_speechd__types.h
index b606945e01..f2f98c4cb0 100644
--- a/chromium/patches/patch-third__party_speech-dispatcher_speechd__types.h
+++ b/chromium/patches/patch-third__party_speech-dispatcher_speechd__types.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_speech-dispatcher_speechd__types.h,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/speech-dispatcher/speechd_types.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/speech-dispatcher/speechd_types.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/speech-dispatcher/speechd_types.h
 @@ -119,4 +119,139 @@ typedef struct {
  	SPDVoice voice;
diff --git a/chromium/patches/patch-third__party_sqlite_BUILD.gn b/chromium/patches/patch-third__party_sqlite_BUILD.gn
index ad6f2274af..0222e398a3 100644
--- a/chromium/patches/patch-third__party_sqlite_BUILD.gn
+++ b/chromium/patches/patch-third__party_sqlite_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_sqlite_BUILD.gn,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/sqlite/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/sqlite/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/sqlite/BUILD.gn
-@@ -142,7 +142,7 @@ config("sqlite_warnings") {
+@@ -155,7 +155,7 @@ config("sqlite_warnings") {
        ]
      }
    }
diff --git a/chromium/patches/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c b/chromium/patches/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
index c6eaa5735b..ab445f80f5 100644
--- a/chromium/patches/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
+++ b/chromium/patches/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
@@ -1,12 +1,21 @@
-$NetBSD: patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -20646,6 +20646,9 @@ SQLITE_PRIVATE int sqlite3HeapNearlyFull
+@@ -14486,7 +14486,7 @@ struct fts5_api {
+ ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
+ ** it.
+ */
+-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
++#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__FreeBSD__)
+ #  define _XOPEN_SOURCE 600
+ #endif
+ 
+@@ -20975,6 +20975,9 @@ SQLITE_PRIVATE int sqlite3HeapNearlyFull
  ** The alloca() routine never returns NULL.  This will cause code paths
  ** that deal with sqlite3StackAlloc() failures to be unreachable.
  */
diff --git a/chromium/patches/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/chromium/patches/patch-third__party_sqlite_src_amalgamation_sqlite3.c
index ee457726dc..956c19c701 100644
--- a/chromium/patches/patch-third__party_sqlite_src_amalgamation_sqlite3.c
+++ b/chromium/patches/patch-third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_sqlite_src_amalgamation_sqlite3.c,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14187,7 +14187,7 @@ struct fts5_api {
+@@ -14486,7 +14486,7 @@ struct fts5_api {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
@@ -15,7 +15,7 @@ $NetBSD: patch-third__party_sqlite_src_amalgamation_sqlite3.c,v 1.1 2025/02/06 0
  #  define _XOPEN_SOURCE 600
  #endif
  
-@@ -20633,6 +20633,9 @@ SQLITE_PRIVATE int sqlite3HeapNearlyFull
+@@ -20962,6 +20962,9 @@ SQLITE_PRIVATE int sqlite3HeapNearlyFull
  ** The alloca() routine never returns NULL.  This will cause code paths
  ** that deal with sqlite3StackAlloc() failures to be unreachable.
  */
@@ -25,7 +25,7 @@ $NetBSD: patch-third__party_sqlite_src_amalgamation_sqlite3.c,v 1.1 2025/02/06 0
  #ifdef SQLITE_USE_ALLOCA
  # define sqlite3StackAllocRaw(D,N)   alloca(N)
  # define sqlite3StackAllocRawNN(D,N) alloca(N)
-@@ -45183,6 +45186,11 @@ static int unixRandomness(sqlite3_vfs *N
+@@ -45387,6 +45390,11 @@ static int unixRandomness(sqlite3_vfs *N
    memset(zBuf, 0, nBuf);
    randomnessPid = osGetpid(0);
  #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -37,7 +37,7 @@ $NetBSD: patch-third__party_sqlite_src_amalgamation_sqlite3.c,v 1.1 2025/02/06 0
    {
      int fd, got;
      fd = robust_open("/dev/urandom", O_RDONLY, 0);
-@@ -45199,6 +45207,7 @@ static int unixRandomness(sqlite3_vfs *N
+@@ -45403,6 +45411,7 @@ static int unixRandomness(sqlite3_vfs *N
      }
    }
  #endif
diff --git a/chromium/patches/patch-third__party_swiftshader_src_Reactor_Debug.cpp b/chromium/patches/patch-third__party_swiftshader_src_Reactor_Debug.cpp
index c450ede83b..e1772620a3 100644
--- a/chromium/patches/patch-third__party_swiftshader_src_Reactor_Debug.cpp
+++ b/chromium/patches/patch-third__party_swiftshader_src_Reactor_Debug.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_swiftshader_src_Reactor_Debug.cpp,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/swiftshader/src/Reactor/Debug.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/swiftshader/src/Reactor/Debug.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/swiftshader/src/Reactor/Debug.cpp
 @@ -46,7 +46,8 @@ namespace {
  
diff --git a/chromium/patches/patch-third__party_swiftshader_src_System_Configurator.cpp b/chromium/patches/patch-third__party_swiftshader_src_System_Configurator.cpp
index bde4225828..6047c3e4d4 100644
--- a/chromium/patches/patch-third__party_swiftshader_src_System_Configurator.cpp
+++ b/chromium/patches/patch-third__party_swiftshader_src_System_Configurator.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_swiftshader_src_System_Configurator.cpp,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/swiftshader/src/System/Configurator.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/swiftshader/src/System/Configurator.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/swiftshader/src/System/Configurator.cpp
 @@ -38,6 +38,9 @@ namespace sw {
  
diff --git a/chromium/patches/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp b/chromium/patches/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
index c79fb5b820..ac9f2351fd 100644
--- a/chromium/patches/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
+++ b/chromium/patches/patch-third__party_swiftshader_src_System_Linux_MemFd.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_swiftshader_src_System_Linux_MemFd.cpp,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/swiftshader/src/System/Linux/MemFd.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/swiftshader/src/System/Linux/MemFd.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/swiftshader/src/System/Linux/MemFd.cpp
 @@ -25,6 +25,7 @@
  #	define MFD_CLOEXEC 0x0001U
diff --git a/chromium/patches/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp b/chromium/patches/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
index 35d405b63e..3165447abf 100644
--- a/chromium/patches/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
+++ b/chromium/patches/patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp
 @@ -49,13 +49,17 @@ public:
  	{
diff --git a/chromium/patches/patch-third__party_swiftshader_src_WSI_libXCB.cpp b/chromium/patches/patch-third__party_swiftshader_src_WSI_libXCB.cpp
index 1f2f16604d..07df2b1cb2 100644
--- a/chromium/patches/patch-third__party_swiftshader_src_WSI_libXCB.cpp
+++ b/chromium/patches/patch-third__party_swiftshader_src_WSI_libXCB.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_swiftshader_src_WSI_libXCB.cpp,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/swiftshader/src/WSI/libXCB.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/swiftshader/src/WSI/libXCB.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/swiftshader/src/WSI/libXCB.cpp
 @@ -57,7 +57,7 @@ LibXcbExports *LibXCB::loadExports()
  		}
diff --git a/chromium/patches/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h b/chromium/patches/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
index 69cb9706bf..0549efa1de 100644
--- a/chromium/patches/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
+++ b/chromium/patches/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
 @@ -29,7 +29,7 @@
  
diff --git a/chromium/patches/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h b/chromium/patches/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
index 801ddbdd50..a10c9f24d5 100644
--- a/chromium/patches/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
+++ b/chromium/patches/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
 @@ -5,8 +5,6 @@
  #include "llvm/Config/llvm-config.h"
diff --git a/chromium/patches/patch-third__party_swiftshader_third__party_marl_src_memory.cpp b/chromium/patches/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
index 5c960a048a..492a6c42d0 100644
--- a/chromium/patches/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
+++ b/chromium/patches/patch-third__party_swiftshader_third__party_marl_src_memory.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_swiftshader_third__party_marl_src_memory.cpp,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/swiftshader/third_party/marl/src/memory.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/swiftshader/third_party/marl/src/memory.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/swiftshader/third_party/marl/src/memory.cpp
 @@ -19,7 +19,8 @@
  
diff --git a/chromium/patches/patch-third__party_swiftshader_third__party_marl_src_thread.cpp b/chromium/patches/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
index 7f7345faae..f09c75a06c 100644
--- a/chromium/patches/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
+++ b/chromium/patches/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_swiftshader_third__party_marl_src_thread.cpp,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/swiftshader/third_party/marl/src/thread.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/swiftshader/third_party/marl/src/thread.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/swiftshader/third_party/marl/src/thread.cpp
 @@ -46,6 +46,9 @@
  #include <unistd.h>
diff --git a/chromium/patches/patch-third__party_test__fonts_fontconfig_BUILD.gn b/chromium/patches/patch-third__party_test__fonts_fontconfig_BUILD.gn
index 9443e36c4c..d3f9ad76e1 100644
--- a/chromium/patches/patch-third__party_test__fonts_fontconfig_BUILD.gn
+++ b/chromium/patches/patch-third__party_test__fonts_fontconfig_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_test__fonts_fontconfig_BUILD.gn,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/test_fonts/fontconfig/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/test_fonts/fontconfig/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/test_fonts/fontconfig/BUILD.gn
 @@ -26,7 +26,11 @@ if (is_linux || is_chromeos) {
  
@@ -19,3 +19,16 @@ $NetBSD: patch-third__party_test__fonts_fontconfig_BUILD.gn,v 1.1 2025/02/06 09:
    }
  
    if (current_toolchain == host_toolchain) {
+@@ -47,7 +51,11 @@ if (is_linux || is_chromeos) {
+         "//third_party/test_fonts",
+       ]
+       args = []
+-      inputs = [ "$root_out_dir/etc/fonts/fonts.conf" ]
++      if (is_freebsd) {
++        inputs = [ "$root_out_dir/usr/local/etc/fonts/fonts.conf" ]
++      } else {
++        inputs = [ "$root_out_dir/etc/fonts/fonts.conf" ]
++      }
+       outputs = [
+         "$root_out_dir/fontconfig_caches/fb5c91b2895aa445d23aebf7f9e2189c-le64.cache-9",
+         "$root_out_dir/fontconfig_caches/CACHEDIR.TAG",
diff --git a/chromium/patches/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc b/chromium/patches/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
index d38e7d4937..941103b03a 100644
--- a/chromium/patches/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
+++ b/chromium/patches/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/test_fonts/fontconfig/fontconfig_util_linux.cc
 @@ -2,6 +2,8 @@
  // Use of this source code is governed by a BSD-style license that can be
diff --git a/chromium/patches/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc b/chromium/patches/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
index 9f975bd8fd..08a79e9268 100644
--- a/chromium/patches/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
+++ b/chromium/patches/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc
 @@ -28,7 +28,7 @@ int main() {
    // fontconfig cache.
diff --git a/chromium/patches/patch-third__party_tflite_features.gni b/chromium/patches/patch-third__party_tflite_features.gni
index 5658ef8eb1..183de066c0 100644
--- a/chromium/patches/patch-third__party_tflite_features.gni
+++ b/chromium/patches/patch-third__party_tflite_features.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_tflite_features.gni,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/tflite/features.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/tflite/features.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/tflite/features.gni
 @@ -9,8 +9,8 @@ declare_args() {
    # This enables building TFLite with XNNPACK. Currently only available for
diff --git a/chromium/patches/patch-third__party_unrar_src_crypt.cpp b/chromium/patches/patch-third__party_unrar_src_crypt.cpp
index 25476a7589..13daa9c871 100644
--- a/chromium/patches/patch-third__party_unrar_src_crypt.cpp
+++ b/chromium/patches/patch-third__party_unrar_src_crypt.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_unrar_src_crypt.cpp,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/unrar/src/crypt.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/unrar/src/crypt.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/unrar/src/crypt.cpp
 @@ -116,6 +116,8 @@ void GetRnd(byte *RndBuf,size_t BufSize)
      Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) != FALSE;
diff --git a/chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h b/chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
index 0238f06e74..b8329e9598 100644
--- a/chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
+++ b/chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
-@@ -2740,7 +2740,7 @@ static void* vma_aligned_alloc(size_t al
+@@ -2971,7 +2971,7 @@ static void* vma_aligned_alloc(size_t al
  
      return memalign(alignment, size);
  }
diff --git a/chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp b/chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp
index a52d675b0e..f559aaf2c6 100644
--- a/chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp
+++ b/chromium/patches/patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_vulkan-validation-layers_src_layers_vulkan_generated_vk__function__pointers.cpp,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/vulkan-validation-layers/src/layers/vulkan/generated/vk_function_pointers.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/vulkan-validation-layers/src/layers/vulkan/generated/vk_function_pointers.cpp.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/vulkan-validation-layers/src/layers/vulkan/generated/vk_function_pointers.cpp
 @@ -53,7 +53,8 @@ static void *get_proc_address(dl_handle 
      assert(name);
diff --git a/chromium/patches/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/chromium/patches/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
index c3ec8ade86..d294c0a2f7 100644
--- a/chromium/patches/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
+++ b/chromium/patches/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
 @@ -2760,7 +2760,7 @@ void* vma_aligned_alloc(size_t alignment
  
diff --git a/chromium/patches/patch-third__party_wayland_BUILD.gn b/chromium/patches/patch-third__party_wayland_BUILD.gn
index e1fbb092b0..67ce3dbde8 100644
--- a/chromium/patches/patch-third__party_wayland_BUILD.gn
+++ b/chromium/patches/patch-third__party_wayland_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_wayland_BUILD.gn,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/wayland/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/wayland/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/wayland/BUILD.gn
 @@ -24,6 +24,11 @@ if (!use_system_libwayland) {
        "src/src",
diff --git a/chromium/patches/patch-third__party_wayland_include_config.h b/chromium/patches/patch-third__party_wayland_include_config.h
index fbab1e7ce0..0e9337560f 100644
--- a/chromium/patches/patch-third__party_wayland_include_config.h
+++ b/chromium/patches/patch-third__party_wayland_include_config.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_wayland_include_config.h,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/wayland/include/config.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/wayland/include/config.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/wayland/include/config.h
 @@ -9,7 +9,14 @@
  
diff --git a/chromium/patches/patch-third__party_webrtc_BUILD.gn b/chromium/patches/patch-third__party_webrtc_BUILD.gn
index 0544be6478..0e081a1545 100644
--- a/chromium/patches/patch-third__party_webrtc_BUILD.gn
+++ b/chromium/patches/patch-third__party_webrtc_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_webrtc_BUILD.gn,v 1.1 2025/02/06 09:58:28 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/BUILD.gn
-@@ -218,6 +218,9 @@ config("common_inherited_config") {
+@@ -219,6 +219,9 @@ config("common_inherited_config") {
    if (is_linux || is_chromeos) {
      defines += [ "WEBRTC_LINUX" ]
    }
diff --git a/chromium/patches/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/chromium/patches/patch-third__party_webrtc_modules_audio__device_BUILD.gn
index 96c9c6d4a8..2c286d76fa 100644
--- a/chromium/patches/patch-third__party_webrtc_modules_audio__device_BUILD.gn
+++ b/chromium/patches/patch-third__party_webrtc_modules_audio__device_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_webrtc_modules_audio__device_BUILD.gn,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/modules/audio_device/BUILD.gn
 @@ -330,7 +330,7 @@ rtc_library("audio_device_impl") {
      if (rtc_use_dummy_audio_file_devices) {
diff --git a/chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
index a218c3568b..4c1e98345e 100644
--- a/chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
+++ b/chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
@@ -1,24 +1,18 @@
-$NetBSD: patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
-@@ -10,11 +10,15 @@
- 
+@@ -11,7 +11,9 @@
  #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
  
+ #include <EGL/eglext.h>
 +#if !defined(WEBRTC_BSD)
  #include <asm/ioctl.h>
 +#endif
  #include <dlfcn.h>
  #include <fcntl.h>
  #include <libdrm/drm_fourcc.h>
-+#if !defined(WEBRTC_BSD)
- #include <linux/types.h>
-+#endif
- #include <spa/param/video/format-utils.h>
- #include <unistd.h>
- #include <xf86drm.h>
diff --git a/chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
index 7fa7466914..b1746607ad 100644
--- a/chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
+++ b/chromium/patches/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
 @@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache
  void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) {
diff --git a/chromium/patches/patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc b/chromium/patches/patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc
deleted file mode 100644
index a02d8701f4..0000000000
--- a/chromium/patches/patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- third_party/webrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ third_party/webrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
-@@ -299,7 +299,9 @@ int LibaomAv1Encoder::InitEncode(const V
-     SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_PALETTE, 0);
-   }
- 
-+#ifdef notyet
-   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_AUTO_TILES, 1);
-+#endif
-   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ROW_MT, 1);
-   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_OBMC, 0);
-   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_NOISE_SENSITIVITY, 0);
-@@ -332,8 +334,10 @@ int LibaomAv1Encoder::InitEncode(const V
-   SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_REFERENCE_FRAMES, 3);
- 
-   if (adaptive_max_consec_drops_) {
-+#ifdef notyet
-     SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR,
-                                       250);
-+#endif
-   }
- 
-   return WEBRTC_VIDEO_CODEC_OK;
diff --git a/chromium/patches/patch-third__party_webrtc_rtc__base_byte__order.h b/chromium/patches/patch-third__party_webrtc_rtc__base_byte__order.h
index cec8cbbe1f..6123aef27d 100644
--- a/chromium/patches/patch-third__party_webrtc_rtc__base_byte__order.h
+++ b/chromium/patches/patch-third__party_webrtc_rtc__base_byte__order.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_webrtc_rtc__base_byte__order.h,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/rtc_base/byte_order.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/rtc_base/byte_order.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/rtc_base/byte_order.h
 @@ -90,6 +90,8 @@
  #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined.
diff --git a/chromium/patches/patch-third__party_webrtc_rtc__base_ip__address.cc b/chromium/patches/patch-third__party_webrtc_rtc__base_ip__address.cc
index 0f121ee755..a15d5b168c 100644
--- a/chromium/patches/patch-third__party_webrtc_rtc__base_ip__address.cc
+++ b/chromium/patches/patch-third__party_webrtc_rtc__base_ip__address.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_webrtc_rtc__base_ip__address.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/rtc_base/ip_address.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/rtc_base/ip_address.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/rtc_base/ip_address.cc
 @@ -14,7 +14,8 @@
  #include <cstring>
diff --git a/chromium/patches/patch-third__party_webrtc_rtc__base_net__test__helpers.cc b/chromium/patches/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
index 2fe4da3a45..e57e3093c5 100644
--- a/chromium/patches/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
+++ b/chromium/patches/patch-third__party_webrtc_rtc__base_net__test__helpers.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_webrtc_rtc__base_net__test__helpers.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/rtc_base/net_test_helpers.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/rtc_base/net_test_helpers.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/rtc_base/net_test_helpers.cc
 @@ -21,6 +21,7 @@
  #endif
diff --git a/chromium/patches/patch-third__party_webrtc_rtc__base_network.cc b/chromium/patches/patch-third__party_webrtc_rtc__base_network.cc
index d018cc7641..74eb8ca46a 100644
--- a/chromium/patches/patch-third__party_webrtc_rtc__base_network.cc
+++ b/chromium/patches/patch-third__party_webrtc_rtc__base_network.cc
@@ -1,20 +1,20 @@
-$NetBSD: patch-third__party_webrtc_rtc__base_network.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/rtc_base/network.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/rtc_base/network.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/rtc_base/network.cc
-@@ -290,7 +290,12 @@ AdapterType GetAdapterTypeFromName(absl:
+@@ -314,7 +314,12 @@ webrtc::AdapterType GetAdapterTypeFromNa
    }
  #endif
  
 +#if defined(WEBRTC_BSD)
 +  // Treat all other network interface names as ethernet on BSD
-+  return ADAPTER_TYPE_ETHERNET;
++  return webrtc::ADAPTER_TYPE_ETHERNET;
 +#else
-   return ADAPTER_TYPE_UNKNOWN;
+   return webrtc::ADAPTER_TYPE_UNKNOWN;
 +#endif
  }
  
diff --git a/chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
index 0a9a0c9590..6454fbacb4 100644
--- a/chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
+++ b/chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/rtc_base/physical_socket_server.cc
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
  #include "rtc_base/time_utils.h"
  #include "system_wrappers/include/field_trial.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2
  #include <linux/sockios.h>
  #endif
  
-@@ -74,7 +74,7 @@ typedef void* SockOptArg;
+@@ -75,7 +75,7 @@ typedef void* SockOptArg;
  
  #endif  // WEBRTC_POSIX
  
@@ -24,7 +24,7 @@ $NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
-@@ -329,7 +329,7 @@ int PhysicalSocket::GetOption(Option opt
+@@ -331,7 +331,7 @@ int PhysicalSocket::GetOption(Option opt
      return -1;
    }
    if (opt == OPT_DONTFRAGMENT) {
@@ -33,7 +33,7 @@ $NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2
      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -358,7 +358,7 @@ int PhysicalSocket::SetOption(Option opt
+@@ -360,7 +360,7 @@ int PhysicalSocket::SetOption(Option opt
    if (TranslateOption(opt, &slevel, &sopt) == -1)
      return -1;
    if (opt == OPT_DONTFRAGMENT) {
@@ -42,7 +42,7 @@ $NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -389,7 +389,7 @@ int PhysicalSocket::SetOption(Option opt
+@@ -391,7 +391,7 @@ int PhysicalSocket::SetOption(Option opt
  int PhysicalSocket::Send(const void* pv, size_t cb) {
    int sent = DoSend(
        s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
@@ -51,7 +51,7 @@ $NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2
        // Suppress SIGPIPE. Without this, attempting to send on a socket whose
        // other end is closed will result in a SIGPIPE signal being raised to
        // our process, which by default will terminate the process, which we
-@@ -418,7 +418,7 @@ int PhysicalSocket::SendTo(const void* b
+@@ -420,7 +420,7 @@ int PhysicalSocket::SendTo(const void* b
    size_t len = addr.ToSockAddrStorage(&saddr);
    int sent =
        DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
@@ -60,7 +60,7 @@ $NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2
                 // Suppress SIGPIPE. See above for explanation.
                 MSG_NOSIGNAL,
  #else
-@@ -697,7 +697,7 @@ int PhysicalSocket::TranslateOption(Opti
+@@ -698,7 +698,7 @@ int PhysicalSocket::TranslateOption(Opti
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
@@ -69,7 +69,7 @@ $NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2
        RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
        return -1;
  #elif defined(WEBRTC_POSIX)
-@@ -746,7 +746,7 @@ int PhysicalSocket::TranslateOption(Opti
+@@ -747,7 +747,7 @@ int PhysicalSocket::TranslateOption(Opti
        return -1;
  #endif
      case OPT_RECV_ECN:
@@ -78,7 +78,7 @@ $NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2
        if (family_ == AF_INET6) {
          *slevel = IPPROTO_IPV6;
          *sopt = IPV6_RECVTCLASS;
-@@ -766,10 +766,19 @@ int PhysicalSocket::TranslateOption(Opti
+@@ -767,10 +767,19 @@ int PhysicalSocket::TranslateOption(Opti
        *sopt = SO_KEEPALIVE;
        break;
      case OPT_TCP_KEEPCNT:
@@ -98,7 +98,7 @@ $NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.cc,v 1.1 2
        *slevel = IPPROTO_TCP;
  #if !defined(WEBRTC_MAC)
        *sopt = TCP_KEEPIDLE;
-@@ -777,12 +786,18 @@ int PhysicalSocket::TranslateOption(Opti
+@@ -778,12 +787,18 @@ int PhysicalSocket::TranslateOption(Opti
        *sopt = TCP_KEEPALIVE;
  #endif
        break;
diff --git a/chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.h
index 8b74c2d559..cadb7bf085 100644
--- a/chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.h
+++ b/chromium/patches/patch-third__party_webrtc_rtc__base_physical__socket__server.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_webrtc_rtc__base_physical__socket__server.h,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/rtc_base/physical_socket_server.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/rtc_base/physical_socket_server.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/rtc_base/physical_socket_server.h
 @@ -18,7 +18,7 @@
  #include "rtc_base/third_party/sigslot/sigslot.h"
diff --git a/chromium/patches/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/chromium/patches/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
index 78e8a695d8..d60ee42d41 100644
--- a/chromium/patches/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
+++ b/chromium/patches/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_webrtc_rtc__base_platform__thread__types.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/rtc_base/platform_thread_types.cc
 @@ -11,7 +11,9 @@
  #include "rtc_base/platform_thread_types.h"
diff --git a/chromium/patches/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h b/chromium/patches/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
index 2638dc7c90..1e5f81b00c 100644
--- a/chromium/patches/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
+++ b/chromium/patches/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h
 @@ -178,6 +178,10 @@ class multi_threaded_local {
  #endif  // _SIGSLOT_HAS_WIN32_THREADS
diff --git a/chromium/patches/patch-third__party_webrtc_system__wrappers_BUILD.gn b/chromium/patches/patch-third__party_webrtc_system__wrappers_BUILD.gn
index db8c75df97..4a09ec0e5e 100644
--- a/chromium/patches/patch-third__party_webrtc_system__wrappers_BUILD.gn
+++ b/chromium/patches/patch-third__party_webrtc_system__wrappers_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_webrtc_system__wrappers_BUILD.gn,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/webrtc/system_wrappers/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/webrtc/system_wrappers/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/webrtc/system_wrappers/BUILD.gn
 @@ -62,8 +62,6 @@ rtc_library("system_wrappers") {
      if (!build_with_chromium) {
diff --git a/chromium/patches/patch-third__party_widevine_cdm_widevine.gni b/chromium/patches/patch-third__party_widevine_cdm_widevine.gni
index 43d2499131..87bdb415d0 100644
--- a/chromium/patches/patch-third__party_widevine_cdm_widevine.gni
+++ b/chromium/patches/patch-third__party_widevine_cdm_widevine.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_widevine_cdm_widevine.gni,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/widevine/cdm/widevine.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/widevine/cdm/widevine.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/widevine/cdm/widevine.gni
 @@ -28,6 +28,9 @@ library_widevine_cdm_available =
      (is_chromeos &&
diff --git a/chromium/patches/patch-third__party_zlib_BUILD.gn b/chromium/patches/patch-third__party_zlib_BUILD.gn
index 22655c7408..462b9a2eba 100644
--- a/chromium/patches/patch-third__party_zlib_BUILD.gn
+++ b/chromium/patches/patch-third__party_zlib_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_zlib_BUILD.gn,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/zlib/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/zlib/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/zlib/BUILD.gn
 @@ -128,7 +128,7 @@ if (use_arm_neon_optimizations) {
      defines = [ "CRC32_ARMV8_CRC32" ]
diff --git a/chromium/patches/patch-third__party_zlib_cpu__features.c b/chromium/patches/patch-third__party_zlib_cpu__features.c
index ab8f02386c..29eddffe6e 100644
--- a/chromium/patches/patch-third__party_zlib_cpu__features.c
+++ b/chromium/patches/patch-third__party_zlib_cpu__features.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_zlib_cpu__features.c,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- third_party/zlib/cpu_features.c.orig	2024-12-17 17:58:49.000000000 +0000
+--- third_party/zlib/cpu_features.c.orig	2025-05-05 19:21:24.000000000 +0000
 +++ third_party/zlib/cpu_features.c
 @@ -39,7 +39,8 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmu
  #ifndef CPU_NO_SIMD
diff --git a/chromium/patches/patch-tools_code__cache__generator_BUILD.gn b/chromium/patches/patch-tools_code__cache__generator_BUILD.gn
new file mode 100644
index 0000000000..e110f287bc
--- /dev/null
+++ b/chromium/patches/patch-tools_code__cache__generator_BUILD.gn
@@ -0,0 +1,52 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- tools/code_cache_generator/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ tools/code_cache_generator/BUILD.gn
+@@ -15,8 +15,34 @@ if (is_android) {
+   import("//build/config/android/rules.gni")
+ }
+ 
+-executable("code_cache_generator") {
++group("code_cache_generator") {
++    deps = [ ":code_cache_generator_executable" ]
++    if (target_os == "netbsd") {
++      deps+= [ ":run_paxctl_code_cache_generator" ]
++    }
++}
++
++action("run_paxctl_code_cache_generator") {
++  deps = [ ":code_cache_generator_executable" ]
++
++  script = "//v8/tools/run-paxctl.py"
++  stamp = "$target_gen_dir/paxctl_stamp"
++  outputs = [ stamp ]
++
++  sources = []
++  data = []
++
++  args = [
++    rebase_path(stamp, root_build_dir),
++    "/usr/sbin/paxctl", "+m",
++    "./" + rebase_path(get_label_info(":code_cache_generator_executable", "root_out_dir") + "/code_cache_generator",
++    root_build_dir),
++  ]
++}
++
++executable("code_cache_generator_executable") {
+   sources = [ "code_cache_generator.cc" ]
++  output_name = "code_cache_generator"
+ 
+   deps = [
+     "//gin:gin",
+@@ -25,6 +51,7 @@ executable("code_cache_generator") {
+     "//tools/v8_context_snapshot:buildflags",
+     "//v8",
+   ]
++
+   data_deps = []
+   data = []
+ 
diff --git a/chromium/patches/patch-tools_generate__shim__headers_generate__shim__headers.py b/chromium/patches/patch-tools_generate__shim__headers_generate__shim__headers.py
index 9d5ba10178..ccaadcf7d0 100644
--- a/chromium/patches/patch-tools_generate__shim__headers_generate__shim__headers.py
+++ b/chromium/patches/patch-tools_generate__shim__headers_generate__shim__headers.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_generate__shim__headers_generate__shim__headers.py,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/generate_shim_headers/generate_shim_headers.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/generate_shim_headers/generate_shim_headers.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/generate_shim_headers/generate_shim_headers.py
 @@ -18,7 +18,7 @@ import sys
  
diff --git a/chromium/patches/patch-tools_generate__stubs_rules.gni b/chromium/patches/patch-tools_generate__stubs_rules.gni
index 09922f15ad..45b57f010c 100644
--- a/chromium/patches/patch-tools_generate__stubs_rules.gni
+++ b/chromium/patches/patch-tools_generate__stubs_rules.gni
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_generate__stubs_rules.gni,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/generate_stubs/rules.gni.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/generate_stubs/rules.gni.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/generate_stubs/rules.gni
 @@ -110,7 +110,6 @@ template("generate_stubs") {
        "${target_gen_dir}/${invoker.output_name}.cc",
diff --git a/chromium/patches/patch-tools_gn_build_build__linux.ninja.template b/chromium/patches/patch-tools_gn_build_build__linux.ninja.template
index 53d4d36e5f..75d13a2c27 100644
--- a/chromium/patches/patch-tools_gn_build_build__linux.ninja.template
+++ b/chromium/patches/patch-tools_gn_build_build__linux.ninja.template
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_gn_build_build__linux.ninja.template,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/gn/build/build_linux.ninja.template.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/gn/build/build_linux.ninja.template.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/gn/build/build_linux.ninja.template
 @@ -5,7 +5,7 @@ rule cxx
    deps = gcc
diff --git a/chromium/patches/patch-tools_gn_build_gen.py b/chromium/patches/patch-tools_gn_build_gen.py
index ce5b2a3465..eb8cfabfa2 100644
--- a/chromium/patches/patch-tools_gn_build_gen.py
+++ b/chromium/patches/patch-tools_gn_build_gen.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_gn_build_gen.py,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/gn/build/gen.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/gn/build/gen.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/gn/build/gen.py
 @@ -94,6 +94,12 @@ class Platform(object):
    def is_solaris(self):
@@ -28,7 +28,7 @@ $NetBSD: patch-tools_gn_build_gen.py,v 1.1 2025/02/06 09:58:29 wiz Exp $
        'haiku': 'build_haiku.ninja.template',
        'solaris': 'build_linux.ninja.template',
        'netbsd': 'build_linux.ninja.template',
-@@ -540,6 +546,9 @@ def WriteGNNinja(path, platform, host, o
+@@ -543,6 +549,9 @@ def WriteGNNinja(path, platform, host, o
      if platform.is_posix() and not platform.is_haiku():
        ldflags.append('-pthread')
  
diff --git a/chromium/patches/patch-tools_gn_src_base_files_file__posix.cc b/chromium/patches/patch-tools_gn_src_base_files_file__posix.cc
index aa6f930b67..672c609b4d 100644
--- a/chromium/patches/patch-tools_gn_src_base_files_file__posix.cc
+++ b/chromium/patches/patch-tools_gn_src_base_files_file__posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_gn_src_base_files_file__posix.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/gn/src/base/files/file_posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/gn/src/base/files/file_posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/gn/src/base/files/file_posix.cc
 @@ -359,7 +359,7 @@ void File::DoInitialize(const FilePath& 
  bool File::Flush() {
diff --git a/chromium/patches/patch-tools_gn_src_gn_version.h b/chromium/patches/patch-tools_gn_src_gn_version.h
index f1e1ecd629..64c5018a5c 100644
--- a/chromium/patches/patch-tools_gn_src_gn_version.h
+++ b/chromium/patches/patch-tools_gn_src_gn_version.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_gn_src_gn_version.h,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/gn/src/gn/version.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/gn/src/gn/version.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/gn/src/gn/version.h
 @@ -22,9 +22,9 @@ class Version {
  
diff --git a/chromium/patches/patch-tools_gn_src_util_exe__path.cc b/chromium/patches/patch-tools_gn_src_util_exe__path.cc
index f5c3e6d1d5..f93fd9851f 100644
--- a/chromium/patches/patch-tools_gn_src_util_exe__path.cc
+++ b/chromium/patches/patch-tools_gn_src_util_exe__path.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_gn_src_util_exe__path.cc,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/gn/src/util/exe_path.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/gn/src/util/exe_path.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/gn/src/util/exe_path.cc
 @@ -15,7 +15,7 @@
  #include <windows.h>
diff --git a/chromium/patches/patch-tools_grit_grit_node_base.py b/chromium/patches/patch-tools_grit_grit_node_base.py
index d51f69834a..8dcccc2dda 100644
--- a/chromium/patches/patch-tools_grit_grit_node_base.py
+++ b/chromium/patches/patch-tools_grit_grit_node_base.py
@@ -1,12 +1,12 @@
-$NetBSD: patch-tools_grit_grit_node_base.py,v 1.1 2025/02/06 09:58:29 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/grit/grit/node/base.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/grit/grit/node/base.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/grit/grit/node/base.py
-@@ -498,7 +498,8 @@ class Node:
+@@ -496,7 +496,8 @@ class Node:
          value = defs
  
        elif name == 'is_linux':
diff --git a/chromium/patches/patch-tools_json__schema__compiler_cpp__bundle__generator.py b/chromium/patches/patch-tools_json__schema__compiler_cpp__bundle__generator.py
index d47352b69a..ba86fb5bba 100644
--- a/chromium/patches/patch-tools_json__schema__compiler_cpp__bundle__generator.py
+++ b/chromium/patches/patch-tools_json__schema__compiler_cpp__bundle__generator.py
@@ -1,14 +1,14 @@
-$NetBSD: patch-tools_json__schema__compiler_cpp__bundle__generator.py,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/json_schema_compiler/cpp_bundle_generator.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/json_schema_compiler/cpp_bundle_generator.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/json_schema_compiler/cpp_bundle_generator.py
-@@ -145,7 +145,7 @@ class CppBundleGenerator(object):
-         # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS).
-         ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)')
+@@ -140,7 +140,7 @@ class CppBundleGenerator(object):
+       elif platform == Platforms.FUCHSIA:
+         ifdefs.append('BUILDFLAG(IS_FUCHSIA)')
        elif platform == Platforms.LINUX:
 -        ifdefs.append('BUILDFLAG(IS_LINUX)')
 +        ifdefs.append('BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)')
diff --git a/chromium/patches/patch-tools_json__schema__compiler_feature__compiler.py b/chromium/patches/patch-tools_json__schema__compiler_feature__compiler.py
index 2fdc07d8e1..83247ad4fa 100644
--- a/chromium/patches/patch-tools_json__schema__compiler_feature__compiler.py
+++ b/chromium/patches/patch-tools_json__schema__compiler_feature__compiler.py
@@ -1,12 +1,12 @@
-$NetBSD: patch-tools_json__schema__compiler_feature__compiler.py,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/json_schema_compiler/feature_compiler.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/json_schema_compiler/feature_compiler.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/json_schema_compiler/feature_compiler.py
-@@ -292,6 +292,9 @@ FEATURE_GRAMMAR = ({
+@@ -289,6 +289,9 @@ FEATURE_GRAMMAR = ({
                  'linux': 'Feature::LINUX_PLATFORM',
                  'mac': 'Feature::MACOSX_PLATFORM',
                  'win': 'Feature::WIN_PLATFORM',
diff --git a/chromium/patches/patch-tools_memory_partition__allocator_inspect__utils.h b/chromium/patches/patch-tools_memory_partition__allocator_inspect__utils.h
index 462f9f58b4..d25b351085 100644
--- a/chromium/patches/patch-tools_memory_partition__allocator_inspect__utils.h
+++ b/chromium/patches/patch-tools_memory_partition__allocator_inspect__utils.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_memory_partition__allocator_inspect__utils.h,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/memory/partition_allocator/inspect_utils.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/memory/partition_allocator/inspect_utils.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/memory/partition_allocator/inspect_utils.h
 @@ -61,7 +61,7 @@ class RemoteProcessMemoryReader {
    const pid_t pid_;
diff --git a/chromium/patches/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/chromium/patches/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index fb168a2262..c0554ae646 100644
--- a/chromium/patches/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/chromium/patches/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-tools_perf_chrome__telemetry__build_BUILD.gn,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -47,7 +47,7 @@ group("telemetry_chrome_test") {
+@@ -56,7 +56,7 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome:reorder_imports" ]
    }
  
@@ -15,7 +15,7 @@ $NetBSD: patch-tools_perf_chrome__telemetry__build_BUILD.gn,v 1.1 2025/02/06 09:
      data_deps += [ "//third_party/breakpad:dump_syms" ]
  
      # CrOS currently has issues with the locally compiled version of
-@@ -178,7 +178,7 @@ group("telemetry_chrome_test_without_chr
+@@ -210,7 +210,7 @@ group("telemetry_chrome_test_without_chr
    ]
  
    # Cr-Fuchsia doesn't support breakpad.
diff --git a/chromium/patches/patch-tools_protoc__wrapper_protoc__wrapper.py b/chromium/patches/patch-tools_protoc__wrapper_protoc__wrapper.py
index 45fee18972..6a3c1fa758 100644
--- a/chromium/patches/patch-tools_protoc__wrapper_protoc__wrapper.py
+++ b/chromium/patches/patch-tools_protoc__wrapper_protoc__wrapper.py
@@ -1,18 +1,18 @@
-$NetBSD: patch-tools_protoc__wrapper_protoc__wrapper.py,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/protoc_wrapper/protoc_wrapper.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/protoc_wrapper/protoc_wrapper.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/protoc_wrapper/protoc_wrapper.py
 @@ -183,15 +183,19 @@ def main(argv):
      if not options.exclude_imports:
        protoc_cmd += ["--include_imports"]
  
 +  nenv = os.environ.copy()
-+  nenv["PATH"] = "${WRKOBJDIR}/bin:" + nenv["PATH"]
-+  nenv["LD_LIBRARY_PATH"] = "${WRKSRC}/out/Release"
++#  nenv["PATH"] = "${WRKOBJDIR}/bin:" + nenv["PATH"]
++  nenv["LD_LIBRARY_PATH"] = "@WRKSRC@/out/Release"
 +
    dependency_file_data = None
    if options.descriptor_set_out and options.descriptor_set_dependency_file:
diff --git a/chromium/patches/patch-tools_v8__context__snapshot_BUILD.gn b/chromium/patches/patch-tools_v8__context__snapshot_BUILD.gn
index b882a4f45a..ad556327a5 100644
--- a/chromium/patches/patch-tools_v8__context__snapshot_BUILD.gn
+++ b/chromium/patches/patch-tools_v8__context__snapshot_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_v8__context__snapshot_BUILD.gn,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/v8_context_snapshot/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/v8_context_snapshot/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/v8_context_snapshot/BUILD.gn
 @@ -36,6 +36,24 @@ buildflag_header("buildflags") {
    ]
@@ -29,15 +29,15 @@ $NetBSD: patch-tools_v8__context__snapshot_BUILD.gn,v 1.1 2025/02/06 09:58:30 wi
 +}
 +
  if (use_v8_context_snapshot) {
-   if (v8_snapshot_toolchain == current_toolchain) {
-     action("generate_v8_context_snapshot") {
-@@ -57,6 +75,9 @@ if (use_v8_context_snapshot) {
-         ":v8_context_snapshot_generator",
-         "//v8:run_mksnapshot_default",
-       ]
+   action("generate_v8_context_snapshot") {
+     script = "//build/gn_run_binary.py"
+@@ -63,6 +81,9 @@ if (use_v8_context_snapshot) {
+       ":v8_context_snapshot_generator($v8_snapshot_toolchain)",
+       "//v8:run_mksnapshot_default",
+     ]
 +      if (target_os == "netbsd") {
 +        deps += [ ":run_paxctl_v8_context_snapshot_generator" ]
 +      }
  
-       # TODO(sky): figure out why this doesn't work on android cross compile.
-       # In the case of compiling for the snapshot `shlib_extension` is ".so"
+     # TODO(sky): figure out why this doesn't work on android cross compile.
+     # In the case of compiling for the snapshot `shlib_extension` is ".so"
diff --git a/chromium/patches/patch-tools_variations_fieldtrial__to__struct.py b/chromium/patches/patch-tools_variations_fieldtrial__to__struct.py
index 7eeecda04e..113679c8ab 100644
--- a/chromium/patches/patch-tools_variations_fieldtrial__to__struct.py
+++ b/chromium/patches/patch-tools_variations_fieldtrial__to__struct.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_variations_fieldtrial__to__struct.py,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- tools/variations/fieldtrial_to_struct.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- tools/variations/fieldtrial_to_struct.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ tools/variations/fieldtrial_to_struct.py
 @@ -41,6 +41,9 @@ _platforms = [
      'linux',
diff --git a/chromium/patches/patch-ui_accessibility_accessibility__features.cc b/chromium/patches/patch-ui_accessibility_accessibility__features.cc
new file mode 100644
index 0000000000..2f74016209
--- /dev/null
+++ b/chromium/patches/patch-ui_accessibility_accessibility__features.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/accessibility/accessibility_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/accessibility/accessibility_features.cc
+@@ -472,7 +472,7 @@ bool IsBlockRootWindowAccessibleNameChan
+ }
+ #endif  // BUILDFLAG(IS_MAC)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kWasmTtsComponentUpdaterEnabled,
+              "WasmTtsComponentUpdaterEnabled",
+              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/chromium/patches/patch-ui_accessibility_accessibility__features.h b/chromium/patches/patch-ui_accessibility_accessibility__features.h
new file mode 100644
index 0000000000..05ddedd85c
--- /dev/null
+++ b/chromium/patches/patch-ui_accessibility_accessibility__features.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/accessibility/accessibility_features.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/accessibility/accessibility_features.h
+@@ -324,7 +324,7 @@ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kBlo
+ AX_BASE_EXPORT bool IsBlockRootWindowAccessibleNameChangeEventEnabled();
+ #endif  // BUILDFLAG(IS_MAC)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enable the component updater to download the wasm tts engine component.
+ AX_BASE_EXPORT BASE_DECLARE_FEATURE(kWasmTtsComponentUpdaterEnabled);
+ AX_BASE_EXPORT bool IsWasmTtsComponentUpdaterEnabled();
diff --git a/chromium/patches/patch-ui_accessibility_ax__node.cc b/chromium/patches/patch-ui_accessibility_ax__node.cc
new file mode 100644
index 0000000000..99303208e0
--- /dev/null
+++ b/chromium/patches/patch-ui_accessibility_ax__node.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/accessibility/ax_node.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/accessibility/ax_node.cc
+@@ -1553,7 +1553,7 @@ AXNode::GetExtraMacNodes() const {
+   return &table_info->extra_mac_nodes;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ AXNode* AXNode::GetExtraAnnouncementNode(
+     ax::mojom::AriaNotificationPriority priority_property) const {
+   if (!tree_->extra_announcement_nodes()) {
+@@ -1581,7 +1581,7 @@ bool AXNode::IsGenerated() const {
+       GetRole() == ax::mojom::Role::kColumn ||
+       GetRole() == ax::mojom::Role::kTableHeaderContainer;
+   DCHECK_EQ(is_generated_node, is_extra_mac_node_role);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   //  On Linux, generated nodes are always children of the root.
+   if (GetParent() && GetParent()->GetManager()) {
+     DCHECK(GetParent()->GetManager()->IsRoot());
diff --git a/chromium/patches/patch-ui_accessibility_ax__node.h b/chromium/patches/patch-ui_accessibility_ax__node.h
new file mode 100644
index 0000000000..be590bf52e
--- /dev/null
+++ b/chromium/patches/patch-ui_accessibility_ax__node.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/accessibility/ax_node.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/accessibility/ax_node.h
+@@ -587,7 +587,7 @@ class AX_EXPORT AXNode final {
+   const std::vector<raw_ptr<AXNode, VectorExperimental>>* GetExtraMacNodes()
+       const;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   AXNode* GetExtraAnnouncementNode(
+       ax::mojom::AriaNotificationPriority priority_property) const;
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-ui_accessibility_ax__tree.cc b/chromium/patches/patch-ui_accessibility_ax__tree.cc
new file mode 100644
index 0000000000..00c0a220c6
--- /dev/null
+++ b/chromium/patches/patch-ui_accessibility_ax__tree.cc
@@ -0,0 +1,44 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/accessibility/ax_tree.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/accessibility/ax_tree.cc
+@@ -824,7 +824,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged
+   return old_node_is_ignored != new_node_is_ignored;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ExtraAnnouncementNodes::ExtraAnnouncementNodes(AXNode* root) {
+   assertive_node_ = CreateNode("assertive", root);
+   polite_node_ = CreateNode("polite", root);
+@@ -917,7 +917,7 @@ AXNode* AXTree::GetFromId(AXNodeID id) c
+ 
+ void AXTree::Destroy() {
+   base::ElapsedThreadTimer timer;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   ClearExtraAnnouncementNodes();
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+@@ -2104,7 +2104,7 @@ void AXTree::NotifyNodeAttributesWillCha
+                     new_data);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void AXTree::ClearExtraAnnouncementNodes() {
+   if (!extra_announcement_nodes_) {
+     return;
+@@ -2493,7 +2493,7 @@ bool AXTree::CreateNewChildVector(
+     AXTreeUpdateState* update_state) {
+   DCHECK(GetTreeUpdateInProgressState());
+   bool success = true;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // If the root node has children added, clear the extra announcement nodes,
+   // which should always have their indices as the last two children of the root
+   // node. They will be recreated if needed, and given the correct indices.
diff --git a/chromium/patches/patch-ui_accessibility_ax__tree.h b/chromium/patches/patch-ui_accessibility_ax__tree.h
new file mode 100644
index 0000000000..8f672244f8
--- /dev/null
+++ b/chromium/patches/patch-ui_accessibility_ax__tree.h
@@ -0,0 +1,35 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/accessibility/ax_tree.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/accessibility/ax_tree.h
+@@ -62,7 +62,7 @@ enum class AXTreeUnserializeError {
+ };
+ // LINT.ThenChange(/tools/metrics/histograms/metadata/accessibility/enums.xml:AccessibilityTreeUnserializeError)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // To support AriaNotify on older versions of ATK, we need to use the ATK
+ // signal "Text::text-insert". This signal requires a node that is a
+ // text type, and it needs to have aria-live properties set in order for
+@@ -287,7 +287,7 @@ class AX_EXPORT AXTree {
+ 
+   void NotifyChildTreeConnectionChanged(AXNode* node, AXTree* child_tree);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void ClearExtraAnnouncementNodes();
+   void CreateExtraAnnouncementNodes();
+   ExtraAnnouncementNodes* extra_announcement_nodes() const {
+@@ -544,7 +544,7 @@ class AX_EXPORT AXTree {
+ 
+   std::unique_ptr<AXEvent> event_data_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<ExtraAnnouncementNodes> extra_announcement_nodes_ = nullptr;
+ #endif  // BUILDFLAG(IS_LINUX)
+ };
diff --git a/chromium/patches/patch-ui_aura_client_drag__drop__client.h b/chromium/patches/patch-ui_aura_client_drag__drop__client.h
index 64273afc06..fcb5063dd5 100644
--- a/chromium/patches/patch-ui_aura_client_drag__drop__client.h
+++ b/chromium/patches/patch-ui_aura_client_drag__drop__client.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_aura_client_drag__drop__client.h,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/aura/client/drag_drop_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/aura/client/drag_drop_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/aura/client/drag_drop_client.h
 @@ -44,7 +44,7 @@ class AURA_EXPORT DragDropClient {
        int allowed_operations,
diff --git a/chromium/patches/patch-ui_aura_screen__ozone.cc b/chromium/patches/patch-ui_aura_screen__ozone.cc
index 48fe4c22c9..6276d06ca8 100644
--- a/chromium/patches/patch-ui_aura_screen__ozone.cc
+++ b/chromium/patches/patch-ui_aura_screen__ozone.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_aura_screen__ozone.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/aura/screen_ozone.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/aura/screen_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/aura/screen_ozone.cc
 @@ -107,7 +107,7 @@ display::Display ScreenOzone::GetPrimary
    return platform_screen_->GetPrimaryDisplay();
  }
  
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  ScreenOzone::ScreenSaverSuspenderOzone::ScreenSaverSuspenderOzone(
      std::unique_ptr<ui::PlatformScreen::PlatformScreenSaverSuspender> suspender)
      : suspender_(std::move(suspender)) {}
diff --git a/chromium/patches/patch-ui_aura_screen__ozone.h b/chromium/patches/patch-ui_aura_screen__ozone.h
index 9ccf64a910..4128838dfd 100644
--- a/chromium/patches/patch-ui_aura_screen__ozone.h
+++ b/chromium/patches/patch-ui_aura_screen__ozone.h
@@ -1,26 +1,26 @@
-$NetBSD: patch-ui_aura_screen__ozone.h,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/aura/screen_ozone.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/aura/screen_ozone.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/aura/screen_ozone.h
-@@ -45,7 +45,7 @@ class AURA_EXPORT ScreenOzone : public d
+@@ -44,7 +44,7 @@ class AURA_EXPORT ScreenOzone : public d
    display::Display GetDisplayMatching(
        const gfx::Rect& match_rect) const override;
    display::Display GetPrimaryDisplay() const override;
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver()
        override;
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-@@ -74,7 +74,7 @@ class AURA_EXPORT ScreenOzone : public d
+ #endif  // BUILDFLAG(IS_LINUX)
+@@ -68,7 +68,7 @@ class AURA_EXPORT ScreenOzone : public d
    ui::PlatformScreen* platform_screen() { return platform_screen_.get(); }
  
   private:
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    class ScreenSaverSuspenderOzone
        : public display::Screen::ScreenSaverSuspender {
     public:
diff --git a/chromium/patches/patch-ui_base_accelerators_accelerator.cc b/chromium/patches/patch-ui_base_accelerators_accelerator.cc
new file mode 100644
index 0000000000..1b163020ac
--- /dev/null
+++ b/chromium/patches/patch-ui_base_accelerators_accelerator.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/base/accelerators/accelerator.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/base/accelerators/accelerator.cc
+@@ -336,7 +336,7 @@ std::u16string Accelerator::ApplyLongFor
+     result = ApplyModifierToAcceleratorString(result, IDS_APP_SEARCH_KEY);
+ #elif BUILDFLAG(IS_WIN)
+     result = ApplyModifierToAcceleratorString(result, IDS_APP_WINDOWS_KEY);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     result = ApplyModifierToAcceleratorString(result, IDS_APP_SUPER_KEY);
+ #else
+     NOTREACHED();
diff --git a/chromium/patches/patch-ui_base_accelerators_command.cc b/chromium/patches/patch-ui_base_accelerators_command.cc
new file mode 100644
index 0000000000..7383453aa7
--- /dev/null
+++ b/chromium/patches/patch-ui_base_accelerators_command.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/base/accelerators/command.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/base/accelerators/command.cc
+@@ -81,7 +81,7 @@ std::string Command::CommandPlatform() {
+   return ui::kKeybindingPlatformMac;
+ #elif BUILDFLAG(IS_CHROMEOS)
+   return ui::kKeybindingPlatformChromeOs;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return ui::kKeybindingPlatformLinux;
+ #elif BUILDFLAG(IS_FUCHSIA)
+   // TODO(crbug.com/40220501): Change this once we decide what string should be
diff --git a/chromium/patches/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc b/chromium/patches/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc
new file mode 100644
index 0000000000..6d3093c82e
--- /dev/null
+++ b/chromium/patches/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc
@@ -0,0 +1,35 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc
+@@ -12,7 +12,7 @@
+ #include "ui/base/accelerators/accelerator.h"
+ #include "ui/ozone/public/ozone_platform.h"
+ 
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS)
+ #include "base/feature_list.h"
+ #include "ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_linux.h"
+ #endif
+@@ -20,7 +20,7 @@
+ using content::BrowserThread;
+ 
+ namespace {
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS)
+ BASE_FEATURE(kGlobalShortcutsPortal,
+              "GlobalShortcutsPortal",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -38,7 +38,7 @@ GlobalAcceleratorListener* GlobalAcceler
+     return instance->get();
+   }
+ 
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS)
+   if (base::FeatureList::IsEnabled(kGlobalShortcutsPortal)) {
+     static GlobalAcceleratorListenerLinux* const linux_instance =
+         new GlobalAcceleratorListenerLinux(nullptr);
diff --git a/chromium/patches/patch-ui_base_clipboard_clipboard__constants.cc b/chromium/patches/patch-ui_base_clipboard_clipboard__constants.cc
index b9aa26e5a9..bffe1f0f75 100644
--- a/chromium/patches/patch-ui_base_clipboard_clipboard__constants.cc
+++ b/chromium/patches/patch-ui_base_clipboard_clipboard__constants.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_clipboard_clipboard__constants.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/clipboard/clipboard_constants.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/clipboard/clipboard_constants.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/clipboard/clipboard_constants.cc
 @@ -25,7 +25,7 @@ const char kMimeTypeOctetStream[] = "app
  // Used for window dragging on some platforms.
@@ -15,3 +15,12 @@ $NetBSD: patch-ui_base_clipboard_clipboard__constants.cc,v 1.1 2025/02/06 09:58:
  const char kMimeTypeLinuxUtf8String[] = "UTF8_STRING";
  const char kMimeTypeLinuxString[] = "STRING";
  const char kMimeTypeLinuxText[] = "TEXT";
+@@ -33,7 +33,7 @@ const char kMimeTypeLinuxText[] = "TEXT"
+         // BUILDFLAG(IS_FUCHSIA)
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ const char kMimeTypeSourceUrl[] = "chromium/x-source-url";
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+         // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
diff --git a/chromium/patches/patch-ui_base_clipboard_clipboard__constants.h b/chromium/patches/patch-ui_base_clipboard_clipboard__constants.h
index 9af950b0b0..b4a87bdbaa 100644
--- a/chromium/patches/patch-ui_base_clipboard_clipboard__constants.h
+++ b/chromium/patches/patch-ui_base_clipboard_clipboard__constants.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_clipboard_clipboard__constants.h,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/clipboard/clipboard_constants.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/clipboard/clipboard_constants.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/clipboard/clipboard_constants.h
-@@ -48,7 +48,7 @@ extern const char kMimeTypeDataTransferE
+@@ -41,7 +41,7 @@ extern const char kMimeTypeWindowDrag[];
  
  // ----- LINUX & CHROMEOS & FUCHSIA MIME TYPES -----
  
@@ -15,3 +15,12 @@ $NetBSD: patch-ui_base_clipboard_clipboard__constants.h,v 1.1 2025/02/06 09:58:3
  COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
  extern const char kMimeTypeLinuxUtf8String[];
  COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
+@@ -53,7 +53,7 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES
+         // BUILDFLAG(IS_FUCHSIA)
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ extern const char kMimeTypeSourceUrl[];
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
+         // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
diff --git a/chromium/patches/patch-ui_base_clipboard_clipboard__non__backed.cc b/chromium/patches/patch-ui_base_clipboard_clipboard__non__backed.cc
index 5469b84162..ced43b6b03 100644
--- a/chromium/patches/patch-ui_base_clipboard_clipboard__non__backed.cc
+++ b/chromium/patches/patch-ui_base_clipboard_clipboard__non__backed.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_clipboard_clipboard__non__backed.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/clipboard/clipboard_non_backed.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/clipboard/clipboard_non_backed.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/clipboard/clipboard_non_backed.cc
 @@ -461,7 +461,7 @@ ClipboardNonBacked::ClipboardNonBacked()
    // so create internal clipboards for platform supported clipboard buffers.
diff --git a/chromium/patches/patch-ui_base_cursor_cursor__factory.cc b/chromium/patches/patch-ui_base_cursor_cursor__factory.cc
index 363d8e581d..005cc634aa 100644
--- a/chromium/patches/patch-ui_base_cursor_cursor__factory.cc
+++ b/chromium/patches/patch-ui_base_cursor_cursor__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_cursor_cursor__factory.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/cursor/cursor_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/cursor/cursor_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/cursor/cursor_factory.cc
 @@ -96,7 +96,7 @@ void CursorFactory::ObserveThemeChanges(
    NOTIMPLEMENTED();
diff --git a/chromium/patches/patch-ui_base_cursor_cursor__factory.h b/chromium/patches/patch-ui_base_cursor_cursor__factory.h
index 27e39cba53..953c62718a 100644
--- a/chromium/patches/patch-ui_base_cursor_cursor__factory.h
+++ b/chromium/patches/patch-ui_base_cursor_cursor__factory.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_cursor_cursor__factory.h,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/cursor/cursor_factory.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/cursor/cursor_factory.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/cursor/cursor_factory.h
 @@ -93,7 +93,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) C
    base::ObserverList<CursorFactoryObserver>::Unchecked observers_;
diff --git a/chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
index 1a27f4b713..224cd30ffb 100644
--- a/chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
+++ b/chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc
 @@ -7,7 +7,7 @@
  #include "base/notreached.h"
diff --git a/chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
index e3977a1968..584b324ff4 100644
--- a/chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
+++ b/chromium/patches/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc
-@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::Se
+@@ -101,7 +101,7 @@ void OSExchangeDataProviderNonBacked::Se
  
  std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString()
      const {
diff --git a/chromium/patches/patch-ui_base_ime_dummy__text__input__client.cc b/chromium/patches/patch-ui_base_ime_dummy__text__input__client.cc
index 83f06d27fc..c4b325bf31 100644
--- a/chromium/patches/patch-ui_base_ime_dummy__text__input__client.cc
+++ b/chromium/patches/patch-ui_base_ime_dummy__text__input__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_ime_dummy__text__input__client.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ime/dummy_text_input_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ime/dummy_text_input_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ime/dummy_text_input_client.cc
-@@ -163,7 +163,7 @@ bool DummyTextInputClient::ShouldDoLearn
+@@ -175,7 +175,7 @@ bool DummyTextInputClient::ShouldDoLearn
    return false;
  }
  
diff --git a/chromium/patches/patch-ui_base_ime_dummy__text__input__client.h b/chromium/patches/patch-ui_base_ime_dummy__text__input__client.h
index f442f6f755..722fd2699c 100644
--- a/chromium/patches/patch-ui_base_ime_dummy__text__input__client.h
+++ b/chromium/patches/patch-ui_base_ime_dummy__text__input__client.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_ime_dummy__text__input__client.h,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ime/dummy_text_input_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ime/dummy_text_input_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ime/dummy_text_input_client.h
-@@ -67,7 +67,7 @@ class DummyTextInputClient : public Text
+@@ -73,7 +73,7 @@ class DummyTextInputClient : public Text
    ukm::SourceId GetClientSourceForMetrics() const override;
    bool ShouldDoLearning() override;
  
diff --git a/chromium/patches/patch-ui_base_ime_fake__text__input__client.cc b/chromium/patches/patch-ui_base_ime_fake__text__input__client.cc
index 953ea687e2..c797b3f884 100644
--- a/chromium/patches/patch-ui_base_ime_fake__text__input__client.cc
+++ b/chromium/patches/patch-ui_base_ime_fake__text__input__client.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_ime_fake__text__input__client.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ime/fake_text_input_client.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ime/fake_text_input_client.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ime/fake_text_input_client.cc
-@@ -215,7 +215,7 @@ bool FakeTextInputClient::ShouldDoLearni
+@@ -227,7 +227,7 @@ bool FakeTextInputClient::ShouldDoLearni
    return should_do_learning_;
  }
  
diff --git a/chromium/patches/patch-ui_base_ime_fake__text__input__client.h b/chromium/patches/patch-ui_base_ime_fake__text__input__client.h
index e36f5bfdd9..064f51a639 100644
--- a/chromium/patches/patch-ui_base_ime_fake__text__input__client.h
+++ b/chromium/patches/patch-ui_base_ime_fake__text__input__client.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_ime_fake__text__input__client.h,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ime/fake_text_input_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ime/fake_text_input_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ime/fake_text_input_client.h
-@@ -101,7 +101,7 @@ class FakeTextInputClient : public TextI
+@@ -107,7 +107,7 @@ class FakeTextInputClient : public TextI
    void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override;
    ukm::SourceId GetClientSourceForMetrics() const override;
    bool ShouldDoLearning() override;
diff --git a/chromium/patches/patch-ui_base_ime_init_input__method__initializer.cc b/chromium/patches/patch-ui_base_ime_init_input__method__initializer.cc
index 437054164c..ec7d1eb7cb 100644
--- a/chromium/patches/patch-ui_base_ime_init_input__method__initializer.cc
+++ b/chromium/patches/patch-ui_base_ime_init_input__method__initializer.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_base_ime_init_input__method__initializer.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ime/init/input_method_initializer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ime/init/input_method_initializer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ime/init/input_method_initializer.cc
-@@ -10,7 +10,7 @@
- #include "build/chromeos_buildflags.h"
+@@ -9,7 +9,7 @@
+ #include "base/trace_event/trace_event.h"
+ #include "build/build_config.h"
  
- #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
  #include "ui/base/ime/linux/fake_input_method_context.h"
  #include "ui/base/ime/linux/linux_input_method_context_factory.h"
  #elif BUILDFLAG(IS_WIN)
@@ -24,12 +24,12 @@ $NetBSD: patch-ui_base_ime_init_input__method__initializer.cc,v 1.1 2025/02/06 0
    GetInputMethodContextFactoryForTest() =
        base::BindRepeating([](LinuxInputMethodContextDelegate* delegate)
                                -> std::unique_ptr<LinuxInputMethodContext> {
-@@ -46,7 +46,7 @@ void InitializeInputMethodForTesting() {
+@@ -45,7 +45,7 @@ void InitializeInputMethodForTesting() {
+ }
  
  void ShutdownInputMethodForTesting() {
- #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
    // The function owns the factory (as a static variable that's returned by
    // reference), so setting this to an empty factory will free the old one.
    GetInputMethodContextFactoryForTest() = LinuxInputMethodContextFactory();
diff --git a/chromium/patches/patch-ui_base_ime_linux_linux__input__method__context__factory.cc b/chromium/patches/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
index d8ea45f329..56a6a541e3 100644
--- a/chromium/patches/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
+++ b/chromium/patches/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_ime_linux_linux__input__method__context__factory.cc,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ime/linux/linux_input_method_context_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ime/linux/linux_input_method_context_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ime/linux/linux_input_method_context_factory.cc
 @@ -9,7 +9,7 @@
  #include "build/build_config.h"
diff --git a/chromium/patches/patch-ui_base_ime_text__input__client.h b/chromium/patches/patch-ui_base_ime_text__input__client.h
index 4f60a9dda2..c31de2ec8e 100644
--- a/chromium/patches/patch-ui_base_ime_text__input__client.h
+++ b/chromium/patches/patch-ui_base_ime_text__input__client.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_ime_text__input__client.h,v 1.1 2025/02/06 09:58:30 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ime/text_input_client.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ime/text_input_client.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ime/text_input_client.h
-@@ -268,7 +268,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) Text
+@@ -337,7 +337,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) Text
    // fields that are considered 'private' (e.g. in incognito tabs).
    virtual bool ShouldDoLearning() = 0;
  
diff --git a/chromium/patches/patch-ui_base_resource_resource__bundle.cc b/chromium/patches/patch-ui_base_resource_resource__bundle.cc
index 52762a4ba9..cac0648e7d 100644
--- a/chromium/patches/patch-ui_base_resource_resource__bundle.cc
+++ b/chromium/patches/patch-ui_base_resource_resource__bundle.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_resource_resource__bundle.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/resource/resource_bundle.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/resource/resource_bundle.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/resource/resource_bundle.cc
-@@ -914,7 +914,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -929,7 +929,7 @@ void ResourceBundle::ReloadFonts() {
  }
  
  ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const {
diff --git a/chromium/patches/patch-ui_base_test_skia__gold__pixel__diff.cc b/chromium/patches/patch-ui_base_test_skia__gold__pixel__diff.cc
index b6941da0db..4ff9228dbf 100644
--- a/chromium/patches/patch-ui_base_test_skia__gold__pixel__diff.cc
+++ b/chromium/patches/patch-ui_base_test_skia__gold__pixel__diff.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_base_test_skia__gold__pixel__diff.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/test/skia_gold_pixel_diff.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/test/skia_gold_pixel_diff.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/test/skia_gold_pixel_diff.cc
-@@ -115,7 +115,7 @@ const char* GetPlatformName() {
+@@ -117,7 +117,7 @@ const char* GetPlatformName() {
+   return "windows";
+ #elif BUILDFLAG(IS_APPLE)
    return "macOS";
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return "linux";
- #elif BUILDFLAG(IS_CHROMEOS_LACROS)
-   return "lacros";
+ #elif BUILDFLAG(IS_CHROMEOS)
+   return "ash";
diff --git a/chromium/patches/patch-ui_base_test_ui__controls.h b/chromium/patches/patch-ui_base_test_ui__controls.h
index 7bceb08899..6891890b93 100644
--- a/chromium/patches/patch-ui_base_test_ui__controls.h
+++ b/chromium/patches/patch-ui_base_test_ui__controls.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_test_ui__controls.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/test/ui_controls.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/test/ui_controls.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/test/ui_controls.h
-@@ -186,7 +186,7 @@ bool SendTouchEventsNotifyWhenDone(int a
+@@ -191,7 +191,7 @@ bool SendTouchEventsNotifyWhenDone(int a
                                     base::OnceClosure task);
  #endif
  
diff --git a/chromium/patches/patch-ui_base_ui__base__features.cc b/chromium/patches/patch-ui_base_ui__base__features.cc
index 9589d94b23..ecf49bddab 100644
--- a/chromium/patches/patch-ui_base_ui__base__features.cc
+++ b/chromium/patches/patch-ui_base_ui__base__features.cc
@@ -1,12 +1,21 @@
-$NetBSD: patch-ui_base_ui__base__features.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ui_base_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ui_base_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ui_base_features.cc
-@@ -173,7 +173,7 @@ BASE_FEATURE(kWaylandUiScale,
+@@ -119,7 +119,7 @@ BASE_FEATURE(kWaylandLinuxDrmSyncobj,
+ // Controls whether support for Wayland's per-surface scaling is enabled.
+ BASE_FEATURE(kWaylandPerSurfaceScale,
+              "WaylandPerSurfaceScale",
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
+@@ -143,7 +143,7 @@ BASE_FEATURE(kWaylandSessionManagement,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_OZONE)
  
@@ -15,16 +24,16 @@ $NetBSD: patch-ui_base_ui__base__features.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
  // If this feature is enabled, users not specify --ozone-platform-hint switch
  // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220.
  COMPONENT_EXPORT(UI_BASE_FEATURES)
-@@ -275,7 +275,7 @@ BASE_FEATURE(kExperimentalFlingAnimation
+@@ -225,7 +225,7 @@ BASE_FEATURE(kUiCompositorUsesLayerLists
+ // native apps on Windows.
+ BASE_FEATURE(kExperimentalFlingAnimation,
               "ExperimentalFlingAnimation",
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) ||                                   \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ||              \
-     (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
-      !BUILDFLAG(IS_CHROMEOS_LACROS))
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -379,7 +379,7 @@ bool IsForcedColorsEnabled() {
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
+@@ -301,7 +301,7 @@ bool IsForcedColorsEnabled() {
  BASE_FEATURE(kEyeDropper,
               "EyeDropper",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/chromium/patches/patch-ui_base_ui__base__features.h b/chromium/patches/patch-ui_base_ui__base__features.h
index 26a693efd2..a0bc3e6aa4 100644
--- a/chromium/patches/patch-ui_base_ui__base__features.h
+++ b/chromium/patches/patch-ui_base_ui__base__features.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-ui_base_ui__base__features.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ui_base_features.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ui_base_features.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ui_base_features.h
-@@ -148,7 +148,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
- BASE_DECLARE_FEATURE(kWaylandUiScale);
+@@ -126,7 +126,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
+ BASE_DECLARE_FEATURE(kWaylandSessionManagement);
  #endif  // BUILDFLAG(IS_OZONE)
  
 -#if BUILDFLAG(IS_LINUX)
diff --git a/chromium/patches/patch-ui_base_ui__base__switches.cc b/chromium/patches/patch-ui_base_ui__base__switches.cc
index 658090b39b..3628ac5059 100644
--- a/chromium/patches/patch-ui_base_ui__base__switches.cc
+++ b/chromium/patches/patch-ui_base_ui__base__switches.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-ui_base_ui__base__switches.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ui_base_switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ui_base_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ui_base_switches.cc
-@@ -31,13 +31,13 @@ const char kShowMacOverlayBorders[] = "s
- const char kEnableResourcesFileSharing[] = "enable-resources-file-sharing";
+@@ -24,13 +24,13 @@ const char kDisableModalAnimations[] = "
+ const char kShowMacOverlayBorders[] = "show-mac-overlay-borders";
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-ui_base_ui__base__switches.h b/chromium/patches/patch-ui_base_ui__base__switches.h
index 1d8220eacc..e4bc8a36aa 100644
--- a/chromium/patches/patch-ui_base_ui__base__switches.h
+++ b/chromium/patches/patch-ui_base_ui__base__switches.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-ui_base_ui__base__switches.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/ui_base_switches.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/ui_base_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/ui_base_switches.h
-@@ -27,11 +27,11 @@ COMPONENT_EXPORT(UI_BASE) extern const c
- COMPONENT_EXPORT(UI_BASE) extern const char kEnableResourcesFileSharing[];
+@@ -22,11 +22,11 @@ COMPONENT_EXPORT(UI_BASE) extern const c
+ COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOverlayBorders[];
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/chromium/patches/patch-ui_base_webui_web__ui__util.cc b/chromium/patches/patch-ui_base_webui_web__ui__util.cc
index 7ddb4b62df..c6da283b4d 100644
--- a/chromium/patches/patch-ui_base_webui_web__ui__util.cc
+++ b/chromium/patches/patch-ui_base_webui_web__ui__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_webui_web__ui__util.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/webui/web_ui_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/webui/web_ui_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/webui/web_ui_util.cc
-@@ -44,7 +44,7 @@ namespace {
+@@ -46,7 +46,7 @@ namespace {
  constexpr float kMaxScaleFactor = 1000.0f;
  
  std::string GetFontFamilyMd() {
@@ -15,12 +15,12 @@ $NetBSD: patch-ui_base_webui_web__ui__util.cc,v 1.1 2025/02/06 09:58:31 wiz Exp
    return "Roboto, " + GetFontFamily();
  #else
    return GetFontFamily();
-@@ -221,7 +221,7 @@ std::string GetFontFamily() {
+@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::str
+ std::string GetFontFamily() {
+   std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY);
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    std::string font_name = ui::ResourceBundle::GetSharedInstance()
                                .GetFont(ui::ResourceBundle::BaseFont)
                                .GetFontName();
diff --git a/chromium/patches/patch-ui_base_x_x11__cursor__factory.cc b/chromium/patches/patch-ui_base_x_x11__cursor__factory.cc
index 9897999d6e..1f53732e8e 100644
--- a/chromium/patches/patch-ui_base_x_x11__cursor__factory.cc
+++ b/chromium/patches/patch-ui_base_x_x11__cursor__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_x_x11__cursor__factory.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/x/x11_cursor_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/x/x11_cursor_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/x/x11_cursor_factory.cc
 @@ -13,7 +13,7 @@
  #include "ui/gfx/geometry/point.h"
diff --git a/chromium/patches/patch-ui_base_x_x11__cursor__factory.h b/chromium/patches/patch-ui_base_x_x11__cursor__factory.h
index 4705e71259..2cc6e885c4 100644
--- a/chromium/patches/patch-ui_base_x_x11__cursor__factory.h
+++ b/chromium/patches/patch-ui_base_x_x11__cursor__factory.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_x_x11__cursor__factory.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/x/x11_cursor_factory.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/x/x11_cursor_factory.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/x/x11_cursor_factory.h
 @@ -20,7 +20,7 @@ namespace ui {
  class X11Cursor;
diff --git a/chromium/patches/patch-ui_base_x_x11__cursor__loader.cc b/chromium/patches/patch-ui_base_x_x11__cursor__loader.cc
index f7aa36343a..6bf0bf3211 100644
--- a/chromium/patches/patch-ui_base_x_x11__cursor__loader.cc
+++ b/chromium/patches/patch-ui_base_x_x11__cursor__loader.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_base_x_x11__cursor__loader.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/x/x11_cursor_loader.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/x/x11_cursor_loader.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/x/x11_cursor_loader.cc
-@@ -34,7 +34,7 @@
+@@ -42,7 +42,7 @@
  #include "ui/gfx/x/connection.h"
  #include "ui/gfx/x/xproto.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_base_x_x11__cursor__loader.cc,v 1.1 2025/02/06 09:58:31 wiz Ex
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -59,7 +59,11 @@ std::string CursorPathFromLibXcursor() {
+@@ -87,7 +87,11 @@ std::string CursorPathFromLibXcursor() {
      void operator()(void* ptr) const { dlclose(ptr); }
    };
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ui_base_x_x11__cursor__loader.cc,v 1.1 2025/02/06 09:58:31 wiz Ex
    if (!lib)
      return "";
  
-@@ -170,7 +174,7 @@ scoped_refptr<base::RefCountedMemory> Re
+@@ -232,7 +236,7 @@ scoped_refptr<base::RefCountedMemory> Re
      const std::string& rm_xcursor_theme) {
    constexpr const char kDefaultTheme[] = "default";
    std::string themes[] = {
@@ -36,7 +36,7 @@ $NetBSD: patch-ui_base_x_x11__cursor__loader.cc,v 1.1 2025/02/06 09:58:31 wiz Ex
      // The toolkit theme has the highest priority.
      LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName()
                          : std::string(),
-@@ -359,7 +363,7 @@ uint32_t XCursorLoader::GetPreferredCurs
+@@ -422,7 +426,7 @@ uint32_t XCursorLoader::GetPreferredCurs
      return size;
    }
  
diff --git a/chromium/patches/patch-ui_base_x_x11__display__manager.cc b/chromium/patches/patch-ui_base_x_x11__display__manager.cc
index 97096f4d8d..c3d3ca57bd 100644
--- a/chromium/patches/patch-ui_base_x_x11__display__manager.cc
+++ b/chromium/patches/patch-ui_base_x_x11__display__manager.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_x_x11__display__manager.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/x/x11_display_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/x/x11_display_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/x/x11_display_manager.cc
 @@ -16,7 +16,7 @@
  #include "ui/gfx/x/randr.h"
diff --git a/chromium/patches/patch-ui_base_x_x11__shm__image__pool.cc b/chromium/patches/patch-ui_base_x_x11__shm__image__pool.cc
index a95ccfce47..ab87d433c7 100644
--- a/chromium/patches/patch-ui_base_x_x11__shm__image__pool.cc
+++ b/chromium/patches/patch-ui_base_x_x11__shm__image__pool.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_base_x_x11__shm__image__pool.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/base/x/x11_shm_image_pool.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/base/x/x11_shm_image_pool.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/base/x/x11_shm_image_pool.cc
 @@ -16,6 +16,7 @@
  #include "base/functional/callback.h"
@@ -12,9 +12,9 @@ $NetBSD: patch-ui_base_x_x11__shm__image__pool.cc,v 1.1 2025/02/06 09:58:31 wiz
  #include "base/strings/string_util.h"
 +#include "base/system/sys_info.h"
  #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
  #include "net/base/url_util.h"
-@@ -45,10 +46,14 @@ constexpr float kShmResizeShrinkThreshol
+ #include "ui/events/platform/platform_event_dispatcher.h"
+@@ -44,10 +45,14 @@ constexpr float kShmResizeShrinkThreshol
      1.0f / (kShmResizeThreshold * kShmResizeThreshold);
  
  std::size_t MaxShmSegmentSizeImpl() {
@@ -29,10 +29,10 @@ $NetBSD: patch-ui_base_x_x11__shm__image__pool.cc,v 1.1 2025/02/06 09:58:31 wiz
  }
  
  std::size_t MaxShmSegmentSize() {
-@@ -57,14 +62,19 @@ std::size_t MaxShmSegmentSize() {
+@@ -56,14 +61,19 @@ std::size_t MaxShmSegmentSize() {
  }
  
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
+ #if !BUILDFLAG(IS_CHROMEOS)
 +#if !BUILDFLAG(IS_BSD)
  bool IsRemoteHost(const std::string& name) {
    if (name.empty())
@@ -49,15 +49,15 @@ $NetBSD: patch-ui_base_x_x11__shm__image__pool.cc,v 1.1 2025/02/06 09:58:31 wiz
    // MIT-SHM may be available on remote connetions, but it will be unusable.  Do
    // a best-effort check to see if the host is remote to disable the SHM
    // codepath.  It may be possible in contrived cases for there to be a
-@@ -93,6 +103,7 @@ bool ShouldUseMitShm(x11::Connection* co
+@@ -92,6 +102,7 @@ bool ShouldUseMitShm(x11::Connection* co
      return false;
  
    return true;
 +#endif
  }
- #endif
+ #endif  // !BUILDFLAG(IS_CHROMEOS)
  
-@@ -183,7 +194,7 @@ bool XShmImagePool::Resize(const gfx::Si
+@@ -182,7 +193,7 @@ bool XShmImagePool::Resize(const gfx::Si
          shmctl(state.shmid, IPC_RMID, nullptr);
          return false;
        }
@@ -66,7 +66,7 @@ $NetBSD: patch-ui_base_x_x11__shm__image__pool.cc,v 1.1 2025/02/06 09:58:31 wiz
        // On Linux, a shmid can still be attached after IPC_RMID if otherwise
        // kept alive.  Detach before XShmAttach to prevent a memory leak in case
        // the process dies.
-@@ -202,7 +213,7 @@ bool XShmImagePool::Resize(const gfx::Si
+@@ -201,7 +212,7 @@ bool XShmImagePool::Resize(const gfx::Si
          return false;
        state.shmseg = shmseg;
        state.shmem_attached_to_server = true;
diff --git a/chromium/patches/patch-ui_color_color__id.h b/chromium/patches/patch-ui_color_color__id.h
index b2e14968d3..aeb3821d90 100644
--- a/chromium/patches/patch-ui_color_color__id.h
+++ b/chromium/patches/patch-ui_color_color__id.h
@@ -1,15 +1,15 @@
-$NetBSD: patch-ui_color_color__id.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/color/color_id.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/color/color_id.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/color/color_id.h
-@@ -622,7 +622,7 @@
-   \
+@@ -624,7 +624,7 @@
    E_CPONLY(kColorCrosSysPositive) \
-   E_CPONLY(kColorCrosSysComplementVariant)
+   E_CPONLY(kColorCrosSysComplementVariant) \
+   E_CPONLY(kColorCrosSysInputFieldOnBase)
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #define PLATFORM_SPECIFIC_COLOR_IDS \
diff --git a/chromium/patches/patch-ui_color_color__provider__utils.cc b/chromium/patches/patch-ui_color_color__provider__utils.cc
index 4400bec81a..517122c24d 100644
--- a/chromium/patches/patch-ui_color_color__provider__utils.cc
+++ b/chromium/patches/patch-ui_color_color__provider__utils.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_color_color__provider__utils.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/color/color_provider_utils.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/color/color_provider_utils.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/color/color_provider_utils.cc
-@@ -187,7 +187,7 @@ std::string_view SystemThemeName(ui::Sys
+@@ -191,7 +191,7 @@ std::string_view SystemThemeName(ui::Sys
    switch (system_theme) {
      case ui::SystemTheme::kDefault:
        return "kDefault";
diff --git a/chromium/patches/patch-ui_color_system__theme.h b/chromium/patches/patch-ui_color_system__theme.h
index 675a19c0b4..a6341c82ba 100644
--- a/chromium/patches/patch-ui_color_system__theme.h
+++ b/chromium/patches/patch-ui_color_system__theme.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_color_system__theme.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/color/system_theme.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/color/system_theme.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/color/system_theme.h
 @@ -15,7 +15,7 @@ namespace ui {
  enum class SystemTheme {
diff --git a/chromium/patches/patch-ui_compositor_compositor.cc b/chromium/patches/patch-ui_compositor_compositor.cc
index 05fb6c1fcf..78f20c6913 100644
--- a/chromium/patches/patch-ui_compositor_compositor.cc
+++ b/chromium/patches/patch-ui_compositor_compositor.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_compositor_compositor.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/compositor/compositor.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/compositor/compositor.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/compositor/compositor.cc
-@@ -915,7 +915,7 @@ void Compositor::OnResume() {
+@@ -952,7 +952,7 @@ void Compositor::OnResume() {
      obs.ResetIfActive();
  }
  
diff --git a/chromium/patches/patch-ui_compositor_compositor.h b/chromium/patches/patch-ui_compositor_compositor.h
index d18b2bd448..9c7976b37e 100644
--- a/chromium/patches/patch-ui_compositor_compositor.h
+++ b/chromium/patches/patch-ui_compositor_compositor.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_compositor_compositor.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/compositor/compositor.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/compositor/compositor.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/compositor/compositor.h
-@@ -457,7 +457,7 @@ class COMPOSITOR_EXPORT Compositor : pub
+@@ -463,7 +463,7 @@ class COMPOSITOR_EXPORT Compositor : pub
    // base::PowerSuspendObserver:
    void OnResume() override;
  
diff --git a/chromium/patches/patch-ui_compositor_compositor__observer.h b/chromium/patches/patch-ui_compositor_compositor__observer.h
index 043ccb8de9..d5154f61c1 100644
--- a/chromium/patches/patch-ui_compositor_compositor__observer.h
+++ b/chromium/patches/patch-ui_compositor_compositor__observer.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_compositor_compositor__observer.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/compositor/compositor_observer.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/compositor/compositor_observer.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/compositor/compositor_observer.h
-@@ -52,7 +52,7 @@ class COMPOSITOR_EXPORT CompositorObserv
+@@ -56,7 +56,7 @@ class COMPOSITOR_EXPORT CompositorObserv
    // Called when a child of the compositor is resizing.
    virtual void OnCompositingChildResizing(Compositor* compositor) {}
  
diff --git a/chromium/patches/patch-ui_display_screen.cc b/chromium/patches/patch-ui_display_screen.cc
index 7f2bd4c461..e8b08af3de 100644
--- a/chromium/patches/patch-ui_display_screen.cc
+++ b/chromium/patches/patch-ui_display_screen.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_display_screen.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/display/screen.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/display/screen.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/display/screen.cc
 @@ -86,7 +86,7 @@ void Screen::SetDisplayForNewWindows(int
    display_id_for_new_windows_ = display_id;
  }
  
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default;
  
  std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() {
diff --git a/chromium/patches/patch-ui_display_screen.h b/chromium/patches/patch-ui_display_screen.h
index 400e854702..d5b8230214 100644
--- a/chromium/patches/patch-ui_display_screen.h
+++ b/chromium/patches/patch-ui_display_screen.h
@@ -1,26 +1,26 @@
-$NetBSD: patch-ui_display_screen.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/display/screen.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/display/screen.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/display/screen.h
 @@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen {
    // (both of which may or may not be `nearest_id`).
    display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const;
  
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Object which suspends the platform-specific screensaver for the duration of
    // its existence.
    class ScreenSaverSuspender {
-@@ -248,7 +248,7 @@ class DISPLAY_EXPORT Screen {
+@@ -246,7 +246,7 @@ class DISPLAY_EXPORT Screen {
    int64_t display_id_for_new_windows_;
    int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId;
  
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    uint32_t screen_saver_suspension_count_ = 0;
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+ #endif  // BUILDFLAG(IS_LINUX)
  };
diff --git a/chromium/patches/patch-ui_events_devices_x11_device__data__manager__x11.cc b/chromium/patches/patch-ui_events_devices_x11_device__data__manager__x11.cc
index a98c0b6586..9256a23f4e 100644
--- a/chromium/patches/patch-ui_events_devices_x11_device__data__manager__x11.cc
+++ b/chromium/patches/patch-ui_events_devices_x11_device__data__manager__x11.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_events_devices_x11_device__data__manager__x11.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/events/devices/x11/device_data_manager_x11.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/events/devices/x11/device_data_manager_x11.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/events/devices/x11/device_data_manager_x11.cc
 @@ -849,6 +849,7 @@ void DeviceDataManagerX11::SetDisabledKe
  }
diff --git a/chromium/patches/patch-ui_events_event.cc b/chromium/patches/patch-ui_events_event.cc
index e1e7542d34..f89e3ce4b4 100644
--- a/chromium/patches/patch-ui_events_event.cc
+++ b/chromium/patches/patch-ui_events_event.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_events_event.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/events/event.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/events/event.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/events/event.cc
-@@ -366,7 +366,7 @@ std::string LocatedEvent::ToString() con
+@@ -373,7 +373,7 @@ std::string LocatedEvent::ToString() con
  MouseEvent::MouseEvent(const PlatformEvent& native_event)
      : LocatedEvent(native_event),
        changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)),
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_events_event.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
        movement_(GetMouseMovementFromNative(native_event)),
  #endif
        pointer_details_(GetMousePointerDetailsFromNative(native_event)) {
-@@ -622,7 +622,7 @@ std::unique_ptr<Event> MouseWheelEvent::
+@@ -629,7 +629,7 @@ std::unique_ptr<Event> MouseWheelEvent::
    return std::make_unique<MouseWheelEvent>(*this);
  }
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ui_events_event.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
  // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on
  // Linux.
  // static
-@@ -882,7 +882,7 @@ void KeyEvent::InitializeNative() {
+@@ -889,7 +889,7 @@ void KeyEvent::InitializeNative() {
    if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent()))
      SetFlags(flags() | EF_IS_REPEAT);
  
diff --git a/chromium/patches/patch-ui_events_event__switches.cc b/chromium/patches/patch-ui_events_event__switches.cc
index 77d6f74f10..695bbb4f52 100644
--- a/chromium/patches/patch-ui_events_event__switches.cc
+++ b/chromium/patches/patch-ui_events_event__switches.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_events_event__switches.cc,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/events/event_switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/events/event_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/events/event_switches.cc
 @@ -21,7 +21,7 @@ const char kCompensateForUnstablePinchZo
  // value is a floating point number that is interpreted as a distance in pixels.
diff --git a/chromium/patches/patch-ui_events_event__switches.h b/chromium/patches/patch-ui_events_event__switches.h
index 0db194554b..d33be45920 100644
--- a/chromium/patches/patch-ui_events_event__switches.h
+++ b/chromium/patches/patch-ui_events_event__switches.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_events_event__switches.h,v 1.1 2025/02/06 09:58:31 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/events/event_switches.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/events/event_switches.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/events/event_switches.h
 @@ -13,7 +13,7 @@ namespace switches {
  EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[];
diff --git a/chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.cc b/chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.cc
index a9464b45b4..65ce267ec6 100644
--- a/chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.cc
+++ b/chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_events_keycodes_dom_keycode__converter.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/events/keycodes/dom/keycode_converter.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/events/keycodes/dom/keycode_converter.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/events/keycodes/dom/keycode_converter.cc
 @@ -18,7 +18,7 @@
  #include "ui/events/keycodes/dom/dom_code.h"
diff --git a/chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.h b/chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.h
index 1391048852..3eba13c288 100644
--- a/chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.h
+++ b/chromium/patches/patch-ui_events_keycodes_dom_keycode__converter.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_events_keycodes_dom_keycode__converter.h,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/events/keycodes/dom/keycode_converter.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/events/keycodes/dom/keycode_converter.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/events/keycodes/dom/keycode_converter.h
 @@ -64,7 +64,7 @@ class KeycodeConverter {
    // Convert a DomCode into a native keycode.
diff --git a/chromium/patches/patch-ui_gfx_BUILD.gn b/chromium/patches/patch-ui_gfx_BUILD.gn
index 24f9927002..1bec8050fd 100644
--- a/chromium/patches/patch-ui_gfx_BUILD.gn
+++ b/chromium/patches/patch-ui_gfx_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gfx_BUILD.gn,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/BUILD.gn
-@@ -666,7 +666,7 @@ source_set("memory_buffer_sources") {
+@@ -661,7 +661,7 @@ source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/chromium/patches/patch-ui_gfx_canvas__skia.cc b/chromium/patches/patch-ui_gfx_canvas__skia.cc
index 7e17e56d9c..31caeafdd0 100644
--- a/chromium/patches/patch-ui_gfx_canvas__skia.cc
+++ b/chromium/patches/patch-ui_gfx_canvas__skia.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gfx_canvas__skia.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/canvas_skia.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/canvas_skia.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/canvas_skia.cc
-@@ -213,7 +213,7 @@ void Canvas::DrawStringRectWithFlags(con
+@@ -219,7 +219,7 @@ void Canvas::DrawStringRectWithFlags(std
      Range range = StripAcceleratorChars(flags, &adjusted_text);
      bool elide_text = ((flags & NO_ELLIPSIS) == 0);
  
diff --git a/chromium/patches/patch-ui_gfx_font__fallback__linux.cc b/chromium/patches/patch-ui_gfx_font__fallback__linux.cc
index 99cdc07006..501c3a8ff4 100644
--- a/chromium/patches/patch-ui_gfx_font__fallback__linux.cc
+++ b/chromium/patches/patch-ui_gfx_font__fallback__linux.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_font__fallback__linux.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/font_fallback_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/font_fallback_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/font_fallback_linux.cc
 @@ -32,6 +32,8 @@
  #include "ui/gfx/linux/fontconfig_util.h"
diff --git a/chromium/patches/patch-ui_gfx_font__render__params.h b/chromium/patches/patch-ui_gfx_font__render__params.h
index 7e6cf289e4..a48b630098 100644
--- a/chromium/patches/patch-ui_gfx_font__render__params.h
+++ b/chromium/patches/patch-ui_gfx_font__render__params.h
@@ -1,26 +1,26 @@
-$NetBSD: patch-ui_gfx_font__render__params.h,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/font_render_params.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/font_render_params.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/font_render_params.h
-@@ -115,7 +115,7 @@ GFX_EXPORT FontRenderParams GetFontRende
-     const FontRenderParamsQuery& query,
-     std::string* family_out);
+@@ -115,7 +115,7 @@ COMPONENT_EXPORT(GFX)
+ FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
+                                      std::string* family_out);
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are
  // changing Fontconfig's configuration.
- GFX_EXPORT void ClearFontRenderParamsCacheForTest();
-@@ -125,7 +125,7 @@ GFX_EXPORT void ClearFontRenderParamsCac
- GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor();
+ COMPONENT_EXPORT(GFX) void ClearFontRenderParamsCacheForTest();
+@@ -125,7 +125,7 @@ COMPONENT_EXPORT(GFX) void ClearFontRend
+ COMPONENT_EXPORT(GFX) float GetFontRenderParamsDeviceScaleFactor();
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
  // Sets the device scale factor for FontRenderParams to decide
  // if it should enable subpixel positioning.
- GFX_EXPORT void SetFontRenderParamsDeviceScaleFactor(
+ COMPONENT_EXPORT(GFX)
diff --git a/chromium/patches/patch-ui_gfx_font__render__params__linux.cc b/chromium/patches/patch-ui_gfx_font__render__params__linux.cc
index 3600647474..50c0c60b64 100644
--- a/chromium/patches/patch-ui_gfx_font__render__params__linux.cc
+++ b/chromium/patches/patch-ui_gfx_font__render__params__linux.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gfx_font__render__params__linux.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/font_render_params_linux.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/font_render_params_linux.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/font_render_params_linux.cc
-@@ -25,7 +25,7 @@
+@@ -24,7 +24,7 @@
  #include "ui/gfx/linux/fontconfig_util.h"
  #include "ui/gfx/switches.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_gfx_font__render__params__linux.cc,v 1.1 2025/02/06 09:58:32 w
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -212,7 +212,7 @@ FontRenderParams GetFontRenderParams(con
+@@ -222,7 +222,7 @@ FontRenderParams GetFontRenderParams(con
  
    // Start with the delegate's settings, but let Fontconfig have the final say.
    FontRenderParams params;
diff --git a/chromium/patches/patch-ui_gfx_font__util.cc b/chromium/patches/patch-ui_gfx_font__util.cc
index b5afc393e6..746f5ce02d 100644
--- a/chromium/patches/patch-ui_gfx_font__util.cc
+++ b/chromium/patches/patch-ui_gfx_font__util.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_font__util.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/font_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/font_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/font_util.cc
 @@ -6,7 +6,7 @@
  
diff --git a/chromium/patches/patch-ui_gfx_gpu__memory__buffer.cc b/chromium/patches/patch-ui_gfx_gpu__memory__buffer.cc
index 1e86c80a72..be2de597ef 100644
--- a/chromium/patches/patch-ui_gfx_gpu__memory__buffer.cc
+++ b/chromium/patches/patch-ui_gfx_gpu__memory__buffer.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-ui_gfx_gpu__memory__buffer.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/gpu_memory_buffer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/gpu_memory_buffer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/gpu_memory_buffer.cc
-@@ -63,7 +63,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHan
-   handle.region = region.Duplicate();
+@@ -108,7 +108,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHan
+   handle.id = id;
    handle.offset = offset;
    handle.stride = stride;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
diff --git a/chromium/patches/patch-ui_gfx_gpu__memory__buffer.h b/chromium/patches/patch-ui_gfx_gpu__memory__buffer.h
index b58fb6a894..04b332875d 100644
--- a/chromium/patches/patch-ui_gfx_gpu__memory__buffer.h
+++ b/chromium/patches/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,22 +1,31 @@
-$NetBSD: patch-ui_gfx_gpu__memory__buffer.h,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/gpu_memory_buffer.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/gpu_memory_buffer.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/gpu_memory_buffer.h
-@@ -15,7 +15,7 @@
+@@ -17,7 +17,7 @@
+ #include "ui/gfx/generic_shared_memory_id.h"
  #include "ui/gfx/geometry/rect.h"
- #include "ui/gfx/gfx_export.h"
  
 -#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "ui/gfx/native_pixmap_handle.h"
  #elif BUILDFLAG(IS_APPLE)
  #include "ui/gfx/mac/io_surface.h"
-@@ -76,7 +76,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle 
-   base::UnsafeSharedMemoryRegion region;
+@@ -47,7 +47,7 @@ enum GpuMemoryBufferType {
+ #if BUILDFLAG(IS_APPLE)
+   IO_SURFACE_BUFFER,
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   NATIVE_PIXMAP,
+ #endif
+ #if BUILDFLAG(IS_WIN)
+@@ -212,7 +212,7 @@ struct COMPONENT_EXPORT(GFX) GpuMemoryBu
+ 
    uint32_t offset = 0;
    uint32_t stride = 0;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
diff --git a/chromium/patches/patch-ui_gfx_linux_dmabuf__uapi.h b/chromium/patches/patch-ui_gfx_linux_dmabuf__uapi.h
index 20be1591a6..b68eb0ee50 100644
--- a/chromium/patches/patch-ui_gfx_linux_dmabuf__uapi.h
+++ b/chromium/patches/patch-ui_gfx_linux_dmabuf__uapi.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_linux_dmabuf__uapi.h,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/linux/dmabuf_uapi.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/linux/dmabuf_uapi.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/linux/dmabuf_uapi.h
 @@ -5,12 +5,11 @@
  #ifndef UI_GFX_LINUX_DMABUF_UAPI_H_
diff --git a/chromium/patches/patch-ui_gfx_linux_gbm__wrapper.cc b/chromium/patches/patch-ui_gfx_linux_gbm__wrapper.cc
index 44981eaa8e..ad41c907ba 100644
--- a/chromium/patches/patch-ui_gfx_linux_gbm__wrapper.cc
+++ b/chromium/patches/patch-ui_gfx_linux_gbm__wrapper.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gfx_linux_gbm__wrapper.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/linux/gbm_wrapper.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/linux/gbm_wrapper.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/linux/gbm_wrapper.cc
-@@ -319,7 +319,7 @@ class Device final : public ui::GbmDevic
+@@ -318,7 +318,7 @@ class Device final : public ui::GbmDevic
      // of 1x1 BOs which are destroyed before creating the final BO creation used
      // to instantiate the returned GbmBuffer.
      gfx::Size size_for_verification =
diff --git a/chromium/patches/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc b/chromium/patches/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
deleted file mode 100644
index 17ce8d608b..0000000000
--- a/chromium/patches/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ui_gfx_mojom_buffer__types__mojom__traits.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/gfx/mojom/buffer_types_mojom_traits.cc
-@@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandl
-       return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
-           std::move(handle.region));
-     case gfx::NATIVE_PIXMAP:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
-       return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
-           std::move(handle.native_pixmap_handle));
- #else
-@@ -115,7 +115,7 @@ bool StructTraits<gfx::mojom::GpuMemoryB
-       out->type = gfx::SHARED_MEMORY_BUFFER;
-       out->region = std::move(platform_handle->get_shared_memory_handle());
-       return true;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
-     case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag::
-         kNativePixmapHandle:
-       out->type = gfx::NATIVE_PIXMAP;
diff --git a/chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
index 3ebabf0580..a836929813 100644
--- a/chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
+++ b/chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
@@ -1,14 +1,23 @@
-$NetBSD: patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc
-@@ -8,11 +8,11 @@
+@@ -14,7 +14,7 @@
+ #include "ui/gfx/mac/io_surface.h"
+ #endif  // BUILDFLAG(IS_APPLE)
  
- namespace mojo {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
+ #include "ui/gfx/native_pixmap_handle.h"
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
+ 
+@@ -80,11 +80,11 @@ bool StructTraits<gfx::mojom::AHardwareB
+ }
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
@@ -20,7 +29,7 @@ $NetBSD: patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc,v 1.1 2025/0
    return mojo::PlatformHandle(std::move(plane.fd));
  #elif BUILDFLAG(IS_FUCHSIA)
    return mojo::PlatformHandle(std::move(plane.vmo));
-@@ -28,7 +28,7 @@ bool StructTraits<
+@@ -100,7 +100,7 @@ bool StructTraits<
    out->size = data.size();
  
    mojo::PlatformHandle handle = data.TakeBufferHandle();
@@ -29,7 +38,7 @@ $NetBSD: patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc,v 1.1 2025/0
    if (!handle.is_fd())
      return false;
    out->fd = handle.TakeFD();
-@@ -54,7 +54,7 @@ bool StructTraits<
+@@ -126,7 +126,7 @@ bool StructTraits<
      gfx::mojom::NativePixmapHandleDataView,
      gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data,
                                     gfx::NativePixmapHandle* out) {
@@ -38,3 +47,21 @@ $NetBSD: patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc,v 1.1 2025/0
    out->modifier = data.modifier();
    out->supports_zero_copy_webgpu_import =
        data.supports_zero_copy_webgpu_import();
+@@ -187,7 +187,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandl
+     case gfx::IO_SURFACE_BUFFER:
+       return Tag::kMachPort;
+ #endif  // BUILDFLAG(IS_APPLE)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
+     case gfx::NATIVE_PIXMAP:
+       return Tag::kNativePixmapHandle;
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
+@@ -251,7 +251,7 @@ bool UnionTraits<gfx::mojom::GpuMemoryBu
+       }
+       return true;
+ #endif  // BUILDFLAG(IS_APPLE)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
+     case Tag::kNativePixmapHandle:
+       handle->type = gfx::NATIVE_PIXMAP;
+       return data.ReadNativePixmapHandle(&handle->native_pixmap_handle);
diff --git a/chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
index 2c35747c31..0c1b128ed6 100644
--- a/chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
+++ b/chromium/patches/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
@@ -1,30 +1,30 @@
-$NetBSD: patch-ui_gfx_mojom_native__handle__types__mojom__traits.h,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/mojom/native_handle_types_mojom_traits.h
-@@ -16,7 +16,7 @@
- #include "mojo/public/cpp/system/platform_handle.h"
+@@ -18,7 +18,7 @@
+ #include "ui/gfx/gpu_memory_buffer.h"
  #include "ui/gfx/mojom/native_handle_types.mojom-shared.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
  #include "ui/gfx/native_pixmap_handle.h"
- #endif
- 
-@@ -26,7 +26,7 @@
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
  
- namespace mojo {
+@@ -46,7 +46,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDL
+ };
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
  template <>
  struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS)
      StructTraits<gfx::mojom::NativePixmapPlaneDataView,
-@@ -54,13 +54,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDL
+@@ -74,13 +74,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDL
      return pixmap_handle.planes;
    }
  
@@ -40,3 +40,12 @@ $NetBSD: patch-ui_gfx_mojom_native__handle__types__mojom__traits.h,v 1.1 2025/02
    static bool supports_zero_copy_webgpu_import(
        const gfx::NativePixmapHandle& pixmap_handle) {
      return pixmap_handle.supports_zero_copy_webgpu_import;
+@@ -159,7 +159,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDL
+   static PlatformHandle mach_port(gfx::GpuMemoryBufferHandle& handle);
+ #endif  // BUILDFLAG(IS_APPLE)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
+   static gfx::NativePixmapHandle& native_pixmap_handle(
+       gfx::GpuMemoryBufferHandle& handle) {
+     return handle.native_pixmap_handle;
diff --git a/chromium/patches/patch-ui_gfx_native__pixmap__handle.cc b/chromium/patches/patch-ui_gfx_native__pixmap__handle.cc
index 30f60bb5dd..9c800cd392 100644
--- a/chromium/patches/patch-ui_gfx_native__pixmap__handle.cc
+++ b/chromium/patches/patch-ui_gfx_native__pixmap__handle.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_native__pixmap__handle.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/native_pixmap_handle.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/native_pixmap_handle.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/native_pixmap_handle.cc
 @@ -11,7 +11,7 @@
  #include "ui/gfx/buffer_format_util.h"
diff --git a/chromium/patches/patch-ui_gfx_native__pixmap__handle.h b/chromium/patches/patch-ui_gfx_native__pixmap__handle.h
index d0fa51b485..3b7935407d 100644
--- a/chromium/patches/patch-ui_gfx_native__pixmap__handle.h
+++ b/chromium/patches/patch-ui_gfx_native__pixmap__handle.h
@@ -1,21 +1,21 @@
-$NetBSD: patch-ui_gfx_native__pixmap__handle.h,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/native_pixmap_handle.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/native_pixmap_handle.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/native_pixmap_handle.h
 @@ -14,7 +14,7 @@
+ #include "build/build_config.h"
  #include "ui/gfx/buffer_types.h"
- #include "ui/gfx/gfx_export.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "base/files/scoped_file.h"
  #endif
  
-@@ -34,7 +34,7 @@ struct GFX_EXPORT NativePixmapPlane {
+@@ -34,7 +34,7 @@ struct COMPONENT_EXPORT(GFX) NativePixma
    NativePixmapPlane(int stride,
                      int offset,
                      uint64_t size
@@ -24,7 +24,7 @@ $NetBSD: patch-ui_gfx_native__pixmap__handle.h,v 1.1 2025/02/06 09:58:32 wiz Exp
                      ,
                      base::ScopedFD fd
  #elif BUILDFLAG(IS_FUCHSIA)
-@@ -55,7 +55,7 @@ struct GFX_EXPORT NativePixmapPlane {
+@@ -55,7 +55,7 @@ struct COMPONENT_EXPORT(GFX) NativePixma
    // This is necessary to map the buffers.
    uint64_t size;
  
@@ -33,7 +33,7 @@ $NetBSD: patch-ui_gfx_native__pixmap__handle.h,v 1.1 2025/02/06 09:58:32 wiz Exp
    // File descriptor for the underlying memory object (usually dmabuf).
    base::ScopedFD fd;
  #elif BUILDFLAG(IS_FUCHSIA)
-@@ -78,7 +78,7 @@ struct GFX_EXPORT NativePixmapHandle {
+@@ -78,7 +78,7 @@ struct COMPONENT_EXPORT(GFX) NativePixma
  
    std::vector<NativePixmapPlane> planes;
  
diff --git a/chromium/patches/patch-ui_gfx_native__widget__types.h b/chromium/patches/patch-ui_gfx_native__widget__types.h
index 769d855e68..4b9d572d4f 100644
--- a/chromium/patches/patch-ui_gfx_native__widget__types.h
+++ b/chromium/patches/patch-ui_gfx_native__widget__types.h
@@ -1,26 +1,26 @@
-$NetBSD: patch-ui_gfx_native__widget__types.h,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/native_widget_types.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/native_widget_types.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/native_widget_types.h
-@@ -104,7 +104,7 @@ class SkBitmap;
+@@ -104,7 +104,7 @@ class ViewAndroid;
+ #endif
+ class SkBitmap;
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  extern "C" {
  struct _AtkObject;
  using AtkObject = struct _AtkObject;
-@@ -219,7 +219,7 @@ using NativeViewAccessible = struct objc
+@@ -194,7 +194,7 @@ using NativeViewAccessible = id;
+ #else
+ using NativeViewAccessible = struct objc_object*;
  #endif
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Linux doesn't have a native font type.
  using NativeViewAccessible = AtkObject*;
  #else
diff --git a/chromium/patches/patch-ui_gfx_platform__font__skia.cc b/chromium/patches/patch-ui_gfx_platform__font__skia.cc
index 974e56c187..bb934b1587 100644
--- a/chromium/patches/patch-ui_gfx_platform__font__skia.cc
+++ b/chromium/patches/patch-ui_gfx_platform__font__skia.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_platform__font__skia.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/platform_font_skia.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/platform_font_skia.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/platform_font_skia.cc
 @@ -29,7 +29,7 @@
  #include "ui/gfx/system_fonts_win.h"
diff --git a/chromium/patches/patch-ui_gfx_render__text__api__fuzzer.cc b/chromium/patches/patch-ui_gfx_render__text__api__fuzzer.cc
index 6a63d3caf8..bebb875043 100644
--- a/chromium/patches/patch-ui_gfx_render__text__api__fuzzer.cc
+++ b/chromium/patches/patch-ui_gfx_render__text__api__fuzzer.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gfx_render__text__api__fuzzer.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/render_text_api_fuzzer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/render_text_api_fuzzer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/render_text_api_fuzzer.cc
-@@ -20,7 +20,7 @@
+@@ -19,7 +19,7 @@
  #include "ui/gfx/font_util.h"
  #include "ui/gfx/render_text.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_gfx_render__text__api__fuzzer.cc,v 1.1 2025/02/06 09:58:32 wiz
  #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h"
  #endif
  
-@@ -47,7 +47,7 @@ struct Environment {
+@@ -46,7 +46,7 @@ struct Environment {
  
      CHECK(base::i18n::InitializeICU());
  
diff --git a/chromium/patches/patch-ui_gfx_render__text__fuzzer.cc b/chromium/patches/patch-ui_gfx_render__text__fuzzer.cc
index 2135bc824e..049adb6597 100644
--- a/chromium/patches/patch-ui_gfx_render__text__fuzzer.cc
+++ b/chromium/patches/patch-ui_gfx_render__text__fuzzer.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_render__text__fuzzer.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/render_text_fuzzer.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/render_text_fuzzer.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/render_text_fuzzer.cc
 @@ -17,7 +17,7 @@
  #include "ui/gfx/canvas.h"
diff --git a/chromium/patches/patch-ui_gfx_switches.cc b/chromium/patches/patch-ui_gfx_switches.cc
index a8590f3eda..143ff3158d 100644
--- a/chromium/patches/patch-ui_gfx_switches.cc
+++ b/chromium/patches/patch-ui_gfx_switches.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_switches.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/switches.cc
 @@ -32,7 +32,7 @@ const char kForcePrefersNoReducedMotion[
  // Run in headless mode, i.e., without a UI or display server dependencies.
diff --git a/chromium/patches/patch-ui_gfx_switches.h b/chromium/patches/patch-ui_gfx_switches.h
index 80655bf49b..1a81131e72 100644
--- a/chromium/patches/patch-ui_gfx_switches.h
+++ b/chromium/patches/patch-ui_gfx_switches.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gfx_switches.h,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/switches.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/switches.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/switches.h
-@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kF
+@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kF
  GFX_SWITCHES_EXPORT extern const char kForcePrefersNoReducedMotion[];
  GFX_SWITCHES_EXPORT extern const char kHeadless[];
  
diff --git a/chromium/patches/patch-ui_gfx_x_atom__cache.cc b/chromium/patches/patch-ui_gfx_x_atom__cache.cc
new file mode 100644
index 0000000000..3e2c0324df
--- /dev/null
+++ b/chromium/patches/patch-ui_gfx_x_atom__cache.cc
@@ -0,0 +1,16 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/gfx/x/atom_cache.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/gfx/x/atom_cache.cc
+@@ -157,6 +157,7 @@ constexpr auto kAtomsToCache = std::to_a
+     "application/octet-stream",
+     "application/vnd.chromium.test",
+     "chromium/filename",
++    "chromium/from-privileged",
+     "chromium/x-bookmark-entries",
+     "chromium/x-browser-actions",
+     "chromium/x-file-system-files",
diff --git a/chromium/patches/patch-ui_gfx_x_generated__protos_dri3.cc b/chromium/patches/patch-ui_gfx_x_generated__protos_dri3.cc
index 78b81037c5..e18b80a9e8 100644
--- a/chromium/patches/patch-ui_gfx_x_generated__protos_dri3.cc
+++ b/chromium/patches/patch-ui_gfx_x_generated__protos_dri3.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_x_generated__protos_dri3.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/x/generated_protos/dri3.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/x/generated_protos/dri3.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/x/generated_protos/dri3.cc
 @@ -27,6 +27,8 @@
  #include <xcb/xcb.h>
diff --git a/chromium/patches/patch-ui_gfx_x_generated__protos_shm.cc b/chromium/patches/patch-ui_gfx_x_generated__protos_shm.cc
index f939fdc3ae..fa9c7a6f2f 100644
--- a/chromium/patches/patch-ui_gfx_x_generated__protos_shm.cc
+++ b/chromium/patches/patch-ui_gfx_x_generated__protos_shm.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_x_generated__protos_shm.cc,v 1.1 2025/02/06 09:58:32 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/x/generated_protos/shm.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/x/generated_protos/shm.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/x/generated_protos/shm.cc
 @@ -27,6 +27,8 @@
  #include <xcb/xcb.h>
diff --git a/chromium/patches/patch-ui_gfx_x_xlib__support.cc b/chromium/patches/patch-ui_gfx_x_xlib__support.cc
index c3236fa914..16ad18e2dd 100644
--- a/chromium/patches/patch-ui_gfx_x_xlib__support.cc
+++ b/chromium/patches/patch-ui_gfx_x_xlib__support.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gfx_x_xlib__support.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gfx/x/xlib_support.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gfx/x/xlib_support.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gfx/x/xlib_support.cc
 @@ -39,10 +39,18 @@ void InitXlib() {
      return;
diff --git a/chromium/patches/patch-ui_gl_BUILD.gn b/chromium/patches/patch-ui_gl_BUILD.gn
index c7e5b5f784..ce941b81cb 100644
--- a/chromium/patches/patch-ui_gl_BUILD.gn
+++ b/chromium/patches/patch-ui_gl_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gl_BUILD.gn,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gl/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gl/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gl/BUILD.gn
-@@ -168,7 +168,6 @@ component("gl") {
+@@ -174,7 +174,6 @@ component("gl") {
    public_deps = [
      ":gl_enums",
      "//base",
@@ -14,7 +14,7 @@ $NetBSD: patch-ui_gl_BUILD.gn,v 1.1 2025/02/06 09:58:33 wiz Exp $
      "//ui/events/platform",
      "//ui/gfx",
      "//ui/gfx/geometry",
-@@ -316,7 +315,6 @@ component("gl") {
+@@ -328,7 +327,6 @@ component("gl") {
      data_deps += [
        "//third_party/angle:libEGL",
        "//third_party/angle:libGLESv2",
@@ -22,7 +22,7 @@ $NetBSD: patch-ui_gl_BUILD.gn,v 1.1 2025/02/06 09:58:33 wiz Exp $
      ]
      if (enable_swiftshader) {
        data_deps += [
-@@ -541,7 +539,6 @@ test("gl_unittests") {
+@@ -554,7 +552,6 @@ test("gl_unittests") {
  
    data_deps = [
      "//testing/buildbot/filters:gl_unittests_filters",
diff --git a/chromium/patches/patch-ui_gl_gl__context.cc b/chromium/patches/patch-ui_gl_gl__context.cc
index f2d75a07d4..860bb0b5b3 100644
--- a/chromium/patches/patch-ui_gl_gl__context.cc
+++ b/chromium/patches/patch-ui_gl_gl__context.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gl_gl__context.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gl/gl_context.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gl/gl_context.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gl/gl_context.cc
-@@ -517,7 +517,7 @@ bool GLContext::MakeVirtuallyCurrent(
+@@ -516,7 +516,7 @@ bool GLContext::MakeVirtuallyCurrent(
    DCHECK(virtual_context->IsCurrent(surface));
  
    if (switched_real_contexts || virtual_context != current_virtual_context_) {
diff --git a/chromium/patches/patch-ui_gl_gl__fence.cc b/chromium/patches/patch-ui_gl_gl__fence.cc
index 3036eeb4df..a96608ee03 100644
--- a/chromium/patches/patch-ui_gl_gl__fence.cc
+++ b/chromium/patches/patch-ui_gl_gl__fence.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gl_gl__fence.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gl/gl_fence.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gl/gl_fence.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gl/gl_fence.cc
 @@ -17,7 +17,7 @@
  #include "ui/gl/gl_surface_egl.h"
diff --git a/chromium/patches/patch-ui_gl_gl__implementation.cc b/chromium/patches/patch-ui_gl_gl__implementation.cc
index 7b0e159910..d0673894de 100644
--- a/chromium/patches/patch-ui_gl_gl__implementation.cc
+++ b/chromium/patches/patch-ui_gl_gl__implementation.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gl_gl__implementation.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gl/gl_implementation.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gl/gl_implementation.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gl/gl_implementation.cc
-@@ -253,7 +253,7 @@ GetRequestedGLImplementationFromCommandL
+@@ -286,7 +286,7 @@ GetRequestedGLImplementationFromCommandL
      const base::CommandLine* command_line) {
    bool overrideUseSoftwareGL =
        command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests);
diff --git a/chromium/patches/patch-ui_gl_gl__switches.cc b/chromium/patches/patch-ui_gl_gl__switches.cc
index 05fe546fae..c077e0a23b 100644
--- a/chromium/patches/patch-ui_gl_gl__switches.cc
+++ b/chromium/patches/patch-ui_gl_gl__switches.cc
@@ -1,35 +1,35 @@
-$NetBSD: patch-ui_gl_gl__switches.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gl/gl_switches.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gl/gl_switches.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gl/gl_switches.cc
-@@ -11,7 +11,7 @@
+@@ -13,7 +13,7 @@
  #include "base/android/build_info.h"
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  #include <vulkan/vulkan_core.h>
  #include "third_party/angle/src/gpu_info_util/SystemInfo.h"  // nogncheck
  #endif
-@@ -288,7 +288,7 @@ bool IsDefaultANGLEVulkan() {
-       base::android::SDK_VERSION_Q)
+@@ -319,7 +319,7 @@ bool IsDefaultANGLEVulkan() {
      return false;
+   }
  #endif  // BUILDFLAG(IS_ANDROID)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    angle::SystemInfo system_info;
-   if (!angle::GetSystemInfoVulkan(&system_info))
-     return false;
-@@ -300,7 +300,7 @@ bool IsDefaultANGLEVulkan() {
- 
-   const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex];
+   {
+     GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan");
+@@ -372,7 +372,7 @@ bool IsDefaultANGLEVulkan() {
+   }
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Vulkan 1.1 is required.
-   if (active_gpu.driverApiVersion < VK_VERSION_1_1)
-     return false;
+   // AMDVLK driver is buggy, so disable Vulkan with AMDVLK for now.
+   // crbug.com/1340081
+   if (active_gpu.driverId == VK_DRIVER_ID_AMD_OPEN_SOURCE)
diff --git a/chromium/patches/patch-ui_gl_sync__control__vsync__provider.cc b/chromium/patches/patch-ui_gl_sync__control__vsync__provider.cc
index 7916cc9e56..af7a341a3b 100644
--- a/chromium/patches/patch-ui_gl_sync__control__vsync__provider.cc
+++ b/chromium/patches/patch-ui_gl_sync__control__vsync__provider.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gl_sync__control__vsync__provider.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gl/sync_control_vsync_provider.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gl/sync_control_vsync_provider.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gl/sync_control_vsync_provider.cc
 @@ -11,7 +11,7 @@
  #include "base/trace_event/trace_event.h"
diff --git a/chromium/patches/patch-ui_gl_sync__control__vsync__provider.h b/chromium/patches/patch-ui_gl_sync__control__vsync__provider.h
index c077a28fde..afe57658ed 100644
--- a/chromium/patches/patch-ui_gl_sync__control__vsync__provider.h
+++ b/chromium/patches/patch-ui_gl_sync__control__vsync__provider.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_gl_sync__control__vsync__provider.h,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gl/sync_control_vsync_provider.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gl/sync_control_vsync_provider.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gl/sync_control_vsync_provider.h
 @@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public 
    bool SupportGetVSyncParametersIfAvailable() const override;
diff --git a/chromium/patches/patch-ui_gtk_gtk__compat.cc b/chromium/patches/patch-ui_gtk_gtk__compat.cc
index f5b8c9fb56..e9b89419fa 100644
--- a/chromium/patches/patch-ui_gtk_gtk__compat.cc
+++ b/chromium/patches/patch-ui_gtk_gtk__compat.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gtk_gtk__compat.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gtk/gtk_compat.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gtk/gtk_compat.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gtk/gtk_compat.cc
-@@ -62,27 +62,47 @@ auto DlCast(void* symbol) {
+@@ -65,27 +65,47 @@ auto DlCast(void* symbol) {
  }
  
  void* GetLibGio() {
diff --git a/chromium/patches/patch-ui_gtk_printing_print__dialog__gtk.cc b/chromium/patches/patch-ui_gtk_printing_print__dialog__gtk.cc
index 48effc31b4..fb10441fdf 100644
--- a/chromium/patches/patch-ui_gtk_printing_print__dialog__gtk.cc
+++ b/chromium/patches/patch-ui_gtk_printing_print__dialog__gtk.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_gtk_printing_print__dialog__gtk.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/gtk/printing/print_dialog_gtk.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/gtk/printing/print_dialog_gtk.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/gtk/printing/print_dialog_gtk.cc
-@@ -439,7 +439,7 @@ void PrintDialogGtk::ShowDialog(
+@@ -438,7 +438,7 @@ void PrintDialogGtk::ShowDialog(
    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
        GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET |
        GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
diff --git a/chromium/patches/patch-ui_message__center_views_message__popup__view.cc b/chromium/patches/patch-ui_message__center_views_message__popup__view.cc
index 29aee152e4..ae500f7439 100644
--- a/chromium/patches/patch-ui_message__center_views_message__popup__view.cc
+++ b/chromium/patches/patch-ui_message__center_views_message__popup__view.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_message__center_views_message__popup__view.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/message_center/views/message_popup_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/message_center/views/message_popup_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/message_center/views/message_popup_view.cc
-@@ -144,7 +144,7 @@ std::unique_ptr<views::Widget> MessagePo
+@@ -153,7 +153,7 @@ std::unique_ptr<views::Widget> MessagePo
+       views::Widget::InitParams::CLIENT_OWNS_WIDGET,
+       views::Widget::InitParams::TYPE_POPUP);
    params.z_order = ui::ZOrderLevel::kFloatingWindow;
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Make the widget explicitly activatable as TYPE_POPUP is not activatable by
    // default but we need focus for the inline reply textarea.
    params.activatable = views::Widget::InitParams::Activatable::kYes;
diff --git a/chromium/patches/patch-ui_native__theme_features_native__theme__features.cc b/chromium/patches/patch-ui_native__theme_features_native__theme__features.cc
new file mode 100644
index 0000000000..28fab81bdd
--- /dev/null
+++ b/chromium/patches/patch-ui_native__theme_features_native__theme__features.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/native_theme/features/native_theme_features.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/native_theme/features/native_theme_features.cc
+@@ -59,7 +59,7 @@ namespace ui {
+ 
+ bool IsFluentOverlayScrollbarEnabled() {
+ // Fluent scrollbars are only used for some OSes due to UI design guidelines.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar);
+ #else
+   return false;
+@@ -68,7 +68,7 @@ bool IsFluentOverlayScrollbarEnabled() {
+ 
+ bool IsFluentScrollbarEnabled() {
+ // Fluent scrollbars are only used for some OSes due to UI design guidelines.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return base::FeatureList::IsEnabled(features::kFluentScrollbar) ||
+          IsFluentOverlayScrollbarEnabled();
+ #else
diff --git a/chromium/patches/patch-ui_native__theme_native__theme.h b/chromium/patches/patch-ui_native__theme_native__theme.h
index db40b3593c..3252ff983f 100644
--- a/chromium/patches/patch-ui_native__theme_native__theme.h
+++ b/chromium/patches/patch-ui_native__theme_native__theme.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_native__theme_native__theme.h,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/native_theme/native_theme.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/native_theme/native_theme.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/native_theme/native_theme.h
-@@ -64,7 +64,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -61,7 +61,7 @@ class COMPONENT_EXPORT(NATIVE_THEME) Nat
+   // The part to be painted / sized.
+   enum Part {
      kCheckbox,
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      kFrameTopArea,
  #endif
      kInnerSpinButton,
diff --git a/chromium/patches/patch-ui_native__theme_native__theme__base.cc b/chromium/patches/patch-ui_native__theme_native__theme__base.cc
index 91bdd22a0c..65cbe83a03 100644
--- a/chromium/patches/patch-ui_native__theme_native__theme__base.cc
+++ b/chromium/patches/patch-ui_native__theme_native__theme__base.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_native__theme_native__theme__base.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/native_theme/native_theme_base.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/native_theme/native_theme_base.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/native_theme/native_theme_base.cc
-@@ -241,7 +241,7 @@ void NativeThemeBase::Paint(cc::PaintCan
+@@ -240,7 +240,7 @@ void NativeThemeBase::Paint(cc::PaintCan
+                     std::get<ButtonExtraParams>(extra), color_scheme,
+                     accent_color_opaque);
        break;
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      case kFrameTopArea:
        PaintFrameTopArea(canvas, state, rect,
-                         absl::get<FrameTopAreaExtraParams>(extra),
+                         std::get<FrameTopAreaExtraParams>(extra), color_scheme);
diff --git a/chromium/patches/patch-ui_native__theme_native__theme__features.cc b/chromium/patches/patch-ui_native__theme_native__theme__features.cc
deleted file mode 100644
index 2000c93f53..0000000000
--- a/chromium/patches/patch-ui_native__theme_native__theme__features.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ui_native__theme_native__theme__features.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/native_theme/native_theme_features.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/native_theme/native_theme_features.cc
-@@ -65,7 +65,7 @@ bool IsOverlayScrollbarEnabled() {
- 
- bool IsFluentScrollbarEnabled() {
- // Fluent scrollbars are only used for some OSes due to UI design guidelines.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(features::kFluentScrollbar) ||
-          IsFluentOverlayScrollbarEnabled();
- #else
-@@ -74,7 +74,7 @@ bool IsFluentScrollbarEnabled() {
- }
- bool IsFluentOverlayScrollbarEnabled() {
- // Fluent scrollbars are only used for some OSes due to UI design guidelines.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar);
- #else
-   return false;
diff --git a/chromium/patches/patch-ui_ozone_common_egl__util.cc b/chromium/patches/patch-ui_ozone_common_egl__util.cc
index ea551295ec..1d933d060d 100644
--- a/chromium/patches/patch-ui_ozone_common_egl__util.cc
+++ b/chromium/patches/patch-ui_ozone_common_egl__util.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_ozone_common_egl__util.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/common/egl_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/common/egl_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/common/egl_util.cc
-@@ -26,9 +26,9 @@ const base::FilePath::CharType kDefaultG
+@@ -27,9 +27,9 @@ const base::FilePath::CharType kDefaultG
      FILE_PATH_LITERAL("libGLESv2.so");
  #else  // BUILDFLAG(IS_FUCHSIA)
  const base::FilePath::CharType kDefaultEglSoname[] =
diff --git a/chromium/patches/patch-ui_ozone_common_features.cc b/chromium/patches/patch-ui_ozone_common_features.cc
deleted file mode 100644
index 91db2023ff..0000000000
--- a/chromium/patches/patch-ui_ozone_common_features.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ui_ozone_common_features.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/common/features.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/common/features.cc
-@@ -35,7 +35,7 @@ BASE_FEATURE(kWaylandSurfaceSubmissionIn
- // enabled.
- BASE_FEATURE(kWaylandFractionalScaleV1,
-              "WaylandFractionalScaleV1",
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -47,7 +47,7 @@ BASE_FEATURE(kWaylandFractionalScaleV1,
- // protocol is supported.
- BASE_FEATURE(kWaylandXdgToplevelDrag,
-              "WaylandXdgToplevelDrag",
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/chromium/patches/patch-ui_ozone_platform_headless_headless__surface__factory.cc b/chromium/patches/patch-ui_ozone_platform_headless_headless__surface__factory.cc
index be6cbb0d65..80633d30c6 100644
--- a/chromium/patches/patch-ui_ozone_platform_headless_headless__surface__factory.cc
+++ b/chromium/patches/patch-ui_ozone_platform_headless_headless__surface__factory.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_ozone_platform_headless_headless__surface__factory.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/headless/headless_surface_factory.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/headless/headless_surface_factory.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/headless/headless_surface_factory.cc
 @@ -34,7 +34,7 @@
  #include "ui/ozone/platform/headless/headless_window_manager.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_ozone_platform_headless_headless__surface__factory.cc,v 1.1 20
  #include "ui/ozone/platform/headless/vulkan_implementation_headless.h"
  #endif
  
-@@ -280,7 +280,7 @@ std::unique_ptr<gpu::VulkanImplementatio
+@@ -281,7 +281,7 @@ std::unique_ptr<gpu::VulkanImplementatio
  HeadlessSurfaceFactory::CreateVulkanImplementation(
      bool use_swiftshader,
      bool allow_protected_memory) {
diff --git a/chromium/patches/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/chromium/patches/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
index f37238847d..ad8aecf239 100644
--- a/chromium/patches/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
+++ b/chromium/patches/patch-ui_ozone_platform_headless_ozone__platform__headless.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_ozone_platform_headless_ozone__platform__headless.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/headless/ozone_platform_headless.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/headless/ozone_platform_headless.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/headless/ozone_platform_headless.cc
-@@ -103,7 +103,7 @@ class OzonePlatformHeadless : public Ozo
+@@ -108,7 +108,7 @@ class OzonePlatformHeadlessImpl : public
    }
  
  // Desktop Linux, not CastOS.
diff --git a/chromium/patches/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/chromium/patches/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
index a449541cc9..9667368c22 100644
--- a/chromium/patches/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
+++ b/chromium/patches/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc
-@@ -118,7 +118,7 @@ VulkanImplementationHeadless::ExportVkFe
+@@ -116,7 +116,7 @@ VulkanImplementationHeadless::ExportVkFe
  
  VkExternalSemaphoreHandleTypeFlagBits
  VulkanImplementationHeadless::GetExternalSemaphoreHandleType() {
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc,v
    return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT;
  #else
    return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT;
-@@ -128,7 +128,7 @@ VulkanImplementationHeadless::GetExterna
+@@ -126,7 +126,7 @@ VulkanImplementationHeadless::GetExterna
  bool VulkanImplementationHeadless::CanImportGpuMemoryBuffer(
      gpu::VulkanDeviceQueue* device_queue,
      gfx::GpuMemoryBufferType memory_buffer_type) {
@@ -24,7 +24,7 @@ $NetBSD: patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc,v
    const auto& enabled_extensions = device_queue->enabled_extensions();
    return gfx::HasExtension(enabled_extensions,
                             VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME) &&
-@@ -151,7 +151,7 @@ VulkanImplementationHeadless::CreateImag
+@@ -149,7 +149,7 @@ VulkanImplementationHeadless::CreateImag
        VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
        VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
    auto tiling = VK_IMAGE_TILING_OPTIMAL;
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_common_wayland__util.cc b/chromium/patches/patch-ui_ozone_platform_wayland_common_wayland__util.cc
index fe9bf23149..eaf30fafef 100644
--- a/chromium/patches/patch-ui_ozone_platform_wayland_common_wayland__util.cc
+++ b/chromium/patches/patch-ui_ozone_platform_wayland_common_wayland__util.cc
@@ -1,26 +1,24 @@
-$NetBSD: patch-ui_ozone_platform_wayland_common_wayland__util.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/wayland/common/wayland_util.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/wayland/common/wayland_util.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/wayland/common/wayland_util.cc
-@@ -347,7 +347,7 @@ void TransformToWlArray(
- }
+@@ -424,6 +424,7 @@ void RecordConnectionMetrics(wl_display*
+         {"weston", WaylandCompositor::kWeston},
+     };
  
- base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(crbug.com/40287874): `milliseconds` comes from Weston that
-   // uses timestamp from libinput, which is different from TimeTicks.
-   // Use EventTimeForNow(), for now.
-@@ -389,7 +389,7 @@ bool MaybeHandlePlatformEventForDrag(con
- }
++#if !BUILDFLAG(IS_BSD)
+     const int fd = wl_display_get_fd(display);
+     if (fd == -1) {
+       return WaylandCompositor::kUnknown;
+@@ -449,6 +450,7 @@ void RecordConnectionMetrics(wl_display*
+         return compositor;
+       }
+     }
++#endif
  
- void RecordConnectionMetrics(wl_display* display) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   CHECK(display);
- 
-   // These values are logged to metrics so must not be changed.
+     return WaylandCompositor::kOther;
+   };
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc b/chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc
deleted file mode 100644
index cc362d26e2..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc
-@@ -284,7 +284,7 @@ void WaylandInputEmulate::EmulateUpdateD
- }
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void WaylandInputEmulate::ForceUseScreenCoordinatesOnce() {
-   force_use_screen_coordinates_once_ = true;
- }
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h b/chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h
deleted file mode 100644
index 765b51a4df..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h,v 1.1 2025/02/06 09:58:33 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/emulate/wayland_input_emulate.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.h
-@@ -68,7 +68,7 @@ class WaylandInputEmulate : public wl::W
-                             uint32_t request_id);
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void ForceUseScreenCoordinatesOnce();
- #endif
- 
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc b/chromium/patches/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
index 616621b1b7..8796e226b6 100644
--- a/chromium/patches/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
+++ b/chromium/patches/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc,v 1.1 2025/02/06 09:58:33 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc
 @@ -38,7 +38,11 @@ bool VulkanImplementationWayland::Initia
  
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__connection.cc b/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__connection.cc
deleted file mode 100644
index 561d3a659d..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__connection.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_wayland__connection.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/wayland_connection.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/wayland_connection.cc
-@@ -541,7 +541,7 @@ bool WaylandConnection::ShouldUseOverlay
-   // isn't present on any non-exo Wayland compositors.
-   bool should_use_overlay_delegation =
-       IsWaylandOverlayDelegationEnabled() && !fractional_scale_manager_v1();
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Overlay delegation also requires a single-pixel-buffer protocol, which
-   // allows creation of non-backed solid color buffers. Even though only video
-   // overlays can be supported on Linux, these color buffers are still needed
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc b/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc
deleted file mode 100644
index b8e30824eb..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/wayland_input_method_context.cc
-@@ -60,7 +60,7 @@ namespace {
- // Only enable the preedit string for sequence mode (i.e. when using dead keys
- // or the Compose key) on Linux ozone/wayland (see b/220370007).
- constexpr CharacterComposer::PreeditStringMode kPreeditStringMode =
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     CharacterComposer::PreeditStringMode::kAlwaysEnabled;
- #else
-     CharacterComposer::PreeditStringMode::kHexModeOnly;
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__popup.cc b/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__popup.cc
deleted file mode 100644
index 532a1bf67b..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__popup.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_wayland__popup.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/wayland_popup.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/wayland_popup.cc
-@@ -34,7 +34,7 @@ WaylandPopup::WaylandPopup(PlatformWindo
-                            WaylandWindow* parent)
-     : WaylandWindow(delegate, connection) {
-   set_parent_window(parent);
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(crbug.com/330384470): Whether the popup appear depends on whether
-   // anchor point is outside of the parent xdg_surface. On Mutter the popup will
-   // not show when outside.
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__screen.cc b/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__screen.cc
deleted file mode 100644
index 6fc2d72648..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__screen.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_wayland__screen.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/wayland_screen.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/wayland_screen.cc
-@@ -47,7 +47,7 @@
- #include "ui/ozone/platform/wayland/host/org_gnome_mutter_idle_monitor.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/base/ui_base_features.h"
- #include "ui/linux/linux_ui.h"
- #endif
-@@ -135,7 +135,7 @@ WaylandScreen::WaylandScreen(WaylandConn
-   tablet_state_ = connection_->GetTabletState();
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (connection_->IsUiScaleEnabled() && LinuxUi::instance()) {
-     OnDeviceScaleFactorChanged();
-     display_scale_factor_observer_.Observe(LinuxUi::instance());
-@@ -614,7 +614,7 @@ bool WaylandScreen::VerifyOutputStateCon
-   return true;
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void WaylandScreen::OnDeviceScaleFactorChanged() {
-   CHECK(connection_->IsUiScaleEnabled());
-   CHECK(LinuxUi::instance());
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__screen.h b/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__screen.h
deleted file mode 100644
index 594b4e5350..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__screen.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_wayland__screen.h,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/wayland_screen.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/wayland_screen.h
-@@ -23,7 +23,7 @@
- #include "ui/ozone/platform/wayland/host/wayland_output.h"
- #include "ui/ozone/public/platform_screen.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/scoped_observation.h"
- #include "ui/linux/device_scale_factor_observer.h"
- #include "ui/linux/linux_ui.h"
-@@ -43,7 +43,7 @@ class OrgGnomeMutterIdleMonitor;
- 
- // A PlatformScreen implementation for Wayland.
- class WaylandScreen : public PlatformScreen
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     ,
-                       public DeviceScaleFactorObserver
- #endif
-@@ -95,7 +95,7 @@ class WaylandScreen : public PlatformScr
-   display::TabletState GetTabletState() const override;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // DeviceScaleFactorObserver:
-   void OnDeviceScaleFactorChanged() override;
- #endif
-@@ -155,7 +155,7 @@ class WaylandScreen : public PlatformScr
-   display::TabletState tablet_state_;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::ScopedObservation<ui::LinuxUi, DeviceScaleFactorObserver>
-       display_scale_factor_observer_{this};
- #endif
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
deleted file mode 100644
index 068f45be93..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
-@@ -629,7 +629,7 @@ void WaylandToplevelWindow::HandleToplev
-   const bool did_active_change = is_active_ != window_states.is_activated;
-   is_active_ = window_states.is_activated;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // The tiled state affects the window geometry, so apply it here.
-   if (window_states.tiled_edges != tiled_state_) {
-     // This configure changes the decoration insets.  We should adjust the
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h
deleted file mode 100644
index d1713d31e4..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h
-@@ -262,7 +262,7 @@ class WaylandToplevelWindow : public Way
-   // The display ID to switch to in case the state is `kFullscreen`.
-   int64_t fullscreen_display_id_ = display::kInvalidDisplayId;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Contains the current state of the tiled edges.
-   WindowTiledEdges tiled_state_;
- #endif
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__window.cc b/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__window.cc
deleted file mode 100644
index 7a1644a4fa..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__window.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_wayland__window.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/wayland_window.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/wayland_window.cc
-@@ -323,7 +323,7 @@ void WaylandWindow::OnPointerFocusChange
-   // Whenever the window gets the pointer focus back, the cursor shape must be
-   // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not
-   // restored by the Wayland compositor.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (focused && async_cursor_) {
-     async_cursor_->AddCursorLoadedCallback(base::BindOnce(
-         &WaylandWindow::OnCursorLoaded, AsWeakPtr(), async_cursor_));
-@@ -604,7 +604,7 @@ bool WaylandWindow::ShouldUseNativeFrame
- void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) {
-   DCHECK(platform_cursor);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor);
- 
-   if (async_cursor_ == async_cursor) {
-@@ -815,7 +815,7 @@ std::string WaylandWindow::WindowStates:
-   } else {
-     base::TrimString(states, " ", &states);
-   }
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   states += "; tiled_edges: ";
-   std::string tiled = "";
-   if (tiled_edges.left) {
-@@ -1318,12 +1318,12 @@ void WaylandWindow::UpdateCursorShape(sc
-         cursor->bitmaps(), hotspot_in_dips,
-         std::ceil(cursor->cursor_image_scale_factor()));
-   }
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   cursor_ = cursor;
- #endif
- }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void WaylandWindow::OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor,
-                                    scoped_refptr<BitmapCursor> bitmap_cursor) {
-   if (HasPointerFocus() && async_cursor_ == cursor && bitmap_cursor) {
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__window.h b/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__window.h
deleted file mode 100644
index 944197ec4f..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_wayland__window.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_wayland__window.h,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/wayland_window.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/wayland_window.h
-@@ -41,7 +41,7 @@
- #include "ui/platform_window/platform_window_init_properties.h"
- #include "ui/platform_window/wm/wm_drag_handler.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h"
- #endif
- 
-@@ -280,7 +280,7 @@ class WaylandWindow : public PlatformWin
-     bool is_snapped_secondary = false;
-     bool is_floated = false;
-     bool is_pip = false;
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     WindowTiledEdges tiled_edges;
- #endif
- 
-@@ -578,7 +578,7 @@ class WaylandWindow : public PlatformWin
- 
-   void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor,
-                       scoped_refptr<BitmapCursor> bitmap_cursor);
- #endif
-@@ -647,7 +647,7 @@ class WaylandWindow : public PlatformWin
- 
-   wl::Object<zaura_surface> aura_surface_;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // The current asynchronously loaded cursor (Linux specific).
-   scoped_refptr<WaylandAsyncCursor> async_cursor_;
- #else
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/chromium/patches/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
deleted file mode 100644
index 2073fa5af5..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc
-@@ -322,7 +322,7 @@ void XDGToplevelWrapperImpl::OnToplevelC
-   window_states.is_activated =
-       CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED);
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (xdg_toplevel_get_version(toplevel) >=
-       XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) {
-     // All four tiled states have the same since version, so it is enough to
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/chromium/patches/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
index 457361f635..09dc5a3066 100644
--- a/chromium/patches/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
+++ b/chromium/patches/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
-@@ -256,6 +256,10 @@ void ZWPTextInputWrapperV1::SetSurroundi
+@@ -261,6 +261,10 @@ void ZWPTextInputWrapperV1::SetSurroundi
    // so if it exceeds 16 bits, it may be broken.
    static constexpr size_t kSizeLimit = 60000;
    if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) {
@@ -17,7 +17,7 @@ $NetBSD: patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc,v
      base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC));
      if (!memfd.get()) {
        PLOG(ERROR) << "Failed to create memfd";
-@@ -268,6 +272,7 @@ void ZWPTextInputWrapperV1::SetSurroundi
+@@ -273,6 +277,7 @@ void ZWPTextInputWrapperV1::SetSurroundi
      zcr_extended_text_input_v1_set_large_surrounding_text(
          extended_obj_.get(), memfd.get(), text.length(),
          selection_range.start(), selection_range.end());
diff --git a/chromium/patches/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/chromium/patches/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
deleted file mode 100644
index b6fa247c9f..0000000000
--- a/chromium/patches/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/ozone/platform/wayland/ozone_platform_wayland.cc
-@@ -66,13 +66,13 @@
- #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h"
- #else
- #include "ui/ozone/common/bitmap_cursor_factory.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h"
- #endif
- 
-@@ -278,7 +278,7 @@ class OzonePlatformWayland : public Ozon
- 
-     buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>(
-         connection_->buffer_manager_host());
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get());
- #else
-     cursor_factory_ = std::make_unique<BitmapCursorFactory>();
-@@ -288,7 +288,7 @@ class OzonePlatformWayland : public Ozon
- 
-     supported_buffer_formats_ =
-         connection_->buffer_manager_host()->GetSupportedBufferFormats();
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     linux_ui_delegate_ =
-         std::make_unique<LinuxUiDelegateWayland>(connection_.get());
- #endif
-@@ -354,7 +354,7 @@ class OzonePlatformWayland : public Ozon
-       properties->supports_global_screen_coordinates =
-           kDefaultScreenCoordinateEnabled;
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-       // TODO(crbug.com/40800718): Revisit (and maybe remove) once proper
-       // support, probably backed by org.freedesktop.portal.Screenshot.PickColor
-       // API is implemented. Note: this is restricted to Linux Desktop as Lacros
-@@ -556,7 +556,7 @@ class OzonePlatformWayland : public Ozon
-   DrmRenderNodePathFinder path_finder_;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   std::unique_ptr<LinuxUiDelegateWayland> linux_ui_delegate_;
- #endif
- };
diff --git a/chromium/patches/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc b/chromium/patches/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
index 32e103bf48..3097cb0d5d 100644
--- a/chromium/patches/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
+++ b/chromium/patches/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/x11/vulkan_implementation_x11.cc
 @@ -59,7 +59,11 @@ bool VulkanImplementationX11::Initialize
  
diff --git a/chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.cc b/chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
index dcd73be283..d4fe1c0fd8 100644
--- a/chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
+++ b/chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_ozone_platform_x11_x11__screen__ozone.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/x11/x11_screen_ozone.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/x11/x11_screen_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/x11/x11_screen_ozone.cc
 @@ -22,7 +22,7 @@
  #include "ui/ozone/platform/x11/x11_window.h"
@@ -24,7 +24,7 @@ $NetBSD: patch-ui_ozone_platform_x11_x11__screen__ozone.cc,v 1.1 2025/02/06 09:5
    if (auto* linux_ui = ui::LinuxUi::instance()) {
      display_scale_factor_observer_.Observe(linux_ui);
    }
-@@ -260,7 +260,7 @@ void X11ScreenOzone::OnEvent(const x11::
+@@ -267,7 +267,7 @@ void X11ScreenOzone::OnEvent(const x11::
    x11_display_manager_->OnEvent(xev);
  }
  
diff --git a/chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.h b/chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.h
index 90e08550c8..8360a52349 100644
--- a/chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.h
+++ b/chromium/patches/patch-ui_ozone_platform_x11_x11__screen__ozone.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_ozone_platform_x11_x11__screen__ozone.h,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/x11/x11_screen_ozone.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/x11/x11_screen_ozone.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/x11/x11_screen_ozone.h
 @@ -16,7 +16,7 @@
  #include "ui/gfx/x/event.h"
diff --git a/chromium/patches/patch-ui_ozone_platform_x11_x11__window.cc b/chromium/patches/patch-ui_ozone_platform_x11_x11__window.cc
index f580462679..eab35aa4d4 100644
--- a/chromium/patches/patch-ui_ozone_platform_x11_x11__window.cc
+++ b/chromium/patches/patch-ui_ozone_platform_x11_x11__window.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_ozone_platform_x11_x11__window.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/platform/x11/x11_window.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/platform/x11/x11_window.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/platform/x11/x11_window.cc
-@@ -1504,7 +1504,7 @@ void X11Window::OnXWindowStateChanged() 
+@@ -1459,7 +1459,7 @@ void X11Window::OnXWindowStateChanged() 
    WindowTiledEdges tiled_state = GetTiledState();
    if (tiled_state != tiled_state_) {
      tiled_state_ = tiled_state;
diff --git a/chromium/patches/patch-ui_ozone_public_ozone__ui__controls__test__helper.h b/chromium/patches/patch-ui_ozone_public_ozone__ui__controls__test__helper.h
new file mode 100644
index 0000000000..9ae6aaa2ac
--- /dev/null
+++ b/chromium/patches/patch-ui_ozone_public_ozone__ui__controls__test__helper.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/ozone/public/ozone_ui_controls_test_helper.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/ozone/public/ozone_ui_controls_test_helper.h
+@@ -62,7 +62,7 @@ class OzoneUIControlsTestHelper {
+   // aura::Window.
+   virtual bool MustUseUiControlsForMoveCursorTo() = 0;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   virtual void ForceUseScreenCoordinatesOnce();
+ #endif
+ };
diff --git a/chromium/patches/patch-ui_ozone_test_mock__platform__window__delegate.h b/chromium/patches/patch-ui_ozone_test_mock__platform__window__delegate.h
index 7295c41846..3bba8c8bbf 100644
--- a/chromium/patches/patch-ui_ozone_test_mock__platform__window__delegate.h
+++ b/chromium/patches/patch-ui_ozone_test_mock__platform__window__delegate.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_ozone_test_mock__platform__window__delegate.h,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/ozone/test/mock_platform_window_delegate.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/ozone/test/mock_platform_window_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/ozone/test/mock_platform_window_delegate.h
 @@ -35,7 +35,7 @@ class MockPlatformWindowDelegate : publi
    MOCK_METHOD2(OnWindowStateChanged,
diff --git a/chromium/patches/patch-ui_platform__window_platform__window__delegate.cc b/chromium/patches/patch-ui_platform__window_platform__window__delegate.cc
index 4d55e48d7f..47dcd6c6ca 100644
--- a/chromium/patches/patch-ui_platform__window_platform__window__delegate.cc
+++ b/chromium/patches/patch-ui_platform__window_platform__window__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_platform__window_platform__window__delegate.cc,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/platform_window/platform_window_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/platform_window/platform_window_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/platform_window/platform_window_delegate.cc
-@@ -66,7 +66,7 @@ gfx::Insets PlatformWindowDelegate::Calc
+@@ -56,7 +56,7 @@ gfx::Insets PlatformWindowDelegate::Calc
    return gfx::Insets();
  }
  
diff --git a/chromium/patches/patch-ui_platform__window_platform__window__delegate.h b/chromium/patches/patch-ui_platform__window_platform__window__delegate.h
index 85d92e4e2e..8f37b67f58 100644
--- a/chromium/patches/patch-ui_platform__window_platform__window__delegate.h
+++ b/chromium/patches/patch-ui_platform__window_platform__window__delegate.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_platform__window_platform__window__delegate.h,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/platform_window/platform_window_delegate.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/platform_window/platform_window_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/platform_window/platform_window_delegate.h
-@@ -191,7 +191,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) 
+@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) 
    virtual void OnWindowStateChanged(PlatformWindowState old_state,
                                      PlatformWindowState new_state) = 0;
  
diff --git a/chromium/patches/patch-ui_platform__window_platform__window__init__properties.h b/chromium/patches/patch-ui_platform__window_platform__window__init__properties.h
index 2d2dabd696..09097baf8a 100644
--- a/chromium/patches/patch-ui_platform__window_platform__window__init__properties.h
+++ b/chromium/patches/patch-ui_platform__window_platform__window__init__properties.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_platform__window_platform__window__init__properties.h,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/platform_window/platform_window_init_properties.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/platform_window/platform_window_init_properties.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/platform_window/platform_window_init_properties.h
 @@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate;
  class ScenicWindowDelegate;
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_platform__window_platform__window__init__properties.h,v 1.1 20
  class X11ExtensionDelegate;
  #endif
  
-@@ -121,7 +121,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW)
+@@ -120,7 +120,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW)
  
    PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault;
  
diff --git a/chromium/patches/patch-ui_qt_BUILD.gn b/chromium/patches/patch-ui_qt_BUILD.gn
index b7010dfc1d..2794bff807 100644
--- a/chromium/patches/patch-ui_qt_BUILD.gn
+++ b/chromium/patches/patch-ui_qt_BUILD.gn
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_qt_BUILD.gn,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/qt/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/qt/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/qt/BUILD.gn
 @@ -20,7 +20,7 @@ config("qt_internal_config") {
  
diff --git a/chromium/patches/patch-ui_qt_qt.gni b/chromium/patches/patch-ui_qt_qt.gni
deleted file mode 100644
index 79144da0f7..0000000000
--- a/chromium/patches/patch-ui_qt_qt.gni
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_qt_qt.gni,v 1.1 2025/02/06 09:58:34 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/qt/qt.gni.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/qt/qt.gni
-@@ -14,7 +14,7 @@ declare_args() {
- 
- declare_args() {
-   if (!use_sysroot && use_qt) {
--    moc_qt5_path = ""
-+    moc_qt5_path = "@QTDIR@/bin"
-   }
- }
- 
diff --git a/chromium/patches/patch-ui_strings_translations_app__locale__settings__bn.xtb b/chromium/patches/patch-ui_strings_translations_app__locale__settings__bn.xtb
index 90cb38bfd8..886c6fc44b 100644
--- a/chromium/patches/patch-ui_strings_translations_app__locale__settings__bn.xtb
+++ b/chromium/patches/patch-ui_strings_translations_app__locale__settings__bn.xtb
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_strings_translations_app__locale__settings__bn.xtb,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/strings/translations/app_locale_settings_bn.xtb.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/strings/translations/app_locale_settings_bn.xtb.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/strings/translations/app_locale_settings_bn.xtb
 @@ -10,7 +10,7 @@
    <translation id="IDS_WEB_FONT_FAMILY">Vrinda</translation>
diff --git a/chromium/patches/patch-ui_strings_translations_app__locale__settings__ja.xtb b/chromium/patches/patch-ui_strings_translations_app__locale__settings__ja.xtb
index 645b2bad83..e026db9207 100644
--- a/chromium/patches/patch-ui_strings_translations_app__locale__settings__ja.xtb
+++ b/chromium/patches/patch-ui_strings_translations_app__locale__settings__ja.xtb
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_strings_translations_app__locale__settings__ja.xtb,v 1.1 2025/02/06 09:58:34 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/strings/translations/app_locale_settings_ja.xtb.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/strings/translations/app_locale_settings_ja.xtb.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/strings/translations/app_locale_settings_ja.xtb
 @@ -12,7 +12,7 @@
  <if expr="is_ios">
diff --git a/chromium/patches/patch-ui_strings_translations_app__locale__settings__ko.xtb b/chromium/patches/patch-ui_strings_translations_app__locale__settings__ko.xtb
index aa3932ae04..730ee84183 100644
--- a/chromium/patches/patch-ui_strings_translations_app__locale__settings__ko.xtb
+++ b/chromium/patches/patch-ui_strings_translations_app__locale__settings__ko.xtb
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_strings_translations_app__locale__settings__ko.xtb,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/strings/translations/app_locale_settings_ko.xtb.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/strings/translations/app_locale_settings_ko.xtb.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/strings/translations/app_locale_settings_ko.xtb
 @@ -12,7 +12,7 @@
  <if expr="is_ios">
diff --git a/chromium/patches/patch-ui_strings_translations_app__locale__settings__ml.xtb b/chromium/patches/patch-ui_strings_translations_app__locale__settings__ml.xtb
index a7bf9398e7..24a3fe7e9b 100644
--- a/chromium/patches/patch-ui_strings_translations_app__locale__settings__ml.xtb
+++ b/chromium/patches/patch-ui_strings_translations_app__locale__settings__ml.xtb
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_strings_translations_app__locale__settings__ml.xtb,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/strings/translations/app_locale_settings_ml.xtb.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/strings/translations/app_locale_settings_ml.xtb.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/strings/translations/app_locale_settings_ml.xtb
 @@ -9,7 +9,7 @@
    <translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,AnjaliOldLipi,Rachana,Kartika</translation>
diff --git a/chromium/patches/patch-ui_strings_translations_app__locale__settings__th.xtb b/chromium/patches/patch-ui_strings_translations_app__locale__settings__th.xtb
index 5f68646a95..0a8071f745 100644
--- a/chromium/patches/patch-ui_strings_translations_app__locale__settings__th.xtb
+++ b/chromium/patches/patch-ui_strings_translations_app__locale__settings__th.xtb
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_strings_translations_app__locale__settings__th.xtb,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/strings/translations/app_locale_settings_th.xtb.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/strings/translations/app_locale_settings_th.xtb.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/strings/translations/app_locale_settings_th.xtb
 @@ -6,7 +6,7 @@
    <translation id="IDS_WEB_FONT_FAMILY">Tahoma,sans-serif</translation>
diff --git a/chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb b/chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
index 1199dd33fb..a25e1f82a1 100644
--- a/chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
+++ b/chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_strings_translations_app__locale__settings__zh-CN.xtb,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/strings/translations/app_locale_settings_zh-CN.xtb.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/strings/translations/app_locale_settings_zh-CN.xtb.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/strings/translations/app_locale_settings_zh-CN.xtb
 @@ -12,7 +12,7 @@
  <if expr="is_ios">
diff --git a/chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb b/chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
index da47fd87c4..4ae9b7786f 100644
--- a/chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
+++ b/chromium/patches/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_strings_translations_app__locale__settings__zh-TW.xtb,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/strings/translations/app_locale_settings_zh-TW.xtb
 @@ -12,7 +12,7 @@
  <if expr="is_ios">
diff --git a/chromium/patches/patch-ui_views_BUILD.gn b/chromium/patches/patch-ui_views_BUILD.gn
new file mode 100644
index 0000000000..a52c6dee52
--- /dev/null
+++ b/chromium/patches/patch-ui_views_BUILD.gn
@@ -0,0 +1,16 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/views/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/views/BUILD.gn
+@@ -839,7 +839,6 @@ component("views") {
+       sources += [ "accessibility/widget_ax_tree_id_map.cc" ]
+     }
+     deps += [
+-      "//components/crash/core/common:crash_key",
+       "//ui/aura",
+       "//ui/base/cursor/mojom:cursor_type_shared",
+       "//ui/events",
diff --git a/chromium/patches/patch-ui_views_accessibility_view__accessibility.cc b/chromium/patches/patch-ui_views_accessibility_view__accessibility.cc
new file mode 100644
index 0000000000..82ccfe7600
--- /dev/null
+++ b/chromium/patches/patch-ui_views_accessibility_view__accessibility.cc
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/views/accessibility/view_accessibility.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/views/accessibility/view_accessibility.cc
+@@ -34,7 +34,7 @@
+ #include "ui/views/accessibility/view_ax_platform_node_delegate_win.h"
+ #elif BUILDFLAG(IS_MAC)
+ #include "ui/views/accessibility/view_ax_platform_node_delegate_mac.h"
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/views/accessibility/view_ax_platform_node_delegate_auralinux.h"
+ #endif
+ 
+@@ -101,7 +101,7 @@ std::unique_ptr<ViewAccessibility> ViewA
+   return ViewAXPlatformNodeDelegateWin::CreatePlatformSpecific(view);
+ #elif BUILDFLAG(IS_MAC)
+   return ViewAXPlatformNodeDelegateMac::CreatePlatformSpecific(view);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return ViewAXPlatformNodeDelegateAuraLinux::CreatePlatformSpecific(view);
+ #endif
+ }
diff --git a/chromium/patches/patch-ui_views_controls_prefix__selector.cc b/chromium/patches/patch-ui_views_controls_prefix__selector.cc
index 6a8e1c6ba1..fd0938b5aa 100644
--- a/chromium/patches/patch-ui_views_controls_prefix__selector.cc
+++ b/chromium/patches/patch-ui_views_controls_prefix__selector.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_controls_prefix__selector.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/controls/prefix_selector.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/controls/prefix_selector.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/controls/prefix_selector.cc
-@@ -178,7 +178,7 @@ bool PrefixSelector::ShouldDoLearning() 
+@@ -192,7 +192,7 @@ bool PrefixSelector::ShouldDoLearning() 
    return false;
  }
  
diff --git a/chromium/patches/patch-ui_views_controls_prefix__selector.h b/chromium/patches/patch-ui_views_controls_prefix__selector.h
index fe1f17f691..67536ce31c 100644
--- a/chromium/patches/patch-ui_views_controls_prefix__selector.h
+++ b/chromium/patches/patch-ui_views_controls_prefix__selector.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_controls_prefix__selector.h,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/controls/prefix_selector.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/controls/prefix_selector.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/controls/prefix_selector.h
-@@ -85,7 +85,7 @@ class VIEWS_EXPORT PrefixSelector : publ
+@@ -91,7 +91,7 @@ class VIEWS_EXPORT PrefixSelector : publ
    ukm::SourceId GetClientSourceForMetrics() const override;
    bool ShouldDoLearning() override;
  
diff --git a/chromium/patches/patch-ui_views_controls_textfield_textfield.cc b/chromium/patches/patch-ui_views_controls_textfield_textfield.cc
index dd82eca205..187fde78b8 100644
--- a/chromium/patches/patch-ui_views_controls_textfield_textfield.cc
+++ b/chromium/patches/patch-ui_views_controls_textfield_textfield.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_views_controls_textfield_textfield.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/controls/textfield/textfield.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/controls/textfield/textfield.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/controls/textfield/textfield.cc
 @@ -87,7 +87,7 @@
  #include "base/win/win_util.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_views_controls_textfield_textfield.cc,v 1.1 2025/02/06 09:58:3
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
-@@ -185,7 +185,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -184,7 +184,7 @@ bool IsControlKeyModifier(int flags) {
  // Control-modified key combination, but we cannot extend it to other platforms
  // as Control has different meanings and behaviors.
  // https://crrev.com/2580483002/#msg46
@@ -24,25 +24,25 @@ $NetBSD: patch-ui_views_controls_textfield_textfield.cc,v 1.1 2025/02/06 09:58:3
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -763,7 +763,7 @@ bool Textfield::OnKeyPressed(const ui::K
-   if (!textfield)
+@@ -791,7 +791,7 @@ bool Textfield::OnKeyPressed(const ui::K
      return handled;
+   }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!handled && linux_ui &&
-@@ -946,7 +946,7 @@ void Textfield::AboutToRequestFocusFromT
+   if (!handled) {
+     if (auto* linux_ui = ui::LinuxUi::instance()) {
+       const auto command =
+@@ -976,7 +976,7 @@ void Textfield::AboutToRequestFocusFromT
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Skip any accelerator handling that conflicts with custom keybindings.
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -1997,7 +1997,7 @@ bool Textfield::ShouldDoLearning() {
+   if (auto* linux_ui = ui::LinuxUi::instance()) {
+     if (IsTextEditCommandEnabled(linux_ui->GetTextEditCommandForEvent(
+@@ -2062,7 +2062,7 @@ bool Textfield::ShouldDoLearning() {
    return false;
  }
  
@@ -51,20 +51,21 @@ $NetBSD: patch-ui_views_controls_textfield_textfield.cc,v 1.1 2025/02/06 09:58:3
  // TODO(crbug.com/41452689): Implement this method to support Korean IME
  // reconversion feature on native text fields (e.g. find bar).
  bool Textfield::SetCompositionFromExistingText(
-@@ -2503,14 +2503,14 @@ ui::TextEditCommand Textfield::GetComman
+@@ -2580,7 +2580,7 @@ ui::TextEditCommand Textfield::GetComman
  #endif
          return ui::TextEditCommand::DELETE_BACKWARD;
        }
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
        // Only erase by line break on Linux and ChromeOS.
-       if (shift)
+       if (shift) {
          return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
+@@ -2588,7 +2588,7 @@ ui::TextEditCommand Textfield::GetComman
  #endif
        return ui::TextEditCommand::DELETE_WORD_BACKWARD;
      case ui::VKEY_DELETE:
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
        // Only erase by line break on Linux and ChromeOS.
-       if (shift && control)
+       if (shift && control) {
          return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
diff --git a/chromium/patches/patch-ui_views_controls_textfield_textfield.h b/chromium/patches/patch-ui_views_controls_textfield_textfield.h
index f774d28041..83f711e3ce 100644
--- a/chromium/patches/patch-ui_views_controls_textfield_textfield.h
+++ b/chromium/patches/patch-ui_views_controls_textfield_textfield.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_views_controls_textfield_textfield.h,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/controls/textfield/textfield.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/controls/textfield/textfield.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/controls/textfield/textfield.h
 @@ -48,7 +48,7 @@
  #include "ui/views/view_observer.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_views_controls_textfield_textfield.h,v 1.1 2025/02/06 09:58:35
  #include <vector>
  #endif
  
-@@ -465,7 +465,7 @@ class VIEWS_EXPORT Textfield : public Vi
+@@ -475,7 +475,7 @@ class VIEWS_EXPORT Textfield : public Vi
    // Set whether the text should be used to improve typing suggestions.
    void SetShouldDoLearning(bool value) { should_do_learning_ = value; }
  
diff --git a/chromium/patches/patch-ui_views_corewm_tooltip__aura.cc b/chromium/patches/patch-ui_views_corewm_tooltip__aura.cc
index 18d86e4ece..a0a861085b 100644
--- a/chromium/patches/patch-ui_views_corewm_tooltip__aura.cc
+++ b/chromium/patches/patch-ui_views_corewm_tooltip__aura.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_views_corewm_tooltip__aura.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/corewm/tooltip_aura.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/corewm/tooltip_aura.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/corewm/tooltip_aura.cc
-@@ -37,7 +37,7 @@ namespace {
+@@ -42,7 +42,7 @@ static constexpr int kTooltipMaxWidth = 
+ 
+ // TODO(varkha): Update if native widget can be transparent on Linux.
  bool CanUseTranslucentTooltipWidget() {
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    return false;
  #else
    return true;
diff --git a/chromium/patches/patch-ui_views_examples_widget__example.cc b/chromium/patches/patch-ui_views_examples_widget__example.cc
index e27d1590d9..4ba2346f20 100644
--- a/chromium/patches/patch-ui_views_examples_widget__example.cc
+++ b/chromium/patches/patch-ui_views_examples_widget__example.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_examples_widget__example.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/examples/widget_example.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/examples/widget_example.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/examples/widget_example.cc
-@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(Vi
+@@ -51,7 +51,7 @@ void WidgetExample::CreateExampleView(Vi
    modal_button->SetCallback(
        base::BindRepeating(&WidgetExample::CreateDialogWidget,
                            base::Unretained(this), modal_button, true));
diff --git a/chromium/patches/patch-ui_views_focus_focus__manager.cc b/chromium/patches/patch-ui_views_focus_focus__manager.cc
index 122957dfee..8638fc6c55 100644
--- a/chromium/patches/patch-ui_views_focus_focus__manager.cc
+++ b/chromium/patches/patch-ui_views_focus_focus__manager.cc
@@ -1,26 +1,26 @@
-$NetBSD: patch-ui_views_focus_focus__manager.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/focus/focus_manager.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/focus/focus_manager.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/focus/focus_manager.cc
-@@ -585,7 +585,7 @@ bool FocusManager::RedirectAcceleratorTo
+@@ -606,7 +606,7 @@ bool FocusManager::RedirectAcceleratorTo
+     return false;
+   }
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Processing an accelerator can delete things. Because we
    // need these objects afterwards on Linux, save widget_ as weak pointer and
    // save the close_on_deactivate property value of widget_delegate in a
-@@ -602,7 +602,7 @@ bool FocusManager::RedirectAcceleratorTo
+@@ -621,7 +621,7 @@ bool FocusManager::RedirectAcceleratorTo
+   const bool accelerator_processed =
+       focus_manager->ProcessAccelerator(accelerator);
  
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Need to manually close the bubble widget on Linux. On Linux when the
    // bubble is shown, the main widget remains active. Because of that when
    // focus is set to the main widget to process accelerator, the main widget
diff --git a/chromium/patches/patch-ui_views_style_platform__style.cc b/chromium/patches/patch-ui_views_style_platform__style.cc
index e0e35615dd..2559714ce5 100644
--- a/chromium/patches/patch-ui_views_style_platform__style.cc
+++ b/chromium/patches/patch-ui_views_style_platform__style.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_style_platform__style.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/style/platform_style.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/style/platform_style.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/style/platform_style.cc
-@@ -17,7 +17,7 @@
+@@ -23,7 +23,7 @@
  #include "ui/views/controls/focusable_border.h"
  #include "ui/views/controls/scrollbar/scroll_bar_views.h"
  
@@ -14,17 +14,8 @@ $NetBSD: patch-ui_views_style_platform__style.cc,v 1.1 2025/02/06 09:58:35 wiz E
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
  #endif
- 
-@@ -50,7 +50,7 @@ const View::FocusBehavior PlatformStyle:
- // Linux clips bubble windows that extend outside their parent window
- // bounds.
- const bool PlatformStyle::kAdjustBubbleIfOffscreen =
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     false;
- #else
-     true;
-@@ -59,7 +59,7 @@ const bool PlatformStyle::kAdjustBubbleI
+ #endif
+@@ -35,7 +35,7 @@ namespace views {
  // static
  std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(
      ScrollBar::Orientation orientation) {
diff --git a/chromium/patches/patch-ui_views_style_platform__style.h b/chromium/patches/patch-ui_views_style_platform__style.h
new file mode 100644
index 0000000000..a3bfc8c38d
--- /dev/null
+++ b/chromium/patches/patch-ui_views_style_platform__style.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/views/style/platform_style.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/views/style/platform_style.h
+@@ -84,7 +84,7 @@ class VIEWS_EXPORT PlatformStyle {
+   // Default setting at bubble creation time for whether arrow will be adjusted
+   // for bubbles going off-screen to bring more bubble area into view. Linux
+   // clips bubble windows that extend outside their parent window bounds.
+-  static constexpr bool kAdjustBubbleIfOffscreen = !BUILDFLAG(IS_LINUX);
++  static constexpr bool kAdjustBubbleIfOffscreen = (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD));
+ 
+   // Default focus behavior on the platform.
+   static constexpr View::FocusBehavior kDefaultFocusBehavior =
diff --git a/chromium/patches/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc b/chromium/patches/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
index 5469cfea82..86b5178711 100644
--- a/chromium/patches/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
+++ b/chromium/patches/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc
@@ -1,14 +1,14 @@
-$NetBSD: patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
-@@ -296,7 +296,7 @@ void UpdateDisplaySync(const std::string
+@@ -237,7 +237,7 @@ bool SendMouseClick(MouseButton type, gf
+                          window_hint);
  }
- #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/chromium/patches/patch-ui_views_views__delegate.cc b/chromium/patches/patch-ui_views_views__delegate.cc
index 419aadafb1..efaba6fe75 100644
--- a/chromium/patches/patch-ui_views_views__delegate.cc
+++ b/chromium/patches/patch-ui_views_views__delegate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_views__delegate.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/views_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/views_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/views_delegate.cc
-@@ -97,7 +97,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx:
+@@ -101,7 +101,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx:
    return false;
  }
  #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \
diff --git a/chromium/patches/patch-ui_views_views__delegate.h b/chromium/patches/patch-ui_views_views__delegate.h
index 00194dc270..f262b49e55 100644
--- a/chromium/patches/patch-ui_views_views__delegate.h
+++ b/chromium/patches/patch-ui_views_views__delegate.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_views__delegate.h,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/views_delegate.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/views_delegate.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/views_delegate.h
-@@ -147,7 +147,7 @@ class VIEWS_EXPORT ViewsDelegate {
+@@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate {
    // environment.
    virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
  #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \
diff --git a/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
index 4bbe1e94b9..2109d7296c 100644
--- a/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
+++ b/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
-@@ -204,7 +204,7 @@ DragOperation DesktopDragDropClientOzone
+@@ -203,7 +203,7 @@ DragOperation DesktopDragDropClientOzone
    return selected_operation_;
  }
  
diff --git a/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
index d4bd245586..05545e7ba4 100644
--- a/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
+++ b/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
 @@ -67,7 +67,7 @@ class VIEWS_EXPORT DesktopDragDropClient
      // The offset of |drag_widget_| relative to the mouse position.
diff --git a/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index c665bf7fda..e1a7b99a7f 100644
--- a/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -49,7 +49,7 @@
+@@ -50,7 +50,7 @@
  #include "ui/wm/core/window_util.h"
  #include "ui/wm/public/window_move_client.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platfo
  #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
  #endif
  
-@@ -359,7 +359,7 @@ std::unique_ptr<aura::client::DragDropCl
+@@ -353,7 +353,7 @@ std::unique_ptr<aura::client::DragDropCl
  DesktopWindowTreeHostPlatform::CreateDragDropClient() {
    ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
    std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
@@ -24,7 +24,7 @@ $NetBSD: patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platfo
        std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
  #else
        std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1176,7 +1176,7 @@ bool DesktopWindowTreeHostPlatform::Rota
+@@ -1185,7 +1185,7 @@ bool DesktopWindowTreeHostPlatform::Rota
  // DesktopWindowTreeHost:
  
  // Linux subclasses this host and adds some Linux specific bits.
diff --git a/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc b/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc
deleted file mode 100644
index 145c0ae5fc..0000000000
--- a/chromium/patches/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig	2024-12-17 17:58:49.000000000 +0000
-+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc
-@@ -23,7 +23,7 @@
- #include "ui/views/widget/widget_delegate.h"
- #include "ui/views/window/native_frame_view.h"
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
- #include "ui/views/widget/desktop_aura/window_event_filter_linux.h"
- using DesktopWindowTreeHostPlatformImpl = views::DesktopWindowTreeHostLinux;
diff --git a/chromium/patches/patch-ui_views_widget_root__view.cc b/chromium/patches/patch-ui_views_widget_root__view.cc
index 66ffd88d36..af490e5c61 100644
--- a/chromium/patches/patch-ui_views_widget_root__view.cc
+++ b/chromium/patches/patch-ui_views_widget_root__view.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_widget_root__view.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/widget/root_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/widget/root_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/widget/root_view.cc
-@@ -110,7 +110,7 @@ class AnnounceTextView : public View {
+@@ -169,7 +169,7 @@ class AnnounceTextView : public View {
  #if BUILDFLAG(IS_CHROMEOS)
      // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting.
      GetViewAccessibility().SetRole(ax::mojom::Role::kStaticText);
diff --git a/chromium/patches/patch-ui_views_widget_widget.cc b/chromium/patches/patch-ui_views_widget_widget.cc
index ac0fc4840b..5df45c1913 100644
--- a/chromium/patches/patch-ui_views_widget_widget.cc
+++ b/chromium/patches/patch-ui_views_widget_widget.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-ui_views_widget_widget.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/widget/widget.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/widget/widget.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/widget/widget.cc
-@@ -59,7 +59,7 @@
+@@ -63,7 +63,7 @@
  #include "ui/views/window/custom_frame_view.h"
  #include "ui/views/window/dialog_delegate.h"
  
@@ -15,12 +15,12 @@ $NetBSD: patch-ui_views_widget_widget.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -2194,7 +2194,7 @@ const ui::NativeTheme* Widget::GetNative
-   if (parent_)
+@@ -2453,7 +2453,7 @@ const ui::NativeTheme* Widget::GetNative
      return parent_->GetNativeTheme();
+   }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow()))
+   if (auto* linux_ui_theme =
+           ui::LinuxUiTheme::GetForWindow(GetNativeWindow())) {
      return linux_ui_theme->GetNativeTheme();
- #endif
diff --git a/chromium/patches/patch-ui_views_widget_widget.h b/chromium/patches/patch-ui_views_widget_widget.h
new file mode 100644
index 0000000000..6b85e3ae40
--- /dev/null
+++ b/chromium/patches/patch-ui_views_widget_widget.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- ui/views/widget/widget.h.orig	2025-05-05 19:21:24.000000000 +0000
++++ ui/views/widget/widget.h
+@@ -487,7 +487,7 @@ class VIEWS_EXPORT Widget : public inter
+     bool force_system_menu_for_frameless = false;
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // Only used by X11, for root level windows. Specifies the res_name and
+     // res_class fields, respectively, of the WM_CLASS window property. Controls
+     // window grouping and desktop file matching in Linux window managers.
diff --git a/chromium/patches/patch-ui_views_window_custom__frame__view.cc b/chromium/patches/patch-ui_views_window_custom__frame__view.cc
index b3c27970d6..fccdbe16e8 100644
--- a/chromium/patches/patch-ui_views_window_custom__frame__view.cc
+++ b/chromium/patches/patch-ui_views_window_custom__frame__view.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_views_window_custom__frame__view.cc,v 1.1 2025/02/06 09:58:35 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/window/custom_frame_view.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/window/custom_frame_view.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/window/custom_frame_view.cc
-@@ -268,7 +268,7 @@ int CustomFrameView::CaptionButtonY() co
+@@ -279,7 +279,7 @@ int CustomFrameView::NonClientTopBorderH
+ int CustomFrameView::CaptionButtonY() const {
+   // Maximized buttons start at window top so that even if their images aren't
    // drawn flush with the screen edge, they still obey Fitts' Law.
- // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return FrameBorderThickness();
  #else
    return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness;
diff --git a/chromium/patches/patch-ui_views_window_dialog__delegate.cc b/chromium/patches/patch-ui_views_window_dialog__delegate.cc
index f98b0b4cd5..fb7d49483a 100644
--- a/chromium/patches/patch-ui_views_window_dialog__delegate.cc
+++ b/chromium/patches/patch-ui_views_window_dialog__delegate.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-ui_views_window_dialog__delegate.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/window/dialog_delegate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/window/dialog_delegate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/window/dialog_delegate.cc
-@@ -105,7 +105,7 @@ Widget* DialogDelegate::CreateDialogWidg
+@@ -106,7 +106,7 @@ Widget* DialogDelegate::CreateDialogWidg
  
  // static
  bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
-     BUILDFLAG(ENABLE_DESKTOP_AURA)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
    // The new style doesn't support unparented dialogs on Linux desktop.
    return parent != nullptr;
+ #else
diff --git a/chromium/patches/patch-ui_views_window_frame__background.cc b/chromium/patches/patch-ui_views_window_frame__background.cc
index 97993a4272..b783b07bf7 100644
--- a/chromium/patches/patch-ui_views_window_frame__background.cc
+++ b/chromium/patches/patch-ui_views_window_frame__background.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-ui_views_window_frame__background.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- ui/views/window/frame_background.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- ui/views/window/frame_background.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ ui/views/window/frame_background.cc
 @@ -110,7 +110,7 @@ void FrameBackground::PaintMaximized(gfx
                                       int width) const {
diff --git a/chromium/patches/patch-v8_BUILD.gn b/chromium/patches/patch-v8_BUILD.gn
index d8b390422c..9db2c2b89f 100644
--- a/chromium/patches/patch-v8_BUILD.gn
+++ b/chromium/patches/patch-v8_BUILD.gn
@@ -1,12 +1,12 @@
-$NetBSD: patch-v8_BUILD.gn,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/BUILD.gn.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/BUILD.gn.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/BUILD.gn
-@@ -929,6 +929,9 @@ external_v8_defines = [
+@@ -1000,6 +1000,9 @@ external_v8_defines = [
    "V8_TARGET_OS_MACOS",
    "V8_TARGET_OS_WIN",
    "V8_TARGET_OS_CHROMEOS",
@@ -16,7 +16,7 @@ $NetBSD: patch-v8_BUILD.gn,v 1.1 2025/02/06 09:58:36 wiz Exp $
  ]
  
  enabled_external_v8_defines = [
-@@ -1005,6 +1008,15 @@ if (target_os == "android") {
+@@ -1079,6 +1082,15 @@ if (target_os == "android") {
  } else if (target_os == "chromeos") {
    enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
    enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ]
@@ -32,7 +32,7 @@ $NetBSD: patch-v8_BUILD.gn,v 1.1 2025/02/06 09:58:36 wiz Exp $
  }
  
  disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines
-@@ -2438,6 +2450,23 @@ action("generate_bytecode_builtins_list"
+@@ -2401,6 +2413,23 @@ action("generate_bytecode_builtins_list"
    ]
  }
  
@@ -56,7 +56,7 @@ $NetBSD: patch-v8_BUILD.gn,v 1.1 2025/02/06 09:58:36 wiz Exp $
  # Template to generate different V8 snapshots based on different runtime flags.
  # Can be invoked with run_mksnapshot(<name>). The target will resolve to
  # run_mksnapshot_<name>. If <name> is "default", no file suffixes will be used.
-@@ -2456,7 +2485,11 @@ template("run_mksnapshot") {
+@@ -2419,7 +2448,11 @@ template("run_mksnapshot") {
      suffix = "_$name"
    }
    action("run_mksnapshot_" + name) {
@@ -69,7 +69,7 @@ $NetBSD: patch-v8_BUILD.gn,v 1.1 2025/02/06 09:58:36 wiz Exp $
      if (v8_verify_deterministic_mksnapshot) {
        # We archive the snapshot executable when verifying snapshot
        # determinism to ease debugging.
-@@ -2563,6 +2596,12 @@ template("run_mksnapshot") {
+@@ -2537,6 +2570,12 @@ template("run_mksnapshot") {
        if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) {
          args += [ "--reorder-builtins" ]
        }
@@ -82,7 +82,7 @@ $NetBSD: patch-v8_BUILD.gn,v 1.1 2025/02/06 09:58:36 wiz Exp $
      }
  
      if (v8_enable_turboshaft_csa) {
-@@ -4658,7 +4697,7 @@ v8_header_set("v8_internal_headers") {
+@@ -4641,7 +4680,7 @@ v8_header_set("v8_internal_headers") {
        # iOS Xcode simulator builds run on an x64 target. iOS and macOS are both
        # based on Darwin and thus POSIX-compliant to a similar degree.
        if (is_linux || is_chromeos || is_mac || is_ios ||
@@ -91,7 +91,7 @@ $NetBSD: patch-v8_BUILD.gn,v 1.1 2025/02/06 09:58:36 wiz Exp $
          sources += [ "src/trap-handler/handler-inside-posix.h" ]
        } else if (is_win) {
          sources += [ "src/trap-handler/handler-inside-win.h" ]
-@@ -6021,7 +6060,7 @@ v8_source_set("v8_base_without_compiler"
+@@ -6003,7 +6042,7 @@ v8_source_set("v8_base_without_compiler"
        # iOS Xcode simulator builds run on an x64 target. iOS and macOS are both
        # based on Darwin and thus POSIX-compliant to a similar degree.
        if (is_linux || is_chromeos || is_mac || is_ios ||
@@ -100,7 +100,7 @@ $NetBSD: patch-v8_BUILD.gn,v 1.1 2025/02/06 09:58:36 wiz Exp $
          sources += [
            "src/trap-handler/handler-inside-posix.cc",
            "src/trap-handler/handler-outside-posix.cc",
-@@ -6636,7 +6675,7 @@ v8_component("v8_libbase") {
+@@ -6631,7 +6670,7 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -109,7 +109,7 @@ $NetBSD: patch-v8_BUILD.gn,v 1.1 2025/02/06 09:58:36 wiz Exp $
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -6647,6 +6686,27 @@ v8_component("v8_libbase") {
+@@ -6642,6 +6681,27 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
diff --git a/chromium/patches/patch-v8_include_v8-internal.h b/chromium/patches/patch-v8_include_v8-internal.h
index 649e26c184..78ec0c3d33 100644
--- a/chromium/patches/patch-v8_include_v8-internal.h
+++ b/chromium/patches/patch-v8_include_v8-internal.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-v8_include_v8-internal.h,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/include/v8-internal.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/include/v8-internal.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/include/v8-internal.h
-@@ -229,7 +229,7 @@ using SandboxedPointer_t = Address;
+@@ -232,7 +232,7 @@ using SandboxedPointer_t = Address;
  #ifdef V8_ENABLE_SANDBOX
  
  // Size of the sandbox, excluding the guard regions surrounding it.
diff --git a/chromium/patches/patch-v8_include_v8config.h b/chromium/patches/patch-v8_include_v8config.h
index fc269907a1..538f594889 100644
--- a/chromium/patches/patch-v8_include_v8config.h
+++ b/chromium/patches/patch-v8_include_v8config.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_include_v8config.h,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/include/v8config.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/include/v8config.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/include/v8config.h
 @@ -201,6 +201,9 @@ path. Add it with -I<path> to the comman
    && !defined(V8_TARGET_OS_FUCHSIA) \
@@ -49,13 +49,11 @@ $NetBSD: patch-v8_include_v8config.h,v 1.1 2025/02/06 09:58:36 wiz Exp $
  #ifdef V8_OS_MACOS
  # define V8_TARGET_OS_MACOS
  #endif
-@@ -381,7 +403,8 @@ path. Add it with -I<path> to the comman
- // preserve_most in clang >= 17 (see https://reviews.llvm.org/D143425).
+@@ -383,6 +405,7 @@ path. Add it with -I<path> to the comman
  #if (defined(_M_X64) || defined(__x86_64__)            /* x64 (everywhere) */  \
       || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */    \
--         && !defined(_WIN32)))                         /* not on windows */    \
-+         && !defined(_WIN32)                           /* not on windows */    \
-+         && !defined(__OpenBSD__)))                    /* not on OpenBSD */    \
+          && !defined(_WIN32)))                         /* not on windows */    \
++     && !defined(__OpenBSD__)                          /* not on OpenBSD */    \
       && !defined(COMPONENT_BUILD)                      /* no component build */\
       && __clang_major__ >= 17                          /* clang >= 17 */
  # define V8_HAS_ATTRIBUTE_PRESERVE_MOST (__has_attribute(preserve_most))
diff --git a/chromium/patches/patch-v8_src_api_api.cc b/chromium/patches/patch-v8_src_api_api.cc
index b732261ba1..209c45d348 100644
--- a/chromium/patches/patch-v8_src_api_api.cc
+++ b/chromium/patches/patch-v8_src_api_api.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-v8_src_api_api.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/api/api.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/api/api.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/api/api.cc
-@@ -151,7 +151,7 @@
+@@ -153,7 +153,7 @@
  #include "src/wasm/wasm-serialization.h"
  #endif  // V8_ENABLE_WEBASSEMBLY
  
@@ -15,7 +15,7 @@ $NetBSD: patch-v8_src_api_api.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
  #include <signal.h>
  #include <unistd.h>
  
-@@ -6559,7 +6559,7 @@ bool v8::V8::Initialize(const int build_
+@@ -6483,7 +6483,7 @@ bool v8::V8::Initialize(const int build_
    return true;
  }
  
diff --git a/chromium/patches/patch-v8_src_base_atomicops.h b/chromium/patches/patch-v8_src_base_atomicops.h
index 6c2dd4d6fd..3137016fbd 100644
--- a/chromium/patches/patch-v8_src_base_atomicops.h
+++ b/chromium/patches/patch-v8_src_base_atomicops.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_base_atomicops.h,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/base/atomicops.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/base/atomicops.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/base/atomicops.h
 @@ -57,10 +57,10 @@ using Atomic64 = SbAtomic64;
  using Atomic8 = char;
diff --git a/chromium/patches/patch-v8_src_base_platform_memory.h b/chromium/patches/patch-v8_src_base_platform_memory.h
index 59e2427701..cd74d1ce1d 100644
--- a/chromium/patches/patch-v8_src_base_platform_memory.h
+++ b/chromium/patches/patch-v8_src_base_platform_memory.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_base_platform_memory.h,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/base/platform/memory.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/base/platform/memory.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/base/platform/memory.h
 @@ -21,13 +21,13 @@
  #include <malloc/malloc.h>
diff --git a/chromium/patches/patch-v8_src_base_platform_platform-freebsd.cc b/chromium/patches/patch-v8_src_base_platform_platform-freebsd.cc
index f089a22410..62d1cdf7d1 100644
--- a/chromium/patches/patch-v8_src_base_platform_platform-freebsd.cc
+++ b/chromium/patches/patch-v8_src_base_platform_platform-freebsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_base_platform_platform-freebsd.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/base/platform/platform-freebsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/base/platform/platform-freebsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/base/platform/platform-freebsd.cc
 @@ -43,14 +43,10 @@ TimezoneCache* OS::CreateTimezoneCache()
    return new PosixDefaultTimezoneCache();
diff --git a/chromium/patches/patch-v8_src_base_platform_platform-openbsd.cc b/chromium/patches/patch-v8_src_base_platform_platform-openbsd.cc
index c613f5f9e0..fcf74fcbc6 100644
--- a/chromium/patches/patch-v8_src_base_platform_platform-openbsd.cc
+++ b/chromium/patches/patch-v8_src_base_platform_platform-openbsd.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_base_platform_platform-openbsd.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/base/platform/platform-openbsd.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/base/platform/platform-openbsd.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/base/platform/platform-openbsd.cc
 @@ -6,6 +6,9 @@
  // POSIX-compatible parts, the implementation is in platform-posix.cc.
diff --git a/chromium/patches/patch-v8_src_base_platform_platform-posix.cc b/chromium/patches/patch-v8_src_base_platform_platform-posix.cc
index 76cc4c288b..7a7c9ba403 100644
--- a/chromium/patches/patch-v8_src_base_platform_platform-posix.cc
+++ b/chromium/patches/patch-v8_src_base_platform_platform-posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_base_platform_platform-posix.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/base/platform/platform-posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/base/platform/platform-posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/base/platform/platform-posix.cc
 @@ -27,6 +27,9 @@
      defined(__NetBSD__) || defined(__OpenBSD__)
@@ -16,7 +16,7 @@ $NetBSD: patch-v8_src_base_platform_platform-posix.cc,v 1.1 2025/02/06 09:58:36
  
  #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
  #define LOG_TAG "v8"
-@@ -75,9 +78,11 @@
+@@ -76,9 +79,11 @@
  #include <sys/syscall.h>
  #endif
  
@@ -29,7 +29,7 @@ $NetBSD: patch-v8_src_base_platform_platform-posix.cc,v 1.1 2025/02/06 09:58:36
  
  #if defined(V8_OS_SOLARIS)
  #if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE > 2) || defined(__EXTENSIONS__)
-@@ -314,6 +319,13 @@ void OS::SetRandomMmapSeed(int64_t seed)
+@@ -315,6 +320,13 @@ void OS::SetRandomMmapSeed(int64_t seed)
    }
  }
  
@@ -43,7 +43,7 @@ $NetBSD: patch-v8_src_base_platform_platform-posix.cc,v 1.1 2025/02/06 09:58:36
  // static
  void* OS::GetRandomMmapAddr() {
    uintptr_t raw_addr;
-@@ -412,6 +424,7 @@ void* OS::GetRandomMmapAddr() {
+@@ -413,6 +425,7 @@ void* OS::GetRandomMmapAddr() {
  #endif
    return reinterpret_cast<void*>(raw_addr);
  }
@@ -51,7 +51,7 @@ $NetBSD: patch-v8_src_base_platform_platform-posix.cc,v 1.1 2025/02/06 09:58:36
  
  // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files.
  #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA
-@@ -700,7 +713,7 @@ void OS::DestroySharedMemoryHandle(Platf
+@@ -701,7 +714,7 @@ void OS::DestroySharedMemoryHandle(Platf
  #if !V8_OS_ZOS
  // static
  bool OS::HasLazyCommits() {
@@ -60,7 +60,7 @@ $NetBSD: patch-v8_src_base_platform_platform-posix.cc,v 1.1 2025/02/06 09:58:36
    return true;
  #else
    // TODO(bbudge) Return true for all POSIX platforms.
-@@ -855,6 +868,8 @@ int OS::GetCurrentThreadId() {
+@@ -855,6 +868,8 @@ int OS::GetCurrentThreadIdInternal() {
    return static_cast<int>(thread_self());
  #elif V8_OS_FUCHSIA
    return static_cast<int>(zx_thread_self());
diff --git a/chromium/patches/patch-v8_src_base_small-vector.h b/chromium/patches/patch-v8_src_base_small-vector.h
deleted file mode 100644
index 3fe71b85ee..0000000000
--- a/chromium/patches/patch-v8_src_base_small-vector.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-v8_src_base_small-vector.h,v 1.1 2025/02/06 09:58:36 wiz Exp $
-
-* Part of patchset to build chromium on NetBSD
-* Based on OpenBSD's chromium patches, and
-  pkgsrc's qt5-qtwebengine patches
-
---- v8/src/base/small-vector.h.orig	2024-12-17 17:58:49.000000000 +0000
-+++ v8/src/base/small-vector.h
-@@ -22,7 +22,7 @@ template <typename T, size_t kSize, type
- class SmallVector {
-   // Currently only support trivially copyable and trivially destructible data
-   // types, as it uses memcpy to copy elements and never calls destructors.
--  ASSERT_TRIVIALLY_COPYABLE(T);
-+  // XXX FREEBSD ASSERT_TRIVIALLY_COPYABLE(T);
-   static_assert(std::is_trivially_destructible<T>::value);
- 
-  public:
diff --git a/chromium/patches/patch-v8_src_base_strings.h b/chromium/patches/patch-v8_src_base_strings.h
index 493286e7c5..850ec1b473 100644
--- a/chromium/patches/patch-v8_src_base_strings.h
+++ b/chromium/patches/patch-v8_src_base_strings.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_base_strings.h,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/base/strings.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/base/strings.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/base/strings.h
 @@ -8,6 +8,9 @@
  #include "src/base/base-export.h"
diff --git a/chromium/patches/patch-v8_src_base_sys-info.cc b/chromium/patches/patch-v8_src_base_sys-info.cc
index b54b188b1b..79ff2b8e04 100644
--- a/chromium/patches/patch-v8_src_base_sys-info.cc
+++ b/chromium/patches/patch-v8_src_base_sys-info.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_base_sys-info.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/base/sys-info.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/base/sys-info.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/base/sys-info.cc
 @@ -35,8 +35,12 @@ namespace base {
  
diff --git a/chromium/patches/patch-v8_src_base_utils_random-number-generator.cc b/chromium/patches/patch-v8_src_base_utils_random-number-generator.cc
index 36292ac882..1b7073ad35 100644
--- a/chromium/patches/patch-v8_src_base_utils_random-number-generator.cc
+++ b/chromium/patches/patch-v8_src_base_utils_random-number-generator.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_base_utils_random-number-generator.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/base/utils/random-number-generator.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/base/utils/random-number-generator.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/base/utils/random-number-generator.cc
 @@ -56,7 +56,7 @@ RandomNumberGenerator::RandomNumberGener
    DCHECK_EQ(0, result);
diff --git a/chromium/patches/patch-v8_src_diagnostics_perf-jit.cc b/chromium/patches/patch-v8_src_diagnostics_perf-jit.cc
index b4b9f43cee..8846e4121a 100644
--- a/chromium/patches/patch-v8_src_diagnostics_perf-jit.cc
+++ b/chromium/patches/patch-v8_src_diagnostics_perf-jit.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_diagnostics_perf-jit.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/diagnostics/perf-jit.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/diagnostics/perf-jit.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/diagnostics/perf-jit.cc
 @@ -31,7 +31,7 @@
  #include "src/flags/flags.h"
diff --git a/chromium/patches/patch-v8_src_diagnostics_perf-jit.h b/chromium/patches/patch-v8_src_diagnostics_perf-jit.h
index 8850d271bc..ced129256c 100644
--- a/chromium/patches/patch-v8_src_diagnostics_perf-jit.h
+++ b/chromium/patches/patch-v8_src_diagnostics_perf-jit.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_diagnostics_perf-jit.h,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/diagnostics/perf-jit.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/diagnostics/perf-jit.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/diagnostics/perf-jit.h
 @@ -31,7 +31,7 @@
  #include "include/v8config.h"
diff --git a/chromium/patches/patch-v8_src_execution_isolate.cc b/chromium/patches/patch-v8_src_execution_isolate.cc
index b54184788b..bcb5e73bb1 100644
--- a/chromium/patches/patch-v8_src_execution_isolate.cc
+++ b/chromium/patches/patch-v8_src_execution_isolate.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-v8_src_execution_isolate.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/execution/isolate.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/execution/isolate.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/execution/isolate.cc
-@@ -168,6 +168,10 @@
+@@ -173,6 +173,10 @@
  #include "src/execution/simulator-base.h"
  #endif
  
@@ -17,7 +17,7 @@ $NetBSD: patch-v8_src_execution_isolate.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
  extern "C" const uint8_t v8_Default_embedded_blob_code_[];
  extern "C" uint32_t v8_Default_embedded_blob_code_size_;
  extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -4996,6 +5000,13 @@ void Isolate::InitializeDefaultEmbeddedB
+@@ -5115,6 +5119,13 @@ void Isolate::InitializeDefaultEmbeddedB
    const uint8_t* data = DefaultEmbeddedBlobData();
    uint32_t data_size = DefaultEmbeddedBlobDataSize();
  
diff --git a/chromium/patches/patch-v8_src_flags_flags.cc b/chromium/patches/patch-v8_src_flags_flags.cc
index 84a81fd9b6..b993ed2bc5 100644
--- a/chromium/patches/patch-v8_src_flags_flags.cc
+++ b/chromium/patches/patch-v8_src_flags_flags.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_flags_flags.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/flags/flags.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/flags/flags.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/flags/flags.cc
 @@ -16,6 +16,10 @@
  #include <set>
@@ -14,10 +14,10 @@ $NetBSD: patch-v8_src_flags_flags.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
 +#include <sys/mman.h>
 +#endif
 +
- #include "src/base/functional.h"
+ #include "src/base/hashing.h"
  #include "src/base/lazy-instance.h"
  #include "src/base/platform/platform.h"
-@@ -807,6 +811,10 @@ void FlagList::FreezeFlags() {
+@@ -823,6 +827,10 @@ void FlagList::FreezeFlags() {
    // Note that for string flags we only protect the pointer itself, but not the
    // string storage. TODO(12887): Fix this.
    base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags));
diff --git a/chromium/patches/patch-v8_src_libsampler_sampler.cc b/chromium/patches/patch-v8_src_libsampler_sampler.cc
new file mode 100644
index 0000000000..bc49b87cd1
--- /dev/null
+++ b/chromium/patches/patch-v8_src_libsampler_sampler.cc
@@ -0,0 +1,25 @@
+$NetBSD$
+
+* Part of patchset to build chromium on NetBSD
+* Based on OpenBSD's chromium patches, and
+  pkgsrc's qt5-qtwebengine patches
+
+--- v8/src/libsampler/sampler.cc.orig	2025-05-05 19:21:24.000000000 +0000
++++ v8/src/libsampler/sampler.cc
+@@ -520,6 +520,16 @@ void SignalHandler::FillRegisterState(vo
+   state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]);
+   state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]);
+   state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]);
++#elif V8_HOST_ARCH_ARM64
++#ifdef __CHERI_PURE_CAPABILITY__
++  state->pc = reinterpret_cast<void*>(mcontext.mc_capregs.cap_elr);
++  state->sp = reinterpret_cast<void*>(mcontext.mc_capregs.cap_sp);
++  state->fp = reinterpret_cast<void*>(mcontext.mc_capregs.cap_x[29]);
++#else   // !__CHERI_PURE_CAPABILITY__
++  state->pc = reinterpret_cast<void*>(mcontext.mc_gpregs.gp_elr);
++  state->sp = reinterpret_cast<void*>(mcontext.mc_gpregs.gp_sp);
++  state->fp = reinterpret_cast<void*>(mcontext.mc_gpregs.gp_x[29]);
++#endif  // __CHERI_PURE_CAPABILITY__
+ #endif  // V8_HOST_ARCH_*
+ #elif V8_OS_NETBSD
+ #if V8_HOST_ARCH_IA32
diff --git a/chromium/patches/patch-v8_src_sandbox_sandbox.cc b/chromium/patches/patch-v8_src_sandbox_sandbox.cc
index 82a39dd98d..139a228f0f 100644
--- a/chromium/patches/patch-v8_src_sandbox_sandbox.cc
+++ b/chromium/patches/patch-v8_src_sandbox_sandbox.cc
@@ -1,12 +1,12 @@
-$NetBSD: patch-v8_src_sandbox_sandbox.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/sandbox/sandbox.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/sandbox/sandbox.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/sandbox/sandbox.cc
-@@ -48,7 +48,7 @@ static Address DetermineAddressSpaceLimi
+@@ -59,7 +59,7 @@ static Address DetermineAddressSpaceLimi
    }
  #endif  // V8_TARGET_ARCH_X64
  
diff --git a/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
index 7cfc0d234e..4f900d3c5c 100644
--- a/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
+++ b/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
 @@ -148,6 +148,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(cons
      return EmbeddedTargetOs::kStarboard;
diff --git a/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h b/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
index 11884847e1..a3bc799e65 100644
--- a/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
+++ b/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.h
 @@ -36,6 +36,7 @@ enum class EmbeddedTargetOs {
    kWin,
diff --git a/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
index 3aea1df1d7..136de90eed 100644
--- a/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
+++ b/chromium/patches/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc,v 1.1 2025/02/06 09:58:36 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
 @@ -9,6 +9,10 @@
  
diff --git a/chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.cc b/chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.cc
index fdbfe98b13..413b6d3207 100644
--- a/chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.cc
+++ b/chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_trap-handler_handler-inside-posix.cc,v 1.1 2025/02/06 09:58:37 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/trap-handler/handler-inside-posix.cc.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/trap-handler/handler-inside-posix.cc.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/trap-handler/handler-inside-posix.cc
 @@ -27,7 +27,7 @@
  
diff --git a/chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.h b/chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.h
index 3536f2b397..61718f3ad8 100644
--- a/chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.h
+++ b/chromium/patches/patch-v8_src_trap-handler_handler-inside-posix.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_trap-handler_handler-inside-posix.h,v 1.1 2025/02/06 09:58:37 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/trap-handler/handler-inside-posix.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/trap-handler/handler-inside-posix.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/trap-handler/handler-inside-posix.h
 @@ -13,7 +13,7 @@ namespace v8 {
  namespace internal {
diff --git a/chromium/patches/patch-v8_src_trap-handler_trap-handler.h b/chromium/patches/patch-v8_src_trap-handler_trap-handler.h
index d29d394a90..9287eebf4e 100644
--- a/chromium/patches/patch-v8_src_trap-handler_trap-handler.h
+++ b/chromium/patches/patch-v8_src_trap-handler_trap-handler.h
@@ -1,17 +1,17 @@
-$NetBSD: patch-v8_src_trap-handler_trap-handler.h,v 1.1 2025/02/06 09:58:37 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/trap-handler/trap-handler.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/trap-handler/trap-handler.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/trap-handler/trap-handler.h
-@@ -20,7 +20,7 @@ namespace trap_handler {
+@@ -18,7 +18,7 @@ namespace v8::internal::trap_handler {
  // X64 on Linux, Windows, MacOS, FreeBSD.
  #if V8_HOST_ARCH_X64 && V8_TARGET_ARCH_X64 &&                        \
      ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_DARWIN || \
 -     V8_OS_FREEBSD)
 +     V8_OS_FREEBSD || V8_OS_OPENBSD || V8_OS_NETBSD)
  #define V8_TRAP_HANDLER_SUPPORTED true
- // Arm64 (non-simulator) on Mac and Linux.
+ // Arm64 (non-simulator) on Linux, Windows, MacOS.
  #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && \
diff --git a/chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
index dd454dedf3..d9cec1ee14 100644
--- a/chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
+++ b/chromium/patches/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h,v 1.1 2025/02/06 09:58:37 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h
 @@ -579,7 +579,7 @@ void LiftoffAssembler::StoreTaggedPointe
  }
diff --git a/chromium/patches/patch-v8_tools_run-paxctl.py b/chromium/patches/patch-v8_tools_run-paxctl.py
index d4b62e3763..254a8eb954 100644
--- a/chromium/patches/patch-v8_tools_run-paxctl.py
+++ b/chromium/patches/patch-v8_tools_run-paxctl.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-v8_tools_run-paxctl.py,v 1.1 2025/02/06 09:58:37 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/tools/run-paxctl.py.orig	2024-12-21 10:25:11.280390780 +0000
+--- v8/tools/run-paxctl.py.orig	2025-05-08 12:01:57.924673269 +0000
 +++ v8/tools/run-paxctl.py
 @@ -0,0 +1,16 @@
 +#!@PYTHONBIN@
diff --git a/chromium/patches/patch-v8_tools_run.py b/chromium/patches/patch-v8_tools_run.py
index 142c63dc4b..7003e21571 100644
--- a/chromium/patches/patch-v8_tools_run.py
+++ b/chromium/patches/patch-v8_tools_run.py
@@ -1,17 +1,17 @@
-$NetBSD: patch-v8_tools_run.py,v 1.1 2025/02/06 09:58:37 wiz Exp $
+$NetBSD$
 
 * Part of patchset to build chromium on NetBSD
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- v8/tools/run.py.orig	2024-12-17 17:58:49.000000000 +0000
+--- v8/tools/run.py.orig	2025-05-05 19:21:24.000000000 +0000
 +++ v8/tools/run.py
 @@ -21,7 +21,7 @@ if cmd and cmd[0] == '--redirect-stdout'
    kwargs = dict(stdout=subprocess.PIPE)
    cmd = cmd[2:]
  
 -process = subprocess.Popen(cmd, **kwargs)
-+process = subprocess.Popen(cmd, env={"LD_LIBRARY_PATH":"${WRKSRC}/out/Release"}, **kwargs)
++process = subprocess.Popen(cmd, env={"LD_LIBRARY_PATH":"@WRKSRC@/out/Release"}, **kwargs)
  stdout, _ = process.communicate()
  if stdout_file:
    with stdout_file.open('w') as f:
diff --git a/chromium/tests.mk b/chromium/tests.mk
index 9115e4f084..ba3a6797b1 100644
--- a/chromium/tests.mk
+++ b/chromium/tests.mk
@@ -1,9 +1,9 @@
-# $NetBSD: tests.mk,v 1.1 2025/02/06 09:57:38 wiz Exp $
+# $NetBSD$
 
 REGRESS_DISTFILE=		chromium-${VERSION}-testdata${EXTRACT_SUFX_C}
 DISTFILES+=			${REGRESS_DISTFILE}
 EXTRACT_ONLY=			${DISTNAME}${EXTRACT_SUFX_C}
-EXTRACT_ONLY+=			${PROFILE_DISTFILES}
+#EXTRACT_ONLY+=			${PROFILE_DISTFILES}
 EXTRACT_ONLY+=			${_GITHUB_DEFAULT_DISTFILES}
 
 USE_TOOLS+=	xzcat gzip tar


Home | Main Index | Thread Index | Old Index