aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2022-05-19 14:34:10 +0000
committerRene Ladan <rene@FreeBSD.org>2022-05-24 19:51:52 +0000
commit6dc209ad0a874c8fbc80859c217ecea69f6b0ade (patch)
tree5cc4e048c366844c7bc17e9a6bdebeab1e212521
parent2a994d8766008f1a2b7d1f4e681b5fd5dae07b48 (diff)
downloadports-6dc209ad0a874c8fbc80859c217ecea69f6b0ade.tar.gz
ports-6dc209ad0a874c8fbc80859c217ecea69f6b0ade.zip
www/chromium: update to 102.0.5005.61
Security: 40e2c35e-db99-11ec-b0cf-3065ec8fd3ec
-rw-r--r--www/chromium/Makefile7
-rw-r--r--www/chromium/distinfo10
-rw-r--r--www/chromium/files/patch-BUILD.gn22
-rw-r--r--www/chromium/files/patch-base_BUILD.gn24
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h11
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h29
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc11
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc14
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h12
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h11
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h13
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc38
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc4
-rw-r--r--www/chromium/files/patch-base_atomicops.h4
-rw-r--r--www/chromium/files/patch-base_files_file__path__watcher__unittest.cc8
-rw-r--r--www/chromium/files/patch-base_files_file__util__posix.cc4
-rw-r--r--www/chromium/files/patch-base_i18n_icu__util.cc4
-rw-r--r--www/chromium/files/patch-base_linux__util.cc8
-rw-r--r--www/chromium/files/patch-base_memory_discardable__memory.cc10
-rw-r--r--www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc6
-rw-r--r--www/chromium/files/patch-base_memory_platform__shared__memory__region.h12
-rw-r--r--www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc12
-rw-r--r--www/chromium/files/patch-base_native__library__posix.cc4
-rw-r--r--www/chromium/files/patch-base_process_kill.h4
-rw-r--r--www/chromium/files/patch-base_process_kill__posix.cc4
-rw-r--r--www/chromium/files/patch-base_process_launch.h4
-rw-r--r--www/chromium/files/patch-base_process_process__metrics.cc6
-rw-r--r--www/chromium/files/patch-base_process_process__metrics.h26
-rw-r--r--www/chromium/files/patch-base_process_process__posix.cc10
-rw-r--r--www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc4
-rw-r--r--www/chromium/files/patch-base_synchronization_lock__impl.h14
-rw-r--r--www/chromium/files/patch-base_system_sys__info.cc4
-rw-r--r--www/chromium/files/patch-base_third__party_libevent_BUILD.gn101
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread.h4
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__linux.cc18
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__posix.cc6
-rw-r--r--www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc18
-rw-r--r--www/chromium/files/patch-build_config_compiler_BUILD.gn39
-rw-r--r--www/chromium/files/patch-build_config_linux_BUILD.gn8
-rw-r--r--www/chromium/files/patch-build_toolchain_gcc__toolchain.gni4
-rw-r--r--www/chromium/files/patch-chrome_app_app__management__strings.grdp11
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main__delegate.cc24
-rw-r--r--www/chromium/files/patch-chrome_app_chromium__strings.grd15
-rw-r--r--www/chromium/files/patch-chrome_app_generated__resources.grd34
-rw-r--r--www/chromium/files/patch-chrome_app_google__chrome__strings.grd15
-rw-r--r--www/chromium/files/patch-chrome_app_settings__strings.grdp6
-rw-r--r--www/chromium/files/patch-chrome_app_theme_theme__resources.grd41
-rw-r--r--www/chromium/files/patch-chrome_browser_about__flags.cc37
-rw-r--r--www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__resources.grd11
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc41
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc30
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_component__updater_registration.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__commands.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__file__picker.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__item__model.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h12
-rw-r--r--www/chromium/files/patch-chrome_browser_media_audio__service__util.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc15
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc43
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc17
-rw-r--r--www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts10
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html10
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts22
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_route.ts4
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc38
-rw-r--r--www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.h20
-rw-r--r--www/chromium/files/patch-chrome_browser_signin_signin__util.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__service.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__commands.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__commands.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc17
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tab__dialogs__views.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc13
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc15
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc14
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.cc18
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.h12
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.h4
-rw-r--r--www/chromium/files/patch-chrome_common_extensions_command.cc6
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.cc20
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h16
-rw-r--r--www/chromium/files/patch-chrome_common_url__constants.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_url__constants.h4
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.cc12
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.h8
-rw-r--r--www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc4
-rw-r--r--www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc8
-rw-r--r--www/chromium/files/patch-chrome_test_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_updater_installer.cc10
-rw-r--r--www/chromium/files/patch-chrome_updater_lib__util.cc11
-rw-r--r--www/chromium/files/patch-chrome_updater_util.cc4
-rw-r--r--www/chromium/files/patch-chrome_utility_services.cc10
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc8
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc8
-rw-r--r--www/chromium/files/patch-components_autofill__payments__strings.grdp6
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc4
-rw-r--r--www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc4
-rw-r--r--www/chromium/files/patch-components_components__chromium__strings.grd11
-rw-r--r--www/chromium/files/patch-components_components__google__chrome__strings.grd11
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc4
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc6
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.h6
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.cc6
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.h12
-rw-r--r--www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc4
-rw-r--r--www/chromium/files/patch-components_flags__ui_flags__state.cc4
-rw-r--r--www/chromium/files/patch-components_live__caption_caption__util.cc11
-rw-r--r--www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc4
-rw-r--r--www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc4
-rw-r--r--www/chromium/files/patch-components_new__or__sad__tab__strings.grdp37
-rw-r--r--www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc4
-rw-r--r--www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc4
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc6
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc8
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h10
-rw-r--r--www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc4
-rw-r--r--www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc12
-rw-r--r--www/chromium/files/patch-components_policy_resources_policy__templates.json44
-rw-r--r--www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc4
-rw-r--r--www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc10
-rw-r--r--www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc6
-rw-r--r--www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc4
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc4
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h6
-rw-r--r--www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc4
-rw-r--r--www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h4
-rw-r--r--www/chromium/files/patch-content_app_content__main__runner__impl.cc24
-rw-r--r--www/chromium/files/patch-content_browser_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_browser_browser__main__loop.cc10
-rw-r--r--www/chromium/files/patch-content_browser_font__access_font__enumeration__data__source.cc4
-rw-r--r--www/chromium/files/patch-content_browser_gpu_compositor__util.cc6
-rw-r--r--www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc20
-rw-r--r--www/chromium/files/patch-content_browser_media_media__interface__proxy.cc20
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc6
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc8
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.h10
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc8
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc10
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc12
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h4
-rw-r--r--www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc21
-rw-r--r--www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc4
-rw-r--r--www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc6
-rw-r--r--www/chromium/files/patch-content_child_child__process.cc4
-rw-r--r--www/chromium/files/patch-content_common_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_common_font__list__unittest.cc4
-rw-r--r--www/chromium/files/patch-content_common_user__agent.cc6
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__main.cc14
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc8
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.cc8
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.h4
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.cc6
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.h6
-rw-r--r--www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc11
-rw-r--r--www/chromium/files/patch-content_renderer_render__process__impl.cc12
-rw-r--r--www/chromium/files/patch-content_renderer_render__thread__impl.cc12
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc12
-rw-r--r--www/chromium/files/patch-content_shell_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc6
-rw-r--r--www/chromium/files/patch-content_test_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_utility_utility__main.cc37
-rw-r--r--www/chromium/files/patch-content_zygote_zygote__linux.cc4
-rw-r--r--www/chromium/files/patch-extensions_browser_extension__prefs.cc4
-rw-r--r--www/chromium/files/patch-extensions_common_api___permission__features.json8
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__gl__texture.cc11
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__gl__texture.cc11
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc15
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc8
-rw-r--r--www/chromium/files/patch-gpu_config_gpu__control__list.cc6
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__init.cc4
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc4
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc4
-rw-r--r--www/chromium/files/patch-headless_public_headless__browser.cc11
-rw-r--r--www/chromium/files/patch-ipc_ipc__channel__common.cc4
-rw-r--r--www/chromium/files/patch-ipc_ipc__message__utils.cc4
-rw-r--r--www/chromium/files/patch-ipc_ipc__message__utils.h4
-rw-r--r--www/chromium/files/patch-media_BUILD.gn4
-rw-r--r--www/chromium/files/patch-media_audio_audio__input__device.cc4
-rw-r--r--www/chromium/files/patch-media_base_media__switches.cc24
-rw-r--r--www/chromium/files/patch-media_base_media__switches.h13
-rw-r--r--www/chromium/files/patch-media_base_supported__types.cc11
-rw-r--r--www/chromium/files/patch-media_base_video__frame.cc14
-rw-r--r--www/chromium/files/patch-media_base_video__frame.h12
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc4
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h4
-rw-r--r--www/chromium/files/patch-media_gpu_buffer__validation.cc6
-rw-r--r--www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc6
-rw-r--r--www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc26
-rw-r--r--www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h16
-rw-r--r--www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc29
-rw-r--r--www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h11
-rw-r--r--www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc4
-rw-r--r--www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc4
-rw-r--r--www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc6
-rw-r--r--www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc4
-rw-r--r--www/chromium/files/patch-media_webrtc_audio__processor.cc4
-rw-r--r--www/chromium/files/patch-media_webrtc_helpers__unittests.cc4
-rw-r--r--www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd11
-rw-r--r--www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni4
-rw-r--r--www/chromium/files/patch-net_BUILD.gn29
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier.cc6
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier__posix.cc4
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc4
-rw-r--r--www/chromium/files/patch-net_dns_BUILD.gn8
-rw-r--r--www/chromium/files/patch-net_dns_host__resolver__manager.cc6
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc8
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc4
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__posix.cc15
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__unittest.cc12
-rw-r--r--www/chromium/files/patch-net_third__party_quiche_BUILD.gn22
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context.cc4
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context.h4
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context__builder.cc4
-rw-r--r--www/chromium/files/patch-printing_print__settings.cc15
-rw-r--r--www/chromium/files/patch-printing_print__settings__conversion.cc10
-rw-r--r--www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc4
-rw-r--r--www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc19
-rw-r--r--www/chromium/files/patch-remoting_resources_remoting__strings.grd6
-rw-r--r--www/chromium/files/patch-sandbox_policy_sandbox__type.cc46
-rw-r--r--www/chromium/files/patch-sandbox_policy_switches.cc13
-rw-r--r--www/chromium/files/patch-sandbox_policy_switches.h13
-rw-r--r--www/chromium/files/patch-services_device_hid_hid__service.cc6
-rw-r--r--www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc6
-rw-r--r--www/chromium/files/patch-services_network_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h6
-rw-r--r--www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_endian.h11
-rw-r--r--www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h13
-rw-r--r--www/chromium/files/patch-third__party_angle_BUILD.gn8
-rw-r--r--www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp4
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp4
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp4
-rw-r--r--www/chromium/files/patch-third__party_angle_util_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h8
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json562
-rw-r--r--www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni4
-rw-r--r--www/chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h10
-rw-r--r--www/chromium/files/patch-third__party_dawn_generator_dawn__version__generator.py22
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h2072
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h2066
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm2070
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h2072
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h2066
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm2070
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h2070
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h2066
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c6
-rw-r--r--www/chromium/files/patch-third__party_ipcz_src_standalone_base_logging.cc12
-rw-r--r--www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc4
-rw-r--r--www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c25
-rw-r--r--www/chromium/files/patch-third__party_libxml_src_dict.c14
-rw-r--r--www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc4
-rw-r--r--www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_strutil.h18
-rw-r--r--www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h11
-rw-r--r--www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c6
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp4
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp13
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h83
-rw-r--r--www/chromium/files/patch-third__party_usrsctp_BUILD.gn11
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.c10
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h12
-rw-r--r--www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc8
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn4
-rw-r--r--www/chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py4
-rw-r--r--www/chromium/files/patch-ui_aura_screen__ozone.cc11
-rw-r--r--www/chromium/files/patch-ui_aura_screen__ozone.h11
-rw-r--r--www/chromium/files/patch-ui_base_cursor_cursor__factory.cc4
-rw-r--r--www/chromium/files/patch-ui_base_ime_text__input__client.h4
-rw-r--r--www/chromium/files/patch-ui_base_webui_web__ui__util.cc4
-rw-r--r--www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc4
-rw-r--r--www/chromium/files/patch-ui_color_color__id.h4
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.cc4
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.h4
-rw-r--r--www/chromium/files/patch-ui_display_screen.cc11
-rw-r--r--www/chromium/files/patch-ui_display_screen.h29
-rw-r--r--www/chromium/files/patch-ui_gfx_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc12
-rw-r--r--www/chromium/files/patch-ui_gfx_x_window__cache.cc18
-rw-r--r--www/chromium/files/patch-ui_gl_BUILD.gn12
-rw-r--r--www/chromium/files/patch-ui_gl_generate__bindings.py4
-rw-r--r--www/chromium/files/patch-ui_gl_gl__context.cc4
-rw-r--r--www/chromium/files/patch-ui_gl_gl__features.cc4
-rw-r--r--www/chromium/files/patch-ui_gl_gl__implementation.cc11
-rw-r--r--www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h6
-rw-r--r--www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc6
-rw-r--r--www/chromium/files/patch-ui_strings_app__locale__settings.grd4
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb11
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb11
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb11
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb11
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__th.xtb11
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb11
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb11
-rw-r--r--www/chromium/files/patch-ui_views_controls_textfield_textfield.cc10
-rw-r--r--www/chromium/files/patch-ui_views_focus_focus__manager.cc6
-rw-r--r--www/chromium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc20
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc4
-rw-r--r--www/chromium/files/patch-ui_views_widget_widget.cc4
-rw-r--r--www/chromium/files/patch-ui_views_window_dialog__delegate.cc4
-rw-r--r--www/chromium/files/patch-ui_webui_resources_js_cr.js4
-rw-r--r--www/chromium/files/patch-v8_BUILD.gn8
-rw-r--r--www/chromium/files/patch-v8_src_api_api.cc6
-rw-r--r--www/chromium/files/patch-v8_src_base_atomicops.h6
-rw-r--r--www/chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc6
-rw-r--r--www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h16
-rw-r--r--www/chromium/files/patch-v8_tools_run.py4
-rw-r--r--www/chromium/pkg-plist6
382 files changed, 8459 insertions, 11904 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 3d4429ee6d80..0f1af3a86296 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,7 +1,7 @@
# Created by: Florent Thoumie <flz@FreeBSD.org>
PORTNAME= chromium
-PORTVERSION= 101.0.4951.67
+PORTVERSION= 102.0.5005.61
CATEGORIES= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:fonts
@@ -321,12 +321,7 @@ do-install:
# SwiftShader
.if ${ARCH} != aarch64
- @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR}
-.for g in libEGL.so libGLESv2.so
- ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \
- ${STAGEDIR}${DATADIR}/swiftshader
-.endfor
.endif
post-install-DEBUG-on:
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 0e418263b579..9056d6f260f6 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1652513853
-SHA256 (chromium-101.0.4951.67.tar.xz) = d419af6fd170d02008b7f78086af11d8e0980618584dc6267ac20e97a4e6e361
-SIZE (chromium-101.0.4951.67.tar.xz) = 1414904488
-SHA256 (chromium-101.0.4951.67-testdata.tar.xz) = 271f168770dc1a09f8aac194abdf8c53b8fffe3ca7cb03472a04b37146aad462
-SIZE (chromium-101.0.4951.67-testdata.tar.xz) = 260656956
+TIMESTAMP = 1652962621
+SHA256 (chromium-102.0.5005.61.tar.xz) = 1a3797d36901fa3ba63744b9a870b65a8890c9a850442c160196bc64df886b1f
+SIZE (chromium-102.0.5005.61.tar.xz) = 1433350708
+SHA256 (chromium-102.0.5005.61-testdata.tar.xz) = 463cd2d0fb101d16bd931814037625d092a65ed4a3b99249d2948201b2fe5805
+SIZE (chromium-102.0.5005.61-testdata.tar.xz) = 260757092
SHA256 (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
SIZE (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = 26759650
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 67d26dc553f0..98eca15f4c7c 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ BUILD.gn
@@ -54,7 +54,7 @@ declare_args() {
root_extra_deps = []
@@ -9,7 +9,15 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
-@@ -436,7 +436,7 @@ group("gn_all") {
+@@ -86,7 +86,6 @@ group("gn_all") {
+ "//codelabs",
+ "//components:components_unittests",
+ "//components/gwp_asan:gwp_asan_unittests",
+- "//infra/orchestrator:orchestrator_all",
+ "//net:net_unittests",
+ "//services:services_unittests",
+ "//services/service_manager/public/cpp",
+@@ -450,7 +449,7 @@ group("gn_all") {
]
}
@@ -18,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -625,6 +625,15 @@ group("gn_all") {
+@@ -635,6 +634,15 @@ group("gn_all") {
}
}
@@ -34,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
-@@ -674,7 +683,7 @@ group("gn_all") {
+@@ -683,7 +691,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -43,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1141,7 +1150,7 @@ if (!is_ios) {
+@@ -1159,7 +1167,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -52,7 +60,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1150,7 +1159,7 @@ if (!is_ios) {
+@@ -1168,7 +1176,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -61,7 +69,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1540,7 +1549,7 @@ group("chromium_builder_perf") {
+@@ -1565,7 +1573,7 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 28df7dbb13f1..7f88a789793f 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- base/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ base/BUILD.gn
-@@ -1010,7 +1010,7 @@ mixed_component("base") {
+@@ -998,7 +998,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
@@ -9,7 +9,7 @@
sources += [
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
-@@ -1021,6 +1021,12 @@ mixed_component("base") {
+@@ -1009,6 +1009,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@@ -22,7 +22,7 @@
}
if (is_win) {
-@@ -1492,11 +1498,23 @@ mixed_component("base") {
+@@ -1486,11 +1492,23 @@ mixed_component("base") {
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
if (!use_sysroot &&
@@ -47,7 +47,7 @@
if (use_allocator_shim) {
sources += [
"allocator/allocator_shim.cc",
-@@ -1520,7 +1538,7 @@ mixed_component("base") {
+@@ -1518,7 +1536,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@@ -56,7 +56,7 @@
sources += [
"allocator/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1576,7 +1594,7 @@ mixed_component("base") {
+@@ -1574,7 +1592,7 @@ mixed_component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -65,13 +65,13 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2255,6 +2273,42 @@ mixed_component("base") {
+@@ -2147,6 +2165,42 @@ mixed_component("base") {
}
}
+ if (is_bsd) {
+ sources -= [
-+ "files/file_path_watcher_linux.cc",
++ "files/file_path_watcher_inotify.cc",
+ "files/file_util_linux.cc",
+ "files/scoped_file_linux.cc",
+ "process/memory_linux.cc",
@@ -108,7 +108,7 @@
# iOS
if (is_ios) {
sources -= [
-@@ -3537,7 +3591,7 @@ test("base_unittests") {
+@@ -3436,7 +3490,7 @@ test("base_unittests") {
}
}
@@ -117,7 +117,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3585,7 +3639,7 @@ test("base_unittests") {
+@@ -3484,7 +3538,7 @@ test("base_unittests") {
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
]
@@ -126,7 +126,7 @@
sources += [
"cpu_affinity_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3596,7 +3650,7 @@ test("base_unittests") {
+@@ -3495,7 +3549,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -135,7 +135,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3765,7 +3819,7 @@ test("base_unittests") {
+@@ -3657,7 +3711,7 @@ test("base_unittests") {
}
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h
index 3f03f54ad491..b92553d33536 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-02-28 16:54:41 UTC
+--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-05-19 14:06:27 UTC
+++ base/allocator/partition_allocator/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
@@ -9,3 +9,12 @@
// We shouldn't allocate system pages at all for sanitizer builds. However,
// we do, and if random hint addresses interfere with address ranges
+@@ -121,7 +121,7 @@ AslrMask(uintptr_t bits) {
+ return AslrAddress(0x20000000ULL);
+ }
+
+- #elif BUILDFLAG(IS_LINUX)
++ #elif BUILDFLAG(IS_LINUX) || 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/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
new file mode 100644
index 000000000000..bd41b2b9b998
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
@@ -0,0 +1,29 @@
+--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-05-19 14:06:27 UTC
++++ base/allocator/partition_allocator/page_allocator_constants.h
+@@ -24,7 +24,7 @@
+ // elimination.
+ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
+
+-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+ // 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
+@@ -79,7 +79,7 @@ PageAllocationGranularityShift() {
+ return 14; // 16kB
+ #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
+ return vm_page_shift;
+-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+ // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
+ // page sizes. Retrieve from or initialize cache.
+ int shift = page_characteristics.shift.load(std::memory_order_relaxed);
+@@ -99,7 +99,7 @@ PageAllocationGranularity() {
+ // This is literally equivalent to |1 << PageAllocationGranularityShift()|
+ // below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
+ return vm_page_size;
+-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+ // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
+ // initialize cache.
+ int size = page_characteristics.size.load(std::memory_order_relaxed);
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
new file mode 100644
index 000000000000..6b2c32c5ae86
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-05-19 14:06:27 UTC
++++ base/allocator/partition_allocator/partition_address_space.cc
+@@ -184,7 +184,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
+ setup_.configurable_pool_ = 0;
+ }
+
+-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+
+ PageCharacteristics page_characteristics;
+
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
index eea69f0eebf4..6da50c163beb 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
@@ -1,15 +1,17 @@
---- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-12-31 00:57:18 UTC
+--- base/allocator/partition_allocator/partition_alloc.cc.orig 2022-05-19 14:06:27 UTC
+++ base/allocator/partition_allocator/partition_alloc.cc
-@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
+@@ -63,8 +63,14 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
"maximum direct mapped allocation");
// Check that some of our zanier calculations worked out as expected.
+#if defined(__i386__) && defined(OS_FREEBSD)
+ // alignof(std::max_align_t) is only 4 on FreeBSD/i386
-+ static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket");
++ static_assert(internal::kSmallestBucket >= internal::kAlignment,
++ "generic smallest bucket");
+#else
- static_assert(kSmallestBucket == kAlignment, "generic smallest bucket");
+ static_assert(internal::kSmallestBucket == internal::kAlignment,
+ "generic smallest bucket");
+#endif
- static_assert(kMaxBucketed == 917504, "generic max bucketed");
+ static_assert(internal::kMaxBucketed == 917504, "generic max bucketed");
STATIC_ASSERT_OR_PA_CHECK(
- MaxSystemPagesPerRegularSlotSpan() <= 16,
+ internal::MaxSystemPagesPerRegularSlotSpan() <= 16,
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
index 6adb646639f4..ae70ea5b47aa 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-04-21 18:48:31 UTC
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-05-19 14:06:27 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -66,7 +66,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -18,12 +18,12 @@
#define PA_HAS_ATFORK_HANDLER
#endif
-@@ -212,7 +212,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -225,7 +225,7 @@ constexpr bool kUseLazyCommit = false;
//
- // This is intended to roll out more broadly, but only enabled on Linux for now
- // to get performance bot and real-world data pre-A/B experiment.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
+ // larger slot spans.
+-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
++#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)
#define PA_PREFER_SMALLER_SLOT_SPANS
#endif // BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
new file mode 100644
index 000000000000..380fe64d6f07
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-05-19 14:06:27 UTC
++++ base/allocator/partition_allocator/partition_alloc_constants.h
+@@ -80,7 +80,7 @@ PartitionPageShift() {
+ return 18; // 256 KiB
+ }
+ #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
+- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
+ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
+ PartitionPageShift() {
+ return PageAllocationGranularityShift() + 2;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
index c7c476112b95..294bfc737221 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_page.h.orig 2022-03-25 21:59:56 UTC
+--- base/allocator/partition_allocator/partition_page.h.orig 2022-05-19 14:06:27 UTC
+++ base/allocator/partition_allocator/partition_page.h
-@@ -128,7 +128,8 @@ struct __attribute__((packed)) SlotSpanMetadata {
+@@ -129,13 +129,14 @@ struct __attribute__((packed)) SlotSpanMetadata {
PartitionBucket<thread_safe>* const bucket = nullptr;
// CHECK()ed in AllocNewSlotSpan().
@@ -10,7 +10,14 @@
// System page size is not a constant on Apple OSes, but is either 4 or 16kiB
// (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
// PartitionPageSize() is 4 times the OS page size.
-@@ -142,7 +143,9 @@ struct __attribute__((packed)) SlotSpanMetadata {
+ static constexpr size_t kMaxSlotsPerSlotSpan =
+ 4 * (1 << 14) / kSmallestBucket;
+-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+ // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
+ // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
+ // so we use the 16 kiB maximum (64 kiB will crash).
+@@ -149,7 +150,9 @@ struct __attribute__((packed)) SlotSpanMetadata {
#endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
// The maximum number of bits needed to cover all currently supported OSes.
static constexpr size_t kMaxSlotsPerSlotSpanBits = 13;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
new file mode 100644
index 000000000000..6461c1678b28
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
@@ -0,0 +1,38 @@
+--- base/allocator/partition_allocator/partition_root.cc.orig 2022-05-19 14:06:27 UTC
++++ base/allocator/partition_allocator/partition_root.cc
+@@ -29,7 +29,7 @@
+ #include "wow64apiset.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include <pthread.h>
+ #endif
+
+@@ -226,7 +226,7 @@ void PartitionAllocMallocInitOnce() {
+ if (!g_global_init_called.compare_exchange_strong(expected, true))
+ return;
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || 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.
+@@ -305,7 +305,7 @@ static size_t PartitionPurgeSlotSpan(
+ constexpr size_t kMaxSlotCount =
+ (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
+ SystemPageSize();
+-#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
++#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
+ // It's better for slot_usage to be stack-allocated and fixed-size, which
+ // demands that its size be constexpr. On IS_APPLE and Linux on arm64,
+ // PartitionPageSize() is always SystemPageSize() << 2, so regardless of
+@@ -648,7 +648,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+ // apple OSes.
+ PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
+ (internal::SystemPageSize() == (size_t{1} << 14)));
+-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(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 needs to be
+ // added here in the future, to allow 64 kiB pagesize. That is only
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc
index 54cc31592590..33a9abe63075 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-02-28 16:54:41 UTC
+--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-05-19 14:06:27 UTC
+++ base/allocator/partition_allocator/starscan/stack/stack.cc
@@ -17,6 +17,10 @@
#include <pthread.h>
@@ -11,7 +11,7 @@
#if defined(LIBC_GLIBC)
extern "C" void* __libc_stack_end;
#endif
-@@ -48,6 +52,36 @@ void* GetStackTop() {
+@@ -47,6 +51,36 @@ void* GetStackTop() {
void* GetStackTop() {
return pthread_get_stackaddr_np(pthread_self());
diff --git a/www/chromium/files/patch-base_atomicops.h b/www/chromium/files/patch-base_atomicops.h
index 2001ce228478..2f8478b40e8d 100644
--- a/www/chromium/files/patch-base_atomicops.h
+++ b/www/chromium/files/patch-base_atomicops.h
@@ -1,6 +1,6 @@
---- base/atomicops.h.orig 2022-02-07 13:39:41 UTC
+--- base/atomicops.h.orig 2022-05-19 14:06:27 UTC
+++ base/atomicops.h
-@@ -57,7 +57,11 @@ typedef intptr_t Atomic64;
+@@ -56,7 +56,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/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
index e0978f8b9384..3bd1d03cc820 100644
--- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_path_watcher_unittest.cc.orig 2022-02-28 16:54:41 UTC
+--- base/files/file_path_watcher_unittest.cc.orig 2022-05-19 14:06:27 UTC
+++ base/files/file_path_watcher_unittest.cc
-@@ -450,7 +450,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
+@@ -498,7 +498,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
ASSERT_TRUE(WaitForEvents());
@@ -9,7 +9,7 @@
// Mac implementation does not detect files modified in a directory.
ASSERT_TRUE(WriteFile(file1, "content v2"));
VLOG(1) << "Waiting for file1 modification";
-@@ -1038,7 +1038,7 @@ enum Permission {
+@@ -1108,7 +1108,7 @@ enum Permission {
Execute
};
@@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
-@@ -1069,7 +1069,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -1139,7 +1139,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
}
#endif // BUILDFLAG(IS_APPLE)
diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc
index acafe295b237..058f7033f6a9 100644
--- a/www/chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_posix.cc.orig 2022-04-21 18:48:31 UTC
+--- base/files/file_util_posix.cc.orig 2022-05-19 14:06:27 UTC
+++ base/files/file_util_posix.cc
-@@ -695,32 +695,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -697,32 +697,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
index efee9094958e..9f649aad1cf1 100644
--- a/www/chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,4 +1,4 @@
---- base/i18n/icu_util.cc.orig 2022-04-21 18:48:31 UTC
+--- base/i18n/icu_util.cc.orig 2022-05-19 14:06:27 UTC
+++ base/i18n/icu_util.cc
@@ -52,7 +52,7 @@
#endif
@@ -9,7 +9,7 @@
!BUILDFLAG(IS_CHROMECAST))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
-@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() {
+@@ -324,7 +324,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc
index 853eb881f872..1f949df12ab0 100644
--- a/www/chromium/files/patch-base_linux__util.cc
+++ b/www/chromium/files/patch-base_linux__util.cc
@@ -1,4 +1,4 @@
---- base/linux_util.cc.orig 2022-02-07 13:39:41 UTC
+--- base/linux_util.cc.orig 2022-05-19 14:06:27 UTC
+++ base/linux_util.cc
@@ -15,6 +15,7 @@
@@ -6,9 +6,9 @@
#include <memory>
+#include <sstream>
+ #include "base/base_export.h"
#include "base/files/dir_reader_posix.h"
- #include "base/files/file_util.h"
-@@ -134,6 +135,9 @@ void SetLinuxDistro(const std::string& distro) {
+@@ -135,6 +136,9 @@ void SetLinuxDistro(const std::string& distro) {
}
bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {
@@ -18,7 +18,7 @@
// 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22
char buf[25];
strings::SafeSPrintf(buf, "/proc/%d/task", pid);
-@@ -153,6 +157,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
+@@ -154,6 +158,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
}
return true;
diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc
index 350a28608203..b75ef293703c 100644
--- a/www/chromium/files/patch-base_memory_discardable__memory.cc
+++ b/www/chromium/files/patch-base_memory_discardable__memory.cc
@@ -1,6 +1,6 @@
---- base/memory/discardable_memory.cc.orig 2022-02-28 16:54:41 UTC
+--- base/memory/discardable_memory.cc.orig 2022-05-19 14:06:27 UTC
+++ base/memory/discardable_memory.cc
-@@ -24,7 +24,7 @@ const base::Feature kMadvFreeDiscardableMemory{
+@@ -25,7 +25,7 @@ const base::Feature kMadvFreeDiscardableMemory{
"MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // BUILDFLAG(IS_POSIX)
@@ -9,7 +9,7 @@
const base::Feature kDiscardableMemoryBackingTrial{
"DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -49,7 +49,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup>
+@@ -50,7 +50,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup>
namespace {
@@ -18,7 +18,7 @@
DiscardableMemoryBacking GetBackingForFieldTrial() {
DiscardableMemoryTrialGroup trial_group =
-@@ -68,7 +68,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() {
+@@ -69,7 +69,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() {
} // namespace
@@ -27,7 +27,7 @@
// Probe capabilities of this device to determine whether we should participate
// in the discardable memory backing trial.
-@@ -98,7 +98,7 @@ DiscardableMemory::DiscardableMemory() = default;
+@@ -99,7 +99,7 @@ DiscardableMemory::DiscardableMemory() = default;
DiscardableMemory::~DiscardableMemory() = default;
DiscardableMemoryBacking GetDiscardableMemoryBacking() {
diff --git a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
index 1f2283b19981..ead3fe5472be 100644
--- a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
+++ b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
@@ -1,6 +1,6 @@
---- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-05-19 14:06:27 UTC
+++ base/memory/madv_free_discardable_memory_posix.cc
-@@ -294,6 +294,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
+@@ -295,6 +295,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
bool MadvFreeDiscardableMemoryPosix::IsResident() const {
DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
@@ -11,7 +11,7 @@
#if BUILDFLAG(IS_APPLE)
std::vector<char> vec(allocated_pages_);
#else
-@@ -309,6 +313,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
+@@ -310,6 +314,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
return false;
}
return true;
diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h
index 002915dba49c..8bc7dfe4b8ec 100644
--- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h
+++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h
@@ -1,15 +1,15 @@
---- base/memory/platform_shared_memory_region.h.orig 2022-02-28 16:54:41 UTC
+--- base/memory/platform_shared_memory_region.h.orig 2022-05-19 14:06:27 UTC
+++ base/memory/platform_shared_memory_region.h
-@@ -23,7 +23,7 @@
- #include "base/files/scoped_file.h"
- #endif
+@@ -14,7 +14,7 @@
+
+ #include <stdint.h>
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
namespace content {
class SandboxIPCHandler;
}
-@@ -116,7 +116,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -81,7 +81,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
};
@@ -18,7 +18,7 @@
// Structure to limit access to executable region creation.
struct ExecutableRegion {
private:
-@@ -263,7 +263,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
CheckPlatformHandlePermissionsCorrespondToMode);
static PlatformSharedMemoryRegion Create(Mode mode,
size_t size
diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
index dc7c81b3ea39..558d0e7c7b15 100644
--- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
+++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
@@ -1,15 +1,15 @@
---- base/memory/platform_shared_memory_region_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- base/memory/platform_shared_memory_region_posix.cc.orig 2022-05-19 14:06:27 UTC
+++ base/memory/platform_shared_memory_region_posix.cc
-@@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const {
- return {fd.get(), readonly_fd.get()};
- }
+@@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) {
+
+ } // 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 =
-@@ -204,7 +204,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
+@@ -171,7 +171,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() {
// static
PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
size_t size
@@ -18,7 +18,7 @@
,
bool executable
#endif
-@@ -233,7 +233,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
+@@ -200,7 +200,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
// flag.
FilePath directory;
if (!GetShmemTempDir(
diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc
index 1aca9e8e282e..c2b8d0e5e970 100644
--- a/www/chromium/files/patch-base_native__library__posix.cc
+++ b/www/chromium/files/patch-base_native__library__posix.cc
@@ -1,6 +1,6 @@
---- base/native_library_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- base/native_library_posix.cc.orig 2022-05-19 14:06:27 UTC
+++ base/native_library_posix.cc
-@@ -32,7 +32,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
+@@ -33,7 +33,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
// http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
// and http://crbug.com/40794.
int flags = RTLD_LAZY;
diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h
index df8eb9fb5f9c..1463ba9ed811 100644
--- a/www/chromium/files/patch-base_process_kill.h
+++ b/www/chromium/files/patch-base_process_kill.h
@@ -1,6 +1,6 @@
---- base/process/kill.h.orig 2022-02-28 16:54:41 UTC
+--- base/process/kill.h.orig 2022-05-19 14:06:27 UTC
+++ base/process/kill.h
-@@ -112,7 +112,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
+@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
ProcessHandle handle, int* exit_code);
diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc
index f2229616fa15..e9446679c97c 100644
--- a/www/chromium/files/patch-base_process_kill__posix.cc
+++ b/www/chromium/files/patch-base_process_kill__posix.cc
@@ -1,6 +1,6 @@
---- base/process/kill_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- base/process/kill_posix.cc.orig 2022-05-19 14:06:27 UTC
+++ base/process/kill_posix.cc
-@@ -159,7 +159,7 @@ void EnsureProcessTerminated(Process process) {
+@@ -158,7 +158,7 @@ void EnsureProcessTerminated(Process process) {
0, new BackgroundReaper(std::move(process), Seconds(2)));
}
diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h
index 61716eeeb3f4..5ad4c6605f88 100644
--- a/www/chromium/files/patch-base_process_launch.h
+++ b/www/chromium/files/patch-base_process_launch.h
@@ -1,6 +1,6 @@
---- base/process/launch.h.orig 2022-02-28 16:54:41 UTC
+--- base/process/launch.h.orig 2022-05-19 14:06:27 UTC
+++ base/process/launch.h
-@@ -195,7 +195,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -199,7 +199,7 @@ struct BASE_EXPORT LaunchOptions {
bool clear_environment = false;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc
index 00d7bf404371..504425708f12 100644
--- a/www/chromium/files/patch-base_process_process__metrics.cc
+++ b/www/chromium/files/patch-base_process_process__metrics.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics.cc.orig 2022-03-25 21:59:56 UTC
+--- base/process/process_metrics.cc.orig 2022-05-19 14:06:27 UTC
+++ base/process/process_metrics.cc
@@ -18,7 +18,7 @@ namespace base {
namespace {
@@ -36,8 +36,8 @@
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
TimeDelta cumulative_cpu = GetCumulativeCPUUsage();
TimeTicks time = TimeTicks::Now();
-@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
- #endif
+@@ -151,7 +151,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
+ #endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
index 940559196a29..c6d856e7598b 100644
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -1,4 +1,4 @@
---- base/process/process_metrics.h.orig 2022-02-28 16:54:41 UTC
+--- base/process/process_metrics.h.orig 2022-05-19 14:06:27 UTC
+++ base/process/process_metrics.h
@@ -36,7 +36,7 @@
#endif
@@ -27,8 +27,8 @@
// 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;
-@@ -134,7 +134,7 @@ class BASE_EXPORT ProcessMetrics {
- [[nodiscard]] TimeDelta GetCumulativeCPUUsage();
+@@ -155,7 +155,7 @@ class BASE_EXPORT ProcessMetrics {
+ #endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_AIX)
@@ -36,7 +36,7 @@
// 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
-@@ -217,7 +217,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX)
@@ -45,7 +45,7 @@
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
-@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -259,7 +259,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -54,7 +54,7 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if BUILDFLAG(IS_APPLE)
-@@ -249,7 +249,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -63,8 +63,8 @@
CPU::CoreType GetCoreType(int core_index);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX)
-@@ -274,7 +274,7 @@ class BASE_EXPORT ProcessMetrics {
- uint64_t last_cumulative_disk_usage_ = 0;
+@@ -294,7 +294,7 @@ class BASE_EXPORT ProcessMetrics {
+ #endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
@@ -72,7 +72,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
-@@ -317,7 +317,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
+@@ -337,7 +337,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@@ -81,7 +81,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
-@@ -352,7 +352,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -372,7 +372,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -90,7 +90,7 @@
// 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
-@@ -367,7 +367,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -387,7 +387,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -99,7 +99,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
-@@ -404,7 +404,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
+@@ -424,7 +424,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -108,7 +108,7 @@
// 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 +591,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -611,7 +611,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;
diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc
index 46fe9bf83464..5154b3028c57 100644
--- a/www/chromium/files/patch-base_process_process__posix.cc
+++ b/www/chromium/files/patch-base_process_process__posix.cc
@@ -1,6 +1,6 @@
---- base/process/process_posix.cc.orig 2022-04-21 18:48:31 UTC
+--- base/process/process_posix.cc.orig 2022-05-19 14:06:27 UTC
+++ base/process/process_posix.cc
-@@ -23,10 +23,15 @@
+@@ -25,10 +25,15 @@
#include "build/build_config.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
@@ -17,7 +17,7 @@
#if BUILDFLAG(CLANG_PROFILING)
#include "base/test/clang_profiling.h"
#endif
-@@ -95,7 +100,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
+@@ -97,7 +102,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
return ret_pid > 0;
}
@@ -26,7 +26,7 @@
// 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.
-@@ -200,7 +205,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
+@@ -202,7 +207,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
const bool exited = (parent_pid < 0);
if (!exited && parent_pid != our_pid) {
@@ -35,7 +35,7 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
-@@ -356,7 +361,55 @@ void Process::Exited(int exit_code) const {}
+@@ -358,7 +363,55 @@ void Process::Exited(int exit_code) const {}
int Process::GetPriority() const {
DCHECK(IsValid());
diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
index 3fd7776ba195..9b71690b5fad 100644
--- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
+++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
@@ -1,6 +1,6 @@
---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-02-28 16:54:41 UTC
+--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-05-19 14:06:27 UTC
+++ base/profiler/stack_sampling_profiler_test_util.cc
-@@ -32,7 +32,7 @@
+@@ -39,7 +39,7 @@
// Fortunately, it provides _alloca, which functions identically.
#include <malloc.h>
#define alloca _alloca
diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h
index f9f875ee3934..4c06c2a54589 100644
--- a/www/chromium/files/patch-base_synchronization_lock__impl.h
+++ b/www/chromium/files/patch-base_synchronization_lock__impl.h
@@ -1,6 +1,6 @@
---- base/synchronization/lock_impl.h.orig 2022-02-28 16:54:41 UTC
+--- base/synchronization/lock_impl.h.orig 2022-05-19 14:06:27 UTC
+++ base/synchronization/lock_impl.h
-@@ -107,6 +107,10 @@ void LockImpl::Unlock() {
+@@ -106,6 +106,10 @@ void LockImpl::Unlock() {
}
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -9,11 +9,11 @@
+#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
+#endif
- BASE_EXPORT std::string SystemErrorCodeToString(int error_code);
-
-@@ -121,6 +125,9 @@ void LockImpl::Unlock() {
- int rv = pthread_mutex_unlock(&native_handle_);
- DCHECK_EQ(rv, 0) << ". " << strerror(rv);
+ #if DCHECK_IS_ON()
+ BASE_EXPORT void dcheck_trylock_result(int rv);
+@@ -126,6 +130,9 @@ void LockImpl::Unlock() {
+ dcheck_unlock_result(rv);
+ #endif
}
+#if BUILDFLAG(IS_FREEBSD)
+#pragma GCC diagnostic pop
diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc
index f991071fe48a..9c2c95db0407 100644
--- a/www/chromium/files/patch-base_system_sys__info.cc
+++ b/www/chromium/files/patch-base_system_sys__info.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info.cc.orig 2022-02-28 16:54:41 UTC
+--- base/system/sys_info.cc.orig 2022-05-19 14:06:27 UTC
+++ base/system/sys_info.cc
-@@ -100,7 +100,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
+@@ -104,7 +104,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
base::ThreadPool::PostTaskAndReplyWithResult(
FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback));
diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
index 95d998da0943..46693612438d 100644
--- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
+++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
@@ -1,24 +1,81 @@
---- base/third_party/libevent/BUILD.gn.orig 2021-04-14 18:40:48 UTC
+--- base/third_party/libevent/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ base/third_party/libevent/BUILD.gn
-@@ -43,13 +43,20 @@ static_library("libevent") {
- "mac/event-config.h",
- ]
- include_dirs = [ "mac" ]
+@@ -1,69 +1,15 @@
+-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
++# 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/nacl/config.gni")
++import("//build/shim_headers.gni")
+
+-static_library("libevent") {
+- sources = [
+- "buffer.c",
+- "evbuffer.c",
+- "evdns.c",
+- "evdns.h",
+- "event-config.h",
+- "event-internal.h",
+- "event.c",
+- "event.h",
+- "event_tagging.c",
+- "evhttp.h",
+- "evrpc-internal.h",
+- "evrpc.c",
+- "evrpc.h",
+- "evsignal.h",
+- "evutil.c",
+- "evutil.h",
+- "http-internal.h",
+- "http.c",
+- "log.c",
+- "log.h",
+- "min_heap.h",
+- "poll.c",
+- "select.c",
+- "signal.c",
+- "strlcpy-internal.h",
+- "strlcpy.c",
+- ]
++shim_headers("libevent_shim") {
++ root_path = "."
++ headers = [ "event.h" ]
++}
+
+- defines = [ "HAVE_CONFIG_H" ]
+-
+- if (is_apple) {
+- sources += [
+- "kqueue.c",
+- "mac/config.h",
+- "mac/event-config.h",
+- ]
+- include_dirs = [ "mac" ]
- } else if (is_linux || is_chromeos) {
-+ } else if ((is_linux || is_chromeos) && !is_bsd) {
- sources += [
- "epoll.c",
- "linux/config.h",
- "linux/event-config.h",
- ]
- include_dirs = [ "linux" ]
-+ } else if (is_bsd) {
-+ sources += [
-+ "kqueue.c",
-+ "freebsd/config.h",
-+ "freebsd/event-config.h",
-+ ]
-+ include_dirs = [ "freebsd" ]
- } else if (is_android) {
- sources += [
- "android/config.h",
+- sources += [
+- "epoll.c",
+- "linux/config.h",
+- "linux/event-config.h",
+- ]
+- include_dirs = [ "linux" ]
+- } else if (is_android) {
+- sources += [
+- "android/config.h",
+- "android/event-config.h",
+- "epoll.c",
+- ]
+- include_dirs = [ "android" ]
+- }
+-
+- if (!is_debug) {
+- configs -= [ "//build/config/compiler:default_optimization" ]
+- configs += [ "//build/config/compiler:optimize_max" ]
+- }
+-
+- configs -= [ "//build/config/compiler:chromium_code" ]
+- configs += [ "//build/config/compiler:no_chromium_code" ]
++source_set("libevent") {
++ deps = [ ":libevent_shim" ]
++ libs = [ "event" ]
+ }
diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h
index fcbe67b6616c..7829e5be4113 100644
--- a/www/chromium/files/patch-base_threading_platform__thread.h
+++ b/www/chromium/files/patch-base_threading_platform__thread.h
@@ -1,6 +1,6 @@
---- base/threading/platform_thread.h.orig 2022-02-28 16:54:41 UTC
+--- base/threading/platform_thread.h.orig 2022-05-19 14:06:27 UTC
+++ base/threading/platform_thread.h
-@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread {
+@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformThread {
// Returns a realtime period provided by `delegate`.
static TimeDelta GetRealtimePeriod(Delegate* delegate);
diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
index a63f03e00a9e..db45be7f723b 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
@@ -1,6 +1,6 @@
---- base/threading/platform_thread_linux.cc.orig 2022-02-28 16:54:41 UTC
+--- base/threading/platform_thread_linux.cc.orig 2022-05-19 14:06:27 UTC
+++ base/threading/platform_thread_linux.cc
-@@ -29,7 +29,9 @@
+@@ -30,7 +30,9 @@
#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#include <pthread.h>
@@ -10,7 +10,7 @@
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
-@@ -132,7 +134,7 @@ int sched_setattr(pid_t pid,
+@@ -133,7 +135,7 @@ int sched_setattr(pid_t pid,
#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -19,7 +19,7 @@
const FilePath::CharType kCgroupDirectory[] =
FILE_PATH_LITERAL("/sys/fs/cgroup");
-@@ -286,7 +288,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI
+@@ -287,7 +289,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI
namespace internal {
namespace {
@@ -28,7 +28,7 @@
const struct sched_param kRealTimePrio = {8};
#endif
} // namespace
-@@ -299,7 +301,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
+@@ -300,7 +302,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
};
bool CanSetThreadPriorityToRealtimeAudio() {
@@ -37,7 +37,7 @@
// A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
// pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
struct rlimit rlim;
-@@ -310,7 +312,7 @@ bool CanSetThreadPriorityToRealtimeAudio() {
+@@ -311,7 +313,7 @@ bool CanSetThreadPriorityToRealtimeAudio() {
}
bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) {
@@ -46,7 +46,7 @@
// For legacy schedtune interface
SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority);
-@@ -328,7 +330,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
+@@ -329,7 +331,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
}
absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() {
@@ -55,7 +55,7 @@
int maybe_sched_rr = 0;
struct sched_param maybe_realtime_prio = {0};
if (pthread_getschedparam(pthread_self(), &maybe_sched_rr,
-@@ -347,7 +349,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit
+@@ -348,7 +350,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit
void PlatformThread::SetName(const std::string& name) {
ThreadIdNameManager::GetInstance()->SetName(name);
@@ -64,7 +64,7 @@
// On linux we can get the thread names to show up in the debugger by setting
// the process name for the LWP. We don't want to do this for the main
// thread because that would rename the process, causing tools like killall
-@@ -377,8 +379,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce
+@@ -378,8 +380,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce
// priority.
CHECK_NE(thread_id, process_id);
diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
index 3eda63205158..393a2d1be773 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
@@ -1,6 +1,6 @@
---- base/threading/platform_thread_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- base/threading/platform_thread_posix.cc.orig 2022-05-19 14:06:27 UTC
+++ base/threading/platform_thread_posix.cc
-@@ -75,7 +75,7 @@ void* ThreadFunc(void* params) {
+@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::DisallowSingleton();
@@ -9,7 +9,7 @@
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
#endif
-@@ -362,6 +362,9 @@ bool PlatformThread::CanChangeThreadPriority(ThreadPri
+@@ -365,6 +365,9 @@ bool PlatformThread::CanChangeThreadPriority(ThreadPri
// static
void PlatformThread::SetCurrentThreadPriorityImpl(ThreadPriority priority) {
#if BUILDFLAG(IS_NACL)
diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
index 42b6b8e0f162..630217b469e1 100644
--- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
+++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
@@ -1,4 +1,4 @@
---- base/trace_event/malloc_dump_provider.cc.orig 2022-02-28 16:54:41 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig 2022-05-19 14:06:27 UTC
+++ base/trace_event/malloc_dump_provider.cc
@@ -23,6 +23,8 @@
@@ -9,7 +9,17 @@
#else
#include <malloc.h>
#endif
-@@ -220,6 +222,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -174,7 +176,8 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
+
+ #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
+ (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
+- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA))
++ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA) && \
++ !BUILDFLAG(IS_BSD))
+ void ReportMallinfoStats(ProcessMemoryDump* pmd,
+ size_t* total_virtual_size,
+ size_t* resident_size,
+@@ -339,6 +342,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.
@@ -17,5 +27,5 @@
+ total_virtual_size = 0;
+ allocated_objects_size = 0;
#else
- #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
- #if __GLIBC_PREREQ(2, 33)
+ ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
+ &allocated_objects_size, &allocated_objects_count);
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 8d5e73144bbf..890458560e59 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- build/config/compiler/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ build/config/compiler/BUILD.gn
-@@ -236,13 +236,16 @@ config("default_include_dirs") {
+@@ -231,13 +231,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") {
@@ -18,7 +18,7 @@
}
# compiler ---------------------------------------------------------------------
-@@ -452,6 +455,10 @@ config("compiler") {
+@@ -447,6 +450,10 @@ config("compiler") {
}
}
@@ -28,8 +28,8 @@
+
# Linux-specific compiler flags setup.
# ------------------------------------
- if ((is_posix || is_fuchsia) && !is_apple && use_lld) {
-@@ -534,7 +541,7 @@ config("compiler") {
+ if (use_gold) {
+@@ -522,7 +529,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -38,7 +38,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
# TODO(hans): Remove this once Clang generates better optimized debug info
-@@ -917,7 +924,7 @@ config("compiler_cpu_abi") {
+@@ -904,7 +911,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@@ -47,7 +47,7 @@
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
}
-@@ -931,7 +938,7 @@ config("compiler_cpu_abi") {
+@@ -918,7 +925,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -56,7 +56,7 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
-@@ -1252,7 +1259,7 @@ config("compiler_deterministic") {
+@@ -1239,7 +1246,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.
@@ -65,7 +65,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
-@@ -1542,12 +1549,12 @@ config("default_warnings") {
+@@ -1530,7 +1537,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@@ -73,14 +73,17 @@
+ if (!is_nacl && !is_bsd) {
# TODO(https://crbug.com/1300731) Clean up and enable.
cflags += [ "-Wno-unqualified-std-cast-call" ]
- }
-- if (is_chromeos || default_toolchain == "//build/toolchain/cros:target") {
-+ if (is_chromeos || default_toolchain == "//build/toolchain/cros:target" || is_bsd) {
- # TODO(https://crbug.com/1016945): Re-enable once ChromeOS toolchain is up to date
- cflags += [ "-Wno-builtin-assume-aligned-alignment" ]
+@@ -1538,7 +1545,7 @@ config("default_warnings") {
+ cflags += [ "-Wno-deprecated-non-prototype" ]
}
-@@ -1740,7 +1747,7 @@ config("no_chromium_code") {
+
+- if (!is_nacl && !(is_chromeos ||
++ if (!is_nacl && !is_bsd && !(is_chromeos ||
+ default_toolchain == "//build/toolchain/cros:target")) {
+ # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out
+ cflags += [
+@@ -1723,7 +1730,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -89,7 +92,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -2254,7 +2261,7 @@ config("afdo_optimize_size") {
+@@ -2237,7 +2244,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") {
@@ -98,7 +101,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2270,7 +2277,7 @@ config("afdo") {
+@@ -2253,7 +2260,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@@ -107,7 +110,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2413,7 +2420,8 @@ config("symbols") {
+@@ -2396,7 +2403,8 @@ config("symbols") {
}
}
diff --git a/www/chromium/files/patch-build_config_linux_BUILD.gn b/www/chromium/files/patch-build_config_linux_BUILD.gn
index f73ef24f032a..2e93980f3e50 100644
--- a/www/chromium/files/patch-build_config_linux_BUILD.gn
+++ b/www/chromium/files/patch-build_config_linux_BUILD.gn
@@ -1,9 +1,9 @@
---- build/config/linux/BUILD.gn.orig 2022-02-07 13:39:41 UTC
+--- build/config/linux/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ build/config/linux/BUILD.gn
-@@ -42,7 +42,7 @@ config("runtime_library") {
+@@ -41,7 +41,7 @@ config("runtime_library") {
+ }
- if ((!(is_chromeos_ash || is_chromeos_lacros) ||
- default_toolchain != "//build/toolchain/cros:target") &&
+ 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/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index 55c8ddbde6d4..b60fac0078ef 100644
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,4 +1,4 @@
---- build/toolchain/gcc_toolchain.gni.orig 2022-04-21 18:48:31 UTC
+--- build/toolchain/gcc_toolchain.gni.orig 2022-05-19 14:06:27 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@@ -14,7 +14,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -780,13 +787,12 @@ template("gcc_toolchain") {
+@@ -786,13 +793,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {
diff --git a/www/chromium/files/patch-chrome_app_app__management__strings.grdp b/www/chromium/files/patch-chrome_app_app__management__strings.grdp
new file mode 100644
index 000000000000..b7638925e9e3
--- /dev/null
+++ b/www/chromium/files/patch-chrome_app_app__management__strings.grdp
@@ -0,0 +1,11 @@
+--- chrome/app/app_management_strings.grdp.orig 2022-05-19 14:06:27 UTC
++++ chrome/app/app_management_strings.grdp
+@@ -165,7 +165,7 @@
+ </message>
+ </if>
+ <!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash` once fixed. -->
+- <if expr="is_fuchsia or is_linux and not chromeos_ash">
++ <if expr="is_fuchsia or is_posix and not chromeos_ash">
+ <message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing a generic Linux file browser app) and a link to a learn more link for default filetype associations.">
+ You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
+ </message>
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
index 84dcfc4d098e..e2579407f457 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/app/chrome_main_delegate.cc
-@@ -114,7 +114,7 @@
+@@ -116,7 +116,7 @@
#include "chrome/app/chrome_crash_reporter_client.h"
#endif
@@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -158,12 +158,12 @@
+@@ -159,12 +159,12 @@
#include "v8/include/v8.h"
#endif
@@ -24,7 +24,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -307,7 +307,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -308,7 +308,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@@ -33,7 +33,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
-@@ -347,7 +347,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -348,7 +348,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -42,7 +42,7 @@
// 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 InitializeUserDataDir(base::CommandLine* command_
+@@ -412,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -51,7 +51,7 @@
// 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.
-@@ -495,7 +495,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -496,7 +496,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -60,7 +60,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
-@@ -676,6 +676,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
+@@ -669,6 +669,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
// not always enabled on Linux/ChromeOS.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@@ -69,7 +69,7 @@
#else
bool enable_gwp_asan = true;
#endif
-@@ -813,7 +815,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -807,7 +809,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -78,7 +78,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -844,7 +846,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -838,7 +840,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@@ -87,7 +87,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -1159,7 +1161,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1153,7 +1155,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
@@ -96,7 +96,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
#if BUILDFLAG(IS_ANDROID)
-@@ -1229,7 +1231,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1223,7 +1225,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
// This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead.
diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
index 8fe11684dc60..aa755102c0fe 100644
--- a/www/chromium/files/patch-chrome_app_chromium__strings.grd
+++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd
@@ -1,6 +1,6 @@
---- chrome/app/chromium_strings.grd.orig 2022-04-21 18:48:31 UTC
+--- chrome/app/chromium_strings.grd.orig 2022-05-19 14:06:27 UTC
+++ chrome/app/chromium_strings.grd
-@@ -294,7 +294,7 @@ If you update this file, be sure also to update google
+@@ -296,7 +296,7 @@ If you update this file, be sure also to update google
Welcome to Chromium; new browser window opened
</message>
</if>
@@ -9,16 +9,7 @@
<message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
Welcome to Chromium
</message>
-@@ -815,7 +815,7 @@ Permissions you've already given to websites and apps
- </if>
-
- <!-- about:browser-switch strings -->
-- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)">
-+ <if expr="is_win or is_macosx or is_fuchsia or (is_posix and not chromeos)">
- <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
- Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
- </message>
-@@ -941,7 +941,7 @@ Permissions you've already given to websites and apps
+@@ -981,7 +981,7 @@ Permissions you've already given to websites and apps
</message>
<!-- ProcessSingleton -->
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index c15631103b44..b1dbb1741e2e 100644
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,4 +1,4 @@
---- chrome/app/generated_resources.grd.orig 2022-04-21 18:48:31 UTC
+--- chrome/app/generated_resources.grd.orig 2022-05-19 14:06:27 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@@ -9,16 +9,7 @@
for making strings OS specific. Other platform defines such as use_titlecase
are declared in tools/grit/grit_rule.gni.
-->
-@@ -293,7 +293,7 @@ are declared in tools/grit/grit_rule.gni.
- <part file="profiles_strings.grdp" />
-
- <!-- Web app intent picker strings -->
-- <if expr="is_win or is_macosx or is_linux">
-+ <if expr="is_win or is_macosx or is_posix">
- <part file="url_handler_intent_picker_strings.grdp" />
- </if>
-
-@@ -2836,7 +2836,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3013,7 +3013,7 @@ are declared in tools/grit/grit_rule.gni.
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@@ -27,30 +18,21 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
-@@ -5728,7 +5728,7 @@ Keep your key file in a safe place. You will need it t
- </if>
-
- <!-- chrome://browser-switch strings -->
-- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)">
-+ <if expr="is_win or is_macosx or is_fuchsia or (is_posix and not chromeos)">
- <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
- Legacy Browser Support
- </message>
-@@ -8322,7 +8322,7 @@ Keep your key file in a safe place. You will need it t
+@@ -8670,7 +8670,7 @@ Keep your key file in a safe place. You will need it t
Google Pay
</message>
-- <if expr="is_linux and not chromeos and not lacros">
-+ <if expr="is_posix and not chromeos and not lacros">
+- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
-@@ -9477,7 +9477,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -9821,7 +9821,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
-- <if expr="is_linux and not chromeos and not lacros">
-+ <if expr="is_posix and not chromeos and not lacros">
+- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
index a05b2e4cec05..4202f42e44a1 100644
--- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
+++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
@@ -1,6 +1,6 @@
---- chrome/app/google_chrome_strings.grd.orig 2022-04-21 18:48:31 UTC
+--- chrome/app/google_chrome_strings.grd.orig 2022-05-19 14:06:27 UTC
+++ chrome/app/google_chrome_strings.grd
-@@ -299,7 +299,7 @@ chromium_strings.grd. -->
+@@ -301,7 +301,7 @@ chromium_strings.grd. -->
Welcome to Chrome; new browser window opened
</message>
</if>
@@ -9,16 +9,7 @@
<message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
Welcome to Google Chrome
</message>
-@@ -859,7 +859,7 @@ Permissions you've already given to websites and apps
- </if>
-
- <!-- about:browser-switch strings -->
-- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)">
-+ <if expr="is_win or is_macosx or is_fuchsia or (is_posix and not chromeos)">
- <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
- Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
- </message>
-@@ -1008,7 +1008,7 @@ Permissions you've already given to websites and apps
+@@ -1048,7 +1048,7 @@ Permissions you've already given to websites and apps
</message>
<!-- ProcessSingleton -->
diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp
index 017a675fc6cd..3aa6d8d7d939 100644
--- a/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp
@@ -1,11 +1,11 @@
---- chrome/app/settings_strings.grdp.orig 2022-02-28 16:54:41 UTC
+--- chrome/app/settings_strings.grdp.orig 2022-05-19 14:06:27 UTC
+++ chrome/app/settings_strings.grdp
@@ -131,7 +131,7 @@
Theme
</message>
</if>
-- <if expr="is_linux and not chromeos and not lacros">
-+ <if expr="is_posix and not chromeos and not lacros">
+- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
GTK+
</message>
diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
index c060bac563b8..959a0c285ffa 100644
--- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
+++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
@@ -1,11 +1,34 @@
---- chrome/app/theme/theme_resources.grd.orig 2021-04-14 18:40:52 UTC
+--- chrome/app/theme/theme_resources.grd.orig 2022-05-19 14:06:27 UTC
+++ chrome/app/theme/theme_resources.grd
-@@ -25,7 +25,7 @@
- <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
- BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
- SAME CONDITIONALS. -->
-- <if expr="is_linux or is_win or chromeos">
-+ <if expr="is_posix or is_win or chromeos">
- <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_CAPTIONS_PREVIEW_BACKGROUND" file="common/captions-preview-bg.png" />
+@@ -128,11 +128,11 @@
+ <structure type="chrome_scaled_image" name="IDR_PRERENDER" file="common/prerender_succeed_icon.png" />
</if>
- <if expr="toolkit_views and not is_macosx">
+ <if expr="not _google_chrome">
+- <if expr="not is_linux">
++ <if expr="not is_posix">
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" />
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" />
+ </if>
+- <if expr="is_linux">
++ <if expr="is_posix">
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" />
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" />
+ </if>
+@@ -140,7 +140,7 @@
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" />
+ </if>
+ <if expr="_google_chrome">
+- <if expr="not is_linux">
++ <if expr="not is_posix">
+ <if expr="not is_android">
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" />
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" />
+@@ -148,7 +148,7 @@
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" />
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" />
+ </if>
+- <if expr="is_linux">
++ <if expr="is_posix">
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" />
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" />
+ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" />
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 127ba1a18a9a..b4582e90b40e 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/about_flags.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/about_flags.cc
-@@ -205,7 +205,7 @@
+@@ -202,7 +202,7 @@
#include "ui/native_theme/native_theme_features.h"
#include "ui/ui_features.h"
@@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -277,7 +277,7 @@
+@@ -274,7 +274,7 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h"
#endif // ENABLE_SUPERVISED_USERS
@@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -364,7 +364,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
+@@ -363,7 +363,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
gl::kANGLEImplementationMetalName}};
#endif
@@ -27,7 +27,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1047,7 +1047,7 @@ const FeatureEntry::FeatureVariation kJourneysOnDevice
+@@ -1055,7 +1055,7 @@ const FeatureEntry::FeatureVariation kJourneysOnDevice
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -36,7 +36,7 @@
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
-@@ -3520,7 +3520,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3668,7 +3668,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)},
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -45,25 +45,16 @@
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -3938,7 +3938,7 @@ const FeatureEntry kFeatureEntries[] = {
- {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName,
- flag_descriptions::kEnableLoginDetectionDescription, kOsAll,
- FEATURE_VALUE_TYPE(login_detection::kLoginDetection)},
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- {"enable-navigation-predictor",
- flag_descriptions::kEnableNavigationPredictorName,
- flag_descriptions::kEnableNavigationPredictorDescription,
-@@ -4138,7 +4138,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4271,7 +4271,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)
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
- flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
+ flag_descriptions::kOzonePlatformHintDescription, kOsLinux | kOsLacros,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
-@@ -4157,7 +4157,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4291,7 +4291,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kForceInitialSyncWhenDecryptionFails)},
#endif // BUILDFLAG(IS_LINUX)
@@ -72,7 +63,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -4886,7 +4886,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4986,7 +4986,7 @@ const FeatureEntry kFeatureEntries[] = {
"OmniboxBundledExperimentV1")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -81,7 +72,7 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -5299,7 +5299,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5375,7 +5375,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -90,7 +81,7 @@
{"webui-feedback", flag_descriptions::kWebuiFeedbackName,
flag_descriptions::kWebuiFeedbackDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kWebUIFeedback)},
-@@ -6363,7 +6363,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6396,7 +6396,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -99,7 +90,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
-@@ -7230,7 +7230,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7260,7 +7260,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -108,7 +99,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -7536,7 +7536,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7551,7 +7551,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
index 7d62b3c9c226..bea2cd828782 100644
--- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
+++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
@@ -1,6 +1,6 @@
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -89,7 +89,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
+@@ -90,7 +90,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
return metrics::OmniboxInputType::QUERY;
case ExternalProtocolHandler::UNKNOWN: {
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
index 0a13c4003a0e..ddb257f073dc 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/browser_process_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/browser_process_impl.cc
-@@ -206,7 +206,7 @@
+@@ -209,7 +209,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
-@@ -1155,7 +1155,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1158,7 +1158,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
-@@ -1402,7 +1402,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1415,7 +1415,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd
new file mode 100644
index 000000000000..b340908a4530
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -0,0 +1,11 @@
+--- chrome/browser/browser_resources.grd.orig 2022-05-19 14:06:27 UTC
++++ chrome/browser/browser_resources.grd
+@@ -119,7 +119,7 @@
+ <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
+ </if>
+ <!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash` once fixed. -->
+- <if expr="is_linux and not chromeos_ash or chromeos_lacros">
++ <if expr="is_posix and not chromeos_ash or chromeos_lacros">
+ <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
+ </if>
+ <if expr="chromeos_ash">
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index ff340b9e9b9e..4e550f8411c9 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -98,13 +98,13 @@
+@@ -100,13 +100,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
-@@ -174,7 +174,7 @@
+@@ -177,7 +177,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,25 +25,7 @@
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
-@@ -272,7 +272,7 @@
- #include "chrome/browser/apps/digital_goods/digital_goods_factory_stub.h"
- #endif // BUILDFLAG(IS_CHROMEOS_LACROS)
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/screen_ai/public/cpp/screen_ai_service_router.h"
- #include "components/services/screen_ai/public/cpp/screen_ai_service_router_factory.h"
- #endif
-@@ -585,7 +585,7 @@ void BindSpeechRecognitionRecognizerClientHandler(
- }
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void BindScreenAIAnnotator(
- content::RenderFrameHost* frame_host,
- mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) {
-@@ -717,7 +717,7 @@ void PopulateChromeFrameBinders(
+@@ -726,7 +726,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -52,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -725,7 +725,7 @@ void PopulateChromeFrameBinders(
+@@ -734,7 +734,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -61,16 +43,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
render_frame_host->IsInPrimaryMainFrame()) {
map->Add<blink::mojom::SubAppsService>(
-@@ -733,7 +733,7 @@ void PopulateChromeFrameBinders(
- }
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- if (base::FeatureList::IsEnabled(features::kScreenAI)) {
- map->Add<screen_ai::mojom::ScreenAIAnnotator>(
- base::BindRepeating(&BindScreenAIAnnotator));
-@@ -779,14 +779,14 @@ void PopulateChromeWebUIFrameBinders(
+@@ -781,14 +781,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -87,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
-@@ -1114,7 +1114,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1111,7 +1111,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index c2f10d92ec7d..71cba7c6a9bf 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,4 +1,4 @@
---- chrome/browser/chrome_browser_main.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -230,11 +230,11 @@
@@ -23,8 +23,8 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
-@@ -1006,7 +1006,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
- AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
+@@ -1009,7 +1009,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+ browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -32,7 +32,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1019,7 +1019,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1022,7 +1022,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -41,7 +41,7 @@
// Set the product channel for crash reports.
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetChannelCrashKey(
-@@ -1040,7 +1040,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 6d6fff8f940a..668295937676 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,9 +1,9 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -377,7 +377,7 @@
+@@ -378,7 +378,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"
- #include "third_party/cros_system_api/switches/chrome_switches.h"
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/chrome_browser_main_linux.h"
@@ -59,7 +59,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -883,7 +883,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
+@@ -889,7 +889,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
int GetCrashSignalFD(const base::CommandLine& command_line) {
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
}
@@ -68,7 +68,7 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
-@@ -1400,7 +1400,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1406,7 +1406,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
std::move(parameters), &startup_data_);
@@ -77,7 +77,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
std::move(parameters), &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
-@@ -1434,7 +1434,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1440,7 +1440,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -86,7 +86,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
-@@ -1451,7 +1451,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1457,7 +1457,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@@ -95,7 +95,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -2200,6 +2200,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2206,6 +2206,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@@ -104,16 +104,16 @@
#else
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2519,7 +2521,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2513,7 +2515,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ // TODO(https://crbug.com/1316129): Re-enable for Lacros.
// Processes may only query perf_event_open with the BPF sandbox disabled.
if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
- command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) {
-@@ -3912,7 +3914,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3903,7 +3905,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -122,7 +122,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -4318,14 +4320,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4310,14 +4312,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@@ -139,7 +139,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -4358,7 +4360,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4350,7 +4352,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index 89820124902a..b2959c6b4fed 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -417,7 +417,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -414,7 +414,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;
diff --git a/www/chromium/files/patch-chrome_browser_component__updater_registration.cc b/www/chromium/files/patch-chrome_browser_component__updater_registration.cc
new file mode 100644
index 000000000000..782c92a32dab
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_component__updater_registration.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/component_updater/registration.cc.orig 2022-05-19 14:06:27 UTC
++++ chrome/browser/component_updater/registration.cc
+@@ -90,7 +90,7 @@
+ #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
+ #endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/component_updater/screen_ai_component_installer.h"
+ #endif // BUILDFLAG(IS_LINUX)
+
+@@ -214,7 +214,7 @@ void RegisterComponentsForUpdate() {
+
+ RegisterClientSidePhishingComponent(cus);
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ RegisterScreenAIComponent(cus, g_browser_process->local_state());
+ #endif // BUILDFLAG(IS_LINUX)
+
diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
index 4b0f3ecbf844..b548b1227e0e 100644
--- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
@@ -1,7 +1,7 @@
---- chrome/browser/dev_ui_browser_resources.grd.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
-@@ -46,7 +46,7 @@ This file specifies browser resources for developer-fa
- <include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="resources\predictors\resource_prefetch_predictor.js" type="BINDATA" />
+@@ -50,7 +50,7 @@ This file specifies browser resources for developer-fa
+ <include name="IDR_PROFILE_INTERNALS_HTML" file="resources\profiles\profile_internals.html" type="BINDATA" />
<include name="IDR_MEDIA_SESSION_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\services\media_session\public\mojom\media_session.mojom-webui.js" use_base_dir="false" type="BINDATA" />
- <if expr="is_android or is_linux">
diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index 90e0d59a8064..c08101b188a1 100644
--- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1540,7 +1540,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1533,7 +1533,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
target_info->is_filetype_handled_safely)
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
@@ -9,7 +9,7 @@
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
-@@ -1609,7 +1609,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1585,7 +1585,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
-@@ -1717,7 +1717,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
+@@ -1693,7 +1693,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
// 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()) {
-@@ -1759,7 +1759,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
+@@ -1735,7 +1735,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
ChromeDownloadManagerDelegate::GetRenameHandlerForDownload(
download::DownloadItem* download_item) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -36,7 +36,7 @@
return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded(
download_item);
#else
-@@ -1775,7 +1775,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
+@@ -1751,7 +1751,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
index 7322bb2b635c..64002dd0fec3 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_commands.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/download/download_commands.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/download/download_commands.cc
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,7 @@
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
-@@ -168,7 +168,7 @@ void DownloadCommands::ExecuteCommand(Command command)
+@@ -167,7 +167,7 @@ void DownloadCommands::ExecuteCommand(Command command)
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc
index bbd456e9bf0d..571caf3b35c3 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_file_picker.cc.orig 2022-05-02 18:33:07 UTC
+--- chrome/browser/download/download_file_picker.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/download/download_file_picker.cc
-@@ -14,7 +14,7 @@
+@@ -16,7 +16,7 @@
#include "content/public/browser/download_manager.h"
#include "content/public/browser/web_contents.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "ui/aura/window.h"
-@@ -74,7 +74,7 @@ DownloadFilePicker::DownloadFilePicker(DownloadItem* i
+@@ -76,7 +76,7 @@ DownloadFilePicker::DownloadFilePicker(DownloadItem* i
// dialog in Linux. See SelectFileImpl() in select_file_dialog_linux_gtk.cc.
// Here we make owning_window host to browser current active window
// if it is null. https://crbug.com/1301898
diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
index 3fd0a97eab3e..22ae1dedb0e4 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_item_model.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/download/download_item_model.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/download/download_item_model.cc
-@@ -660,7 +660,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -678,7 +678,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
-@@ -700,7 +700,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -718,7 +718,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
index d44f23417418..1191fd54aa79 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -13,6 +13,7 @@
#include "base/callback_helpers.h"
@@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
-@@ -289,7 +294,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -291,7 +296,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
/*default_value=*/base::Time());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -432,7 +437,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
+@@ -434,7 +439,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
bool DownloadPrefs::IsAutoOpenByUserUsed() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -55,7 +55,7 @@
if (ShouldOpenPdfInSystemReader())
return true;
#endif
-@@ -447,7 +452,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
+@@ -449,7 +454,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
extension.erase(0, 1);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -64,7 +64,7 @@
if (base::FilePath::CompareEqualIgnoreCase(extension,
FILE_PATH_LITERAL("pdf")) &&
ShouldOpenPdfInSystemReader())
-@@ -502,7 +507,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
+@@ -504,7 +509,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -73,7 +73,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
-@@ -524,7 +529,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -526,7 +531,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -82,7 +82,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
-@@ -664,7 +669,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -666,7 +671,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
#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/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
index 3b9cdcce2bf0..7bc29b44a5a3 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/download/download_prefs.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/download/download_prefs.h
@@ -125,7 +125,7 @@ class DownloadPrefs {
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
@@ -9,7 +9,7 @@
// 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);
-@@ -184,7 +184,7 @@ class DownloadPrefs {
+@@ -185,7 +185,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/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index 7f9cc0d5ca15..12a4cc805196 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1299,6 +1299,10 @@ static_library("extensions") {
+@@ -1302,6 +1302,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
index cec9c02cb102..86eb1466c079 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2021-04-14 18:40:53 UTC
+--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
-@@ -22,6 +22,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
+@@ -21,6 +21,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -8,7 +8,7 @@
if (g_test_device_list.Get().get() != nullptr) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
-@@ -35,6 +36,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
+@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
base::BindOnce(&RemovableStorageProvider::PopulateDeviceList),
std::move(callback));
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
index 8e814e8a9a64..c70ae09c36a8 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
-@@ -30,7 +30,7 @@
+@@ -29,7 +29,7 @@
#include "extensions/browser/process_manager.h"
#include "extensions/common/error_utils.h"
@@ -9,7 +9,7 @@
#include "extensions/common/permissions/permissions_data.h"
#endif
-@@ -39,7 +39,7 @@ namespace {
+@@ -38,7 +38,7 @@ namespace {
bool CanEnableAudioDebugRecordingsFromExtension(
const extensions::Extension* extension) {
bool enabled_by_permissions = false;
@@ -18,7 +18,7 @@
if (extension) {
enabled_by_permissions =
extension->permissions_data()->active_permissions().HasAPIPermission(
-@@ -580,7 +580,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
+@@ -579,7 +579,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
ExtensionFunction::ResponseAction
WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
index ccfb84227366..ae603afe7673 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
#include "ppapi/buildflags/buildflags.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
-@@ -124,7 +124,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+@@ -133,7 +133,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
extensions::SignedInDevicesManager::GetFactoryInstance();
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index ffbb2e4afcf6..67486d5f9f47 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -5688,7 +5688,7 @@ const char kDownloadShelfWebUIDescription[] =
+@@ -5639,7 +5639,7 @@ const char kDownloadShelfWebUIDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
const char kWebuiFeedbackName[] = "WebUI Feedback";
const char kWebuiFeedbackDescription[] =
-@@ -5699,7 +5699,7 @@ const char kWebuiFeedbackDescription[] =
+@@ -5650,7 +5650,7 @@ const char kWebuiFeedbackDescription[] =
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
const char kDesktopRestructuredLanguageSettingsName[] =
"Restructured Language Settings (Desktop)";
-@@ -5725,7 +5725,7 @@ const char kWebShareDescription[] =
+@@ -5676,7 +5676,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -27,7 +27,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -5737,7 +5737,7 @@ const char kOzonePlatformHintDescription[] =
+@@ -5688,7 +5688,7 @@ const char kOzonePlatformHintDescription[] =
"\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. ";
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
@@ -36,7 +36,7 @@
const char kCleanUndecryptablePasswordsLinuxName[] =
"Cleanup local undecryptable passwords during initial sync flow";
const char kCleanUndecryptablePasswordsLinuxDescription[] =
-@@ -5750,7 +5750,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
+@@ -5701,7 +5701,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX)
@@ -45,7 +45,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
-@@ -5867,7 +5867,7 @@ const char kElasticOverscrollDescription[] =
+@@ -5832,7 +5832,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index eb4a09c1b6ac..c15792e97796 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/flag_descriptions.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -3276,7 +3276,7 @@ extern const char kDownloadShelfWebUIDescription[];
+@@ -3241,7 +3241,7 @@ extern const char kDownloadShelfWebUIDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
extern const char kWebuiFeedbackName[];
extern const char kWebuiFeedbackDescription[];
-@@ -3285,7 +3285,7 @@ extern const char kWebuiFeedbackDescription[];
+@@ -3250,7 +3250,7 @@ extern const char kWebuiFeedbackDescription[];
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
extern const char kDesktopRestructuredLanguageSettingsName[];
extern const char kDesktopRestructuredLanguageSettingsDescription[];
-@@ -3304,7 +3304,7 @@ extern const char kWebShareName[];
+@@ -3269,7 +3269,7 @@ extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -27,7 +27,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -3320,7 +3320,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
+@@ -3285,7 +3285,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX)
@@ -36,7 +36,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -3402,7 +3402,7 @@ extern const char kElasticOverscrollDescription[];
+@@ -3377,7 +3377,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc
index be8233631306..4713f329eb17 100644
--- a/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc
+++ b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/audio_service_util.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/media/audio_service_util.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/media/audio_service_util.cc
@@ -21,7 +21,7 @@
@@ -9,7 +9,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
bool GetPolicyOrFeature(const char* policy_name, const base::Feature& feature) {
const policy::PolicyMap& policies =
-@@ -41,7 +41,7 @@ bool GetPolicyOrFeature(const char* policy_name, const
+@@ -40,7 +40,7 @@ bool GetPolicyOrFeature(const char* policy_name, const
bool IsAudioServiceSandboxEnabled() {
// TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being
// built with OS_CHROMEOS instead of OS_LINUX.
diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
index 174848de2493..f92ee97ce131 100644
--- a/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/media/router/discovery/BUILD.gn
-@@ -94,7 +94,7 @@ static_library("discovery") {
+@@ -79,7 +79,7 @@ static_library("discovery") {
"media_sink_discovery_metrics.h",
]
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
index 0d84ec44ea96..be4c6b83e83f 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -363,6 +363,10 @@ void WebRtcLogUploader::SetupMultipart(
+@@ -362,6 +362,10 @@ void WebRtcLogUploader::SetupMultipart(
const char product[] = "Chrome_ChromeOS";
#elif BUILDFLAG(IS_FUCHSIA)
const char product[] = "Chrome_Fuchsia";
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
index 5266ccb476a1..6d56e2f1ab3a 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
-@@ -25,10 +25,10 @@
+@@ -24,10 +24,10 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/render_process_host.h"
@@ -13,7 +13,7 @@
using webrtc_event_logging::WebRtcEventLogManager;
-@@ -282,7 +282,7 @@ void WebRtcLoggingController::StartEventLogging(
+@@ -281,7 +281,7 @@ void WebRtcLoggingController::StartEventLogging(
web_app_id, callback);
}
@@ -22,7 +22,7 @@
void WebRtcLoggingController::GetLogsDirectory(
LogsDirectoryCallback callback,
LogsDirectoryErrorCallback error_callback) {
-@@ -328,7 +328,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
+@@ -327,7 +327,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
FROM_HERE,
base::BindOnce(std::move(callback), file_system.id(), registered_name));
}
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index 00d3ad3d30ca..912d6984b293 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -769,7 +769,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
-@@ -859,7 +859,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -874,7 +874,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@@ -17,8 +17,8 @@
+#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)
-@@ -1039,7 +1039,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+ metrics_service_->RegisterMetricsProvider(
+@@ -1053,7 +1053,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index 2fb30b298577..2c8698541206 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/net/system_network_context_manager.cc
-@@ -91,7 +91,7 @@
+@@ -90,7 +90,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
-@@ -173,7 +173,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -172,7 +172,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@@ -18,7 +18,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -467,7 +467,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -466,7 +466,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@@ -27,7 +27,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -534,7 +534,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -533,7 +533,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string());
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
std::string());
diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
index 7c7584a02130..cf7943370f20 100644
--- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/notifications/notification_display_service_impl.cc
@@ -32,7 +32,7 @@
#endif
@@ -15,10 +15,10 @@
user_prefs::PrefRegistrySyncable* registry) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true);
registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true);
#endif
-@@ -82,7 +82,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
+ }
+@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
std::make_unique<PersistentNotificationHandler>());
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -27,7 +27,7 @@
AddNotificationHandler(
NotificationHandler::Type::SEND_TAB_TO_SELF,
std::make_unique<send_tab_to_self::DesktopNotificationHandler>(
-@@ -90,7 +90,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
+@@ -89,7 +89,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc b/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc
index b76fb7634ea3..cc6e40bebaa5 100644
--- a/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc
+++ b/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc
@@ -1,6 +1,6 @@
---- chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc
-@@ -17,7 +17,7 @@
+@@ -16,7 +16,7 @@
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
@@ -9,7 +9,7 @@
#include "base/memory/memory_pressure_monitor.h"
#endif
-@@ -122,7 +122,7 @@ void HighPMFDiscardPolicy::OnProcessMemoryMetricsAvail
+@@ -121,7 +121,7 @@ void HighPMFDiscardPolicy::OnProcessMemoryMetricsAvail
if (should_discard) {
discard_attempt_in_progress_ = true;
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc
index 66e4c89e08ee..c88046d4002e 100644
--- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc
+++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc
@@ -1,11 +1,11 @@
---- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/performance_monitor/process_metrics_recorder_util.cc
-@@ -39,7 +39,7 @@ void RecordProcessHistograms(const char* histogram_suf
- metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin,
+@@ -43,7 +43,7 @@ void RecordProcessHistograms(const char* histogram_suf
kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount);
+ #endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
base::UmaHistogramCounts10000(
- base::JoinString({"PerformanceMonitor.IdleWakeups.", histogram_suffix},
- ""),
+ base::StrCat({"PerformanceMonitor.IdleWakeups.", histogram_suffix}),
+ metrics.idle_wakeups);
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc
index 7eb2ce3c9034..d4341d8d8ff2 100644
--- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc
+++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc
@@ -1,7 +1,16 @@
---- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/performance_monitor/process_monitor.cc
-@@ -83,7 +83,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
- lhs.cpu_usage += rhs.cpu_usage;
+@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
+ metrics.precise_cpu_usage = process_metrics.GetPreciseCPUUsage();
+ #endif
+ #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)
+@@ -119,7 +119,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
+ #endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h
index 026781f76c1e..7e90761af238 100644
--- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h
+++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h
@@ -1,7 +1,7 @@
---- chrome/browser/performance_monitor/process_monitor.h.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/performance_monitor/process_monitor.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/performance_monitor/process_monitor.h
-@@ -52,7 +52,7 @@ class ProcessMonitor {
- double cpu_usage = 0.0;
+@@ -78,7 +78,7 @@ class ProcessMonitor : public content::BrowserChildPro
+ #endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
index 15c89668c143..3a6b435d8c1b 100644
--- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
-@@ -46,7 +46,7 @@
+@@ -47,7 +47,7 @@
#include "chrome/browser/policy/browser_dm_token_storage_mac.h"
#endif // BUILDFLAG(IS_MAC)
@@ -9,7 +9,7 @@
#include "chrome/browser/policy/browser_dm_token_storage_linux.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
#include "chrome/install_static/install_util.h"
#endif // BUILDFLAG(IS_WIN)
@@ -18,7 +18,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.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"
-@@ -88,7 +88,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
+@@ -89,7 +89,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
#if BUILDFLAG(IS_MAC)
storage_delegate = std::make_unique<BrowserDMTokenStorageMac>();
@@ -27,7 +27,7 @@
storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>();
#elif BUILDFLAG(IS_WIN)
storage_delegate = std::make_unique<BrowserDMTokenStorageWin>();
-@@ -243,7 +243,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
+@@ -244,7 +244,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager>
ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() {
diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index 446934d960d9..c5533c6b1ade 100644
--- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,6 +1,15 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -1473,7 +1473,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -187,7 +187,7 @@
+ #endif // BUILDFLAG(ENABLE_SIDE_SEARCH)
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h"
+ #endif
+
+@@ -1557,7 +1557,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS)
@@ -9,7 +18,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
-@@ -1582,7 +1582,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1624,7 +1624,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -18,25 +27,25 @@
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
-@@ -1888,7 +1888,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
- #endif // BUILDFLAG(IS_ANDROID)
+@@ -1940,7 +1940,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+ key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
+ chrome_schema));
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
-- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- handlers->AddHandler(
- std::make_unique<
- enterprise_connectors::EnterpriseConnectorsPolicyHandler>(
-@@ -2258,7 +2258,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
- SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
+-#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<LocalSyncPolicyHandler>());
+ handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+@@ -2294,7 +2294,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+ static_cast<int>(variations::RestrictionPolicy::ALL), false));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>(
- key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema,
- SCHEMA_ALLOW_UNKNOWN,
-@@ -2289,7 +2289,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+ handlers->AddHandler(
+ std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+@@ -2313,7 +2313,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
policy::key::kSpellcheckLanguageBlocklist));
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index 1c10cfa7db70..db49d7358c07 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -423,14 +423,14 @@
+@@ -430,14 +430,14 @@
#include "components/os_crypt/os_crypt.h"
#endif
@@ -17,7 +17,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -1162,7 +1162,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
+@@ -1191,7 +1191,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
@@ -26,7 +26,16 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif
-@@ -1466,7 +1466,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1205,7 +1205,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
+ registry->RegisterBooleanPref(
+ policy::policy_prefs::kSetTimeoutWithout1MsClampEnabled, false);
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ screen_ai::RegisterLocalStatePrefs(registry);
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+
+@@ -1504,7 +1504,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
index c04a0dd08d38..8374e8b2683c 100644
--- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
@@ -1,15 +1,15 @@
---- chrome/browser/printing/print_backend_service_manager.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/printing/print_backend_service_manager.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
-@@ -420,7 +420,7 @@ uint32_t PrintBackendServiceManager::RegisterClient(
+@@ -480,7 +480,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R
query_clients_.insert(client_id);
break;
case ClientType::kQueryWithUi:
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- DCHECK_EQ(query_with_ui_clients_.size(), 0u);
+ if (!query_with_ui_clients_.empty())
+ return absl::nullopt;
#endif
- query_with_ui_clients_.insert(client_id);
-@@ -644,7 +644,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -705,7 +705,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
break;
case ClientType::kQueryWithUi:
@@ -18,7 +18,7 @@
// No need to update if there were other query with UI clients.
if (query_with_ui_clients_.size() > 1)
return absl::nullopt;
-@@ -701,7 +701,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -762,7 +762,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:
diff --git a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc
index 3a87ff4df601..7bcb6159f42c 100644
--- a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc
+++ b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/print_job_worker.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/printing/print_job_worker.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/printing/print_job_worker.cc
-@@ -220,7 +220,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n
+@@ -216,7 +216,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend->GetPrinterDriverInfo(printer_name));
diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index e6bd2cfbb3f0..a59897bf8a89 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -395,7 +395,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -400,7 +400,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
index bd6ebd137dbb..841292078166 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profile_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/profiles/profile_impl.cc
-@@ -266,6 +266,10 @@
+@@ -264,6 +264,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
-@@ -852,7 +856,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
+@@ -844,7 +848,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts
index 6a9f629650d7..503b3d11307a 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts
@@ -1,11 +1,11 @@
---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-02-07 13:39:41 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts
@@ -16,7 +16,7 @@ export interface AppearanceBrowserProxy {
useDefaultTheme(): void;
-- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_bsd and not chromeos">
+- // <if expr="is_linux and not chromeos_ash">
++ // <if expr="is_bsd and not chromeos_ash">
useSystemTheme(): void;
// </if>
@@ -13,8 +13,8 @@
chrome.send('useDefaultTheme');
}
-- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_bsd and not chromeos">
+- // <if expr="is_linux and not chromeos_ash">
++ // <if expr="is_bsd and not chromeos_ash">
useSystemTheme() {
chrome.send('useSystemTheme');
}
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
index 522102aa1e38..7990e1a34ff0 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
@@ -1,4 +1,4 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -27,7 +27,7 @@
<cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
@@ -13,8 +13,8 @@
</cr-button>
</template>
</if>
--<if expr="is_linux and not chromeos and not lacros">
-+<if expr="is_posix and not chromeos and not lacros">
+-<if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++<if expr="is_posix and not chromeos_ash and not chromeos_lacros">
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, useSystemTheme_)]]"
@@ -22,8 +22,8 @@
pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
label="$i18n{showBookmarksBar}">
</settings-toggle-button>
--<if expr="is_linux and not chromeos and not lacros">
-+<if expr="is_posix and not chromeos and not lacros">
+-<if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++<if expr="is_posix and not chromeos_ash and not chromeos_lacros">
<div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div>
<settings-toggle-button
hidden="[[!showCustomChromeFrame_]]"
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
index 39444d6681b1..20b321bd4c5b 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
@@ -1,11 +1,11 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -146,7 +146,7 @@ export class SettingsAppearancePageElement extends
'prefs.autogenerated.theme.policy.color.controlledBy)',
},
-- // <if expr="is_linux and not chromeos and not lacros">
-+ // <if expr="is_posix and not chromeos and not lacros">
+- // <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ // <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
/**
* Whether to show the "Custom Chrome Frame" setting.
*/
@@ -13,8 +13,8 @@
'themeChanged_(' +
'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)',
-- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_posix and not chromeos">
+- // <if expr="is_linux and not chromeos_ash">
++ // <if expr="is_posix and not chromeos_ash">
// NOTE: this pref only exists on Linux.
'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
// </if>
@@ -22,8 +22,8 @@
private showReaderModeOption_: boolean;
private isForcedTheme_: boolean;
-- // <if expr="is_linux and not chromeos and not lacros">
-+ // <if expr="is_posix and not chromeos and not lacros">
+- // <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ // <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
private showCustomChromeFrame_: boolean;
// </if>
@@ -31,8 +31,8 @@
this.appearanceBrowserProxy_.useDefaultTheme();
}
-- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_posix and not chromeos">
+- // <if expr="is_linux and not chromeos_ash">
++ // <if expr="is_posix and not chromeos_ash">
private useSystemThemePrefChanged_(useSystemTheme: boolean) {
this.useSystemTheme_ = useSystemTheme;
}
@@ -40,8 +40,8 @@
}
let i18nId;
-- // <if expr="is_linux and not chromeos and not lacros">
-+ // <if expr="is_posix and not chromeos and not lacros">
+- // <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ // <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme';
// </if>
- // <if expr="not is_linux or chromeos_ash or chromeos_lacros">
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
index 65eeddfba783..be6eb02d57a1 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
@@ -1,6 +1,6 @@
---- chrome/browser/resources/settings/route.ts.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/resources/settings/route.ts.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/resources/settings/route.ts
-@@ -185,7 +185,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
+@@ -188,7 +188,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y');
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
index 6d6d4fe52a48..f8d53d434290 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
@@ -1,24 +1,24 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
-@@ -21,7 +21,7 @@
+@@ -20,7 +20,7 @@
#include "content/public/browser/browser_thread.h"
#include "url/gurl.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) | BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h"
#endif
-@@ -102,7 +102,7 @@ void FileAnalyzer::Start(const base::FilePath& target_
+@@ -101,7 +101,7 @@ void FileAnalyzer::Start(const base::FilePath& target_
} else if (inspection_type == DownloadFileType::DMG) {
StartExtractDmgFeatures();
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- } else if (base::FeatureList::IsEnabled(
- safe_browsing::kClientSideDetectionDocumentScanning) &&
- inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
-@@ -286,7 +286,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
+ } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
+ StartExtractDocumentFeatures();
+ #endif
+@@ -283,7 +283,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
index 10862fcee8b9..b7a83e3882ac 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
@@ -1,6 +1,6 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.h
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
#include "components/safe_browsing/core/common/proto/csd.pb.h"
#include "third_party/protobuf/src/google/protobuf/repeated_field.h"
@@ -9,7 +9,7 @@
#include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h"
#endif
-@@ -111,7 +111,7 @@ class FileAnalyzer {
+@@ -112,7 +112,7 @@ class FileAnalyzer {
const safe_browsing::ArchiveAnalyzerResults& archive_results);
#endif
@@ -18,7 +18,7 @@
void StartExtractDocumentFeatures();
void OnDocumentAnalysisFinished(
const DocumentAnalyzerResults& document_results);
-@@ -131,7 +131,7 @@ class FileAnalyzer {
+@@ -132,7 +132,7 @@ class FileAnalyzer {
scoped_refptr<SandboxedDMGAnalyzer> dmg_analyzer_;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
index 10916cbe3ae1..fd15c8fa7cab 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -708,7 +708,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
+@@ -707,7 +707,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
// Process::Current().CreationTime() is missing on some platforms.
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc b/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc
new file mode 100644
index 000000000000..ed53b893c4a0
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc
@@ -0,0 +1,38 @@
+--- chrome/browser/signin/primary_account_policy_manager.cc.orig 2022-05-19 14:06:27 UTC
++++ chrome/browser/signin/primary_account_policy_manager.cc
+@@ -22,7 +22,7 @@
+ #include "google_apis/gaia/gaia_auth_util.h"
+ #include "ui/base/l10n/l10n_util.h"
+
+-#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/profiles/profile_manager.h"
+ #include "chrome/browser/ui/browser.h"
+ #include "chrome/browser/ui/browser_finder.h"
+@@ -34,7 +34,7 @@
+ #include "chrome/browser/ui/webui/profile_helper.h"
+ #endif
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ // Manager that presents the profile will be deleted dialog on the first active
+ // browser window.
+ class PrimaryAccountPolicyManager::DeleteProfileDialogManager
+@@ -249,7 +249,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
+ break;
+ }
+ case signin::Tribool::kFalse:
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ // Force remove the profile if sign out is not allowed and if the
+ // primary account is no longer allowed.
+ // This may be called while the profile is initializing, so it must be
+@@ -280,7 +280,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
+ #endif // !BUILDFLAG(IS_CHROMEOS_ASH)
+ }
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ // Shows the delete profile dialog on the first browser active window.
+ void PrimaryAccountPolicyManager::ShowDeleteProfileDialog(
+ Profile* profile,
diff --git a/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.h b/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.h
new file mode 100644
index 000000000000..130138098df4
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.h
@@ -0,0 +1,20 @@
+--- chrome/browser/signin/primary_account_policy_manager.h.orig 2022-05-19 14:06:27 UTC
++++ chrome/browser/signin/primary_account_policy_manager.h
+@@ -44,7 +44,7 @@ class PrimaryAccountPolicyManager : public KeyedServic
+ Profile* profile,
+ signin_metrics::ProfileSignout clear_primary_account_source);
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ class DeleteProfileDialogManager;
+
+ // SHows the delete profile dialog.
+@@ -68,7 +68,7 @@ class PrimaryAccountPolicyManager : public KeyedServic
+ // profile-specific local prefs (like kGoogleServicesUsernamePattern).
+ PrefChangeRegistrar local_state_pref_registrar_;
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ std::unique_ptr<DeleteProfileDialogManager> delete_profile_dialog_manager_;
+ bool hide_ui_for_testing_ = false;
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
deleted file mode 100644
index 155a3866bc82..000000000000
--- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/signin/signin_util.cc.orig 2022-03-25 21:59:56 UTC
-+++ chrome/browser/signin/signin_util.cc
-@@ -39,7 +39,7 @@
- #include "ui/base/l10n/l10n_util.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_finder.h"
- #include "chrome/browser/ui/browser_list.h"
- #include "chrome/browser/ui/browser_list_observer.h"
diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
index a3f57960398e..bceba5d45c5e 100644
--- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
-@@ -411,7 +411,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -433,7 +433,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
// 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/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index 7f1052143a43..3d8d4a3acd73 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -217,7 +217,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -216,7 +216,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
}
int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
index f5754ce6aece..201e89390c56 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/themes/theme_service.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/themes/theme_service.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/themes/theme_service.cc
-@@ -73,7 +73,7 @@
+@@ -72,7 +72,7 @@
#include "extensions/browser/extension_registry_observer.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
-@@ -512,7 +512,7 @@ ThemeService::BrowserThemeProvider::GetColorProviderCo
+@@ -511,7 +511,7 @@ ThemeService::BrowserThemeProvider::GetColorProviderCo
native_theme = ui::NativeTheme::GetInstanceForDarkUI();
} else {
native_theme = ui::NativeTheme::GetInstanceForNativeUi();
@@ -18,7 +18,7 @@
if (const auto* linux_ui = views::LinuxUI::instance()) {
native_theme =
linux_ui->GetNativeTheme(delegate_->ShouldUseSystemTheme());
-@@ -632,7 +632,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
+@@ -631,7 +631,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseSystemTheme() const {
@@ -27,7 +27,7 @@
return profile_->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
#else
return false;
-@@ -640,7 +640,7 @@ bool ThemeService::ShouldUseSystemTheme() const {
+@@ -639,7 +639,7 @@ bool ThemeService::ShouldUseSystemTheme() const {
}
bool ThemeService::ShouldUseCustomFrame() const {
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index a9eb0f08a1b7..b3fdff9f3d18 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/browser_command_controller.cc
-@@ -70,7 +70,7 @@
+@@ -71,7 +71,7 @@
#include "ui/base/ui_base_features.h"
#include "ui/events/keycodes/keyboard_codes.h"
@@ -9,7 +9,7 @@
#include "ui/accessibility/accessibility_features.h"
#endif
-@@ -92,7 +92,7 @@
+@@ -96,7 +96,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
-@@ -283,7 +283,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -287,7 +287,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +27,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -519,7 +519,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -523,7 +523,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -36,7 +36,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -888,7 +888,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -926,7 +926,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
ExecuteUIDebugCommand(id, browser_);
break;
@@ -45,7 +45,7 @@
case IDC_RUN_SCREEN_AI:
RunScreenAi(browser_);
break;
-@@ -1050,7 +1050,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1088,7 +1088,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -54,7 +54,7 @@
command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
-@@ -1431,7 +1431,7 @@ void BrowserCommandController::UpdateCommandsForFullsc
+@@ -1474,7 +1474,7 @@ void BrowserCommandController::UpdateCommandsForFullsc
command_updater_.UpdateCommandEnabled(
IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY, main_not_fullscreen);
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc
index 2a1b21a781b8..9ccd79eefb9f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/browser_commands.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/browser_commands.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/browser_commands.cc
@@ -176,7 +176,7 @@
#include "chromeos/lacros/lacros_service.h"
@@ -9,8 +9,8 @@
#include "ui/accessibility/ax_action_data.h"
#include "ui/accessibility/ax_enums.mojom.h"
#endif
-@@ -1873,7 +1873,7 @@ void FollowSite(Browser* browser, content::WebContents
- feed::FollowSite(web_contents);
+@@ -1859,7 +1859,7 @@ void UnfollowSite(content::WebContents* web_contents)
+ feed::UnfollowSite(web_contents);
}
-#if BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__commands.h b/www/chromium/files/patch-chrome_browser_ui_browser__commands.h
index d7065b70f756..a9511ee83274 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__commands.h
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__commands.h
@@ -1,8 +1,8 @@
---- chrome/browser/ui/browser_commands.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/browser_commands.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/browser_commands.h
-@@ -250,7 +250,7 @@ void ProcessInterceptedChromeURLNavigationInIncognito(
- // Follows a web feed associated with the main frame of specified web contents.
- void FollowSite(Browser* browser, content::WebContents* web_contents);
+@@ -251,7 +251,7 @@ void ProcessInterceptedChromeURLNavigationInIncognito(
+ void FollowSite(content::WebContents* web_contents);
+ void UnfollowSite(content::WebContents* web_contents);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
index d72bd43d0b07..48471d5179ed 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/chrome_pages.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/chrome_pages.cc
-@@ -553,7 +553,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -561,7 +561,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
index b8873227ec81..c4500cd60570 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
@@ -1,8 +1,8 @@
---- chrome/browser/ui/signin_view_controller.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/ui/signin_view_controller.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/signin_view_controller.cc
-@@ -259,7 +259,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
+@@ -262,7 +262,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
SkColor profile_color,
- base::OnceCallback<void(bool)> callback) {
+ signin::SigninChoiceCallback callback) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h
index 576db126de2e..246febfc321f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h
+++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/signin_view_controller_delegate.h
-@@ -74,7 +74,7 @@ class SigninViewControllerDelegate {
+@@ -75,7 +75,7 @@ class SigninViewControllerDelegate {
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index 7f800b5861c7..57dfa984310d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,7 +1,7 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -126,7 +126,7 @@
- #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
+@@ -128,7 +128,7 @@
+ #include "chrome/credential_provider/common/gcp_strings.h"
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#endif
-@@ -948,7 +948,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1007,7 +1007,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@@ -18,7 +18,7 @@
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
-@@ -1140,7 +1140,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1197,7 +1197,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
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);
diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index e5f83c8bcd8b..8e542f4d7477 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -181,7 +181,7 @@
+@@ -192,7 +192,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
#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"
-@@ -505,13 +505,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -530,13 +530,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -25,12 +25,12 @@
if (base::FeatureList::IsEnabled(
features::kHappinessTrackingSurveysForDesktopDemo) ||
base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) ||
-@@ -522,7 +522,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -551,7 +551,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- SharedHighlightingPromo::CreateForWebContents(web_contents);
- #endif
-
+ if (base::FeatureList::IsEnabled(
+ autofill_assistant::features::kAutofillAssistantDesktop)) {
+ autofill_assistant::CreateForWebContents(web_contents);
diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index 010f9d21e664..db8f379cdb37 100644
--- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -451,7 +451,7 @@ std::u16string TaskManagerTableModel::GetText(int row,
+@@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(int row,
? stringifier_->backgrounded_string()
: stringifier_->foregrounded_string();
@@ -9,7 +9,7 @@
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)
-@@ -618,7 +618,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+@@ -621,7 +621,7 @@ int TaskManagerTableModel::CompareValues(int row1,
return BooleanCompare(is_proc1_bg, is_proc2_bg);
}
@@ -18,7 +18,7 @@
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
const int proc1_fd_count =
observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -792,7 +792,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -795,7 +795,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
type = REFRESH_TYPE_KEEPALIVE_COUNT;
break;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index b8a56d7afedb..d618a4423631 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
-@@ -61,7 +61,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -62,11 +62,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -8,8 +8,13 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || 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) || BUILDFLAG(IS_CHROMEOS_LACROS)
+-#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)
{ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
-@@ -93,7 +93,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+ {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+ IDC_MOVE_TAB_PREVIOUS},
+@@ -97,7 +97,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +23,7 @@
{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},
-@@ -138,7 +138,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -142,7 +142,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
IDC_SHOW_AVATAR_MENU},
// Platform-specific key maps.
@@ -27,8 +32,8 @@
{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},
-@@ -229,7 +229,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
- {ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_COMMANDER},
+@@ -240,7 +240,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+ {ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS},
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
#endif // !BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc
index ebbe59d763bb..1ef2802c3c51 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc
-@@ -81,7 +81,7 @@ void EyeDropperView::MoveViewToFront() {
+@@ -86,7 +86,7 @@ void EyeDropperView::MoveViewToFront() {
}
void EyeDropperView::CaptureInputIfNeeded() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index 760de2cf1e4e..0b8c96b46162 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1945,7 +1945,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -1956,7 +1956,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
// CrOS cleanup is done.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index 98befea058f7..9e2f319ba90e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -53,7 +53,7 @@
#include "ui/views/window/vector_icons/vector_icons.h"
@@ -9,7 +9,7 @@
#include "ui/views/controls/menu/menu_runner.h"
#endif
-@@ -541,7 +541,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
+@@ -542,7 +542,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
OpaqueBrowserFrameView::GetFrameButtonStyle() const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
return FrameButtonStyle::kMdButton;
#else
return FrameButtonStyle::kImageButton;
-@@ -751,7 +751,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
+@@ -752,7 +752,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
}
void OpaqueBrowserFrameView::WindowIconPressed() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
index c0e369a2dd4b..501b649783ba 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -611,7 +611,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
+@@ -610,7 +610,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
index 33ac4384e4fa..aadbc302c4da 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
-@@ -138,7 +138,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
+@@ -139,7 +139,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// static
std::unique_ptr<views::WebView>
SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView(
-@@ -417,7 +417,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
+@@ -421,7 +421,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
index 6fcdbb7001d8..3cdb605a96fe 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
-@@ -71,7 +71,7 @@ class SigninViewControllerDelegateViews
+@@ -72,7 +72,7 @@ class SigninViewControllerDelegateViews
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tab__dialogs__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_tab__dialogs__views.cc
deleted file mode 100644
index 78ee24e0f062..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_views_tab__dialogs__views.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/tab_dialogs_views.cc.orig 2022-04-21 18:48:31 UTC
-+++ chrome/browser/ui/views/tab_dialogs_views.cc
-@@ -15,7 +15,7 @@
- #include "content/public/browser/web_contents.h"
-
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view.h"
- #endif
-
-@@ -83,7 +83,7 @@ void TabDialogsViews::ShowDeprecatedAppsDialog(
- const std::set<extensions::ExtensionId>& deprecated_app_ids,
- content::WebContents* web_contents) {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- DeprecatedAppsDialogView::CreateAndShowDialog(deprecated_app_ids,
- web_contents);
- #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
index f80771e5ce24..af33ce6bf360 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/tabs/tab.cc
-@@ -580,7 +580,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
+@@ -582,7 +582,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
return;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index 76a393a8298e..daad11b85efb 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-05-11 06:38:23 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -480,7 +480,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
@@ -27,7 +27,7 @@
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
-@@ -2359,7 +2359,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2358,7 +2358,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
index a58769788db8..6b60931ed6e5 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
-@@ -68,7 +68,7 @@ GetMemoryPressureOverride() {
+@@ -71,7 +71,7 @@ GetMemoryPressureOverride() {
// Fetches the Omnibox drop-down widget, or returns null if the drop-down is
// not visible.
void FixWidgetStackOrder(views::Widget* widget, const Browser* browser) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc b/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc
index 3c05ffaa72ea..06b162d7df10 100644
--- a/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/web_applications/app_browser_controller.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/web_applications/app_browser_controller.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/web_applications/app_browser_controller.cc
-@@ -379,7 +379,7 @@ CustomThemeSupplier* AppBrowserController::GetThemeSup
+@@ -385,7 +385,7 @@ CustomThemeSupplier* AppBrowserController::GetThemeSup
}
bool AppBrowserController::ShouldUseSystemTheme() const {
@@ -9,7 +9,7 @@
return browser_->profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
#else
return false;
-@@ -387,7 +387,7 @@ bool AppBrowserController::ShouldUseSystemTheme() cons
+@@ -393,7 +393,7 @@ bool AppBrowserController::ShouldUseSystemTheme() cons
}
bool AppBrowserController::ShouldUseCustomFrame() const {
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
index 45df4b04931f..a323b2fda89f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/webui/about_ui.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/webui/about_ui.cc
-@@ -619,7 +619,7 @@ std::string ChromeURLs() {
+@@ -622,7 +622,7 @@ std::string ChromeURLs() {
return html;
}
@@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data,
-@@ -677,7 +677,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -680,7 +680,7 @@ void AboutUIHTMLSource::StartDataRequest(
response =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index 8c780073200e..bc8f13bfea06 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -299,7 +299,7 @@
+@@ -304,7 +304,7 @@
#include "chrome/browser/ui/webui/app_launcher_page_ui.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
#endif
-@@ -324,17 +324,17 @@
+@@ -329,17 +329,17 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -30,7 +30,7 @@
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
-@@ -682,7 +682,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -695,7 +695,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@@ -39,7 +39,7 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1098,7 +1098,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1115,7 +1115,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<ash::SampleSystemWebAppUI>;
#endif // !defined(OFFICIAL_BUILD)
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
-@@ -1156,7 +1156,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1173,7 +1173,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@@ -57,7 +57,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
-@@ -1212,27 +1212,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1229,27 +1229,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc
index e7914b6f84a7..e715ba89489c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc
@@ -1,15 +1,15 @@
---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
-@@ -316,7 +316,7 @@ void AppLauncherHandler::CreateExtensionInfo(const Ext
-
+@@ -316,7 +316,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
bool is_deprecated_app = false;
+ auto* context = extension_service_->GetBrowserContext();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(
- extension_service_->GetBrowserContext(), extension->id());
+ is_deprecated_app =
+ extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
#endif
-@@ -1379,7 +1379,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
+@@ -1387,7 +1387,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] =
web_app->CanUserUninstallWebApp();
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index 5ba6ce92d4a6..7e23bc2e263b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -117,7 +117,7 @@
+@@ -116,7 +116,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/display/screen.h"
#endif
-@@ -138,7 +138,7 @@
+@@ -137,7 +137,7 @@
#include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
#endif
@@ -18,7 +18,7 @@
#include "ui/ozone/public/ozone_platform.h"
#endif
-@@ -372,7 +372,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -371,7 +371,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +27,7 @@
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -380,7 +380,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -379,7 +379,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@@ -36,7 +36,7 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
-@@ -401,7 +401,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -400,7 +400,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
index d336ec99bd48..37d543d1a4f9 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
@@ -1,6 +1,15 @@
---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/web_applications/extensions/extension_status_utils.cc
-@@ -88,7 +88,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
+@@ -26,7 +26,7 @@ namespace {
+ const char* g_preinstalled_app_for_testing = nullptr;
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ base::Feature kChromeAppsDeprecationExcludeForceInstalls(
+ "ChromeAppsDeprecationExcludeForceInstalls",
+ base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -100,7 +100,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
index 136df987cd17..0f2ee6457227 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/web_applications/os_integration/web_app_shortcut.h
@@ -19,7 +19,7 @@
#include "ui/gfx/image/image_family.h"
@@ -9,16 +9,16 @@
#include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -47,7 +47,7 @@ struct ScopedShortcutOverrideForTesting {
- base::ScopedTempDir startup;
+@@ -48,7 +48,7 @@ struct ScopedShortcutOverrideForTesting {
#elif BUILDFLAG(IS_MAC)
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;
#endif
-@@ -90,7 +90,7 @@ struct ShortcutInfo {
+@@ -91,7 +91,7 @@ struct ShortcutInfo {
std::set<std::string> file_handler_extensions;
std::set<std::string> file_handler_mime_types;
std::set<std::string> protocol_handlers;
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc
index 5ecbbf680c84..2d75aa220578 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc
@@ -1,15 +1,6 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc
-@@ -35,7 +35,7 @@ namespace web_app {
-
- namespace {
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Aligns with other platform implementations that only support 10 items.
- constexpr int kMaxApplicationDockMenuItems = 10;
- #endif // BUILDFLAG(IS_LINUX)
-@@ -382,7 +382,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
+@@ -379,7 +379,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
}
}
@@ -17,4 +8,4 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const std::vector<WebAppShortcutsMenuItemInfo>& shortcuts_menu_item_infos =
app->shortcuts_menu_item_infos();
- int num_entries = std::min(static_cast<int>(shortcuts_menu_item_infos.size()),
+ DCHECK_LE(shortcuts_menu_item_infos.size(), kMaxApplicationDockMenuItems);
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
index 4925a4ac61fc..6beb7b9a4582 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/web_app_provider.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/web_applications/web_app_provider.cc
-@@ -285,7 +285,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
+@@ -292,7 +292,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
protocol_handler_manager.get());
std::unique_ptr<UrlHandlerManager> url_handler_manager;
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
index 8c254f6f264d..de944fd655dc 100644
--- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,11 +1,11 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -869,7 +869,7 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitC
+@@ -557,7 +557,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
+
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
- // switch of lacros-chrome is complete. If updating this, also update
- // kWebAuthCableServerLink.
+ // switch of lacros-chrome is complete.
-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-
- // caBLEv1 is disabled on these platforms. It never launched on them because
- // it causes problems in bluez. Rather than disabling caBLE completely, which
+ if (std::any_of(pairings_from_extension.begin(),
+ pairings_from_extension.end(),
+ [](const device::CableDiscoveryData& v) -> bool {
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 0255919a2493..3c431f2e6835 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/chrome_features.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/chrome_features.cc
-@@ -110,7 +110,7 @@ const base::Feature kAsyncDns {
+@@ -104,7 +104,7 @@ const base::Feature kAsyncDns {
};
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// Enables or disables the Autofill survey triggered by opening a prompt to
// save address info.
const base::Feature kAutofillAddressSurvey{"AutofillAddressSurvey",
-@@ -125,7 +125,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP
+@@ -119,7 +119,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP
base::FEATURE_DISABLED_BY_DEFAULT};
#endif
@@ -18,7 +18,7 @@
// 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.
-@@ -295,7 +295,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit
+@@ -298,7 +298,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit
// Enables or disables Desktop PWAs to be auto-started on OS login.
const base::Feature kDesktopPWAsRunOnOsLogin {
"DesktopPWAsRunOnOsLogin",
@@ -27,7 +27,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -317,7 +317,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA
+@@ -314,7 +314,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA
base::FEATURE_DISABLED_BY_DEFAULT};
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
// Serves web app settings at chrome://app-settings/<app-id>.
const base::Feature kDesktopPWAsWebAppSettingsPage{
"DesktopPWAsWebAppSettingsPage", base::FEATURE_ENABLED_BY_DEFAULT};
-@@ -332,7 +332,7 @@ const base::Feature kChromeAppsDeprecation{"ChromeApps
+@@ -333,7 +333,7 @@ const base::Feature kKeepForceInstalledPreinstalledApp
const base::Feature kDnsOverHttps {
"DnsOverHttps",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -45,7 +45,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -348,7 +348,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+@@ -349,7 +349,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
&kDnsOverHttps, "ShowUi",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -54,7 +54,7 @@
true
#else
false
-@@ -639,7 +639,7 @@ const base::Feature kKernelnextVMs{"KernelnextVMs",
+@@ -646,7 +646,7 @@ const base::Feature kKernelnextVMs{"KernelnextVMs",
base::FEATURE_DISABLED_BY_DEFAULT};
#endif
@@ -63,7 +63,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor",
base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -652,7 +652,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -659,7 +659,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
&kLinuxLowMemoryMonitor, "critical_level", 255};
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index 191bf1960fcd..35273b09cef8 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/chrome_features.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/chrome_features.h
-@@ -95,7 +95,7 @@ extern const base::Feature kArcPiGhostWindow;
+@@ -91,7 +91,7 @@ extern const base::Feature kArcPiGhostWindow;
COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kAutofillAddressSurvey;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -104,7 +104,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -100,7 +100,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kAutofillPasswordSurvey;
#endif
@@ -18,7 +18,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kBackgroundModeAllowRestart;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -219,7 +219,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -223,7 +223,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kDesktopPWAsWebBundles;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kDesktopPWAsWebAppSettingsPage;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -440,7 +440,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -451,7 +451,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kKernelnextVMs;
#endif
@@ -36,7 +36,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kLinuxLowMemoryMonitor;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -449,7 +449,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -460,7 +460,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index ecd8b4312283..c24f2985a599 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/chrome_switches.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/chrome_switches.cc
-@@ -802,14 +802,14 @@ const char kAllowNaClSocketAPI[] = "allow-n
+@@ -786,14 +786,14 @@ const char kAllowNaClSocketAPI[] = "allow-n
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index 44baa2226b06..86da70b918a2 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/chrome_switches.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/chrome_switches.h
-@@ -249,12 +249,12 @@ extern const char kAllowNaClSocketAPI[];
+@@ -245,12 +245,12 @@ extern const char kAllowNaClSocketAPI[];
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc
index aeafe29aa10f..c5fb7b11aecd 100644
--- a/www/chromium/files/patch-chrome_common_extensions_command.cc
+++ b/www/chromium/files/patch-chrome_common_extensions_command.cc
@@ -1,4 +1,4 @@
---- chrome/common/extensions/command.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/common/extensions/command.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/extensions/command.cc
@@ -295,7 +295,7 @@ std::string Command::CommandPlatform() {
return values::kKeybindingPlatformMac;
@@ -7,5 +7,5 @@
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return values::kKeybindingPlatformLinux;
- #else
- return "";
+ #elif BUILDFLAG(IS_FUCHSIA)
+ // TODO(crbug.com/1312215): Change this once we decide what string should be
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index 434ccdd94147..04b95fd57e0d 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/pref_names.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/pref_names.cc
-@@ -1189,7 +1189,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
+@@ -1221,7 +1221,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemTheme[] = "extensions.theme.use_system";
#endif
-@@ -1292,7 +1292,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1324,7 +1324,7 @@ const char kShowUpdatePromotionInfoBar[] =
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
// 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).
const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1777,7 +1777,7 @@ const char kDownloadDirUpgraded[] = "download.director
+@@ -1809,7 +1809,7 @@ const char kDownloadDirUpgraded[] = "download.director
const char kDownloadLastCompleteTime[] = "download.last_complete_time";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
const char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
#endif
-@@ -2066,7 +2066,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
+@@ -2104,7 +2104,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
// its isolation requirements.
const char kWebAppsIsolationState[] = "web_apps.isolation_state";
@@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
// Dictionary that maps origins to web apps that can act as URL handlers.
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
-@@ -2196,7 +2196,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
+@@ -2234,7 +2234,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
// requests.
const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled";
@@ -45,12 +45,12 @@
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
// along with kAuthNegotiateDelegateAllowlist.
const char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3126,7 +3126,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
+@@ -3172,7 +3172,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
const char kSandboxExternalProtocolBlocked[] =
"profile.sandbox_external_protocol_blocked";
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Boolean that indicates if native notifications are allowed to be used in
- // place of Chrome notifications. Will be replaced by kAllowSystemNotifications.
- const char kAllowNativeNotifications[] = "native_notifications.allowed";
+ // Boolean that indicates if system notifications are allowed to be used in
+ // place of Chrome notifications.
+ const char kAllowSystemNotifications[] = "system_notifications.allowed";
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index 5df4c8091c2b..b2dd7abfec78 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/pref_names.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/pref_names.h
-@@ -372,7 +372,7 @@ extern const char kUseAshProxy[];
+@@ -377,7 +377,7 @@ extern const char kUseAshProxy[];
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
extern const char kUsesSystemTheme[];
#endif
extern const char kCurrentThemePackFilename[];
-@@ -401,7 +401,7 @@ extern const char kShowUpdatePromotionInfoBar[];
+@@ -406,7 +406,7 @@ extern const char kShowUpdatePromotionInfoBar[];
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
extern const char kUseCustomChromeFrame[];
#endif
#if BUILDFLAG(ENABLE_PLUGINS)
-@@ -585,7 +585,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
+@@ -590,7 +590,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
extern const char kDownloadDirUpgraded[];
extern const char kDownloadLastCompleteTime[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
extern const char kOpenPdfDownloadInSystemReader[];
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -692,7 +692,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
+@@ -700,7 +700,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
extern const char kWebAppsPreferences[];
extern const char kWebAppsIsolationState[];
@@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
extern const char kWebAppsUrlHandlerInfo[];
#endif
-@@ -831,7 +831,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
+@@ -839,7 +839,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
extern const char kAmbientAuthenticationInPrivateModesEnabled[];
extern const char kBasicAuthOverHttpEnabled[];
@@ -45,12 +45,12 @@
extern const char kAuthNegotiateDelegateByKdcPolicy[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -1069,7 +1069,7 @@ extern const char kBlockAutoplayEnabled[];
+@@ -1081,7 +1081,7 @@ extern const char kBlockAutoplayEnabled[];
#endif
extern const char kSandboxExternalProtocolBlocked[];
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kAllowNativeNotifications[];
extern const char kAllowSystemNotifications[];
#endif
+
diff --git a/www/chromium/files/patch-chrome_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc
index 838f406abc82..3404f016bd60 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/url_constants.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/url_constants.cc
-@@ -489,7 +489,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
+@@ -476,7 +476,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
"https://support.google.com/chromebook/?p=multidevice";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h
index d785f26f838f..c9d4af2c790b 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.h
+++ b/www/chromium/files/patch-chrome_common_url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/url_constants.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/url_constants.h
-@@ -452,7 +452,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
+@@ -446,7 +446,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
extern const char kPhoneHubPermissionLearnMoreURL[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
index 66b4083e6443..49349be39b27 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/webui_url_constants.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -440,18 +440,18 @@ const char kOsUIFlagsURL[] = "os://flags";
+@@ -453,18 +453,18 @@ const char kOsUIHelpAppURL[] = "os://help-app";
const char kOsUIVersionURL[] = "os://version";
#endif
@@ -22,7 +22,7 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
#endif
-@@ -466,14 +466,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -479,14 +479,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -39,7 +39,7 @@
const char kChromeUIBrowserSwitchHost[] = "browser-switch";
const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
const char kChromeUIEnterpriseProfileWelcomeHost[] =
-@@ -488,7 +488,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+@@ -501,7 +501,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
const char kChromeUIProfilePickerStartupQuery[] = "startup";
#endif
@@ -48,7 +48,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
-@@ -561,7 +561,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
+@@ -574,7 +574,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -57,7 +57,7 @@
const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
const char kChromeUIWebAppSettingsHost[] = "app-settings";
#endif
-@@ -758,7 +758,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -779,7 +779,7 @@ const char* const kChromeDebugURLs[] = {
blink::kChromeUIGpuJavaCrashURL,
kChromeUIJavaCrashURL,
#endif
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h
index 2a7f8bc6f0c9..69131e754d5d 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/webui_url_constants.h.orig 2022-05-19 14:06:27 UTC
+++ chrome/common/webui_url_constants.h
-@@ -376,24 +376,24 @@ extern const char kOsUIFlagsURL[];
+@@ -382,24 +382,24 @@ extern const char kOsUIHelpAppURL[];
extern const char kOsUIVersionURL[];
#endif
@@ -29,7 +29,7 @@
extern const char kChromeUIWebAppSettingsURL[];
extern const char kChromeUIWebAppSettingsHost[];
#endif
-@@ -408,14 +408,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -414,14 +414,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
extern const char kChromeUIBrowserSwitchHost[];
extern const char kChromeUIBrowserSwitchURL[];
extern const char kChromeUIEnterpriseProfileWelcomeHost[];
-@@ -427,7 +427,7 @@ extern const char kChromeUIProfilePickerUrl[];
+@@ -433,7 +433,7 @@ extern const char kChromeUIProfilePickerUrl[];
extern const char kChromeUIProfilePickerStartupQuery[];
#endif
diff --git a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
index 0d6941cf82d8..521f657924be 100644
--- a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
+++ b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
@@ -1,6 +1,6 @@
---- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/renderer/chrome_render_frame_observer.cc
-@@ -280,7 +280,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
+@@ -331,7 +331,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
void ChromeRenderFrameObserver::DraggableRegionsChanged() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
index 09b6a65ee30b..fd1c34fc9974 100644
--- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,11 +1,11 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/services/printing/print_backend_service_impl.cc
-@@ -510,7 +510,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -603,7 +603,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
- print_backend_->GetPrinterDriverInfo(printer_name));
+ print_backend_->GetPrinterDriverInfo(*printer_name));
-#if BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS)
// Try to fill in advanced settings based upon basic info options.
PrinterBasicInfo basic_info;
- if (print_backend_->GetPrinterBasicInfo(printer_name, &basic_info) ==
+ if (print_backend_->GetPrinterBasicInfo(*printer_name, &basic_info) ==
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index 51d857c5e702..716204ec664c 100644
--- a/www/chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- chrome/test/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ chrome/test/BUILD.gn
-@@ -9278,7 +9278,7 @@ test("chrome_app_unittests") {
+@@ -9454,7 +9454,7 @@ test("chrome_app_unittests") {
"//components/heap_profiling/in_process",
"//components/safe_browsing:buildflags",
]
diff --git a/www/chromium/files/patch-chrome_updater_installer.cc b/www/chromium/files/patch-chrome_updater_installer.cc
index c175cd231f61..b6d6c0d7be9b 100644
--- a/www/chromium/files/patch-chrome_updater_installer.cc
+++ b/www/chromium/files/patch-chrome_updater_installer.cc
@@ -1,11 +1,11 @@
---- chrome/updater/installer.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/updater/installer.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/updater/installer.cc
-@@ -228,7 +228,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn
+@@ -242,7 +242,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn
return path->AppendASCII(pv_.GetString());
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- Installer::Result Installer::RunApplicationInstaller(
- const base::FilePath& /*app_installer*/,
- const std::string& /*arguments*/,
+
+ AppInstallerResult RunApplicationInstaller(
+ const AppInfo& /*app_info*/,
diff --git a/www/chromium/files/patch-chrome_updater_lib__util.cc b/www/chromium/files/patch-chrome_updater_lib__util.cc
deleted file mode 100644
index cc827bcb8c96..000000000000
--- a/www/chromium/files/patch-chrome_updater_lib__util.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/updater/lib_util.cc.orig 2022-02-28 16:54:41 UTC
-+++ chrome/updater/lib_util.cc
-@@ -11,7 +11,7 @@
-
- namespace updater {
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-
- std::string UnescapeURLComponent(base::StringPiece escaped_text) {
- return base::UnescapeURLComponent(
diff --git a/www/chromium/files/patch-chrome_updater_util.cc b/www/chromium/files/patch-chrome_updater_util.cc
index ac5775b8f153..3a9f249cbdfc 100644
--- a/www/chromium/files/patch-chrome_updater_util.cc
+++ b/www/chromium/files/patch-chrome_updater_util.cc
@@ -1,6 +1,6 @@
---- chrome/updater/util.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/updater/util.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/updater/util.cc
-@@ -265,7 +265,7 @@ GURL AppendQueryParameter(const GURL& url,
+@@ -266,7 +266,7 @@ GURL AppendQueryParameter(const GURL& url,
return url.ReplaceComponents(replacements);
}
diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc
index f78a75241d29..ce7e69ff7508 100644
--- a/www/chromium/files/patch-chrome_utility_services.cc
+++ b/www/chromium/files/patch-chrome_utility_services.cc
@@ -1,4 +1,4 @@
---- chrome/utility/services.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/utility/services.cc.orig 2022-05-19 14:06:27 UTC
+++ chrome/utility/services.cc
@@ -28,7 +28,7 @@
#include "printing/buildflags/buildflags.h"
@@ -18,7 +18,7 @@
#include "chrome/services/file_util/document_analysis_service.h" // nogncheck
#endif
-@@ -213,7 +213,7 @@ auto RunSpeechRecognitionService(
+@@ -215,7 +215,7 @@ auto RunSpeechRecognitionService(
}
#endif // !BUILDFLAG(IS_ANDROID)
@@ -27,7 +27,7 @@
auto RunScreenAIService(
mojo::PendingReceiver<screen_ai::mojom::ScreenAIService> receiver) {
return std::make_unique<screen_ai::ScreenAIService>(std::move(receiver));
-@@ -227,7 +227,7 @@ auto RunCupsIppParser(
+@@ -229,7 +229,7 @@ auto RunCupsIppParser(
}
#endif
@@ -36,7 +36,7 @@
auto RunDocumentAnalysis(
mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) {
return std::make_unique<DocumentAnalysisService>(std::move(receiver));
-@@ -374,7 +374,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -382,7 +382,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
services.Add(RunSpeechRecognitionService);
#endif
@@ -45,7 +45,7 @@
if (features::IsScreenAIEnabled())
services.Add(RunScreenAIService);
#endif
-@@ -398,7 +398,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -406,7 +406,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
services.Add(RunFileUtil);
#endif
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
index 5873aa782b6b..c5dad6837844 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,4 +1,4 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig 2022-04-21 18:48:31 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig 2022-05-19 14:06:27 UTC
+++ chromecast/browser/cast_browser_main_parts.cc
@@ -92,7 +92,7 @@
#include "ui/base/ui_base_switches.h"
@@ -36,7 +36,7 @@
#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.
-@@ -521,7 +521,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -519,7 +519,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
views_delegate_ = std::make_unique<CastViewsDelegate>();
#endif // defined(USE_AURA)
@@ -45,7 +45,7 @@
base::FilePath dir_font = GetApplicationFontsDir();
const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data());
if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) {
-@@ -752,7 +752,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() {
+@@ -750,7 +750,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() {
cast_browser_process_->browser_context());
#endif
@@ -54,7 +54,7 @@
wayland_server_controller_ =
std::make_unique<WaylandServerController>(window_manager_.get());
#endif
-@@ -827,7 +827,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() {
+@@ -825,7 +825,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() {
cast_browser_process_->cast_service()->Stop();
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
index abe79ed7dab4..2f482e80813f 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_content_browser_client.cc.orig 2022-04-21 18:48:31 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig 2022-05-19 14:06:27 UTC
+++ chromecast/browser/cast_content_browser_client.cc
-@@ -134,7 +134,7 @@
+@@ -135,7 +135,7 @@
#include "extensions/common/constants.h" // nogncheck
#endif
@@ -9,7 +9,7 @@
#include "chromecast/browser/webview/webview_controller.h"
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-@@ -475,7 +475,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -476,7 +476,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
switches::kAudioOutputChannels));
}
} else if (process_type == switches::kGpuProcess) {
@@ -18,7 +18,7 @@
// 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.
-@@ -871,7 +871,7 @@ CastContentBrowserClient::CreateThrottlesForNavigation
+@@ -872,7 +872,7 @@ CastContentBrowserClient::CreateThrottlesForNavigation
handle, general_audience_browsing_service_.get()));
}
diff --git a/www/chromium/files/patch-components_autofill__payments__strings.grdp b/www/chromium/files/patch-components_autofill__payments__strings.grdp
index 9f6083d67442..6cfac250aa08 100644
--- a/www/chromium/files/patch-components_autofill__payments__strings.grdp
+++ b/www/chromium/files/patch-components_autofill__payments__strings.grdp
@@ -1,11 +1,11 @@
---- components/autofill_payments_strings.grdp.orig 2022-04-21 18:48:31 UTC
+--- components/autofill_payments_strings.grdp.orig 2022-05-19 14:06:27 UTC
+++ components/autofill_payments_strings.grdp
@@ -124,7 +124,7 @@
<message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java">
Save card
</message>
-- <if expr="is_linux and not chromeos">
-+ <if expr="is_posix and not chromeos">
+- <if expr="is_linux and not chromeos_ash">
++ <if expr="is_posix and not chromeos_ash">
<then>
<message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar.">
Do you want to save this card to your Google Account?
diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
index e31f9c92af85..b3d0ac86f391 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/personal_data_manager.cc.orig 2022-04-21 18:48:31 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig 2022-05-19 14:06:27 UTC
+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -1987,7 +1987,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -1975,7 +1975,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index fcc1c642e53a..e04afbe2c5b7 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig 2022-04-21 18:48:31 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-05-19 14:06:27 UTC
+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -187,7 +187,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma
+@@ -201,7 +201,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma
bool ShouldShowImprovedUserConsentForCreditCardSave() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_components__chromium__strings.grd b/www/chromium/files/patch-components_components__chromium__strings.grd
new file mode 100644
index 000000000000..cb9930716629
--- /dev/null
+++ b/www/chromium/files/patch-components_components__chromium__strings.grd
@@ -0,0 +1,11 @@
+--- components/components_chromium_strings.grd.orig 2022-05-19 14:06:27 UTC
++++ components/components_chromium_strings.grd
+@@ -224,7 +224,7 @@
+ </if>
+ <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
+ <!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash and not chromeos_lacros` once fixed. -->
+- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+ <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
+ Go to
+ the Chromium menu &gt;
diff --git a/www/chromium/files/patch-components_components__google__chrome__strings.grd b/www/chromium/files/patch-components_components__google__chrome__strings.grd
new file mode 100644
index 000000000000..6e617fe72157
--- /dev/null
+++ b/www/chromium/files/patch-components_components__google__chrome__strings.grd
@@ -0,0 +1,11 @@
+--- components/components_google_chrome_strings.grd.orig 2022-05-19 14:06:27 UTC
++++ components/components_google_chrome_strings.grd
+@@ -231,7 +231,7 @@
+ </if>
+ <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
+ <!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash and not chromeos_lacros` once fixed. -->
+- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+ <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
+ Go to
+ the Chrome menu &gt;
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
index 1209be8e6a89..76220f64241d 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_configurations.cc.orig 2022-03-25 21:59:56 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig 2022-05-19 14:06:27 UTC
+++ components/feature_engagement/public/feature_configurations.cc
@@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
absl::optional<FeatureConfig> GetClientSideFeatureConfig(
@@ -9,7 +9,7 @@
if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
absl::optional<FeatureConfig> config = FeatureConfig();
config->valid = true;
-@@ -834,7 +834,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
+@@ -849,7 +849,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
index 045eadf3725f..5274ab655829 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig 2022-03-25 21:59:56 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig 2022-05-19 14:06:27 UTC
+++ components/feature_engagement/public/feature_constants.cc
@@ -22,7 +22,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy",
base::FEATURE_DISABLED_BY_DEFAULT};
@@ -9,8 +9,8 @@
const base::Feature kIPHDesktopSharedHighlightingFeature{
"IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kIPHDesktopTabGroupsNewGroupFeature{
-@@ -286,7 +286,7 @@ const base::Feature kIPHDefaultSiteViewFeature{
- "IPH_DefaultSiteView", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -288,7 +288,7 @@ const base::Feature kIPHPasswordSuggestionsFeature{
+ "IPH_PasswordSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // BUILDFLAG(IS_IOS)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
index bece36b428e3..130a5c4eb349 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig 2022-03-25 21:59:56 UTC
+--- components/feature_engagement/public/feature_constants.h.orig 2022-05-19 14:06:27 UTC
+++ components/feature_engagement/public/feature_constants.h
@@ -30,7 +30,7 @@ extern const base::Feature kUseClientConfigIPH;
extern const base::Feature kIPHDummyFeature;
@@ -9,8 +9,8 @@
extern const base::Feature kIPHDesktopSharedHighlightingFeature;
extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature;
extern const base::Feature kIPHFocusHelpBubbleScreenReaderPromoFeature;
-@@ -174,7 +174,7 @@ extern const base::Feature kIPHDiscoverFeedHeaderFeatu
- extern const base::Feature kIPHDefaultSiteViewFeature;
+@@ -175,7 +175,7 @@ extern const base::Feature kIPHDefaultSiteViewFeature;
+ extern const base::Feature kIPHPasswordSuggestionsFeature;
#endif // BUILDFLAG(IS_IOS)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
index e589ce4ca33e..9072d425dd9d 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,7 +1,7 @@
---- components/feature_engagement/public/feature_list.cc.orig 2022-04-21 18:48:31 UTC
+--- components/feature_engagement/public/feature_list.cc.orig 2022-05-19 14:06:27 UTC
+++ components/feature_engagement/public/feature_list.cc
@@ -120,7 +120,7 @@ const base::Feature* const kAllFeatures[] = {
- &kIPHDefaultSiteViewFeature,
+ &kIPHPasswordSuggestionsFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -9,7 +9,7 @@
&kIPHDesktopTabGroupsNewGroupFeature,
&kIPHFocusHelpBubbleScreenReaderPromoFeature,
&kIPHGMCCastStartStopFeature,
-@@ -142,7 +142,8 @@ const base::Feature* const kAllFeatures[] = {
+@@ -143,7 +143,8 @@ const base::Feature* const kAllFeatures[] = {
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
index e7c544fabf01..f30ceb6912d2 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig 2022-04-21 18:48:31 UTC
+--- components/feature_engagement/public/feature_list.h.orig 2022-05-19 14:06:27 UTC
+++ components/feature_engagement/public/feature_list.h
-@@ -223,7 +223,7 @@ DEFINE_VARIATION_PARAM(kIPHDefaultSiteViewFeature, "IP
+@@ -224,7 +224,7 @@ DEFINE_VARIATION_PARAM(kIPHPasswordSuggestionsFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature,
"IPH_DesktopTabGroupsNewGroup");
DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode");
-@@ -253,7 +253,8 @@ DEFINE_VARIATION_PARAM(kIPHDesktopSharedHighlightingFe
+@@ -255,7 +255,8 @@ DEFINE_VARIATION_PARAM(kIPHIntentChipFeature, "IPH_Int
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -19,16 +19,16 @@
DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature,
"IPH_AutofillVirtualCardSuggestion");
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
-@@ -358,7 +359,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
- VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature),
+@@ -360,7 +361,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
VARIATION_ENTRY(kIPHDefaultSiteViewFeature),
+ VARIATION_ENTRY(kIPHPasswordSuggestionsFeature),
#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(kIPHDesktopTabGroupsNewGroupFeature),
VARIATION_ENTRY(kIPHFocusModeFeature),
VARIATION_ENTRY(kIPHGlobalMediaControls),
-@@ -381,7 +382,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -384,7 +385,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc b/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc
index 1d67fb207d08..131a8f272406 100644
--- a/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc
+++ b/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc
@@ -1,6 +1,6 @@
---- components/feed/core/v2/test/proto_printer.cc.orig 2022-04-21 18:48:31 UTC
+--- components/feed/core/v2/test/proto_printer.cc.orig 2022-05-19 14:06:27 UTC
+++ components/feed/core/v2/test/proto_printer.cc
-@@ -158,8 +158,8 @@ class TextProtoPrinter {
+@@ -157,8 +157,8 @@ class TextProtoPrinter {
}
TextProtoPrinter& operator<<(const feedwire::Version& v) {
BeginMessage();
diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc
index 9883288acc3f..9dca2225b1bf 100644
--- a/www/chromium/files/patch-components_flags__ui_flags__state.cc
+++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc
@@ -1,6 +1,6 @@
---- components/flags_ui/flags_state.cc.orig 2022-03-25 21:59:56 UTC
+--- components/flags_ui/flags_state.cc.orig 2022-05-19 14:06:27 UTC
+++ components/flags_ui/flags_state.cc
-@@ -622,7 +622,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
+@@ -623,7 +623,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
#elif BUILDFLAG(IS_CHROMEOS_ASH)
return kOsCrOS;
#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/chromium/files/patch-components_live__caption_caption__util.cc b/www/chromium/files/patch-components_live__caption_caption__util.cc
new file mode 100644
index 000000000000..44520d9e7302
--- /dev/null
+++ b/www/chromium/files/patch-components_live__caption_caption__util.cc
@@ -0,0 +1,11 @@
+--- components/live_caption/caption_util.cc.orig 2022-05-19 14:06:27 UTC
++++ components/live_caption/caption_util.cc
+@@ -142,7 +142,7 @@ bool IsLiveCaptionFeatureSupported() {
+ return false;
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Check if the CPU has the required instruction set to run the Speech
+ // On-Device API (SODA) library.
+ static bool has_sse41 = base::CPU().has_sse41();
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
index 527fa368114f..8cef443a87d0 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2022-04-21 18:48:31 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2022-05-19 14:06:27 UTC
+++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -822,7 +822,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -813,7 +813,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
}
#endif // #if !BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
index e8957e2ee886..ee8cecd1a764 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-04-21 18:48:31 UTC
+--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-05-19 14:06:27 UTC
+++ components/network_session_configurator/browser/network_session_configurator_unittest.cc
-@@ -820,7 +820,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
+@@ -807,7 +807,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
}
TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) {
diff --git a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
index 059f13e07742..9a5e50653897 100644
--- a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
+++ b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
@@ -1,20 +1,11 @@
---- components/new_or_sad_tab_strings.grdp.orig 2022-02-07 13:39:41 UTC
+--- components/new_or_sad_tab_strings.grdp.orig 2022-05-19 14:06:27 UTC
+++ components/new_or_sad_tab_strings.grdp
-@@ -51,7 +51,7 @@
- Open page in a new Incognito window (⇧⌘N)
- </message>
- </if>
-- <if expr="is_win or is_linux or is_fuchsia or chromeos">
-+ <if expr="is_win or is_posix or is_fuchsia or chromeos">
- <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode.">
- Open page in a new Incognito window (Ctrl-Shift-N)
- </message>
@@ -66,7 +66,7 @@
Close other tabs or apps
</message>
</if>
-- <if expr="is_linux and not chromeos">
-+ <if expr="is_posix and not chromeos">
+- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
<message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer.">
Close other tabs or programs
</message>
@@ -22,26 +13,8 @@
Close other apps
</message>
</if>
-- <if expr="is_linux and not chromeos">
-+ <if expr="is_posix and not chromeos">
+- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
++ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
<message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux).">
Close other programs
</message>
-@@ -91,7 +91,7 @@
- Restart Chromium
- </message>
- </if>
-- <if expr="is_win or is_linux or is_macosx or is_fuchsia or chromeos">
-+ <if expr="is_win or is_posix or is_macosx or is_fuchsia or chromeos">
- <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their computer.">
- Restart your computer
- </message>
-@@ -106,7 +106,7 @@
- Learn more
- </message>
- </if>
-- <if expr="is_win or is_linux or is_macosx or is_fuchsia or chromeos">
-+ <if expr="is_win or is_posix or is_macosx or is_fuchsia or chromeos">
- <message name="IDS_SAD_TAB_ERROR_CODE" desc="The message displayed on the crashed web page indicating the type of the crash.">
- Error code: <ph name="ERROR_CODE">$1<ex>STATUS_ACCESS_VIOLATION</ex></ph>
- </message>
diff --git a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc
index 3b7dc8695422..0bbcfdb492aa 100644
--- a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc
+++ b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc
@@ -1,6 +1,6 @@
---- components/paint_preview/browser/paint_preview_client.cc.orig 2022-02-07 13:39:41 UTC
+--- components/paint_preview/browser/paint_preview_client.cc.orig 2022-05-19 14:06:27 UTC
+++ components/paint_preview/browser/paint_preview_client.cc
-@@ -313,8 +313,8 @@ void PaintPreviewClient::CapturePaintPreview(
+@@ -312,8 +312,8 @@ void PaintPreviewClient::CapturePaintPreview(
metadata->set_url(url.spec());
metadata->set_version(kPaintPreviewVersion);
auto* chromeVersion = metadata->mutable_chrome_version();
diff --git a/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc
index 9dff7dab1482..66060a482ee9 100644
--- a/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc
+++ b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc
@@ -1,6 +1,6 @@
---- components/paint_preview/player/player_compositor_delegate.cc.orig 2022-02-28 16:54:41 UTC
+--- components/paint_preview/player/player_compositor_delegate.cc.orig 2022-05-19 14:06:27 UTC
+++ components/paint_preview/player/player_compositor_delegate.cc
-@@ -445,8 +445,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT
+@@ -444,8 +444,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT
// use the AXTreeUpdate.
auto chrome_version = capture_result_->proto.metadata().chrome_version();
if (capture_result_->proto.metadata().has_chrome_version() &&
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
index b4007b63e794..a056b951423e 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-04-21 18:48:31 UTC
+--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-05-19 14:06:27 UTC
+++ components/password_manager/core/browser/sync/password_sync_bridge.cc
-@@ -151,7 +151,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -150,7 +150,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
// Delete the local undecryptable copy when this is MacOS only.
#if BUILDFLAG(IS_MAC)
return true;
@@ -9,7 +9,7 @@
return base::FeatureList::IsEnabled(
features::kSyncUndecryptablePasswordsLinux);
#else
-@@ -160,7 +160,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -159,7 +159,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
}
bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() {
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
index 838b0938f3f6..5914211e9a11 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/common/password_manager_features.cc.orig 2022-04-21 18:48:31 UTC
+--- components/password_manager/core/common/password_manager_features.cc.orig 2022-05-19 14:06:27 UTC
+++ components/password_manager/core/common/password_manager_features.cc
-@@ -65,7 +65,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{
+@@ -70,7 +70,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{
const base::Feature kFillOnAccountSelect = {"fill-on-account-select",
base::FEATURE_DISABLED_BY_DEFAULT};
@@ -9,7 +9,7 @@
// When enabled, initial sync will be forced during startup if the password
// store has encryption service failures.
const base::Feature kForceInitialSyncWhenDecryptionFails = {
-@@ -151,7 +151,7 @@ const base::Feature kReparseServerPredictionsFollowing
+@@ -148,7 +148,7 @@ const base::Feature kRecoverFromNeverSaveAndroid = {
const base::Feature kSecondaryServerFieldPredictions = {
"SecondaryServerFieldPredictions", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -18,7 +18,7 @@
// Displays at least the decryptable and never saved logins in the password
// manager
const base::Feature kSkipUndecryptablePasswords = {
-@@ -163,7 +163,7 @@ const base::Feature kSkipUndecryptablePasswords = {
+@@ -160,7 +160,7 @@ const base::Feature kSkipUndecryptablePasswords = {
const base::Feature kSupportForAddPasswordsInSettings = {
"SupportForAddPasswordsInSettings", base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
index a3c7e4bca11a..548ec7b00afc 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
@@ -1,7 +1,7 @@
---- components/password_manager/core/common/password_manager_features.h.orig 2022-04-21 18:48:31 UTC
+--- components/password_manager/core/common/password_manager_features.h.orig 2022-05-19 14:06:27 UTC
+++ components/password_manager/core/common/password_manager_features.h
-@@ -30,7 +30,7 @@ extern const base::Feature kEnablePasswordsAccountStor
- extern const base::Feature KEnablePasswordGenerationForClearTextFields;
+@@ -31,7 +31,7 @@ extern const base::Feature KEnablePasswordGenerationFo
+ extern const base::Feature kEnablePasswordManagerWithinFencedFrame;
extern const base::Feature kFillingAcrossAffiliatedWebsites;
extern const base::Feature kFillOnAccountSelect;
-#if BUILDFLAG(IS_LINUX)
@@ -9,9 +9,9 @@
extern const base::Feature kForceInitialSyncWhenDecryptionFails;
#endif
extern const base::Feature kInferConfirmationPasswordField;
-@@ -50,11 +50,11 @@ extern const base::Feature kPasswordScriptsFetching;
+@@ -50,11 +50,11 @@ extern const base::Feature kPasswordsAccountStorageRev
+ extern const base::Feature kPasswordScriptsFetching;
extern const base::Feature kRecoverFromNeverSaveAndroid;
- extern const base::Feature kReparseServerPredictionsFollowingFormChange;
extern const base::Feature kSecondaryServerFieldPredictions;
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
index 2e38c9d03cc8..a58c41faac7f 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-03-25 21:59:56 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-05-19 14:06:27 UTC
+++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -417,7 +417,7 @@ void CloudPolicyClient::FetchPolicy() {
+@@ -422,7 +422,7 @@ void CloudPolicyClient::FetchPolicy() {
fetch_request->set_invalidation_payload(invalidation_payload_);
}
}
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
index 2d7172254051..06680693e265 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-02-28 16:54:41 UTC
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-05-19 14:06:27 UTC
+++ components/policy/core/common/cloud/cloud_policy_util.cc
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
@@ -9,7 +9,7 @@
#include <pwd.h>
#include <sys/types.h>
#include <unistd.h>
-@@ -34,10 +34,14 @@
+@@ -35,10 +35,14 @@
#import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
#endif
@@ -25,7 +25,7 @@
#include <utility>
#include "base/check.h"
-@@ -77,7 +81,7 @@ namespace em = enterprise_management;
+@@ -78,7 +82,7 @@ namespace em = enterprise_management;
std::string GetMachineName() {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
@@ -34,7 +34,7 @@
char hostname[HOST_NAME_MAX];
if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
return hostname;
-@@ -135,7 +139,7 @@ std::string GetMachineName() {
+@@ -136,7 +140,7 @@ std::string GetMachineName() {
std::string GetOSVersion() {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
@@ -43,7 +43,7 @@
return base::SysInfo::OperatingSystemVersion();
#elif BUILDFLAG(IS_WIN)
base::win::OSInfo::VersionNumber version_number =
-@@ -158,7 +162,7 @@ std::string GetOSArchitecture() {
+@@ -159,7 +163,7 @@ std::string GetOSArchitecture() {
}
std::string GetOSUsername() {
diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json
index d41bcb1d49e9..b9f17c5136da 100644
--- a/www/chromium/files/patch-components_policy_resources_policy__templates.json
+++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json
@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig 2022-04-21 18:48:31 UTC
+--- components/policy/resources/policy_templates.json.orig 2022-05-19 14:06:27 UTC
+++ components/policy/resources/policy_templates.json
-@@ -1430,7 +1430,7 @@
+@@ -1434,7 +1434,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -9,7 +9,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -2534,7 +2534,7 @@
+@@ -2560,7 +2560,7 @@
'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -4300,7 +4300,7 @@
+@@ -4326,7 +4326,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -27,7 +27,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -4329,7 +4329,7 @@
+@@ -4355,7 +4355,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -36,7 +36,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -5262,7 +5262,7 @@
+@@ -5319,7 +5319,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -45,7 +45,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -5323,7 +5323,7 @@
+@@ -5380,7 +5380,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -54,7 +54,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -5389,7 +5389,7 @@
+@@ -5446,7 +5446,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -63,7 +63,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -10493,7 +10493,7 @@
+@@ -10588,7 +10588,7 @@
'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -72,7 +72,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -10587,7 +10587,7 @@
+@@ -10682,7 +10682,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -81,7 +81,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -12584,7 +12584,7 @@
+@@ -12679,7 +12679,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -90,7 +90,7 @@
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,
-@@ -13442,7 +13442,7 @@
+@@ -13537,7 +13537,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -99,7 +99,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -20371,7 +20371,7 @@
+@@ -20502,7 +20502,7 @@
'items': { 'type': 'string' }
},
# Spell checking is provided by macOS, so can't be controlled on Mac.
@@ -108,7 +108,7 @@
'features': {
'can_be_recommended': False,
'dynamic_refresh': True,
-@@ -20402,7 +20402,7 @@
+@@ -20533,7 +20533,7 @@
'items': { 'type': 'string' }
},
# Spell checking is provided by macOS, so can't be controlled on Mac.
@@ -117,7 +117,7 @@
'deprecated': True,
'features': {
'can_be_recommended': False,
-@@ -20436,7 +20436,7 @@
+@@ -20567,7 +20567,7 @@
'items': { 'type': 'string' }
},
# Spell checking is provided by macOS, so can't be controlled on Mac.
@@ -126,7 +126,7 @@
'features': {
'can_be_recommended': False,
'dynamic_refresh': True,
-@@ -21174,7 +21174,7 @@
+@@ -21337,7 +21337,7 @@
'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -135,7 +135,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -25448,7 +25448,7 @@
+@@ -25611,7 +25611,7 @@
'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -144,7 +144,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -26790,7 +26790,7 @@ If this policy is left unset, privacy screen is disabl
+@@ -26955,7 +26955,7 @@ If this policy is left unset, privacy screen is disabl
'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -153,7 +153,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -26814,7 +26814,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google
+@@ -26979,7 +26979,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google
'owners': ['file://chrome/browser/notifications/OWNERS'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -162,7 +162,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -27883,7 +27883,7 @@ If you disable this policy, web page scrolling to spec
+@@ -28077,7 +28077,7 @@ If you disable this policy, web page scrolling to spec
'owners': ['asumaneev@google.com'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -171,7 +171,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -29119,7 +29119,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
+@@ -29320,7 +29320,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
},
],
'default': True,
@@ -180,7 +180,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -29252,7 +29252,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
+@@ -29453,7 +29453,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
'owners': ['mattm@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
diff --git a/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
index 98470bee9ca5..d3ae896e19e4 100644
--- a/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
+++ b/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
@@ -1,6 +1,6 @@
---- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2022-02-28 16:54:41 UTC
+--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2022-05-19 14:06:27 UTC
+++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
-@@ -115,7 +115,7 @@ std::ostream& operator<<(std::ostream& os, const ListI
+@@ -116,7 +116,7 @@ std::ostream& operator<<(std::ostream& os, const ListI
PlatformType GetCurrentPlatformType() {
#if BUILDFLAG(IS_WIN)
return WINDOWS_PLATFORM;
diff --git a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
index 49d469f73973..71179c9bddb0 100644
--- a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
@@ -1,14 +1,14 @@
---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2022-04-21 18:48:31 UTC
+--- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2022-05-19 14:06:27 UTC
+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
-@@ -30,6 +30,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
- if (!screen_ai_library)
- VLOG(1) << dlerror();
+@@ -35,6 +35,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
+ VLOG(2) << "Screen AI library loaded pre-sandboxing:" << library_path;
+ }
+#if !BUILDFLAG(IS_BSD)
auto* instance = sandbox::policy::SandboxLinux::GetInstance();
std::vector<BrokerFilePermission> permissions{
-@@ -41,6 +42,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
+@@ -46,6 +47,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
sandbox::syscall_broker::COMMAND_OPEN}),
permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options);
instance->EngageNamespaceSandboxIfPossible();
diff --git a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
index 235924ee0915..8d0c97ec9447 100644
--- a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
+++ b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
@@ -1,6 +1,6 @@
---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2022-02-28 16:54:41 UTC
+--- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2022-05-19 14:06:27 UTC
+++ components/startup_metric_utils/browser/startup_metric_utils.cc
-@@ -347,7 +347,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time
+@@ -308,7 +308,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time
// Enabling this logic on OS X causes a significant performance regression.
// https://crbug.com/601270
@@ -9,7 +9,7 @@
static bool statics_initialized = false;
base::ThreadPriority previous_priority = base::ThreadPriority::NORMAL;
-@@ -361,7 +361,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time
+@@ -322,7 +322,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time
static const base::Time time_base = base::Time::Now();
static const base::TimeTicks trace_ticks_base = base::TimeTicks::Now();
diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
index 8d2c8ff0d992..6a0c338fe352 100644
--- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
+++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
@@ -1,6 +1,6 @@
---- components/sync_device_info/local_device_info_util.cc.orig 2022-02-28 16:54:41 UTC
+--- components/sync_device_info/local_device_info_util.cc.orig 2022-05-19 14:06:27 UTC
+++ components/sync_device_info/local_device_info_util.cc
-@@ -75,7 +75,7 @@ std::string GetPersonalizableDeviceNameInternal();
+@@ -74,7 +74,7 @@ std::string GetPersonalizableDeviceNameInternal();
sync_pb::SyncEnums::DeviceType GetLocalDeviceType() {
#if BUILDFLAG(IS_CHROMEOS_ASH)
return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
index 181ced8109cf..21b67c3514dd 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1193,7 +1193,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1200,7 +1200,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
->GetDeviceQueue()
->GetVulkanPhysicalDevice(),
VK_IMAGE_TILING_OPTIMAL, ycbcr_info);
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
index 88022d438fff..fd322b83c76d 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/software_output_surface.h.orig 2022-02-28 16:54:41 UTC
+--- components/viz/service/display_embedder/software_output_surface.h.orig 2022-05-19 14:06:27 UTC
+++ components/viz/service/display_embedder/software_output_surface.h
-@@ -56,7 +56,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
+@@ -57,7 +57,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
gfx::OverlayTransform GetDisplayTransform() override;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
void SetNeedsSwapSizeNotifications(
bool needs_swap_size_notifications) override;
#endif
-@@ -78,7 +78,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
+@@ -79,7 +79,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index c517b2b3498c..ca213c615d05 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,4 +1,4 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-03-25 21:59:56 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
@@ -97,7 +97,7 @@ RootCompositorFrameSinkImpl::Create(
@@ -9,7 +9,7 @@
// 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);
-@@ -569,7 +569,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -581,7 +581,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
display_client_->DidCompleteSwapWithSize(pixel_size);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index d7edfe42c46e..64f188f0deab 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2022-03-25 21:59:56 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2022-05-19 14:06:27 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -196,7 +196,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
+@@ -197,7 +197,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index a7f2d06d96eb..e331d51e75f1 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig 2022-03-25 21:59:56 UTC
+--- content/app/content_main_runner_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ content/app/content_main_runner_impl.cc
-@@ -130,13 +130,13 @@
+@@ -129,13 +129,13 @@
#include "base/posix/global_descriptors.h"
#include "content/public/common/content_descriptors.h"
@@ -16,7 +16,7 @@
#include "base/native_library.h"
#include "base/rand_util.h"
#include "content/public/common/zygote/sandbox_support_linux.h"
-@@ -170,6 +170,10 @@
+@@ -169,6 +169,10 @@
#include "media/base/media_switches.h"
#endif
@@ -26,8 +26,8 @@
+
#if BUILDFLAG(IS_ANDROID)
#include "base/system/sys_info.h"
- #include "components/power_scheduler/power_scheduler.h"
-@@ -340,7 +344,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+ #include "content/browser/android/battery_metrics.h"
+@@ -338,7 +342,7 @@ void InitializeZygoteSandboxForBrowserProcess(
}
#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
@@ -36,7 +36,7 @@
#if BUILDFLAG(ENABLE_PLUGINS)
// Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -376,7 +380,7 @@ void PreloadLibraryCdms() {
+@@ -374,7 +378,7 @@ void PreloadLibraryCdms() {
}
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
@@ -45,7 +45,7 @@
void PreSandboxInit() {
// Pre-acquire resources needed by BoringSSL. See
// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
-@@ -392,6 +396,11 @@ void PreSandboxInit() {
+@@ -390,6 +394,11 @@ void PreSandboxInit() {
#endif
InitializeWebRtcModule();
@@ -57,7 +57,7 @@
// Set the android SkFontMgr for blink. We need to ensure this is done
// before the sandbox is initialized to allow the font manager to access
// font configuration files on disk.
-@@ -561,7 +570,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
+@@ -559,7 +568,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
delegate->ZygoteStarting(&zygote_fork_delegates);
media::InitializeMediaLibrary();
@@ -66,7 +66,7 @@
PreSandboxInit();
#endif
-@@ -747,11 +756,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -745,11 +754,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -80,7 +80,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -949,6 +957,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -926,6 +934,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
}
#endif
@@ -97,7 +97,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
-@@ -1004,7 +1022,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -981,7 +999,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
mojo::core::InitFeatures();
}
@@ -106,7 +106,7 @@
// If dynamic Mojo Core is being used, ensure that it's loaded very early in
// the child/zygote process, before any sandbox is initialized. The library
// is not fully initialized with IPC support until a ChildProcess is later
-@@ -1037,6 +1055,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1014,6 +1032,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
content_main_params_.reset();
RegisterMainThreadFactories();
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index 0fe17d6ba4a9..979871d51d65 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- content/browser/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ content/browser/BUILD.gn
-@@ -2379,6 +2379,13 @@ source_set("browser") {
+@@ -2389,6 +2389,13 @@ source_set("browser") {
]
}
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index 68d07fe69d3e..8c65553b3781 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2022-04-21 18:48:31 UTC
+--- content/browser/browser_main_loop.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/browser_main_loop.cc
-@@ -241,6 +241,12 @@
+@@ -242,6 +242,12 @@
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
#endif
@@ -13,7 +13,7 @@
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
-@@ -548,6 +554,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -549,6 +555,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());
@@ -26,7 +26,7 @@
#endif
// GLib's spawning of new processes is buggy, so it's important that at this
-@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -576,7 +588,7 @@ int BrowserMainLoop::EarlyInitialization() {
// Up the priority of the UI thread unless it was already high (since Mac
// and recent versions of Android (O+) do this automatically).
@@ -35,7 +35,7 @@
if (base::FeatureList::IsEnabled(
features::kBrowserUseDisplayThreadPriority) &&
base::PlatformThread::GetCurrentThreadPriority() <
-@@ -586,7 +598,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -587,7 +599,7 @@ int BrowserMainLoop::EarlyInitialization() {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-content_browser_font__access_font__enumeration__data__source.cc b/www/chromium/files/patch-content_browser_font__access_font__enumeration__data__source.cc
index 17bc66a73cb3..116e4a9c0455 100644
--- a/www/chromium/files/patch-content_browser_font__access_font__enumeration__data__source.cc
+++ b/www/chromium/files/patch-content_browser_font__access_font__enumeration__data__source.cc
@@ -1,4 +1,4 @@
---- content/browser/font_access/font_enumeration_data_source.cc.orig 2022-03-25 21:59:56 UTC
+--- content/browser/font_access/font_enumeration_data_source.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/font_access/font_enumeration_data_source.cc
@@ -16,7 +16,7 @@
#include "content/browser/font_access/font_enumeration_data_source_win.h"
@@ -18,7 +18,7 @@
return std::make_unique<FontEnumerationDataSourceLinux>();
#else
return std::make_unique<FontEnumerationDataSourceNull>();
-@@ -76,7 +76,7 @@ bool FontEnumerationDataSource::IsOsSupportedForTestin
+@@ -76,7 +76,7 @@ bool FontEnumerationDataSource::IsOsSupported() {
return true;
#elif BUILDFLAG(IS_MAC)
return true;
diff --git a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc
index 8951945c9a53..c544ea7f38f8 100644
--- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc
+++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/compositor_util.cc.orig 2022-04-21 18:48:31 UTC
+--- content/browser/gpu/compositor_util.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/gpu/compositor_util.cc
-@@ -147,7 +147,7 @@ const GpuFeatureData GetGpuFeatureData(
+@@ -148,7 +148,7 @@ const GpuFeatureData GetGpuFeatureData(
{"video_decode",
SafeGetFeatureStatus(gpu_feature_info,
gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
@@ -9,7 +9,7 @@
!base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux),
#else
command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-@@ -159,7 +159,7 @@ const GpuFeatureData GetGpuFeatureData(
+@@ -160,7 +160,7 @@ const GpuFeatureData GetGpuFeatureData(
{"video_encode",
SafeGetFeatureStatus(gpu_feature_info,
gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE),
diff --git a/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc b/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc
new file mode 100644
index 000000000000..5add7191a5d9
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc
@@ -0,0 +1,20 @@
+--- content/browser/media/frameless_media_interface_proxy.cc.orig 2022-05-19 14:06:27 UTC
++++ content/browser/media/frameless_media_interface_proxy.cc
+@@ -15,7 +15,7 @@
+ #include "media/mojo/mojom/renderer_extensions.mojom.h"
+ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "content/public/browser/stable_video_decoder_factory.h"
+ #include "media/base/media_switches.h"
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -64,7 +64,7 @@ void FramelessMediaInterfaceProxy::CreateVideoDecoder(
+
+ mojo::PendingRemote<media::stable::mojom::StableVideoDecoder>
+ oop_video_decoder;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) {
+ // TODO(b/195769334): for now, we're using the same
+ // StableVideoDecoderFactory. However, we should be using a separate
diff --git a/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc b/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc
new file mode 100644
index 000000000000..aa1f464c30ee
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc
@@ -0,0 +1,20 @@
+--- content/browser/media/media_interface_proxy.cc.orig 2022-05-19 14:06:27 UTC
++++ content/browser/media/media_interface_proxy.cc
+@@ -73,7 +73,7 @@
+ #include "media/mojo/services/mojo_renderer_service.h" // nogncheck
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "content/public/browser/stable_video_decoder_factory.h"
+ #include "media/base/media_switches.h"
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -293,7 +293,7 @@ void MediaInterfaceProxy::CreateVideoDecoder(
+
+ mojo::PendingRemote<media::stable::mojom::StableVideoDecoder>
+ oop_video_decoder;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) {
+ // TODO(b/195769334): for now, we're using the same
+ // StableVideoDecoderFactory. However, we should be using a separate
diff --git a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
index 0d876b0fef73..e747d1f7a861 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2022-02-28 16:54:41 UTC
+--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/renderer_host/pepper/pepper_file_io_host.cc
-@@ -456,7 +456,7 @@ void PepperFileIOHost::OnLocalFileOpened(
+@@ -455,7 +455,7 @@ void PepperFileIOHost::OnLocalFileOpened(
ppapi::host::ReplyMessageContext reply_context,
const base::FilePath& path,
base::File::Error error_code) {
@@ -9,7 +9,7 @@
// 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) {
-@@ -490,7 +490,7 @@ void PepperFileIOHost::OnLocalFileOpened(
+@@ -489,7 +489,7 @@ void PepperFileIOHost::OnLocalFileOpened(
#endif
}
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc
index 6d92341e3fa0..a89c4c3df9de 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_frame_host_impl.cc.orig 2022-05-03 04:41:28 UTC
+--- content/browser/renderer_host/render_frame_host_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/renderer_host/render_frame_host_impl.cc
-@@ -272,7 +272,7 @@
+@@ -276,7 +276,7 @@
#include "content/browser/renderer_host/render_view_host_delegate_view.h"
#endif
@@ -9,7 +9,7 @@
#include "content/browser/accessibility/ax_screen_ai_annotator.h"
#include "ui/accessibility/accessibility_features.h"
#endif
-@@ -2581,7 +2581,7 @@ void RenderFrameHostImpl::AccessibilityPerformAction(
+@@ -2661,7 +2661,7 @@ void RenderFrameHostImpl::AccessibilityPerformAction(
view->SetLastPointerType(ui::EventPointerType::kTouch);
}
@@ -18,7 +18,7 @@
if (action_data.action == ax::mojom::Action::kRunScreenAi) {
RunScreenAIAnnotator();
return;
-@@ -2591,7 +2591,7 @@ void RenderFrameHostImpl::AccessibilityPerformAction(
+@@ -2671,7 +2671,7 @@ void RenderFrameHostImpl::AccessibilityPerformAction(
render_accessibility_->PerformAction(action_data);
}
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.h
index 44378772e16b..787c0c54c2e2 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.h
@@ -1,15 +1,15 @@
---- content/browser/renderer_host/render_frame_host_impl.h.orig 2022-05-03 04:41:28 UTC
+--- content/browser/renderer_host/render_frame_host_impl.h.orig 2022-05-19 14:06:27 UTC
+++ content/browser/renderer_host/render_frame_host_impl.h
-@@ -3301,7 +3301,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
- perfetto::protos::pbzero::RenderFrameHost::LifecycleState
- LifecycleStateToProto();
+@@ -3341,7 +3341,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
+
+ TraceProto::LifecycleState LifecycleStateToProto() const;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
void RunScreenAIAnnotator();
#endif
-@@ -4141,7 +4141,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
+@@ -4193,7 +4193,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
BackForwardCacheDisablingFeaturesCallback
back_forward_cache_disabling_features_callback_for_testing_;
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
index b093f609301c..2479b1bac7a5 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_message_filter.cc.orig 2022-02-28 16:54:41 UTC
+--- content/browser/renderer_host/render_message_filter.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/renderer_host/render_message_filter.cc
-@@ -67,7 +67,7 @@
+@@ -66,7 +66,7 @@
#if BUILDFLAG(IS_MAC)
#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
#endif
@@ -9,7 +9,7 @@
#include "base/linux_util.h"
#include "base/threading/platform_thread.h"
#endif
-@@ -129,7 +129,7 @@ void RenderMessageFilter::GenerateFrameRoutingID(
+@@ -128,7 +128,7 @@ void RenderMessageFilter::GenerateFrameRoutingID(
std::move(callback).Run(routing_id, frame_token, devtools_frame_token);
}
@@ -18,7 +18,7 @@
void RenderMessageFilter::SetThreadPriorityOnFileThread(
base::PlatformThreadId ns_tid,
base::ThreadPriority priority) {
-@@ -150,7 +150,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea
+@@ -149,7 +149,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea
}
#endif
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 0b965b1c2e03..c2fa8838903a 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -209,7 +209,7 @@
+@@ -210,7 +210,7 @@
#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
#endif
@@ -9,7 +9,7 @@
#include <sys/resource.h>
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
-@@ -1179,7 +1179,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1180,7 +1180,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
// to indicate failure and std::numeric_limits<size_t>::max() to indicate
// unlimited.
size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
struct rlimit limit;
if (getrlimit(RLIMIT_NPROC, &limit) != 0)
return kUnknownPlatformProcessLimit;
-@@ -1266,7 +1266,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1267,7 +1267,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
return;
}
@@ -27,7 +27,7 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
-@@ -3261,6 +3261,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3257,6 +3257,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
switches::kDisableSpeechAPI,
switches::kDisableThreadedCompositing,
switches::kDisableTouchDragDrop,
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index dd20a9f6a229..fbec9c89ecb7 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-04-21 18:48:31 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-05-19 14:06:27 UTC
+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -464,7 +464,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -461,7 +461,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Sets this RenderProcessHost to be guest only. For Testing only.
void SetForGuestsOnlyForTesting();
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 4bab4e2ebd84..dfafc2c1bb09 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-03-25 21:59:56 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -115,7 +115,7 @@
+@@ -114,7 +114,7 @@
#include "ui/gfx/gdi_util.h"
#endif
@@ -9,7 +9,7 @@
#include "content/browser/accessibility/browser_accessibility_auralinux.h"
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
-@@ -453,7 +453,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
+@@ -439,7 +439,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
if (manager)
return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM();
@@ -18,7 +18,7 @@
BrowserAccessibilityManager* manager =
host()->GetOrCreateRootBrowserAccessibilityManager();
if (manager && manager->GetRoot())
-@@ -1576,7 +1576,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1596,7 +1596,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
return GetTextInputManager() && GetTextInputManager()->should_do_learning();
}
@@ -27,7 +27,7 @@
bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
const gfx::Range& range,
const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2412,7 +2412,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2408,7 +2408,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,7 +36,7 @@
return NeedsInputGrab();
#else
return false;
-@@ -2604,7 +2604,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2585,7 +2585,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
index b85531b362fa..3dda48e8eb46 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-04-21 18:48:31 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-05-19 14:06:27 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.h
-@@ -247,7 +247,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
+@@ -244,7 +244,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
ukm::SourceId GetClientSourceForMetrics() const override;
bool ShouldDoLearning() override;
diff --git a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc
index 41b4b6de92bc..f7a5722a4449 100644
--- a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc
+++ b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc
@@ -1,6 +1,6 @@
---- content/browser/utility_sandbox_delegate.cc.orig 2022-04-21 18:48:31 UTC
+--- content/browser/utility_sandbox_delegate.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/utility_sandbox_delegate.cc
-@@ -62,7 +62,7 @@ UtilitySandboxedProcessLauncherDelegate::
+@@ -62,10 +62,10 @@ UtilitySandboxedProcessLauncherDelegate::
#if BUILDFLAG(ENABLE_PLUGINS)
sandbox_type_ == sandbox::mojom::Sandbox::kPpapi ||
#endif
@@ -8,8 +8,12 @@
+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
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_CHROMEOS_ASH)
-@@ -73,7 +73,7 @@ UtilitySandboxedProcessLauncherDelegate::
+@@ -75,7 +75,7 @@ UtilitySandboxedProcessLauncherDelegate::
sandbox_type_ == sandbox::mojom::Sandbox::kLibassistant ||
#endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -18,7 +22,16 @@
sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI ||
#endif
sandbox_type_ == sandbox::mojom::Sandbox::kAudio ||
-@@ -118,7 +118,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::
+@@ -108,7 +108,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::
+ // unsandboxed zygote and then apply their actual sandboxes in the forked
+ // process upon startup.
+ if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
+-#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_CHROMEOS_ASH)
+@@ -122,7 +122,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::
#if BUILDFLAG(ENABLE_OOP_PRINTING)
sandbox_type_ == sandbox::mojom::Sandbox::kPrintBackend ||
#endif
diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
index 3179324f9117..336ecc8a9179 100644
--- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-04-21 18:48:31 UTC
+--- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/web_contents/web_contents_view_aura.cc
@@ -159,7 +159,7 @@ class WebDragSourceAura : public content::WebContentsO
raw_ptr<aura::Window> window_;
@@ -18,7 +18,7 @@
// 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.
-@@ -1330,7 +1330,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
+@@ -1333,7 +1333,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
// 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/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
index f55da6f7203a..3532116043be 100644
--- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
+++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
@@ -1,8 +1,8 @@
---- content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-02-28 16:54:41 UTC
+--- content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-05-19 14:06:27 UTC
+++ content/browser/webui/web_ui_main_frame_observer.cc
-@@ -12,7 +12,7 @@
- #include "content/browser/webui/web_ui_impl.h"
+@@ -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)
diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc
index 40b8b7b384e4..5026048a86d7 100644
--- a/www/chromium/files/patch-content_child_child__process.cc
+++ b/www/chromium/files/patch-content_child_child__process.cc
@@ -1,6 +1,6 @@
---- content/child/child_process.cc.orig 2022-04-21 18:48:31 UTC
+--- content/child/child_process.cc.orig 2022-05-19 14:06:27 UTC
+++ content/child/child_process.cc
-@@ -72,7 +72,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr
+@@ -68,7 +68,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr
DCHECK(!g_lazy_child_process_tls.Pointer()->Get());
g_lazy_child_process_tls.Pointer()->Set(this);
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index ad648e249b18..abaa8142474d 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig 2022-02-28 16:54:41 UTC
+--- content/common/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ content/common/BUILD.gn
-@@ -406,6 +406,9 @@ if (is_linux || is_chromeos) {
+@@ -403,6 +403,9 @@ if (is_linux || is_chromeos) {
public = [ "set_process_title_linux.h" ]
sources = [ "set_process_title_linux.cc" ]
deps = [ "//base" ]
diff --git a/www/chromium/files/patch-content_common_font__list__unittest.cc b/www/chromium/files/patch-content_common_font__list__unittest.cc
index 8f36cb7c123b..996f152fc989 100644
--- a/www/chromium/files/patch-content_common_font__list__unittest.cc
+++ b/www/chromium/files/patch-content_common_font__list__unittest.cc
@@ -1,6 +1,6 @@
---- content/common/font_list_unittest.cc.orig 2022-02-28 16:54:41 UTC
+--- content/common/font_list_unittest.cc.orig 2022-05-19 14:06:27 UTC
+++ content/common/font_list_unittest.cc
-@@ -51,7 +51,7 @@ TEST(FontList, GetFontList) {
+@@ -50,7 +50,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"));
diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc
index 8b753fdd0872..84da00b6b5d8 100644
--- a/www/chromium/files/patch-content_common_user__agent.cc
+++ b/www/chromium/files/patch-content_common_user__agent.cc
@@ -1,6 +1,6 @@
---- content/common/user_agent.cc.orig 2022-04-21 18:48:31 UTC
+--- content/common/user_agent.cc.orig 2022-05-19 14:06:27 UTC
+++ content/common/user_agent.cc
-@@ -33,7 +33,7 @@ std::string GetUserAgentPlatform() {
+@@ -34,7 +34,7 @@ std::string GetUserAgentPlatform() {
return "";
#elif BUILDFLAG(IS_MAC)
return "Macintosh; ";
@@ -9,7 +9,7 @@
return "X11; "; // strange, but that's what Firefox uses
#elif BUILDFLAG(IS_ANDROID)
return "Linux; ";
-@@ -243,6 +243,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
+@@ -260,6 +260,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
"Android %s", os_version.c_str()
#elif BUILDFLAG(IS_FUCHSIA)
"Fuchsia"
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index 62bc81021cf9..f3e058e2c8cd 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig 2022-03-25 21:59:56 UTC
+--- content/gpu/gpu_main.cc.orig 2022-05-19 14:06:27 UTC
+++ content/gpu/gpu_main.cc
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
#include "sandbox/win/src/sandbox.h"
#endif
@@ -9,7 +9,7 @@
#include "content/gpu/gpu_sandbox_hook_linux.h"
#include "sandbox/policy/linux/sandbox_linux.h"
#include "sandbox/policy/sandbox_type.h"
-@@ -108,7 +108,7 @@ namespace content {
+@@ -109,7 +109,7 @@ namespace content {
namespace {
@@ -18,7 +18,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
-@@ -170,7 +170,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -171,7 +171,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) override {
@@ -27,7 +27,7 @@
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
#elif BUILDFLAG(IS_WIN)
return StartSandboxWindows(sandbox_info_);
-@@ -266,7 +266,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -267,7 +267,7 @@ int GpuMain(MainFunctionParams parameters) {
std::make_unique<base::SingleThreadTaskExecutor>(
gpu_preferences.message_pump_type);
}
@@ -36,7 +36,7 @@
#error "Unsupported Linux platform."
#elif BUILDFLAG(IS_MAC)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -409,17 +409,19 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -410,17 +410,19 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
@@ -57,7 +57,7 @@
// SandboxLinux::InitializeSandbox() must always be called
// with only one thread.
-@@ -454,11 +456,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -455,11 +457,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
*base::CommandLine::ForCurrentProcess()),
base::BindOnce(GpuProcessPreSandboxHook), sandbox_options);
diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
index 88e68fd7a3c3..6ed0a67dc944 100644
--- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-03-25 21:59:56 UTC
+--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-05-19 14:06:27 UTC
+++ content/gpu/gpu_sandbox_hook_linux.cc
@@ -104,6 +104,7 @@ static const char kLibV4lEncPluginPath[] =
@@ -27,7 +27,7 @@
}
bool LoadAmdGpuLibraries() {
-@@ -526,12 +530,14 @@ void LoadV4L2Libraries(
+@@ -528,12 +532,14 @@ void LoadV4L2Libraries(
}
void LoadChromecastV4L2Libraries() {
@@ -42,7 +42,7 @@
}
bool LoadLibrariesForGpu(
-@@ -558,6 +564,7 @@ bool LoadLibrariesForGpu(
+@@ -560,6 +566,7 @@ bool LoadLibrariesForGpu(
return true;
}
@@ -50,7 +50,7 @@
sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
const sandbox::policy::SandboxLinux::Options& options) {
sandbox::syscall_broker::BrokerCommandSet command_set;
-@@ -580,13 +587,17 @@ bool BrokerProcessPreSandboxHook(
+@@ -582,13 +589,17 @@ bool BrokerProcessPreSandboxHook(
SetProcessTitleFromCommandLine(nullptr);
return true;
}
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index 6444539c91d1..b54010be9e01 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig 2022-04-21 18:48:31 UTC
+--- content/public/common/content_features.cc.orig 2022-05-19 14:06:27 UTC
+++ content/public/common/content_features.cc
@@ -43,7 +43,7 @@ const base::Feature kAudioServiceOutOfProcess {
"AudioServiceOutOfProcess",
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1051,7 +1051,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB
+@@ -1055,7 +1055,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB
const base::Feature kWebAssemblyCodeProtection{
"WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -27,7 +27,7 @@
// Use memory protection keys in userspace (PKU) (if available) to protect code
// JITed for WebAssembly. Fall back to traditional memory protection if
// WebAssemblyCodeProtection is also enabled.
-@@ -1081,7 +1081,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi
+@@ -1085,7 +1085,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi
const base::Feature kWebAssemblyTrapHandler {
"WebAssemblyTrapHandler",
#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -36,7 +36,7 @@
defined(ARCH_CPU_X86_64)) || \
(BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
base::FEATURE_ENABLED_BY_DEFAULT
-@@ -1162,7 +1162,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{
+@@ -1166,7 +1166,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{
// Controls whether the WebUSB API is enabled:
// https://wicg.github.io/webusb
diff --git a/www/chromium/files/patch-content_public_common_content__features.h b/www/chromium/files/patch-content_public_common_content__features.h
index 7f0e57cb8300..08a96085a4b3 100644
--- a/www/chromium/files/patch-content_public_common_content__features.h
+++ b/www/chromium/files/patch-content_public_common_content__features.h
@@ -1,6 +1,6 @@
---- content/public/common/content_features.h.orig 2022-04-21 18:48:31 UTC
+--- content/public/common/content_features.h.orig 2022-05-19 14:06:27 UTC
+++ content/public/common/content_features.h
-@@ -259,7 +259,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture;
+@@ -264,7 +264,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture;
CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay;
CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline;
CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection;
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
index 8f17be4a34e5..ab653cca6f60 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig 2022-04-21 18:48:31 UTC
+--- content/public/common/content_switches.cc.orig 2022-05-19 14:06:27 UTC
+++ content/public/common/content_switches.cc
-@@ -380,6 +380,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] =
+@@ -370,6 +370,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] =
// builds.
const char kEnableLogging[] = "enable-logging";
@@ -9,7 +9,7 @@
// 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.
-@@ -983,7 +985,7 @@ const char kEnableAutomation[] = "enable-automation";
+@@ -981,7 +983,7 @@ const char kEnableAutomation[] = "enable-automation";
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
index e3a8977c43e8..dd5a2ce9fd0f 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig 2022-04-21 18:48:31 UTC
+--- content/public/common/content_switches.h.orig 2022-05-19 14:06:27 UTC
+++ content/public/common/content_switches.h
-@@ -120,6 +120,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu
+@@ -117,6 +117,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu
CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[];
CONTENT_EXPORT extern const char kEnableLCDText[];
CONTENT_EXPORT extern const char kEnableLogging[];
@@ -8,7 +8,7 @@
CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -267,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -265,7 +266,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc b/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc
deleted file mode 100644
index ba73820d0fac..000000000000
--- a/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/public/common/use_zoom_for_dsf_policy.cc.orig 2022-02-28 16:54:41 UTC
-+++ content/public/common/use_zoom_for_dsf_policy.cc
-@@ -26,7 +26,7 @@ const base::Feature kUseZoomForDsfEnabledByDefault{
-
- bool IsUseZoomForDSFEnabledByDefault() {
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
-- BUILDFLAG(IS_MAC)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- return true;
- #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
- return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault);
diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc
index 724870160ef7..89d3a847c717 100644
--- a/www/chromium/files/patch-content_renderer_render__process__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_process_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- content/renderer/render_process_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ content/renderer/render_process_impl.cc
-@@ -48,7 +48,7 @@
+@@ -47,7 +47,7 @@
#if BUILDFLAG(IS_WIN)
#include "base/win/win_util.h"
#endif
@@ -9,7 +9,7 @@
#include "v8/include/v8-wasm-trap-handler-posix.h"
#endif
-@@ -147,7 +147,7 @@ RenderProcessImpl::RenderProcessImpl()
+@@ -146,7 +146,7 @@ RenderProcessImpl::RenderProcessImpl()
SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection,
"--no-wasm-write-protect-code-memory");
@@ -18,9 +18,9 @@
SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku,
"--wasm-memory-protection-keys");
SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku,
-@@ -228,7 +228,7 @@ RenderProcessImpl::RenderProcessImpl()
- SetV8FlagIfFeature(features::kWebAssemblyDynamicTiering,
- "--wasm-dynamic-tiering");
+@@ -229,7 +229,7 @@ RenderProcessImpl::RenderProcessImpl()
+ SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering,
+ "--no-wasm-dynamic-tiering");
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64)
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index 65136d444b1b..25c46e126b26 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- content/renderer/render_thread_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ content/renderer/render_thread_impl.cc
-@@ -191,7 +191,7 @@
+@@ -189,7 +189,7 @@
#if BUILDFLAG(IS_MAC)
#include <malloc/malloc.h>
@@ -9,7 +9,7 @@
#include <malloc.h>
#endif
-@@ -720,7 +720,7 @@ void RenderThreadImpl::Init() {
+@@ -716,7 +716,7 @@ void RenderThreadImpl::Init() {
DCHECK(parsed_num_raster_threads) << string_value;
DCHECK_GT(num_raster_threads, 0);
@@ -18,7 +18,7 @@
categorized_worker_pool_->SetBackgroundingCallback(
main_thread_scheduler_->DefaultTaskRunner(),
base::BindOnce(
-@@ -743,7 +743,7 @@ void RenderThreadImpl::Init() {
+@@ -739,7 +739,7 @@ void RenderThreadImpl::Init() {
base::DiscardableMemoryAllocator::SetInstance(
discardable_memory_allocator_.get());
@@ -27,7 +27,7 @@
if (base::FeatureList::IsEnabled(
blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
render_message_filter()->SetThreadPriority(
-@@ -1095,7 +1095,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1098,7 +1098,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
const bool enable_video_decode_accelerator =
@@ -36,7 +36,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
#else
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1106,7 +1106,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1109,7 +1109,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
const bool enable_video_encode_accelerator =
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index e87fbf143033..122ec1373f57 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -110,7 +110,7 @@
+@@ -109,7 +109,7 @@
#if BUILDFLAG(IS_MAC)
#include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#endif
-@@ -179,7 +179,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -178,7 +178,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
main_thread_scheduler_(main_thread_scheduler) {
// RenderThread may not exist in some tests.
if (RenderThreadImpl::current()) {
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
RenderThreadImpl::current()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -189,7 +189,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -188,7 +188,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
#endif
}
@@ -27,7 +27,7 @@
if (sandboxEnabled()) {
#if BUILDFLAG(IS_MAC)
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -284,7 +284,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory(
+@@ -283,7 +283,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory(
/*terminate_sync_load_event=*/nullptr);
}
@@ -37,7 +37,7 @@
void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
base::PlatformThreadId thread_id) {
if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
-@@ -299,7 +300,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
+@@ -298,7 +299,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index aea21185750b..4384cd627ed4 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig 2022-03-25 21:59:56 UTC
+--- content/shell/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ content/shell/BUILD.gn
-@@ -882,7 +882,7 @@ group("content_shell_crash_test") {
+@@ -880,7 +880,7 @@ group("content_shell_crash_test") {
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
}
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
index 9edf00e28c09..354654dfb0eb 100644
--- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig 2022-04-21 18:48:31 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig 2022-05-19 14:06:27 UTC
+++ content/shell/browser/shell_browser_main_parts.cc
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
#include "net/base/network_change_notifier.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/base/ime/init/input_method_initializer.h"
#endif
-@@ -130,7 +130,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
+@@ -131,7 +131,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
}
int ShellBrowserMainParts::PreEarlyInitialization() {
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
index 49a2afa86665..d2fe457d92dd 100644
--- a/www/chromium/files/patch-content_test_BUILD.gn
+++ b/www/chromium/files/patch-content_test_BUILD.gn
@@ -1,6 +1,6 @@
---- content/test/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- content/test/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ content/test/BUILD.gn
-@@ -1914,7 +1914,7 @@ static_library("run_all_unittests") {
+@@ -1938,7 +1938,7 @@ static_library("run_all_unittests") {
":test_support",
"//base/test:test_support",
]
@@ -9,7 +9,7 @@
deps += [ "//content/common:set_process_title_linux" ]
}
}
-@@ -2866,7 +2866,7 @@ test("content_unittests") {
+@@ -2888,7 +2888,7 @@ test("content_unittests") {
deps += [ "//third_party/boringssl" ]
}
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc
index c45281e29db6..870834b11c62 100644
--- a/www/chromium/files/patch-content_utility_utility__main.cc
+++ b/www/chromium/files/patch-content_utility_utility__main.cc
@@ -1,6 +1,6 @@
---- content/utility/utility_main.cc.orig 2022-04-21 18:48:31 UTC
+--- content/utility/utility_main.cc.orig 2022-05-19 14:06:27 UTC
+++ content/utility/utility_main.cc
-@@ -32,17 +32,23 @@
+@@ -32,18 +32,20 @@
#include "third_party/icu/source/common/unicode/unistr.h"
#include "third_party/icu/source/i18n/unicode/timezone.h"
@@ -18,6 +18,15 @@
#include "services/network/network_sandbox_hook_linux.h"
#endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #include "gpu/config/gpu_info_collector.h"
+ #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h"
+
+@@ -52,6 +54,10 @@
+ #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+
+#if BUILDFLAG(IS_BSD)
+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
+#endif
@@ -25,7 +34,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/services/ime/ime_sandbox_hook.h"
#include "chromeos/assistant/buildflags.h"
-@@ -136,7 +142,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -139,7 +145,7 @@ int UtilityMain(MainFunctionParams parameters) {
}
}
@@ -34,15 +43,29 @@
// Initializes the sandbox before any threads are created.
// TODO(jorgelo): move this after GTK initialization when we enable a strict
// Seccomp-BPF policy.
-@@ -183,6 +189,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -165,7 +171,7 @@ int UtilityMain(MainFunctionParams parameters) {
+ case sandbox::mojom::Sandbox::kScreenAI:
+ pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook);
+ break;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
+ pre_sandbox_hook =
+ base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
+@@ -188,10 +194,11 @@ int UtilityMain(MainFunctionParams parameters) {
default:
break;
}
+#if !BUILDFLAG(IS_BSD)
- if (parameters.zygote_child || !pre_sandbox_hook.is_null()) {
+ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
+ (parameters.zygote_child || !pre_sandbox_hook.is_null())) {
sandbox::policy::SandboxLinux::Options sandbox_options;
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -198,6 +205,11 @@ int UtilityMain(MainFunctionParams parameters) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ if (sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding) {
+ // The kHardwareVideoDecoding sandbox needs to know the GPU type in order
+ // to select the right policy.
+@@ -204,6 +211,11 @@ int UtilityMain(MainFunctionParams parameters) {
sandbox::policy::Sandbox::Initialize(
sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
}
diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc
index a9459a80819d..4039ac0d91d7 100644
--- a/www/chromium/files/patch-content_zygote_zygote__linux.cc
+++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- content/zygote/zygote_linux.cc.orig 2022-05-19 14:06:27 UTC
+++ content/zygote/zygote_linux.cc
@@ -1,6 +1,7 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -8,7 +8,7 @@
#include "content/zygote/zygote_linux.h"
-@@ -650,3 +651,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
+@@ -654,3 +655,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
}
} // namespace content
diff --git a/www/chromium/files/patch-extensions_browser_extension__prefs.cc b/www/chromium/files/patch-extensions_browser_extension__prefs.cc
index 1328e0884471..d351fd2b78ac 100644
--- a/www/chromium/files/patch-extensions_browser_extension__prefs.cc
+++ b/www/chromium/files/patch-extensions_browser_extension__prefs.cc
@@ -1,6 +1,6 @@
---- extensions/browser/extension_prefs.cc.orig 2022-04-21 18:48:31 UTC
+--- extensions/browser/extension_prefs.cc.orig 2022-05-19 14:06:27 UTC
+++ extensions/browser/extension_prefs.cc
-@@ -2270,7 +2270,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
+@@ -2271,7 +2271,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
registry->RegisterDictionaryPref(kInstallSignature);
registry->RegisterListPref(kExternalUninstalls);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json
index 81c60495b3c4..a5d8edf8fdba 100644
--- a/www/chromium/files/patch-extensions_common_api___permission__features.json
+++ b/www/chromium/files/patch-extensions_common_api___permission__features.json
@@ -1,6 +1,6 @@
---- extensions/common/api/_permission_features.json.orig 2022-02-28 16:54:41 UTC
+--- extensions/common/api/_permission_features.json.orig 2022-05-19 14:06:27 UTC
+++ extensions/common/api/_permission_features.json
-@@ -134,7 +134,7 @@
+@@ -140,7 +140,7 @@
{
"channel": "stable",
"extension_types": ["platform_app"],
@@ -9,7 +9,7 @@
"allowlist": [
"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169
"A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169
-@@ -447,7 +447,7 @@
+@@ -453,7 +453,7 @@
}, {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
@@ -18,7 +18,7 @@
"allowlist": [
"0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651
"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683
-@@ -485,7 +485,7 @@
+@@ -497,7 +497,7 @@
"networkingPrivate": {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
index 858eaf7fc46f..2dd27a0ccf4d 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2022-04-21 18:48:31 UTC
+--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2022-05-19 14:06:27 UTC
+++ gpu/command_buffer/service/external_vk_image_backing.cc
@@ -30,7 +30,7 @@
#include "ui/gl/gl_version_info.h"
@@ -9,7 +9,7 @@
#include "gpu/command_buffer/service/external_vk_image_dawn_representation.h"
#endif
-@@ -558,7 +558,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
+@@ -570,7 +570,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
MemoryTypeTracker* tracker,
WGPUDevice wgpuDevice,
WGPUBackendType backend_type) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc
index ef674e1c8f71..306ee714d0b7 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-03-25 21:59:56 UTC
+--- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-05-19 14:06:27 UTC
+++ gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
-@@ -574,7 +574,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle
+@@ -577,7 +577,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle
// TODO(penghuang): verify the scanout is the right usage for video playback.
// crbug.com/1280798
constexpr auto kSupportedUsages =
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__gl__texture.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__gl__texture.cc
new file mode 100644
index 000000000000..4ac1f38c195d
--- /dev/null
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__gl__texture.cc
@@ -0,0 +1,11 @@
+--- gpu/command_buffer/service/shared_image_backing_factory_gl_texture.cc.orig 2022-05-19 14:06:27 UTC
++++ gpu/command_buffer/service/shared_image_backing_factory_gl_texture.cc
+@@ -145,7 +145,7 @@ bool SharedImageBackingFactoryGLTexture::IsSupported(
+ // Linux and ChromeOS support WebGPU/Compat on GL. All other platforms
+ // do not support WebGPU on GL.
+ if (usage & SHARED_IMAGE_USAGE_WEBGPU) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD)
+ if (use_webgpu_adapter_ != WebGPUAdapterName::kCompat) {
+ return false;
+ }
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__gl__texture.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__gl__texture.cc
new file mode 100644
index 000000000000..14cd81729e57
--- /dev/null
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__gl__texture.cc
@@ -0,0 +1,11 @@
+--- gpu/command_buffer/service/shared_image_backing_gl_texture.cc.orig 2022-05-19 14:06:27 UTC
++++ gpu/command_buffer/service/shared_image_backing_gl_texture.cc
+@@ -257,7 +257,7 @@ void SharedImageBackingGLTexture::InitializeGLTexture(
+ }
+
+ void SharedImageBackingGLTexture::CreateEGLImage() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD)
+ SharedContextState* shared_context_state = factory()->GetSharedContextState();
+ ui::ScopedMakeCurrent smc(shared_context_state->context(),
+ shared_context_state->surface());
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc
index 0e9120084ccc..2513ce5c68d0 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc
@@ -1,11 +1,6 @@
---- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-04-21 18:48:31 UTC
+--- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-05-19 14:06:27 UTC
+++ gpu/command_buffer/service/shared_image_factory.cc
-@@ -38,11 +38,11 @@
- #include "gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.h"
- #endif
-
--#if BUILDFLAG(IS_LINUX) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN)
+@@ -46,7 +46,7 @@
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -14,16 +9,16 @@
BUILDFLAG(ENABLE_VULKAN)
#include "gpu/command_buffer/service/external_vk_image_factory.h"
#elif BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_VULKAN)
-@@ -78,7 +78,7 @@
+@@ -81,7 +81,7 @@
namespace gpu {
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
!BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) && \
BUILDFLAG(ENABLE_VULKAN)
-@@ -241,7 +241,7 @@ SharedImageFactory::SharedImageFactory(
+@@ -325,7 +325,7 @@ SharedImageFactory::SharedImageFactory(
factories_.push_back(std::move(external_vk_image_factory));
}
#elif defined(USE_OZONE)
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index a0d38838323f..045d71aff7db 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,9 +1,9 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1508,7 +1508,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter(
- }
+@@ -1547,7 +1547,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter(
- if (gr_context_type_ != GrContextType::kVulkan) {
+ if (gr_context_type_ != GrContextType::kVulkan &&
+ use_webgpu_adapter_ != WebGPUAdapterName::kCompat) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
SendAdapterProperties(request_adapter_serial, -1, nullptr,
diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
index 2ad7e68a262e..644cf5b2b178 100644
--- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_control_list.cc.orig 2022-02-28 16:54:41 UTC
+--- gpu/config/gpu_control_list.cc.orig 2022-05-19 14:06:27 UTC
+++ gpu/config/gpu_control_list.cc
-@@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
+@@ -261,7 +261,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
GpuControlList::GLType GpuControlList::More::GetDefaultGLType() {
#if BUILDFLAG(IS_CHROMEOS)
return kGLTypeGL;
@@ -9,7 +9,7 @@
return kGLTypeGL;
#elif BUILDFLAG(IS_MAC)
return kGLTypeGL;
-@@ -781,7 +781,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
+@@ -784,7 +784,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
return kOsAndroid;
#elif BUILDFLAG(IS_FUCHSIA)
return kOsFuchsia;
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index 77adcbd2f37f..a4abf1a0301e 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/service/gpu_init.cc.orig 2022-04-21 18:48:31 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2022-05-19 14:06:27 UTC
+++ gpu/ipc/service/gpu_init.cc
@@ -313,7 +313,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
enable_watchdog = false;
@@ -54,7 +54,7 @@
// 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.
-@@ -860,7 +860,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -857,7 +857,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
index e2a88a389107..094da6fa2849 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_request_context_manager.cc.orig 2022-02-28 16:54:41 UTC
+--- headless/lib/browser/headless_request_context_manager.cc.orig 2022-05-19 14:06:27 UTC
+++ headless/lib/browser/headless_request_context_manager.cc
-@@ -65,7 +65,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
+@@ -64,7 +64,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
return;
done_once = true;
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
index 350201e1fb4c..799726bb8c36 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-03-25 21:59:56 UTC
+--- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ headless/lib/browser/headless_web_contents_impl.cc
-@@ -56,7 +56,7 @@ namespace headless {
+@@ -57,7 +57,7 @@ namespace headless {
namespace {
void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) {
diff --git a/www/chromium/files/patch-headless_public_headless__browser.cc b/www/chromium/files/patch-headless_public_headless__browser.cc
deleted file mode 100644
index fcecc9f8ea61..000000000000
--- a/www/chromium/files/patch-headless_public_headless__browser.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- headless/public/headless_browser.cc.orig 2022-03-25 21:59:56 UTC
-+++ headless/public/headless_browser.cc
-@@ -42,7 +42,7 @@ Options::Options(int argc, const char** argv)
- user_agent(content::BuildUserAgentFromProduct(product_name_and_version)),
- window_size(kDefaultWindowSize),
- font_render_hinting(kDefaultFontRenderHinting) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- gl_implementation = gl::kGLImplementationANGLEName;
- angle_implementation = gl::kANGLEImplementationSwiftShaderForWebGLName;
- #endif
diff --git a/www/chromium/files/patch-ipc_ipc__channel__common.cc b/www/chromium/files/patch-ipc_ipc__channel__common.cc
index 426ef109e668..ba398d72e225 100644
--- a/www/chromium/files/patch-ipc_ipc__channel__common.cc
+++ b/www/chromium/files/patch-ipc_ipc__channel__common.cc
@@ -1,6 +1,6 @@
---- ipc/ipc_channel_common.cc.orig 2022-02-28 16:54:41 UTC
+--- ipc/ipc_channel_common.cc.orig 2022-05-19 14:06:27 UTC
+++ ipc/ipc_channel_common.cc
-@@ -10,7 +10,7 @@
+@@ -11,7 +11,7 @@
namespace IPC {
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc
index c56681bc15b7..05f316f844ed 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.cc
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc
@@ -1,6 +1,6 @@
---- ipc/ipc_message_utils.cc.orig 2022-03-25 21:59:56 UTC
+--- ipc/ipc_message_utils.cc.orig 2022-05-19 14:06:27 UTC
+++ ipc/ipc_message_utils.cc
-@@ -350,7 +350,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
+@@ -359,7 +359,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h
index 0056c08eeec3..a0726995cc95 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.h
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.h
@@ -1,6 +1,6 @@
---- ipc/ipc_message_utils.h.orig 2022-03-25 21:59:56 UTC
+--- ipc/ipc_message_utils.h.orig 2022-05-19 14:06:27 UTC
+++ ipc/ipc_message_utils.h
-@@ -214,7 +214,7 @@ struct ParamTraits<unsigned int> {
+@@ -212,7 +212,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/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn
index 0b878f28c0b5..4c101c6ee7fa 100644
--- a/www/chromium/files/patch-media_BUILD.gn
+++ b/www/chromium/files/patch-media_BUILD.gn
@@ -1,6 +1,6 @@
---- media/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- media/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ media/BUILD.gn
-@@ -77,6 +77,9 @@ config("media_config") {
+@@ -76,6 +76,9 @@ config("media_config") {
defines += [ "DLOPEN_PULSEAUDIO" ]
}
}
diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc
index 30a8b45d281e..6413a38b2057 100644
--- a/www/chromium/files/patch-media_audio_audio__input__device.cc
+++ b/www/chromium/files/patch-media_audio_audio__input__device.cc
@@ -1,6 +1,6 @@
---- media/audio/audio_input_device.cc.orig 2022-02-28 16:54:41 UTC
+--- media/audio/audio_input_device.cc.orig 2022-05-19 14:06:27 UTC
+++ media/audio/audio_input_device.cc
-@@ -259,7 +259,7 @@ void AudioInputDevice::OnStreamCreated(
+@@ -260,7 +260,7 @@ void AudioInputDevice::OnStreamCreated(
// here. See comments in AliveChecker and PowerObserverHelper for details and
// todos.
if (detect_dead_stream_ == DeadStreamDetection::kEnabled) {
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index 2650100c4948..a6eec177873a 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig 2022-04-21 18:48:31 UTC
+--- media/base/media_switches.cc.orig 2022-05-19 14:06:27 UTC
+++ media/base/media_switches.cc
@@ -10,7 +10,7 @@
#include "components/system_media_controls/linux/buildflags/buildflags.h"
@@ -9,7 +9,7 @@
#include "base/cpu.h"
#endif
-@@ -410,7 +410,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
+@@ -416,7 +416,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
const base::Feature kGlobalMediaControls {
"GlobalMediaControls",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -442,7 +442,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
+@@ -448,7 +448,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
const base::Feature kGlobalMediaControlsPictureInPicture {
"GlobalMediaControlsPictureInPicture",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -483,7 +483,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
+@@ -489,7 +489,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
base::FEATURE_ENABLED_BY_DEFAULT};
@@ -36,12 +36,12 @@
// Enable vaapi video decoding on linux. This is already enabled by default on
// chromeos, but needs an experiment on linux.
const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder",
-@@ -972,7 +972,7 @@ bool IsLiveCaptionFeatureEnabled() {
- return false;
- #endif
+@@ -863,7 +863,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod
+ "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT};
+ #endif // BUILDFLAG(IS_CHROMEOS)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Check if the CPU has the required instruction set to run the Speech
- // On-Device API (SODA) library.
- static bool has_sse41 = base::CPU().has_sse41();
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Spawn utility processes to perform hardware decode acceleration instead of
+ // using the GPU process.
+ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoDecoding{
diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h
index 1551bfcc59f7..09ad0059497c 100644
--- a/www/chromium/files/patch-media_base_media__switches.h
+++ b/www/chromium/files/patch-media_base_media__switches.h
@@ -1,6 +1,6 @@
---- media/base/media_switches.h.orig 2022-04-21 18:48:31 UTC
+--- media/base/media_switches.h.orig 2022-05-19 14:06:27 UTC
+++ media/base/media_switches.h
-@@ -187,7 +187,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr
+@@ -195,7 +195,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr
MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream;
MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore;
MEDIA_EXPORT extern const base::Feature kUseR16Texture;
@@ -9,3 +9,12 @@
MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux;
MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux;
#endif // BUILDFLAG(IS_LINUX)
+@@ -278,7 +278,7 @@ MEDIA_EXPORT extern const base::Feature kD3D11Vp9kSVCH
+ MEDIA_EXPORT extern const base::Feature kDeprecateLowUsageCodecs;
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ MEDIA_EXPORT extern const base::Feature kUseOutOfProcessVideoDecoding;
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+
diff --git a/www/chromium/files/patch-media_base_supported__types.cc b/www/chromium/files/patch-media_base_supported__types.cc
new file mode 100644
index 000000000000..ec23228a6875
--- /dev/null
+++ b/www/chromium/files/patch-media_base_supported__types.cc
@@ -0,0 +1,11 @@
+--- media/base/supported_types.cc.orig 2022-05-19 14:06:27 UTC
++++ media/base/supported_types.cc
+@@ -206,7 +206,7 @@ bool IsHevcProfileSupported(const VideoType& type) {
+ return false;
+
+ #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return GetSupplementalProfileCache()->IsProfileSupported(type.profile);
+ #else
+ return true;
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc
index 40bc4150ec0b..3dcfb3ce24b1 100644
--- a/www/chromium/files/patch-media_base_video__frame.cc
+++ b/www/chromium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig 2022-04-21 18:48:31 UTC
+--- media/base/video_frame.cc.orig 2022-05-19 14:06:27 UTC
+++ media/base/video_frame.cc
@@ -72,7 +72,7 @@ std::string VideoFrame::StorageTypeToString(
return "OWNED_MEMORY";
@@ -18,7 +18,7 @@
// This is not strictly needed but makes explicit that, at VideoFrame
// level, DmaBufs are not mappable from userspace.
storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -275,7 +275,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo
+@@ -285,7 +285,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo
return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
}
@@ -27,7 +27,7 @@
// This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
// thus to have several VideoFrames share the same set of DMABUF FDs.
class VideoFrame::DmabufHolder
-@@ -614,7 +614,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -624,7 +624,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
for (size_t i = 0; i < num_planes; ++i)
planes[i].stride = gpu_memory_buffer->stride(i);
uint64_t modifier = gfx::NativePixmapHandle::kNoModifier;
@@ -36,7 +36,7 @@
if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) {
const auto gmb_handle = gpu_memory_buffer->CloneHandle();
if (gmb_handle.is_null() ||
-@@ -660,7 +660,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -670,7 +670,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
return frame;
}
@@ -45,7 +45,7 @@
// static
scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
const VideoFrameLayout& layout,
-@@ -884,7 +884,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
+@@ -894,7 +894,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
}
}
@@ -54,7 +54,7 @@
DCHECK(frame->dmabuf_fds_);
// If there are any |dmabuf_fds_| plugged in, we should refer them too.
wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
-@@ -1250,7 +1250,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
+@@ -1265,7 +1265,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
: mailbox_holders_[texture_index];
}
@@ -63,7 +63,7 @@
const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
-@@ -1362,7 +1362,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+@@ -1377,7 +1377,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
storage_type_(storage_type),
visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
natural_size_(natural_size),
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index 4635beba1402..d0642f48a2a6 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,6 +1,6 @@
---- media/base/video_frame.h.orig 2022-04-21 18:48:31 UTC
+--- media/base/video_frame.h.orig 2022-05-19 14:06:27 UTC
+++ media/base/video_frame.h
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
#include "base/mac/scoped_cftyperef.h"
#endif // BUILDFLAG(IS_MAC)
@@ -9,7 +9,7 @@
#include "base/files/scoped_file.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -82,7 +82,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -83,7 +83,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
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 unsafe (writable) shared memory.
@@ -18,7 +18,7 @@
// 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
-@@ -280,7 +280,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -281,7 +281,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
base::TimeDelta timestamp);
@@ -27,7 +27,7 @@
// 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
-@@ -539,7 +539,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -540,7 +540,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// mailbox, the caller must wait for the included sync point.
const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
@@ -36,7 +36,7 @@
// Returns a vector containing the backing DmaBufs for this frame. The number
// of returned 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
-@@ -743,7 +743,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -744,7 +744,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
diff --git a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
index 1381e614fb61..7a42f3a96782 100644
--- a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
+++ b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
@@ -1,6 +1,6 @@
---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-02-28 16:54:41 UTC
+--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ media/capture/video/linux/fake_v4l2_impl.cc
-@@ -424,7 +424,7 @@ int FakeV4L2Impl::close(int fd) {
+@@ -425,7 +425,7 @@ int FakeV4L2Impl::close(int fd) {
return kSuccessReturnValue;
}
diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
index 5e05b1ac62c1..a4602fc3e3e2 100644
--- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
+++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
@@ -1,6 +1,6 @@
---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2022-02-07 13:39:41 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2022-05-19 14:06:27 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.h
-@@ -84,10 +84,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+@@ -85,10 +85,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
// 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.
diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc
index 75c62880bb07..c45a0388754a 100644
--- a/www/chromium/files/patch-media_gpu_buffer__validation.cc
+++ b/www/chromium/files/patch-media_gpu_buffer__validation.cc
@@ -1,4 +1,4 @@
---- media/gpu/buffer_validation.cc.orig 2022-04-21 18:48:31 UTC
+--- media/gpu/buffer_validation.cc.orig 2022-05-19 14:06:27 UTC
+++ media/gpu/buffer_validation.cc
@@ -15,7 +15,7 @@
#include "ui/gfx/geometry/size.h"
@@ -16,10 +16,10 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (fd < 0) {
- VLOGF(1) << "Invalid file descriptor";
+ VLOG(1) << "Invalid file descriptor";
return false;
@@ -73,7 +73,7 @@ bool VerifyGpuMemoryBufferHandle(
- VLOGF(1) << "Unsupported: " << pixel_format;
+ VLOG(1) << "Unsupported: " << pixel_format;
return false;
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
index 6e08ced6ba4f..6b68d7ec9228 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-03-25 21:59:56 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-05-19 14:06:27 UTC
+++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -646,7 +646,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -647,7 +647,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
}
}
@@ -9,7 +9,7 @@
// Linux should always use a custom allocator (to allocate buffers using
// libva) and a PlatformVideoFramePool.
CHECK(allocator.has_value());
-@@ -668,7 +668,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -669,7 +669,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
#error "Unsupported platform"
#endif
diff --git a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
new file mode 100644
index 000000000000..f7261371f0bb
--- /dev/null
+++ b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
@@ -0,0 +1,26 @@
+--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2022-05-19 14:06:27 UTC
++++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
+@@ -14,12 +14,15 @@
+ #include "media/gpu/vaapi/vaapi_wrapper.h"
+ #endif
+
++#if !BUILDFLAG(IS_BSD)
+ using sandbox::syscall_broker::BrokerFilePermission;
++#endif
+
+ namespace media {
+
+ bool HardwareVideoDecodingPreSandboxHook(
+ sandbox::policy::SandboxLinux::Options options) {
++#if !BUILDFLAG(IS_BSD)
+ sandbox::syscall_broker::BrokerCommandSet command_set;
+ std::vector<BrokerFilePermission> permissions;
+
+@@ -121,6 +124,7 @@ bool HardwareVideoDecodingPreSandboxHook(
+ dlopen("/usr/lib/libv4l2.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
+ #endif // defined(__aarch64__)
+ #endif // BUILDFLAG(USE_VAAPI)
++#endif
+
+ return true;
+ }
diff --git a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
new file mode 100644
index 000000000000..92f89932773d
--- /dev/null
+++ b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
@@ -0,0 +1,16 @@
+--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig 2022-05-19 14:06:27 UTC
++++ 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/openbsd/sandbox_openbsd.h"
++#else
+ #include "sandbox/policy/linux/sandbox_linux.h"
++#endif
+
+ namespace media {
+
diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
new file mode 100644
index 000000000000..1f647c244f52
--- /dev/null
+++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
@@ -0,0 +1,29 @@
+--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2022-05-19 14:06:27 UTC
++++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
+@@ -42,7 +42,7 @@ media::stable::mojom::VideoFrameDataPtr MakeVideoFrame
+ gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle =
+ input->GetGpuMemoryBuffer()->CloneHandle();
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ CHECK_EQ(gpu_memory_buffer_handle.type, gfx::NATIVE_PIXMAP);
+ CHECK(!gpu_memory_buffer_handle.native_pixmap_handle.planes.empty());
+ #else
+@@ -749,7 +749,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
+ 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,
+@@ -770,7 +770,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
+
+ 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/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
new file mode 100644
index 000000000000..c8745ab93146
--- /dev/null
+++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
@@ -0,0 +1,11 @@
+--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2022-05-19 14:06:27 UTC
++++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
+@@ -620,7 +620,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
+ 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/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
index ebcb0be6ee69..021c357bcdd3 100644
--- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
+++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
@@ -1,6 +1,6 @@
---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-02-28 16:54:41 UTC
+--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-05-19 14:06:27 UTC
+++ media/mojo/mojom/video_frame_mojom_traits.cc
-@@ -21,7 +21,7 @@
+@@ -23,7 +23,7 @@
#include "ui/gfx/mojom/color_space_mojom_traits.h"
#include "ui/gfx/mojom/hdr_metadata_mojom_traits.h"
diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
index 81276616f64f..173df8d18e87 100644
--- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,6 +1,6 @@
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2022-04-21 18:48:31 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2022-05-19 14:06:27 UTC
+++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -788,7 +788,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -795,7 +795,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
}
bool is_software_backed_video_frame = !video_frame->HasTextures();
diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
index 3faff4f3df0e..21112bf23cde 100644
--- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
+++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
@@ -1,6 +1,6 @@
---- media/video/video_encode_accelerator_adapter.cc.orig 2022-04-21 18:48:31 UTC
+--- media/video/video_encode_accelerator_adapter.cc.orig 2022-05-19 14:06:27 UTC
+++ media/video/video_encode_accelerator_adapter.cc
-@@ -97,7 +97,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
+@@ -98,7 +98,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
if (is_rgb)
config.input_format = PIXEL_FORMAT_I420;
@@ -9,7 +9,7 @@
if (storage_type == VideoFrame::STORAGE_DMABUFS ||
storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) {
if (is_rgb)
-@@ -238,7 +238,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
+@@ -239,7 +239,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
auto vea_config =
SetUpVeaConfig(profile_, options_, format, first_frame->storage_type());
diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
index 0d11d1823246..1dab820380c4 100644
--- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
+++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
@@ -1,6 +1,6 @@
---- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-04-21 18:48:31 UTC
+--- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-05-19 14:06:27 UTC
+++ media/video/video_encode_accelerator_adapter_test.cc
-@@ -352,7 +352,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes
+@@ -378,7 +378,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes
vea()->SetEncodingCallback(base::BindLambdaForTesting(
[&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) {
diff --git a/www/chromium/files/patch-media_webrtc_audio__processor.cc b/www/chromium/files/patch-media_webrtc_audio__processor.cc
index 64db24c821ab..90d2e8933ec6 100644
--- a/www/chromium/files/patch-media_webrtc_audio__processor.cc
+++ b/www/chromium/files/patch-media_webrtc_audio__processor.cc
@@ -1,6 +1,6 @@
---- media/webrtc/audio_processor.cc.orig 2022-04-21 18:48:31 UTC
+--- media/webrtc/audio_processor.cc.orig 2022-05-19 14:06:27 UTC
+++ media/webrtc/audio_processor.cc
-@@ -469,7 +469,7 @@ absl::optional<double> AudioProcessor::ProcessData(
+@@ -466,7 +466,7 @@ absl::optional<double> AudioProcessor::ProcessData(
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
DCHECK_LE(volume, 1.0);
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc
index 0f4283be3863..5cf8052588ee 100644
--- a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc
+++ b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc
@@ -1,4 +1,4 @@
---- media/webrtc/helpers_unittests.cc.orig 2022-03-25 21:59:56 UTC
+--- media/webrtc/helpers_unittests.cc.orig 2022-05-19 14:06:27 UTC
+++ media/webrtc/helpers_unittests.cc
@@ -36,7 +36,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau
EXPECT_FALSE(config.pre_amplifier.enabled);
@@ -9,7 +9,7 @@
EXPECT_TRUE(config.gain_controller2.enabled);
#else
EXPECT_FALSE(config.gain_controller2.enabled);
-@@ -94,7 +94,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau
+@@ -93,7 +93,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau
// Check that either AGC1 digital or AGC2 digital is used based on the
// platforms where the Hybrid AGC is enabled by default.
diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
deleted file mode 100644
index 534a90c00d99..000000000000
--- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- mojo/public/js/mojo_bindings_resources.grd.orig 2022-04-21 18:48:31 UTC
-+++ mojo/public/js/mojo_bindings_resources.grd
-@@ -126,7 +126,7 @@
- use_base_dir="false"
- resource_path="mojo/mojo/public/mojom/base/unguessable_token.mojom-webui.js"
- type="BINDATA" />
-- <if expr="is_win or is_macosx or is_linux or is_android or is_fuchsia">
-+ <if expr="is_win or is_macosx or is_posix or is_android or is_fuchsia">
- <include name="IDR_MOJO_PROCESS_ID_MOJOM_WEBUI_JS"
- file="${root_gen_dir}/mojom-webui/mojo/public/mojom/base/process_id.mojom-webui.js"
- use_base_dir="false"
diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
index 11acb87ccc15..b4511f374ac0 100644
--- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
+++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
@@ -1,6 +1,6 @@
---- mojo/public/tools/bindings/mojom.gni.orig 2022-02-28 16:54:41 UTC
+--- mojo/public/tools/bindings/mojom.gni.orig 2022-05-19 14:06:27 UTC
+++ mojo/public/tools/bindings/mojom.gni
-@@ -690,6 +690,16 @@ template("mojom") {
+@@ -689,6 +689,16 @@ template("mojom") {
enabled_features += [ "is_win" ]
}
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 7160c775da52..4b5d771694d5 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- net/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ net/BUILD.gn
@@ -104,7 +104,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
@@ -9,7 +9,7 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1096,6 +1096,7 @@ component("net") {
+@@ -1081,6 +1081,7 @@ component("net") {
"//net/dns:mdns_client",
"//net/dns/public",
"//net/third_party/quiche",
@@ -17,7 +17,7 @@
]
allow_circular_includes_from = [
-@@ -1222,6 +1223,15 @@ component("net") {
+@@ -1207,6 +1208,15 @@ component("net") {
]
}
@@ -33,7 +33,7 @@
if (is_mac) {
sources += [
"base/network_notification_thread_mac.cc",
-@@ -1354,7 +1364,7 @@ component("net") {
+@@ -1337,7 +1347,7 @@ component("net") {
}
}
@@ -42,7 +42,7 @@
sources += [
"base/network_change_notifier_posix.cc",
"base/network_change_notifier_posix.h",
-@@ -1387,7 +1397,7 @@ component("net") {
+@@ -1370,7 +1380,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
@@ -51,16 +51,7 @@
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -2470,7 +2480,7 @@ if (is_linux || is_chromeos || is_mac) {
- }
- }
-
--if (is_linux || is_chromeos) {
-+if ((is_linux || is_chromeos) && !is_bsd) {
- static_library("epoll_server") {
- sources = [
- "tools/epoll_server/platform/impl/epoll_bug_impl.h",
-@@ -4463,7 +4473,7 @@ test("net_unittests") {
+@@ -4358,7 +4368,7 @@ test("net_unittests") {
]
}
@@ -69,7 +60,7 @@
sources += [
"base/address_tracker_linux_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
-@@ -4537,6 +4547,10 @@ test("net_unittests") {
+@@ -4432,6 +4442,10 @@ test("net_unittests") {
"//url:buildflags",
]
@@ -80,16 +71,16 @@
allow_circular_includes_from = [ "//net/third_party/quiche:quiche_tests" ]
if (enable_websockets) {
-@@ -4607,7 +4621,7 @@ test("net_unittests") {
+@@ -4502,7 +4516,7 @@ test("net_unittests") {
]
}
- if (is_linux || is_chromeos) {
+ if ((is_linux || is_chromeos) && !is_bsd) {
sources += [
- "quic/platform/impl/quic_epoll_clock_test.cc",
"quic/platform/impl/quic_flags_test.cc",
-@@ -4755,7 +4769,7 @@ test("net_unittests") {
+ "tools/quic/quic_http_proxy_backend_stream_test.cc",
+@@ -4649,7 +4663,7 @@ test("net_unittests") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc
index 761aa6b0f425..8fb7f56c1547 100644
--- a/www/chromium/files/patch-net_base_network__change__notifier.cc
+++ b/www/chromium/files/patch-net_base_network__change__notifier.cc
@@ -1,6 +1,6 @@
---- net/base/network_change_notifier.cc.orig 2022-04-21 18:48:31 UTC
+--- net/base/network_change_notifier.cc.orig 2022-05-19 14:06:27 UTC
+++ net/base/network_change_notifier.cc
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
#include "net/base/network_change_notifier_linux.h"
#elif BUILDFLAG(IS_APPLE)
#include "net/base/network_change_notifier_mac.h"
@@ -9,7 +9,7 @@
#include "net/base/network_change_notifier_posix.h"
#elif BUILDFLAG(IS_FUCHSIA)
#include "net/base/network_change_notifier_fuchsia.h"
-@@ -320,6 +320,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
+@@ -331,6 +331,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
#elif BUILDFLAG(IS_FUCHSIA)
return std::make_unique<NetworkChangeNotifierFuchsia>(
/*require_wlan=*/false);
diff --git a/www/chromium/files/patch-net_base_network__change__notifier__posix.cc b/www/chromium/files/patch-net_base_network__change__notifier__posix.cc
index a735563830e7..a1f3285c9076 100644
--- a/www/chromium/files/patch-net_base_network__change__notifier__posix.cc
+++ b/www/chromium/files/patch-net_base_network__change__notifier__posix.cc
@@ -1,6 +1,6 @@
---- net/base/network_change_notifier_posix.cc.orig 2021-12-14 11:45:08 UTC
+--- net/base/network_change_notifier_posix.cc.orig 2022-05-19 14:06:27 UTC
+++ net/base/network_change_notifier_posix.cc
-@@ -93,7 +93,7 @@ void NetworkChangeNotifierPosix::GetCurrentMaxBandwidt
+@@ -92,7 +92,7 @@ void NetworkChangeNotifierPosix::GetCurrentMaxBandwidt
NetworkChangeNotifier::NetworkChangeCalculatorParams
NetworkChangeNotifierPosix::NetworkChangeCalculatorParamsPosix() {
NetworkChangeCalculatorParams params;
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc
index eb5b2f1e119a..2adc8a62414e 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc_unittest.cc.orig 2022-04-21 18:48:31 UTC
+--- net/cert/cert_verify_proc_unittest.cc.orig 2022-05-19 14:06:27 UTC
+++ net/cert/cert_verify_proc_unittest.cc
-@@ -231,7 +231,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier
+@@ -232,7 +232,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier
CERT_VERIFY_PROC_MAC, CERT_VERIFY_PROC_BUILTIN
#elif BUILDFLAG(IS_WIN)
CERT_VERIFY_PROC_WIN, CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS
diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn
index 5cd4ec92683f..d37f40166419 100644
--- a/www/chromium/files/patch-net_dns_BUILD.gn
+++ b/www/chromium/files/patch-net_dns_BUILD.gn
@@ -1,6 +1,6 @@
---- net/dns/BUILD.gn.orig 2022-03-25 21:59:56 UTC
+--- net/dns/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ net/dns/BUILD.gn
-@@ -114,7 +114,7 @@ source_set("dns") {
+@@ -112,7 +112,7 @@ source_set("dns") {
"dns_config_service_android.cc",
"dns_config_service_android.h",
]
@@ -9,7 +9,7 @@
sources += [
"dns_config_service_linux.cc",
"dns_config_service_linux.h",
-@@ -155,6 +155,7 @@ source_set("dns") {
+@@ -153,6 +153,7 @@ source_set("dns") {
":host_resolver_manager",
":mdns_client",
"//net:net_public_deps",
@@ -17,7 +17,7 @@
]
allow_circular_includes_from = [
-@@ -416,9 +417,9 @@ source_set("tests") {
+@@ -413,9 +414,9 @@ source_set("tests") {
if (is_android) {
sources += [ "dns_config_service_android_unittest.cc" ]
diff --git a/www/chromium/files/patch-net_dns_host__resolver__manager.cc b/www/chromium/files/patch-net_dns_host__resolver__manager.cc
index cc373e5b904a..da4e19114df1 100644
--- a/www/chromium/files/patch-net_dns_host__resolver__manager.cc
+++ b/www/chromium/files/patch-net_dns_host__resolver__manager.cc
@@ -1,7 +1,7 @@
---- net/dns/host_resolver_manager.cc.orig 2022-04-21 18:48:31 UTC
+--- net/dns/host_resolver_manager.cc.orig 2022-05-19 14:06:27 UTC
+++ net/dns/host_resolver_manager.cc
-@@ -2996,7 +2996,7 @@ HostResolverManager::HostResolverManager(
- NetworkChangeNotifier::AddConnectionTypeObserver(this);
+@@ -3157,7 +3157,7 @@ HostResolverManager::HostResolverManager(
+ }
if (system_dns_config_notifier_)
system_dns_config_notifier_->AddObserver(this);
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
diff --git a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
index f5c0329a53dd..d4d5987a5991 100644
--- a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
@@ -1,6 +1,6 @@
---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2022-02-28 16:54:41 UTC
+--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2022-05-19 14:06:27 UTC
+++ net/proxy_resolution/configured_proxy_resolution_service.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
#elif BUILDFLAG(IS_MAC)
#include "net/proxy_resolution/proxy_config_service_mac.h"
#include "net/proxy_resolution/proxy_resolver_mac.h"
@@ -9,7 +9,7 @@
#include "net/proxy_resolution/proxy_config_service_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "net/proxy_resolution/proxy_config_service_android.h"
-@@ -64,7 +64,7 @@ namespace net {
+@@ -65,7 +65,7 @@ namespace net {
namespace {
@@ -18,7 +18,7 @@
constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
semantics {
-@@ -1422,7 +1422,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon
+@@ -1423,7 +1423,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon
<< "profile_io_data.cc::CreateProxyConfigService and this should "
<< "be used only for examples.";
return std::make_unique<UnsetProxyConfigService>();
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 6d6781a7bba3..938e6e6d2516 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-05-19 14:06:27 UTC
+++ net/proxy_resolution/proxy_config_service_linux.cc
@@ -6,7 +6,9 @@
@@ -26,7 +26,7 @@
} // namespace
-@@ -1222,9 +1226,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1223,9 +1227,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
case base::nix::DESKTOP_ENVIRONMENT_KDE3:
case base::nix::DESKTOP_ENVIRONMENT_KDE4:
case base::nix::DESKTOP_ENVIRONMENT_KDE5:
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
index c47c7993e711..89514745435c 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_posix.cc.orig 2022-04-21 18:48:31 UTC
+--- net/socket/udp_socket_posix.cc.orig 2022-05-19 14:06:27 UTC
+++ net/socket/udp_socket_posix.cc
-@@ -620,7 +620,7 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -621,7 +621,7 @@ int UDPSocketPosix::SetDoNotFragment() {
}
void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -9,7 +9,7 @@
if (confirm) {
sendto_flags_ |= MSG_CONFIRM;
} else {
-@@ -641,7 +641,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -642,7 +642,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
int value = broadcast ? 1 : 0;
int rv;
@@ -18,3 +18,12 @@
// SO_REUSEPORT on OSX permits multiple processes to each receive
// UDP multicast or broadcast datagrams destined for the bound
// port.
+@@ -955,7 +955,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+ 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
diff --git a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc
index 01c181600c2b..18d34e1a61cc 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_unittest.cc.orig 2022-04-21 18:48:31 UTC
+--- net/socket/udp_socket_unittest.cc.orig 2022-05-19 14:06:27 UTC
+++ net/socket/udp_socket_unittest.cc
-@@ -327,7 +327,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
+@@ -328,7 +328,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
EXPECT_EQ(second_packet, received);
}
@@ -9,7 +9,7 @@
// - 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).
-@@ -587,7 +587,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) {
+@@ -588,7 +588,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) {
EXPECT_THAT(rv, IsOk());
rv = client.SetDoNotFragment();
@@ -18,7 +18,7 @@
// TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia.
EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
#elif BUILDFLAG(IS_MAC)
-@@ -615,7 +615,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) {
+@@ -616,7 +616,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) {
EXPECT_THAT(rv, IsOk());
rv = server.SetDoNotFragment();
@@ -27,7 +27,7 @@
// TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia.
EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
#elif BUILDFLAG(IS_MAC)
-@@ -680,7 +680,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
+@@ -681,7 +681,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
// TODO(https://crbug.com/947115): failing on device on iOS 12.2.
// TODO(https://crbug.com/1227554): flaky on Mac 11.
@@ -36,7 +36,7 @@
#define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress
#else
#define MAYBE_SharedMulticastAddress SharedMulticastAddress
-@@ -734,7 +734,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
+@@ -735,7 +735,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) {
NetLogSource());
ASSERT_THAT(client_socket.Connect(send_address), IsOk());
diff --git a/www/chromium/files/patch-net_third__party_quiche_BUILD.gn b/www/chromium/files/patch-net_third__party_quiche_BUILD.gn
index d16740e0ed55..349ce70c8cc0 100644
--- a/www/chromium/files/patch-net_third__party_quiche_BUILD.gn
+++ b/www/chromium/files/patch-net_third__party_quiche_BUILD.gn
@@ -1,33 +1,33 @@
---- net/third_party/quiche/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- net/third_party/quiche/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ net/third_party/quiche/BUILD.gn
-@@ -701,7 +701,7 @@ proto_library("net_quic_test_tools_proto") {
+@@ -711,7 +711,7 @@ proto_library("net_quic_test_tools_proto") {
extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
}
-if (is_linux || is_chromeos) {
+if ((is_linux || is_chromeos) && !is_bsd) {
- source_set("epoll_server_core") {
+ source_set("epoll_server") {
sources = [
- "src/epoll_server/platform/api/epoll_bug.h",
-@@ -1059,7 +1059,7 @@ source_set("quic_test_tools_core") {
+ "overrides/quiche_platform_impl/epoll_bug_impl.h",
+@@ -1102,7 +1102,7 @@ source_set("quic_test_tools_core") {
"//third_party/quic_trace:quic_trace_proto",
]
- if (is_linux || is_chromeos) {
+ if ((is_linux || is_chromeos) && !is_bsd) {
sources += [
- "src/epoll_server/fake_simple_epoll_server.cc",
- "src/epoll_server/fake_simple_epoll_server.h",
-@@ -1516,10 +1516,10 @@ source_set("quiche_tests") {
+ "src/quiche/epoll_server/fake_simple_epoll_server.cc",
+ "src/quiche/epoll_server/fake_simple_epoll_server.h",
+@@ -1562,10 +1562,10 @@ source_set("quiche_tests") {
]
public_deps = []
- if (is_linux || is_chromeos_lacros) {
+ if ((is_linux || is_chromeos_lacros) && !is_bsd) {
- public_deps += [ "//net:epoll_quic_tools" ]
+ public_deps += [ ":epoll_quic_tools" ]
}
- if (is_linux || is_chromeos) {
+ if ((is_linux || is_chromeos) && !is_bsd) {
sources += [
- "src/epoll_server/simple_epoll_server_test.cc",
- "src/quic/core/chlo_extractor_test.cc",
+ "overrides/quiche_platform_impl/quiche_command_line_flags_test.cc",
+ "src/quiche/epoll_server/simple_epoll_server_test.cc",
diff --git a/www/chromium/files/patch-net_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc
index f4ce413f95b7..d48e834a054d 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context.cc.orig 2022-03-25 21:59:56 UTC
+--- net/url_request/url_request_context.cc.orig 2022-05-19 14:06:27 UTC
+++ net/url_request/url_request_context.cc
-@@ -90,7 +90,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge
+@@ -91,7 +91,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
#if !BUILDFLAG(IS_WIN) && \
diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h
index 8b6ae8c4bff1..be2003e4e649 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context.h
+++ b/www/chromium/files/patch-net_url__request_url__request__context.h
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context.h.orig 2022-03-25 21:59:56 UTC
+--- net/url_request/url_request_context.h.orig 2022-05-19 14:06:27 UTC
+++ net/url_request/url_request_context.h
-@@ -83,7 +83,7 @@ class NET_EXPORT URLRequestContext {
+@@ -89,7 +89,7 @@ class NET_EXPORT URLRequestContext {
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
#if !BUILDFLAG(IS_WIN) && \
diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
index f39035c8be93..73f0e82479f4 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig 2022-03-25 21:59:56 UTC
+--- net/url_request/url_request_context_builder.cc.orig 2022-05-19 14:06:27 UTC
+++ net/url_request/url_request_context_builder.cc
-@@ -492,7 +492,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -498,7 +498,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
}
if (!proxy_resolution_service_) {
diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc
index 38b6c7a5bc9a..c79bd7ac21e6 100644
--- a/www/chromium/files/patch-printing_print__settings.cc
+++ b/www/chromium/files/patch-printing_print__settings.cc
@@ -1,6 +1,6 @@
---- printing/print_settings.cc.orig 2022-02-28 16:54:41 UTC
+--- printing/print_settings.cc.orig 2022-05-19 14:06:27 UTC
+++ printing/print_settings.cc
-@@ -265,7 +265,7 @@ PrintSettings::PrintSettings(const PrintSettings& sett
+@@ -272,7 +272,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
#endif
is_modifiable_ = settings.is_modifiable_;
pages_per_sheet_ = settings.pages_per_sheet_;
@@ -9,16 +9,7 @@
for (const auto& item : settings.advanced_settings_)
advanced_settings_.emplace(item.first, item.second.Clone());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -305,7 +305,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
- #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)
-@@ -345,7 +345,7 @@ void PrintSettings::Clear() {
+@@ -312,7 +312,7 @@ void PrintSettings::Clear() {
#endif
is_modifiable_ = true;
pages_per_sheet_ = 1;
diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc
index a8f5c1c7691c..d9a7f028fbc1 100644
--- a/www/chromium/files/patch-printing_print__settings__conversion.cc
+++ b/www/chromium/files/patch-printing_print__settings__conversion.cc
@@ -1,11 +1,11 @@
---- printing/print_settings_conversion.cc.orig 2022-03-25 21:59:56 UTC
+--- printing/print_settings_conversion.cc.orig 2022-05-19 14:06:27 UTC
+++ printing/print_settings_conversion.cc
-@@ -217,7 +217,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
+@@ -215,7 +215,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
settings->set_is_modifiable(is_modifiable.value());
}
-#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && defined(USE_CUPS))
-+#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && defined(USE_CUPS))
- const base::Value* advanced_settings =
- job_settings.FindDictKey(kSettingAdvancedSettings);
++#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS))
+ const base::Value::Dict* advanced_settings =
+ job_settings.FindDict(kSettingAdvancedSettings);
if (advanced_settings) {
diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
index 5801e14df8a0..0ca314158c65 100644
--- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
+++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
@@ -1,6 +1,6 @@
---- remoting/host/me2me_desktop_environment.cc.orig 2022-02-28 16:54:41 UTC
+--- remoting/host/me2me_desktop_environment.cc.orig 2022-05-19 14:06:27 UTC
+++ remoting/host/me2me_desktop_environment.cc
-@@ -143,7 +143,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
+@@ -146,7 +146,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
// Otherwise, if the session is shared with the local user start monitoring
// the local input and create the in-session UI.
diff --git a/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc b/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc
index 5e8953f7d363..e8f1cbd06f50 100644
--- a/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc
+++ b/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc
@@ -1,6 +1,6 @@
---- remoting/host/remote_open_url/remote_open_url_client.cc.orig 2022-02-28 16:54:41 UTC
+--- remoting/host/remote_open_url/remote_open_url_client.cc.orig 2022-05-19 14:06:27 UTC
+++ remoting/host/remote_open_url/remote_open_url_client.cc
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
#include "remoting/host/mojom/chromoting_host_services.mojom.h"
#include "remoting/host/mojom/remote_url_opener.mojom.h"
@@ -9,7 +9,7 @@
#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"
-@@ -28,7 +28,7 @@ namespace {
+@@ -31,7 +31,7 @@ namespace {
constexpr base::TimeDelta kRequestTimeout = base::Seconds(5);
std::unique_ptr<RemoteOpenUrlClient::Delegate> CreateDelegate() {
diff --git a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
new file mode 100644
index 000000000000..bf7e2c626cb0
--- /dev/null
+++ b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
@@ -0,0 +1,19 @@
+--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2022-05-19 14:06:27 UTC
++++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc
+@@ -49,14 +49,14 @@ namespace {
+ // 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)
+ base::FilePath base_path;
+ if (!base::PathService::Get(base::DIR_HOME, &base_path)) {
+ LOG(ERROR) << "Failed to get local app data dir";
diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd
index 88df1e35a7d7..7ab1d6f71943 100644
--- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd
+++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd
@@ -1,6 +1,6 @@
---- remoting/resources/remoting_strings.grd.orig 2022-04-21 18:48:31 UTC
+--- remoting/resources/remoting_strings.grd.orig 2022-05-19 14:06:27 UTC
+++ remoting/resources/remoting_strings.grd
-@@ -948,7 +948,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
+@@ -955,7 +955,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
<message name="IDS_URL_FORWARDER_INCORRECTLY_CONFIGURED" desc="Message shown when the Chrome Remote Desktop URL forwarder is incorrectly configured.">
<ph name="URL_FORWARDER_NAME">%s<ex>Chrome Remote Desktop URL Forwarder</ex></ph> is not configured correctly. Please choose a different default web browser and then enable URL forwarding again.
</message>
@@ -9,7 +9,7 @@
<message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog.">
Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.)
</message>
-@@ -964,7 +964,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
+@@ -971,7 +971,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
<message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session.">
Launch the default XSession
</message>
diff --git a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc
index 49f7577258ab..1e11d06c7cac 100644
--- a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc
+++ b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/sandbox_type.cc.orig 2022-04-21 18:48:31 UTC
+--- sandbox/policy/sandbox_type.cc.orig 2022-05-19 14:06:27 UTC
+++ sandbox/policy/sandbox_type.cc
@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
#endif
@@ -9,7 +9,16 @@
case Sandbox::kVideoCapture:
return false;
#endif
-@@ -70,8 +70,10 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+ case Sandbox::kMirroring:
+ case Sandbox::kNaClLoader:
+ #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)
+@@ -72,8 +72,10 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
case Sandbox::kLibassistant:
#endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
#endif // // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -21,7 +30,7 @@
case Sandbox::kScreenAI:
#endif
case Sandbox::kSpeechRecognition:
-@@ -123,7 +125,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -125,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
#endif
case Sandbox::kPrintCompositor:
case Sandbox::kAudio:
@@ -30,7 +39,16 @@
case Sandbox::kVideoCapture:
#endif
#if BUILDFLAG(IS_WIN)
-@@ -145,7 +147,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -136,7 +138,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+ 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_CHROMEOS_ASH)
+@@ -149,7 +151,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
#if BUILDFLAG(IS_MAC)
case Sandbox::kMirroring:
#endif // BUILDFLAG(IS_MAC)
@@ -39,7 +57,7 @@
case Sandbox::kScreenAI:
#endif
case Sandbox::kSpeechRecognition:
-@@ -251,7 +253,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -255,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
return switches::kUtilitySandbox;
case Sandbox::kAudio:
return switches::kAudioSandbox;
@@ -48,7 +66,7 @@
case Sandbox::kVideoCapture:
return switches::kVideoCaptureSandbox;
#endif
-@@ -261,7 +263,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -265,7 +267,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
return switches::kServiceSandboxWithJit;
case Sandbox::kSpeechRecognition:
return switches::kSpeechRecognitionSandbox;
@@ -57,7 +75,16 @@
case Sandbox::kScreenAI:
return switches::kScreenAISandbox;
#endif
-@@ -363,11 +365,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
+@@ -285,7 +287,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+ case Sandbox::kMirroring:
+ return switches::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)
+@@ -369,15 +371,15 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
return Sandbox::kAudio;
if (sandbox_string == switches::kSpeechRecognitionSandbox)
return Sandbox::kSpeechRecognition;
@@ -71,3 +98,8 @@
if (sandbox_string == switches::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)
diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc
index 769002c56cb9..1eb26bb12aa3 100644
--- a/www/chromium/files/patch-sandbox_policy_switches.cc
+++ b/www/chromium/files/patch-sandbox_policy_switches.cc
@@ -1,6 +1,15 @@
---- sandbox/policy/switches.cc.orig 2022-04-21 18:48:31 UTC
+--- sandbox/policy/switches.cc.orig 2022-05-19 14:06:27 UTC
+++ sandbox/policy/switches.cc
-@@ -96,7 +96,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
+@@ -52,7 +52,7 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro
+ 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)
+
+@@ -99,7 +99,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
// Meant to be used as a browser-level switch for testing purposes only.
const char kNoSandbox[] = "no-sandbox";
diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h
index 056b7cba3a9e..aeebbcbb5644 100644
--- a/www/chromium/files/patch-sandbox_policy_switches.h
+++ b/www/chromium/files/patch-sandbox_policy_switches.h
@@ -1,6 +1,15 @@
---- sandbox/policy/switches.h.orig 2022-04-21 18:48:31 UTC
+--- sandbox/policy/switches.h.orig 2022-05-19 14:06:27 UTC
+++ sandbox/policy/switches.h
-@@ -72,7 +72,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
+@@ -53,7 +53,7 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem
+ 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)
+
+@@ -75,7 +75,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[];
SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[];
SANDBOX_POLICY_EXPORT extern const char kNoSandbox[];
diff --git a/www/chromium/files/patch-services_device_hid_hid__service.cc b/www/chromium/files/patch-services_device_hid_hid__service.cc
index fec0b0ae6285..52e2a11ac3e5 100644
--- a/www/chromium/files/patch-services_device_hid_hid__service.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__service.cc
@@ -1,6 +1,6 @@
---- services/device/hid/hid_service.cc.orig 2022-02-28 16:54:41 UTC
+--- services/device/hid/hid_service.cc.orig 2022-05-19 14:06:27 UTC
+++ services/device/hid/hid_service.cc
-@@ -18,6 +18,10 @@
+@@ -19,6 +19,10 @@
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV)
#include "services/device/hid/hid_service_linux.h"
@@ -11,7 +11,7 @@
#elif BUILDFLAG(IS_MAC)
#include "services/device/hid/hid_service_mac.h"
#elif BUILDFLAG(IS_WIN)
-@@ -61,6 +65,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr
+@@ -62,6 +66,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr
std::unique_ptr<HidService> HidService::Create() {
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV)
return base::WrapUnique(new HidServiceLinux());
diff --git a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
index 5ac0482aaa6d..88202dc0ac11 100644
--- a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
+++ b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
@@ -1,6 +1,6 @@
---- services/device/serial/serial_device_enumerator.cc.orig 2022-02-28 16:54:41 UTC
+--- services/device/serial/serial_device_enumerator.cc.orig 2022-05-19 14:06:27 UTC
+++ services/device/serial/serial_device_enumerator.cc
-@@ -10,7 +10,7 @@
+@@ -11,7 +11,7 @@
#include "build/build_config.h"
#include "components/device_event_log/device_event_log.h"
@@ -9,7 +9,7 @@
#include "services/device/serial/serial_device_enumerator_linux.h"
#elif BUILDFLAG(IS_MAC)
#include "services/device/serial/serial_device_enumerator_mac.h"
-@@ -23,7 +23,7 @@ namespace device {
+@@ -24,7 +24,7 @@ namespace device {
// static
std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create(
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn
index 5624d1d6f884..2a7e0aef461a 100644
--- a/www/chromium/files/patch-services_network_BUILD.gn
+++ b/www/chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- services/network/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ services/network/BUILD.gn
-@@ -327,7 +327,6 @@ if (is_linux || is_chromeos) {
+@@ -328,7 +328,6 @@ if (is_linux || is_chromeos) {
]
deps = [
"//base:base",
diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
index ea41829ef317..387488bd6863 100644
--- a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
+++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
@@ -1,6 +1,6 @@
---- third_party/abseil-cpp/absl/base/config.h.orig 2022-04-21 18:48:31 UTC
+--- third_party/abseil-cpp/absl/base/config.h.orig 2022-05-19 14:06:27 UTC
+++ third_party/abseil-cpp/absl/base/config.h
-@@ -445,7 +445,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -448,7 +448,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
// POSIX.1-2001.
#ifdef ABSL_HAVE_SCHED_YIELD
#error ABSL_HAVE_SCHED_YIELD cannot be directly set
@@ -10,7 +10,7 @@
#define ABSL_HAVE_SCHED_YIELD 1
#endif
-@@ -460,7 +461,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -463,7 +464,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
// platforms.
#ifdef ABSL_HAVE_SEMAPHORE_H
#error ABSL_HAVE_SEMAPHORE_H cannot be directly set
diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_endian.h b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_endian.h
deleted file mode 100644
index 42f3d54bf9db..000000000000
--- a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_endian.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/abseil-cpp/absl/base/internal/endian.h.orig 2022-02-07 13:39:41 UTC
-+++ third_party/abseil-cpp/absl/base/internal/endian.h
-@@ -19,7 +19,7 @@
- // The following guarantees declaration of the byte swap functions
- #ifdef _MSC_VER
- #include <stdlib.h> // NOLINT(build/include)
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
- #include <sys/endian.h>
- #elif defined(__GLIBC__)
- #include <byteswap.h> // IWYU pragma: export
diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
index eaad46a8ea8d..34a830d59012 100644
--- a/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
+++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
@@ -1,11 +1,12 @@
---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2022-04-21 18:48:31 UTC
+--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2022-05-19 14:06:27 UTC
+++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
-@@ -31,7 +31,7 @@
- #error ABSL_HAVE_ELF_MEM_IMAGE cannot be directly set
+@@ -32,7 +32,8 @@
#endif
--#if defined(__ELF__) && !defined(__OpenBSD__) && \
-+#if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && \
- !defined(__native_client__) && !defined(__asmjs__) && !defined(__wasm__)
+ #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
+- !defined(__native_client__) && !defined(__asmjs__) && !defined(__wasm__)
++ !defined(__native_client__) && !defined(__asmjs__) && !defined(__wasm__) && \
++ !defined(__FreeBSD__)
#define ABSL_HAVE_ELF_MEM_IMAGE 1
#endif
+
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index 9b65315c095b..5bd5ca9bcd92 100644
--- a/www/chromium/files/patch-third__party_angle_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/BUILD.gn.orig 2022-02-07 13:39:41 UTC
+--- third_party/angle/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ third_party/angle/BUILD.gn
-@@ -206,7 +206,6 @@ config("extra_warnings") {
+@@ -213,7 +213,6 @@ config("extra_warnings") {
"-Wtautological-type-limit-compare",
"-Wundefined-reinterpret-cast",
"-Wunneeded-internal-declaration",
@@ -8,7 +8,7 @@
"-Wsuggest-destructor-override",
"-Wsuggest-override",
-@@ -384,7 +383,7 @@ angle_static_library("angle_common") {
+@@ -391,7 +390,7 @@ angle_static_library("angle_common") {
all_dependent_configs = [ ":angle_disable_pool_alloc" ]
}
@@ -17,7 +17,7 @@
libs = [ "dl" ]
}
-@@ -498,6 +497,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -512,6 +511,9 @@ angle_static_library("angle_gpu_info_util") {
"Xi",
"Xext",
]
diff --git a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp
index 9f56a5b88759..43f8ba375f95 100644
--- a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp
@@ -1,6 +1,6 @@
---- third_party/angle/src/common/system_utils_posix.cpp.orig 2022-03-25 21:59:56 UTC
+--- third_party/angle/src/common/system_utils_posix.cpp.orig 2022-05-19 14:06:27 UTC
+++ third_party/angle/src/common/system_utils_posix.cpp
-@@ -197,7 +197,9 @@ void *OpenSystemLibraryWithExtensionAndGetError(const
+@@ -201,7 +201,9 @@ void *OpenSystemLibraryWithExtensionAndGetError(const
int extraFlags = 0;
if (searchType == SearchType::AlreadyLoaded)
{
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
index cff97e7bbbb3..838318b2421b 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig 2022-04-21 18:48:31 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig 2022-05-19 14:06:27 UTC
+++ third_party/angle/src/libANGLE/Display.cpp
@@ -55,7 +55,7 @@
# include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
@@ -36,7 +36,7 @@
# if defined(ANGLE_USE_X11)
if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable())
{
-@@ -1926,7 +1926,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -1932,7 +1932,7 @@ static ClientExtensions GenerateClientExtensions()
extensions.x11Visual = true;
#endif
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
index de6511913744..326b45bf5f85 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
@@ -1,6 +1,6 @@
---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-03-25 21:59:56 UTC
+--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-05-19 14:06:27 UTC
+++ third_party/angle/src/libANGLE/formatutils.cpp
-@@ -1388,7 +1388,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
+@@ -1393,7 +1393,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
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);
diff --git a/www/chromium/files/patch-third__party_angle_util_BUILD.gn b/www/chromium/files/patch-third__party_angle_util_BUILD.gn
index 247bcf3d7818..912f36e8a1d5 100644
--- a/www/chromium/files/patch-third__party_angle_util_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_util_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/util/BUILD.gn.orig 2022-02-07 13:39:41 UTC
+--- third_party/angle/util/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ third_party/angle/util/BUILD.gn
-@@ -200,7 +200,7 @@ foreach(is_shared_library,
+@@ -203,7 +203,7 @@ foreach(is_shared_library,
]
libs = []
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
index 8c81728bbb1d..ef31aacc8b56 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -404,7 +404,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
+@@ -405,7 +405,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
const blink::RendererPreferences& prefs) {
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
@@ -9,7 +9,7 @@
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'
-@@ -3156,7 +3156,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3168,7 +3168,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
renderer_preferences_.use_subpixel_positioning);
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
index 18e84755c02e..1b6ec2508e5c 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-04-21 18:48:31 UTC
+--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6308,7 +6308,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+@@ -6281,7 +6281,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000));
}
@@ -9,7 +9,7 @@
TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) {
RegisterMockedHttpURLLoad("move_caret.html");
-@@ -6687,7 +6687,7 @@ TEST_F(CompositedSelectionBoundsTest, SVGBasic) {
+@@ -6660,7 +6660,7 @@ TEST_F(CompositedSelectionBoundsTest, SVGBasic) {
TEST_F(CompositedSelectionBoundsTest, SVGTextWithFragments) {
RunTest("composited_selection_bounds_svg_text_with_fragments.html");
}
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
index 063605f9fbcd..27c5cdf1225c 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2022-02-28 16:54:41 UTC
+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -44,7 +44,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
+@@ -45,7 +45,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
/* The value is based on user statistics on Nov 2017. */
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
deleted file mode 100644
index aa7f47bf2644..000000000000
--- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2022-03-25 21:59:56 UTC
-+++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc
-@@ -179,7 +179,7 @@ class InternalPopupMenu::ItemIterationContext {
- is_in_group_(false),
- buffer_(buffer) {
- DCHECK(buffer_);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // On other platforms, the <option> background color is the same as the
- // <select> background color. On Linux, that makes the <option>
- // background color very dark, so by default, try to use a lighter
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
index ae267ed8407b..03a35f1e970c 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-03-25 21:59:56 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/core/layout/layout_view.cc
-@@ -64,7 +64,7 @@
+@@ -65,7 +65,7 @@
#include "ui/display/screen_info.h"
#include "ui/gfx/geometry/quad_f.h"
@@ -9,7 +9,7 @@
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
#endif
-@@ -359,7 +359,7 @@ void LayoutView::UpdateLayout() {
+@@ -360,7 +360,7 @@ void LayoutView::UpdateLayout() {
DCHECK(!layout_state_);
LayoutState root_layout_state(*this);
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
index ea7935ecbc9c..0986b5111949 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-03-25 21:59:56 UTC
+--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
-@@ -293,7 +293,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifyS
+@@ -288,7 +288,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifyS
SetupRenderer(kDefaultOutputDeviceId);
renderer_proxy_->Start();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
index fa7852b69ad7..ed4e9bdb1877 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-04-21 18:48:31 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6109,7 +6109,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6057,7 +6057,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
constexpr bool kAllowZeroCopyImages = true;
#endif
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index 9f3935ce3d94..ddd0caedeb39 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1872,7 +1872,7 @@ static_library("test_support") {
+@@ -1879,7 +1879,7 @@ static_library("test_support") {
]
# fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
index bc222f4b791a..bb6dc6e01c3d 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-03-25 21:59:56 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/platform/fonts/font_cache.cc
-@@ -87,7 +87,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo
+@@ -75,7 +75,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo
SkFontMgr* FontCache::static_font_manager_ = nullptr;
@@ -9,7 +9,7 @@
float FontCache::device_scale_factor_ = 1.0;
#endif
-@@ -120,7 +120,7 @@ FontCache::FontCache() : font_manager_(sk_ref_sp(stati
+@@ -120,7 +120,7 @@ FontCache::~FontCache() = default;
FontPlatformData* FontCache::SystemFontPlatformData(
const FontDescription& font_description) {
const AtomicString& family = FontCache::SystemFontFamily();
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
index eee93679d010..e4a946da2ee4 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-03-25 21:59:56 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/platform/fonts/font_cache.h
-@@ -59,7 +59,7 @@
+@@ -57,7 +57,7 @@
#include "third_party/skia/include/core/SkFontMgr.h"
#include "third_party/skia/include/core/SkRefCnt.h"
@@ -27,7 +27,7 @@
static bool GetFontForCharacter(UChar32,
const char* preferred_locale,
gfx::FallbackFontData*);
-@@ -388,7 +388,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -347,7 +347,7 @@ class PLATFORM_EXPORT FontCache final {
const FontFaceCreationParams&,
std::string& name);
@@ -36,7 +36,7 @@
static AtomicString GetFamilyNameForCharacter(SkFontMgr*,
UChar32,
const FontDescription&,
-@@ -430,7 +430,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -389,7 +389,7 @@ class PLATFORM_EXPORT FontCache final {
std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_;
#endif // BUILDFLAG(IS_WIN)
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
index db0920b3ea53..9c645e03faeb 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-02-07 13:39:41 UTC
+--- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
-@@ -74,7 +74,11 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
+@@ -75,7 +75,11 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
// Once we are using RAF, this thread is driving Display updates. Update
// priority accordingly.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
index b1724233430d..ace11f828f41 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-03-25 21:59:56 UTC
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-05-19 14:06:27 UTC
+++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -328,7 +328,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+@@ -329,7 +329,7 @@ void VideoFrameSubmitter::OnBeginFrame(
continue;
auto& feedback =
timing_details.find(frame_token)->value.presentation_feedback;
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
new file mode 100644
index 000000000000..e01df5446310
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -0,0 +1,62 @@
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-05-21 05:41:22 UTC
++++ third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -33,7 +33,7 @@
+ // shipped stable can have its runtime flag removed soon after.
+ status: {
+ valid_values: ["stable", "experimental", "test"],
+- valid_keys: ["Android", "Win", "ChromeOS_Ash", "ChromeOS_Lacros", "Mac", "Linux"]
++ valid_keys: ["Android", "Win", "ChromeOS_Ash", "ChromeOS_Lacros", "Mac", "Linux", "OpenBSD", "FreeBSD"]
+ },
+
+ // "implied_by" or "depends_on" specifies relationship to other features:
+@@ -1098,7 +1098,7 @@
+ depends_on: ["FileSystemAccess"],
+ status: {"Android": "test", "default": "experimental"},
+ origin_trial_feature_name: "FileHandling",
+- origin_trial_os: ["win", "mac", "linux", "chromeos"],
++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+ },
+ {
+ name: "FileHandlingIcons",
+@@ -2366,7 +2366,7 @@
+ {
+ name: "U2FSecurityKeyAPI",
+ origin_trial_feature_name: "U2FSecurityKeyAPI",
+- origin_trial_os: ["win", "mac", "linux", "chromeos"],
++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+ origin_trial_type: "deprecation",
+ },
+ {
+@@ -2385,7 +2385,7 @@
+ {
+ name: "UnrestrictedSharedArrayBuffer",
+ origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
+- origin_trial_os: ["win", "mac", "linux", "chromeos"],
++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+ },
+ {
+ name: "URLPattern",
+@@ -2411,7 +2411,7 @@
+ origin_trial_feature_name: "UserAgentReduction",
+ origin_trial_allows_third_party: true,
+ // iOS not included as it should not send a reduced User-Agent string.
+- origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win"],
++ origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win", "openbsd", "freebsd"],
+ },
+ {
+ name: "UUID",
+@@ -2537,12 +2537,12 @@
+ name: "WebAppUrlHandling",
+ status: "experimental",
+ origin_trial_feature_name: "WebAppUrlHandling",
+- origin_trial_os: ["win", "mac", "linux"],
++ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"],
+ },
+ {
+ name: "WebAppWindowControlsOverlay",
+ origin_trial_feature_name: "WebAppWindowControlsOverlay",
+- origin_trial_os: ["win", "mac", "linux", "chromeos"],
++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+ status: "experimental",
+ },
+ {
diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni
index c102787fd6f8..55d45f5df6ed 100644
--- a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni
+++ b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni
@@ -1,6 +1,6 @@
---- third_party/boringssl/BUILD.generated.gni.orig 2022-04-21 18:48:31 UTC
+--- third_party/boringssl/BUILD.generated.gni.orig 2022-05-19 14:06:27 UTC
+++ third_party/boringssl/BUILD.generated.gni
-@@ -82,6 +82,7 @@ crypto_sources = [
+@@ -81,6 +81,7 @@ crypto_sources = [
"src/crypto/cpu_aarch64_apple.c",
"src/crypto/cpu_aarch64_fuchsia.c",
"src/crypto/cpu_aarch64_linux.c",
diff --git a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h b/www/chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h
new file mode 100644
index 000000000000..4a3c9a829e59
--- /dev/null
+++ b/www/chromium/files/patch-third__party_boringssl_src_include_openssl_thread.h
@@ -0,0 +1,10 @@
+--- third_party/boringssl/src/include/openssl/thread.h.orig 2022-05-19 14:06:27 UTC
++++ third_party/boringssl/src/include/openssl/thread.h
+@@ -78,6 +78,7 @@ typedef union crypto_mutex_st {
+ void *handle;
+ } CRYPTO_MUTEX;
+ #elif !defined(__GLIBC__)
++#include <pthread.h>
+ typedef pthread_rwlock_t CRYPTO_MUTEX;
+ #else
+ // On glibc, |pthread_rwlock_t| is hidden under feature flags, and we can't
diff --git a/www/chromium/files/patch-third__party_dawn_generator_dawn__version__generator.py b/www/chromium/files/patch-third__party_dawn_generator_dawn__version__generator.py
new file mode 100644
index 000000000000..e04e2baa6736
--- /dev/null
+++ b/www/chromium/files/patch-third__party_dawn_generator_dawn__version__generator.py
@@ -0,0 +1,22 @@
+--- third_party/dawn/generator/dawn_version_generator.py.orig 2022-05-21 05:41:22 UTC
++++ third_party/dawn/generator/dawn_version_generator.py
+@@ -23,11 +23,14 @@ def get_git():
+
+
+ def get_gitHash(dawnDir):
+- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'],
+- stdout=subprocess.PIPE,
+- cwd=dawnDir)
+- if result.returncode == 0:
+- return result.stdout.decode('utf-8').strip()
++ try:
++ result = subprocess.run([get_git(), "rev-parse", "HEAD"],
++ stdout=subprocess.PIPE,
++ cwd=dawnDir)
++ if result.returncode == 0:
++ return result.stdout.decode("utf-8").strip()
++ except Exception:
++ return ""
+ # No hash was available (possibly) because the directory was not a git checkout. Dawn should
+ # explicitly handle its absenece and disable features relying on the hash, i.e. caching.
+ return ''
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h
index df7b315b1067..629eac589e0a 100644
--- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h
+++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h
@@ -1,10 +1,10 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2022-03-25 21:59:56 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2022-05-19 14:06:27 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h
-@@ -0,0 +1,2787 @@
+@@ -0,0 +1,737 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/d/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
+#define CONFIG_THIS_YEAR 2022
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -66,6 +66,7 @@
+#define HAVE_AVX 0
+#define HAVE_AVX2 0
+#define HAVE_AVX512 0
++#define HAVE_AVX512ICL 0
+#define HAVE_FMA3 0
+#define HAVE_FMA4 0
+#define HAVE_MMX 0
@@ -113,6 +114,7 @@
+#define HAVE_AVX_EXTERNAL 0
+#define HAVE_AVX2_EXTERNAL 0
+#define HAVE_AVX512_EXTERNAL 0
++#define HAVE_AVX512ICL_EXTERNAL 0
+#define HAVE_FMA3_EXTERNAL 0
+#define HAVE_FMA4_EXTERNAL 0
+#define HAVE_MMX_EXTERNAL 0
@@ -160,6 +162,7 @@
+#define HAVE_AVX_INLINE 0
+#define HAVE_AVX2_INLINE 0
+#define HAVE_AVX512_INLINE 0
++#define HAVE_AVX512ICL_INLINE 0
+#define HAVE_FMA3_INLINE 0
+#define HAVE_FMA4_INLINE 0
+#define HAVE_MMX_INLINE 0
@@ -245,7 +248,7 @@
+#define HAVE_TERMIOS_H 1
+#define HAVE_UDPLITE_H 0
+#define HAVE_UNISTD_H 1
-+#define HAVE_VALGRIND_VALGRIND_H 0
++#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */
+#define HAVE_WINDOWS_H 0
+#define HAVE_WINSOCK2_H 0
+#define HAVE_INTRINSICS_NEON 1
@@ -293,6 +296,7 @@
+#define HAVE_COMMANDLINETOARGVW 0
+#define HAVE_FCNTL 1
+#define HAVE_GETADDRINFO 0
++#define HAVE_GETAUXVAL 0
+#define HAVE_GETHRTIME 0
+#define HAVE_GETOPT 1
+#define HAVE_GETMODULEHANDLE 0
@@ -332,7 +336,7 @@
+#define HAVE_SLEEP 0
+#define HAVE_STRERROR_R 1
+#define HAVE_SYSCONF 1
-+#define HAVE_SYSCTL 1
++#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 1 -- forced to 0 for Fuchsia */
+#define HAVE_USLEEP 1
+#define HAVE_UTGETOSTYPEFROMSTRING 0
+#define HAVE_VIRTUALALLOC 0
@@ -578,7 +582,6 @@
+#define CONFIG_VIDEOTOOLBOX 0
+#define CONFIG_VULKAN 0
+#define CONFIG_V4L2_M2M 0
-+#define CONFIG_XVMC 0
+#define CONFIG_FTRAPV 0
+#define CONFIG_GRAY 0
+#define CONFIG_HARDCODED_TABLES 0
@@ -610,7 +613,6 @@
+#define CONFIG_FAST_UNALIGNED 1
+#define CONFIG_FFT 1
+#define CONFIG_LSP 0
-+#define CONFIG_LZO 0
+#define CONFIG_MDCT 1
+#define CONFIG_PIXELUTILS 0
+#define CONFIG_NETWORK 0
@@ -655,6 +657,7 @@
+#define CONFIG_CBS_JPEG 0
+#define CONFIG_CBS_MPEG2 0
+#define CONFIG_CBS_VP9 0
++#define CONFIG_DEFLATE_WRAPPER 0
+#define CONFIG_DIRAC_PARSE 1
+#define CONFIG_DNN 0
+#define CONFIG_DOVI_RPU 0
@@ -683,6 +686,7 @@
+#define CONFIG_IDCTDSP 0
+#define CONFIG_IIRFILTER 0
+#define CONFIG_MDCT15 1
++#define CONFIG_INFLATE_WRAPPER 0
+#define CONFIG_INTRAX8 0
+#define CONFIG_ISO_MEDIA 1
+#define CONFIG_IVIDSP 0
@@ -733,2058 +737,4 @@
+#define CONFIG_VP8DSP 1
+#define CONFIG_WMA_FREQS 0
+#define CONFIG_WMV2DSP 0
-+#define CONFIG_AAC_ADTSTOASC_BSF 0
-+#define CONFIG_AV1_FRAME_MERGE_BSF 0
-+#define CONFIG_AV1_FRAME_SPLIT_BSF 0
-+#define CONFIG_AV1_METADATA_BSF 0
-+#define CONFIG_CHOMP_BSF 0
-+#define CONFIG_DUMP_EXTRADATA_BSF 0
-+#define CONFIG_DCA_CORE_BSF 0
-+#define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+#define CONFIG_FILTER_UNITS_BSF 0
-+#define CONFIG_H264_METADATA_BSF 0
-+#define CONFIG_H264_MP4TOANNEXB_BSF 0
-+#define CONFIG_H264_REDUNDANT_PPS_BSF 0
-+#define CONFIG_HAPQA_EXTRACT_BSF 0
-+#define CONFIG_HEVC_METADATA_BSF 0
-+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
-+#define CONFIG_IMX_DUMP_HEADER_BSF 0
-+#define CONFIG_MJPEG2JPEG_BSF 0
-+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
-+#define CONFIG_MPEG2_METADATA_BSF 0
-+#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
-+#define CONFIG_MOV2TEXTSUB_BSF 0
-+#define CONFIG_NOISE_BSF 0
-+#define CONFIG_NULL_BSF 0
-+#define CONFIG_OPUS_METADATA_BSF 0
-+#define CONFIG_PCM_RECHUNK_BSF 0
-+#define CONFIG_PRORES_METADATA_BSF 0
-+#define CONFIG_REMOVE_EXTRADATA_BSF 0
-+#define CONFIG_SETTS_BSF 0
-+#define CONFIG_TEXT2MOVSUB_BSF 0
-+#define CONFIG_TRACE_HEADERS_BSF 0
-+#define CONFIG_TRUEHD_CORE_BSF 0
-+#define CONFIG_VP9_METADATA_BSF 0
-+#define CONFIG_VP9_RAW_REORDER_BSF 0
-+#define CONFIG_VP9_SUPERFRAME_BSF 0
-+#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
-+#define CONFIG_AASC_DECODER 0
-+#define CONFIG_AIC_DECODER 0
-+#define CONFIG_ALIAS_PIX_DECODER 0
-+#define CONFIG_AGM_DECODER 0
-+#define CONFIG_AMV_DECODER 0
-+#define CONFIG_ANM_DECODER 0
-+#define CONFIG_ANSI_DECODER 0
-+#define CONFIG_APNG_DECODER 0
-+#define CONFIG_ARBC_DECODER 0
-+#define CONFIG_ARGO_DECODER 0
-+#define CONFIG_ASV1_DECODER 0
-+#define CONFIG_ASV2_DECODER 0
-+#define CONFIG_AURA_DECODER 0
-+#define CONFIG_AURA2_DECODER 0
-+#define CONFIG_AVRP_DECODER 0
-+#define CONFIG_AVRN_DECODER 0
-+#define CONFIG_AVS_DECODER 0
-+#define CONFIG_AVUI_DECODER 0
-+#define CONFIG_AYUV_DECODER 0
-+#define CONFIG_BETHSOFTVID_DECODER 0
-+#define CONFIG_BFI_DECODER 0
-+#define CONFIG_BINK_DECODER 0
-+#define CONFIG_BITPACKED_DECODER 0
-+#define CONFIG_BMP_DECODER 0
-+#define CONFIG_BMV_VIDEO_DECODER 0
-+#define CONFIG_BRENDER_PIX_DECODER 0
-+#define CONFIG_C93_DECODER 0
-+#define CONFIG_CAVS_DECODER 0
-+#define CONFIG_CDGRAPHICS_DECODER 0
-+#define CONFIG_CDTOONS_DECODER 0
-+#define CONFIG_CDXL_DECODER 0
-+#define CONFIG_CFHD_DECODER 0
-+#define CONFIG_CINEPAK_DECODER 0
-+#define CONFIG_CLEARVIDEO_DECODER 0
-+#define CONFIG_CLJR_DECODER 0
-+#define CONFIG_CLLC_DECODER 0
-+#define CONFIG_COMFORTNOISE_DECODER 0
-+#define CONFIG_CPIA_DECODER 0
-+#define CONFIG_CRI_DECODER 0
-+#define CONFIG_CSCD_DECODER 0
-+#define CONFIG_CYUV_DECODER 0
-+#define CONFIG_DDS_DECODER 0
-+#define CONFIG_DFA_DECODER 0
-+#define CONFIG_DIRAC_DECODER 0
-+#define CONFIG_DNXHD_DECODER 0
-+#define CONFIG_DPX_DECODER 0
-+#define CONFIG_DSICINVIDEO_DECODER 0
-+#define CONFIG_DVAUDIO_DECODER 0
-+#define CONFIG_DVVIDEO_DECODER 0
-+#define CONFIG_DXA_DECODER 0
-+#define CONFIG_DXTORY_DECODER 0
-+#define CONFIG_DXV_DECODER 0
-+#define CONFIG_EACMV_DECODER 0
-+#define CONFIG_EAMAD_DECODER 0
-+#define CONFIG_EATGQ_DECODER 0
-+#define CONFIG_EATGV_DECODER 0
-+#define CONFIG_EATQI_DECODER 0
-+#define CONFIG_EIGHTBPS_DECODER 0
-+#define CONFIG_EIGHTSVX_EXP_DECODER 0
-+#define CONFIG_EIGHTSVX_FIB_DECODER 0
-+#define CONFIG_ESCAPE124_DECODER 0
-+#define CONFIG_ESCAPE130_DECODER 0
-+#define CONFIG_EXR_DECODER 0
-+#define CONFIG_FFV1_DECODER 0
-+#define CONFIG_FFVHUFF_DECODER 0
-+#define CONFIG_FIC_DECODER 0
-+#define CONFIG_FITS_DECODER 0
-+#define CONFIG_FLASHSV_DECODER 0
-+#define CONFIG_FLASHSV2_DECODER 0
-+#define CONFIG_FLIC_DECODER 0
-+#define CONFIG_FLV_DECODER 0
-+#define CONFIG_FMVC_DECODER 0
-+#define CONFIG_FOURXM_DECODER 0
-+#define CONFIG_FRAPS_DECODER 0
-+#define CONFIG_FRWU_DECODER 0
-+#define CONFIG_G2M_DECODER 0
-+#define CONFIG_GDV_DECODER 0
-+#define CONFIG_GEM_DECODER 0
-+#define CONFIG_GIF_DECODER 0
-+#define CONFIG_H261_DECODER 0
-+#define CONFIG_H263_DECODER 0
-+#define CONFIG_H263I_DECODER 0
-+#define CONFIG_H263P_DECODER 0
-+#define CONFIG_H263_V4L2M2M_DECODER 0
-+#define CONFIG_H264_DECODER 1
-+#define CONFIG_H264_CRYSTALHD_DECODER 0
-+#define CONFIG_H264_V4L2M2M_DECODER 0
-+#define CONFIG_H264_MEDIACODEC_DECODER 0
-+#define CONFIG_H264_MMAL_DECODER 0
-+#define CONFIG_H264_QSV_DECODER 0
-+#define CONFIG_H264_RKMPP_DECODER 0
-+#define CONFIG_HAP_DECODER 0
-+#define CONFIG_HEVC_DECODER 0
-+#define CONFIG_HEVC_QSV_DECODER 0
-+#define CONFIG_HEVC_RKMPP_DECODER 0
-+#define CONFIG_HEVC_V4L2M2M_DECODER 0
-+#define CONFIG_HNM4_VIDEO_DECODER 0
-+#define CONFIG_HQ_HQA_DECODER 0
-+#define CONFIG_HQX_DECODER 0
-+#define CONFIG_HUFFYUV_DECODER 0
-+#define CONFIG_HYMT_DECODER 0
-+#define CONFIG_IDCIN_DECODER 0
-+#define CONFIG_IFF_ILBM_DECODER 0
-+#define CONFIG_IMM4_DECODER 0
-+#define CONFIG_IMM5_DECODER 0
-+#define CONFIG_INDEO2_DECODER 0
-+#define CONFIG_INDEO3_DECODER 0
-+#define CONFIG_INDEO4_DECODER 0
-+#define CONFIG_INDEO5_DECODER 0
-+#define CONFIG_INTERPLAY_VIDEO_DECODER 0
-+#define CONFIG_IPU_DECODER 0
-+#define CONFIG_JPEG2000_DECODER 0
-+#define CONFIG_JPEGLS_DECODER 0
-+#define CONFIG_JV_DECODER 0
-+#define CONFIG_KGV1_DECODER 0
-+#define CONFIG_KMVC_DECODER 0
-+#define CONFIG_LAGARITH_DECODER 0
-+#define CONFIG_LOCO_DECODER 0
-+#define CONFIG_LSCR_DECODER 0
-+#define CONFIG_M101_DECODER 0
-+#define CONFIG_MAGICYUV_DECODER 0
-+#define CONFIG_MDEC_DECODER 0
-+#define CONFIG_MIMIC_DECODER 0
-+#define CONFIG_MJPEG_DECODER 0
-+#define CONFIG_MJPEGB_DECODER 0
-+#define CONFIG_MMVIDEO_DECODER 0
-+#define CONFIG_MOBICLIP_DECODER 0
-+#define CONFIG_MOTIONPIXELS_DECODER 0
-+#define CONFIG_MPEG1VIDEO_DECODER 0
-+#define CONFIG_MPEG2VIDEO_DECODER 0
-+#define CONFIG_MPEG4_DECODER 0
-+#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
-+#define CONFIG_MPEG4_V4L2M2M_DECODER 0
-+#define CONFIG_MPEG4_MMAL_DECODER 0
-+#define CONFIG_MPEGVIDEO_DECODER 0
-+#define CONFIG_MPEG1_V4L2M2M_DECODER 0
-+#define CONFIG_MPEG2_MMAL_DECODER 0
-+#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
-+#define CONFIG_MPEG2_V4L2M2M_DECODER 0
-+#define CONFIG_MPEG2_QSV_DECODER 0
-+#define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-+#define CONFIG_MSA1_DECODER 0
-+#define CONFIG_MSCC_DECODER 0
-+#define CONFIG_MSMPEG4V1_DECODER 0
-+#define CONFIG_MSMPEG4V2_DECODER 0
-+#define CONFIG_MSMPEG4V3_DECODER 0
-+#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
-+#define CONFIG_MSP2_DECODER 0
-+#define CONFIG_MSRLE_DECODER 0
-+#define CONFIG_MSS1_DECODER 0
-+#define CONFIG_MSS2_DECODER 0
-+#define CONFIG_MSVIDEO1_DECODER 0
-+#define CONFIG_MSZH_DECODER 0
-+#define CONFIG_MTS2_DECODER 0
-+#define CONFIG_MV30_DECODER 0
-+#define CONFIG_MVC1_DECODER 0
-+#define CONFIG_MVC2_DECODER 0
-+#define CONFIG_MVDV_DECODER 0
-+#define CONFIG_MVHA_DECODER 0
-+#define CONFIG_MWSC_DECODER 0
-+#define CONFIG_MXPEG_DECODER 0
-+#define CONFIG_NOTCHLC_DECODER 0
-+#define CONFIG_NUV_DECODER 0
-+#define CONFIG_PAF_VIDEO_DECODER 0
-+#define CONFIG_PAM_DECODER 0
-+#define CONFIG_PBM_DECODER 0
-+#define CONFIG_PCX_DECODER 0
-+#define CONFIG_PFM_DECODER 0
-+#define CONFIG_PGM_DECODER 0
-+#define CONFIG_PGMYUV_DECODER 0
-+#define CONFIG_PGX_DECODER 0
-+#define CONFIG_PHOTOCD_DECODER 0
-+#define CONFIG_PICTOR_DECODER 0
-+#define CONFIG_PIXLET_DECODER 0
-+#define CONFIG_PNG_DECODER 0
-+#define CONFIG_PPM_DECODER 0
-+#define CONFIG_PRORES_DECODER 0
-+#define CONFIG_PROSUMER_DECODER 0
-+#define CONFIG_PSD_DECODER 0
-+#define CONFIG_PTX_DECODER 0
-+#define CONFIG_QDRAW_DECODER 0
-+#define CONFIG_QPEG_DECODER 0
-+#define CONFIG_QTRLE_DECODER 0
-+#define CONFIG_R10K_DECODER 0
-+#define CONFIG_R210_DECODER 0
-+#define CONFIG_RASC_DECODER 0
-+#define CONFIG_RAWVIDEO_DECODER 0
-+#define CONFIG_RL2_DECODER 0
-+#define CONFIG_ROQ_DECODER 0
-+#define CONFIG_RPZA_DECODER 0
-+#define CONFIG_RSCC_DECODER 0
-+#define CONFIG_RV10_DECODER 0
-+#define CONFIG_RV20_DECODER 0
-+#define CONFIG_RV30_DECODER 0
-+#define CONFIG_RV40_DECODER 0
-+#define CONFIG_S302M_DECODER 0
-+#define CONFIG_SANM_DECODER 0
-+#define CONFIG_SCPR_DECODER 0
-+#define CONFIG_SCREENPRESSO_DECODER 0
-+#define CONFIG_SGA_DECODER 0
-+#define CONFIG_SGI_DECODER 0
-+#define CONFIG_SGIRLE_DECODER 0
-+#define CONFIG_SHEERVIDEO_DECODER 0
-+#define CONFIG_SIMBIOSIS_IMX_DECODER 0
-+#define CONFIG_SMACKER_DECODER 0
-+#define CONFIG_SMC_DECODER 0
-+#define CONFIG_SMVJPEG_DECODER 0
-+#define CONFIG_SNOW_DECODER 0
-+#define CONFIG_SP5X_DECODER 0
-+#define CONFIG_SPEEDHQ_DECODER 0
-+#define CONFIG_SPEEX_DECODER 0
-+#define CONFIG_SRGC_DECODER 0
-+#define CONFIG_SUNRAST_DECODER 0
-+#define CONFIG_SVQ1_DECODER 0
-+#define CONFIG_SVQ3_DECODER 0
-+#define CONFIG_TARGA_DECODER 0
-+#define CONFIG_TARGA_Y216_DECODER 0
-+#define CONFIG_TDSC_DECODER 0
-+#define CONFIG_THEORA_DECODER 1
-+#define CONFIG_THP_DECODER 0
-+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0
-+#define CONFIG_TIFF_DECODER 0
-+#define CONFIG_TMV_DECODER 0
-+#define CONFIG_TRUEMOTION1_DECODER 0
-+#define CONFIG_TRUEMOTION2_DECODER 0
-+#define CONFIG_TRUEMOTION2RT_DECODER 0
-+#define CONFIG_TSCC_DECODER 0
-+#define CONFIG_TSCC2_DECODER 0
-+#define CONFIG_TXD_DECODER 0
-+#define CONFIG_ULTI_DECODER 0
-+#define CONFIG_UTVIDEO_DECODER 0
-+#define CONFIG_V210_DECODER 0
-+#define CONFIG_V210X_DECODER 0
-+#define CONFIG_V308_DECODER 0
-+#define CONFIG_V408_DECODER 0
-+#define CONFIG_V410_DECODER 0
-+#define CONFIG_VB_DECODER 0
-+#define CONFIG_VBLE_DECODER 0
-+#define CONFIG_VC1_DECODER 0
-+#define CONFIG_VC1_CRYSTALHD_DECODER 0
-+#define CONFIG_VC1IMAGE_DECODER 0
-+#define CONFIG_VC1_MMAL_DECODER 0
-+#define CONFIG_VC1_QSV_DECODER 0
-+#define CONFIG_VC1_V4L2M2M_DECODER 0
-+#define CONFIG_VCR1_DECODER 0
-+#define CONFIG_VMDVIDEO_DECODER 0
-+#define CONFIG_VMNC_DECODER 0
-+#define CONFIG_VP3_DECODER 1
-+#define CONFIG_VP4_DECODER 0
-+#define CONFIG_VP5_DECODER 0
-+#define CONFIG_VP6_DECODER 0
-+#define CONFIG_VP6A_DECODER 0
-+#define CONFIG_VP6F_DECODER 0
-+#define CONFIG_VP7_DECODER 0
-+#define CONFIG_VP8_DECODER 1
-+#define CONFIG_VP8_RKMPP_DECODER 0
-+#define CONFIG_VP8_V4L2M2M_DECODER 0
-+#define CONFIG_VP9_DECODER 0
-+#define CONFIG_VP9_RKMPP_DECODER 0
-+#define CONFIG_VP9_V4L2M2M_DECODER 0
-+#define CONFIG_VQA_DECODER 0
-+#define CONFIG_WEBP_DECODER 0
-+#define CONFIG_WCMV_DECODER 0
-+#define CONFIG_WRAPPED_AVFRAME_DECODER 0
-+#define CONFIG_WMV1_DECODER 0
-+#define CONFIG_WMV2_DECODER 0
-+#define CONFIG_WMV3_DECODER 0
-+#define CONFIG_WMV3_CRYSTALHD_DECODER 0
-+#define CONFIG_WMV3IMAGE_DECODER 0
-+#define CONFIG_WNV1_DECODER 0
-+#define CONFIG_XAN_WC3_DECODER 0
-+#define CONFIG_XAN_WC4_DECODER 0
-+#define CONFIG_XBM_DECODER 0
-+#define CONFIG_XFACE_DECODER 0
-+#define CONFIG_XL_DECODER 0
-+#define CONFIG_XPM_DECODER 0
-+#define CONFIG_XWD_DECODER 0
-+#define CONFIG_Y41P_DECODER 0
-+#define CONFIG_YLC_DECODER 0
-+#define CONFIG_YOP_DECODER 0
-+#define CONFIG_YUV4_DECODER 0
-+#define CONFIG_ZERO12V_DECODER 0
-+#define CONFIG_ZEROCODEC_DECODER 0
-+#define CONFIG_ZLIB_DECODER 0
-+#define CONFIG_ZMBV_DECODER 0
-+#define CONFIG_AAC_DECODER 1
-+#define CONFIG_AAC_FIXED_DECODER 0
-+#define CONFIG_AAC_LATM_DECODER 0
-+#define CONFIG_AC3_DECODER 0
-+#define CONFIG_AC3_FIXED_DECODER 0
-+#define CONFIG_ACELP_KELVIN_DECODER 0
-+#define CONFIG_ALAC_DECODER 0
-+#define CONFIG_ALS_DECODER 0
-+#define CONFIG_AMRNB_DECODER 0
-+#define CONFIG_AMRWB_DECODER 0
-+#define CONFIG_APE_DECODER 0
-+#define CONFIG_APTX_DECODER 0
-+#define CONFIG_APTX_HD_DECODER 0
-+#define CONFIG_ATRAC1_DECODER 0
-+#define CONFIG_ATRAC3_DECODER 0
-+#define CONFIG_ATRAC3AL_DECODER 0
-+#define CONFIG_ATRAC3P_DECODER 0
-+#define CONFIG_ATRAC3PAL_DECODER 0
-+#define CONFIG_ATRAC9_DECODER 0
-+#define CONFIG_BINKAUDIO_DCT_DECODER 0
-+#define CONFIG_BINKAUDIO_RDFT_DECODER 0
-+#define CONFIG_BMV_AUDIO_DECODER 0
-+#define CONFIG_COOK_DECODER 0
-+#define CONFIG_DCA_DECODER 0
-+#define CONFIG_DOLBY_E_DECODER 0
-+#define CONFIG_DSD_LSBF_DECODER 0
-+#define CONFIG_DSD_MSBF_DECODER 0
-+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0
-+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0
-+#define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
-+#define CONFIG_DST_DECODER 0
-+#define CONFIG_EAC3_DECODER 0
-+#define CONFIG_EVRC_DECODER 0
-+#define CONFIG_FASTAUDIO_DECODER 0
-+#define CONFIG_FFWAVESYNTH_DECODER 0
-+#define CONFIG_FLAC_DECODER 1
-+#define CONFIG_G723_1_DECODER 0
-+#define CONFIG_G729_DECODER 0
-+#define CONFIG_GSM_DECODER 0
-+#define CONFIG_GSM_MS_DECODER 0
-+#define CONFIG_HCA_DECODER 0
-+#define CONFIG_HCOM_DECODER 0
-+#define CONFIG_IAC_DECODER 0
-+#define CONFIG_ILBC_DECODER 0
-+#define CONFIG_IMC_DECODER 0
-+#define CONFIG_INTERPLAY_ACM_DECODER 0
-+#define CONFIG_MACE3_DECODER 0
-+#define CONFIG_MACE6_DECODER 0
-+#define CONFIG_METASOUND_DECODER 0
-+#define CONFIG_MLP_DECODER 0
-+#define CONFIG_MP1_DECODER 0
-+#define CONFIG_MP1FLOAT_DECODER 0
-+#define CONFIG_MP2_DECODER 0
-+#define CONFIG_MP2FLOAT_DECODER 0
-+#define CONFIG_MP3FLOAT_DECODER 0
-+#define CONFIG_MP3_DECODER 1
-+#define CONFIG_MP3ADUFLOAT_DECODER 0
-+#define CONFIG_MP3ADU_DECODER 0
-+#define CONFIG_MP3ON4FLOAT_DECODER 0
-+#define CONFIG_MP3ON4_DECODER 0
-+#define CONFIG_MPC7_DECODER 0
-+#define CONFIG_MPC8_DECODER 0
-+#define CONFIG_MSNSIREN_DECODER 0
-+#define CONFIG_NELLYMOSER_DECODER 0
-+#define CONFIG_ON2AVC_DECODER 0
-+#define CONFIG_OPUS_DECODER 0
-+#define CONFIG_PAF_AUDIO_DECODER 0
-+#define CONFIG_QCELP_DECODER 0
-+#define CONFIG_QDM2_DECODER 0
-+#define CONFIG_QDMC_DECODER 0
-+#define CONFIG_RA_144_DECODER 0
-+#define CONFIG_RA_288_DECODER 0
-+#define CONFIG_RALF_DECODER 0
-+#define CONFIG_SBC_DECODER 0
-+#define CONFIG_SHORTEN_DECODER 0
-+#define CONFIG_SIPR_DECODER 0
-+#define CONFIG_SIREN_DECODER 0
-+#define CONFIG_SMACKAUD_DECODER 0
-+#define CONFIG_SONIC_DECODER 0
-+#define CONFIG_TAK_DECODER 0
-+#define CONFIG_TRUEHD_DECODER 0
-+#define CONFIG_TRUESPEECH_DECODER 0
-+#define CONFIG_TTA_DECODER 0
-+#define CONFIG_TWINVQ_DECODER 0
-+#define CONFIG_VMDAUDIO_DECODER 0
-+#define CONFIG_VORBIS_DECODER 1
-+#define CONFIG_WAVPACK_DECODER 0
-+#define CONFIG_WMALOSSLESS_DECODER 0
-+#define CONFIG_WMAPRO_DECODER 0
-+#define CONFIG_WMAV1_DECODER 0
-+#define CONFIG_WMAV2_DECODER 0
-+#define CONFIG_WMAVOICE_DECODER 0
-+#define CONFIG_WS_SND1_DECODER 0
-+#define CONFIG_XMA1_DECODER 0
-+#define CONFIG_XMA2_DECODER 0
-+#define CONFIG_PCM_ALAW_DECODER 1
-+#define CONFIG_PCM_BLURAY_DECODER 0
-+#define CONFIG_PCM_DVD_DECODER 0
-+#define CONFIG_PCM_F16LE_DECODER 0
-+#define CONFIG_PCM_F24LE_DECODER 0
-+#define CONFIG_PCM_F32BE_DECODER 0
-+#define CONFIG_PCM_F32LE_DECODER 1
-+#define CONFIG_PCM_F64BE_DECODER 0
-+#define CONFIG_PCM_F64LE_DECODER 0
-+#define CONFIG_PCM_LXF_DECODER 0
-+#define CONFIG_PCM_MULAW_DECODER 1
-+#define CONFIG_PCM_S8_DECODER 0
-+#define CONFIG_PCM_S8_PLANAR_DECODER 0
-+#define CONFIG_PCM_S16BE_DECODER 1
-+#define CONFIG_PCM_S16BE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S16LE_DECODER 1
-+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S24BE_DECODER 1
-+#define CONFIG_PCM_S24DAUD_DECODER 0
-+#define CONFIG_PCM_S24LE_DECODER 1
-+#define CONFIG_PCM_S24LE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S32BE_DECODER 0
-+#define CONFIG_PCM_S32LE_DECODER 1
-+#define CONFIG_PCM_S32LE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S64BE_DECODER 0
-+#define CONFIG_PCM_S64LE_DECODER 0
-+#define CONFIG_PCM_SGA_DECODER 0
-+#define CONFIG_PCM_U8_DECODER 1
-+#define CONFIG_PCM_U16BE_DECODER 0
-+#define CONFIG_PCM_U16LE_DECODER 0
-+#define CONFIG_PCM_U24BE_DECODER 0
-+#define CONFIG_PCM_U24LE_DECODER 0
-+#define CONFIG_PCM_U32BE_DECODER 0
-+#define CONFIG_PCM_U32LE_DECODER 0
-+#define CONFIG_PCM_VIDC_DECODER 0
-+#define CONFIG_DERF_DPCM_DECODER 0
-+#define CONFIG_GREMLIN_DPCM_DECODER 0
-+#define CONFIG_INTERPLAY_DPCM_DECODER 0
-+#define CONFIG_ROQ_DPCM_DECODER 0
-+#define CONFIG_SDX2_DPCM_DECODER 0
-+#define CONFIG_SOL_DPCM_DECODER 0
-+#define CONFIG_XAN_DPCM_DECODER 0
-+#define CONFIG_ADPCM_4XM_DECODER 0
-+#define CONFIG_ADPCM_ADX_DECODER 0
-+#define CONFIG_ADPCM_AFC_DECODER 0
-+#define CONFIG_ADPCM_AGM_DECODER 0
-+#define CONFIG_ADPCM_AICA_DECODER 0
-+#define CONFIG_ADPCM_ARGO_DECODER 0
-+#define CONFIG_ADPCM_CT_DECODER 0
-+#define CONFIG_ADPCM_DTK_DECODER 0
-+#define CONFIG_ADPCM_EA_DECODER 0
-+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
-+#define CONFIG_ADPCM_EA_R1_DECODER 0
-+#define CONFIG_ADPCM_EA_R2_DECODER 0
-+#define CONFIG_ADPCM_EA_R3_DECODER 0
-+#define CONFIG_ADPCM_EA_XAS_DECODER 0
-+#define CONFIG_ADPCM_G722_DECODER 0
-+#define CONFIG_ADPCM_G726_DECODER 0
-+#define CONFIG_ADPCM_G726LE_DECODER 0
-+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0
-+#define CONFIG_ADPCM_IMA_AMV_DECODER 0
-+#define CONFIG_ADPCM_IMA_ALP_DECODER 0
-+#define CONFIG_ADPCM_IMA_APC_DECODER 0
-+#define CONFIG_ADPCM_IMA_APM_DECODER 0
-+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
-+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK3_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK4_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_ISS_DECODER 0
-+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
-+#define CONFIG_ADPCM_IMA_MTF_DECODER 0
-+#define CONFIG_ADPCM_IMA_OKI_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_DECODER 0
-+#define CONFIG_ADPCM_IMA_RAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_SSI_DECODER 0
-+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
-+#define CONFIG_ADPCM_IMA_WAV_DECODER 0
-+#define CONFIG_ADPCM_IMA_WS_DECODER 0
-+#define CONFIG_ADPCM_MS_DECODER 0
-+#define CONFIG_ADPCM_MTAF_DECODER 0
-+#define CONFIG_ADPCM_PSX_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_2_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_3_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_4_DECODER 0
-+#define CONFIG_ADPCM_SWF_DECODER 0
-+#define CONFIG_ADPCM_THP_DECODER 0
-+#define CONFIG_ADPCM_THP_LE_DECODER 0
-+#define CONFIG_ADPCM_VIMA_DECODER 0
-+#define CONFIG_ADPCM_XA_DECODER 0
-+#define CONFIG_ADPCM_YAMAHA_DECODER 0
-+#define CONFIG_ADPCM_ZORK_DECODER 0
-+#define CONFIG_SSA_DECODER 0
-+#define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
-+#define CONFIG_DVBSUB_DECODER 0
-+#define CONFIG_DVDSUB_DECODER 0
-+#define CONFIG_JACOSUB_DECODER 0
-+#define CONFIG_MICRODVD_DECODER 0
-+#define CONFIG_MOVTEXT_DECODER 0
-+#define CONFIG_MPL2_DECODER 0
-+#define CONFIG_PGSSUB_DECODER 0
-+#define CONFIG_PJS_DECODER 0
-+#define CONFIG_REALTEXT_DECODER 0
-+#define CONFIG_SAMI_DECODER 0
-+#define CONFIG_SRT_DECODER 0
-+#define CONFIG_STL_DECODER 0
-+#define CONFIG_SUBRIP_DECODER 0
-+#define CONFIG_SUBVIEWER_DECODER 0
-+#define CONFIG_SUBVIEWER1_DECODER 0
-+#define CONFIG_TEXT_DECODER 0
-+#define CONFIG_VPLAYER_DECODER 0
-+#define CONFIG_WEBVTT_DECODER 0
-+#define CONFIG_XSUB_DECODER 0
-+#define CONFIG_AAC_AT_DECODER 0
-+#define CONFIG_AC3_AT_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
-+#define CONFIG_ALAC_AT_DECODER 0
-+#define CONFIG_AMR_NB_AT_DECODER 0
-+#define CONFIG_EAC3_AT_DECODER 0
-+#define CONFIG_GSM_MS_AT_DECODER 0
-+#define CONFIG_ILBC_AT_DECODER 0
-+#define CONFIG_MP1_AT_DECODER 0
-+#define CONFIG_MP2_AT_DECODER 0
-+#define CONFIG_MP3_AT_DECODER 0
-+#define CONFIG_PCM_ALAW_AT_DECODER 0
-+#define CONFIG_PCM_MULAW_AT_DECODER 0
-+#define CONFIG_QDMC_AT_DECODER 0
-+#define CONFIG_QDM2_AT_DECODER 0
-+#define CONFIG_LIBARIBB24_DECODER 0
-+#define CONFIG_LIBCELT_DECODER 0
-+#define CONFIG_LIBCODEC2_DECODER 0
-+#define CONFIG_LIBDAV1D_DECODER 0
-+#define CONFIG_LIBDAVS2_DECODER 0
-+#define CONFIG_LIBFDK_AAC_DECODER 0
-+#define CONFIG_LIBGSM_DECODER 0
-+#define CONFIG_LIBGSM_MS_DECODER 0
-+#define CONFIG_LIBILBC_DECODER 0
-+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
-+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
-+#define CONFIG_LIBOPENJPEG_DECODER 0
-+#define CONFIG_LIBOPUS_DECODER 1
-+#define CONFIG_LIBRSVG_DECODER 0
-+#define CONFIG_LIBSPEEX_DECODER 0
-+#define CONFIG_LIBUAVS3D_DECODER 0
-+#define CONFIG_LIBVORBIS_DECODER 0
-+#define CONFIG_LIBVPX_VP8_DECODER 0
-+#define CONFIG_LIBVPX_VP9_DECODER 0
-+#define CONFIG_LIBZVBI_TELETEXT_DECODER 0
-+#define CONFIG_BINTEXT_DECODER 0
-+#define CONFIG_XBIN_DECODER 0
-+#define CONFIG_IDF_DECODER 0
-+#define CONFIG_LIBAOM_AV1_DECODER 0
-+#define CONFIG_AV1_DECODER 0
-+#define CONFIG_AV1_CUVID_DECODER 0
-+#define CONFIG_AV1_QSV_DECODER 0
-+#define CONFIG_LIBOPENH264_DECODER 0
-+#define CONFIG_H264_CUVID_DECODER 0
-+#define CONFIG_HEVC_CUVID_DECODER 0
-+#define CONFIG_HEVC_MEDIACODEC_DECODER 0
-+#define CONFIG_MJPEG_CUVID_DECODER 0
-+#define CONFIG_MJPEG_QSV_DECODER 0
-+#define CONFIG_MPEG1_CUVID_DECODER 0
-+#define CONFIG_MPEG2_CUVID_DECODER 0
-+#define CONFIG_MPEG4_CUVID_DECODER 0
-+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
-+#define CONFIG_VC1_CUVID_DECODER 0
-+#define CONFIG_VP8_CUVID_DECODER 0
-+#define CONFIG_VP8_MEDIACODEC_DECODER 0
-+#define CONFIG_VP8_QSV_DECODER 0
-+#define CONFIG_VP9_CUVID_DECODER 0
-+#define CONFIG_VP9_MEDIACODEC_DECODER 0
-+#define CONFIG_VP9_QSV_DECODER 0
-+#define CONFIG_A64MULTI_ENCODER 0
-+#define CONFIG_A64MULTI5_ENCODER 0
-+#define CONFIG_ALIAS_PIX_ENCODER 0
-+#define CONFIG_AMV_ENCODER 0
-+#define CONFIG_APNG_ENCODER 0
-+#define CONFIG_ASV1_ENCODER 0
-+#define CONFIG_ASV2_ENCODER 0
-+#define CONFIG_AVRP_ENCODER 0
-+#define CONFIG_AVUI_ENCODER 0
-+#define CONFIG_AYUV_ENCODER 0
-+#define CONFIG_BITPACKED_ENCODER 0
-+#define CONFIG_BMP_ENCODER 0
-+#define CONFIG_CFHD_ENCODER 0
-+#define CONFIG_CINEPAK_ENCODER 0
-+#define CONFIG_CLJR_ENCODER 0
-+#define CONFIG_COMFORTNOISE_ENCODER 0
-+#define CONFIG_DNXHD_ENCODER 0
-+#define CONFIG_DPX_ENCODER 0
-+#define CONFIG_DVVIDEO_ENCODER 0
-+#define CONFIG_EXR_ENCODER 0
-+#define CONFIG_FFV1_ENCODER 0
-+#define CONFIG_FFVHUFF_ENCODER 0
-+#define CONFIG_FITS_ENCODER 0
-+#define CONFIG_FLASHSV_ENCODER 0
-+#define CONFIG_FLASHSV2_ENCODER 0
-+#define CONFIG_FLV_ENCODER 0
-+#define CONFIG_GIF_ENCODER 0
-+#define CONFIG_H261_ENCODER 0
-+#define CONFIG_H263_ENCODER 0
-+#define CONFIG_H263P_ENCODER 0
-+#define CONFIG_HAP_ENCODER 0
-+#define CONFIG_HUFFYUV_ENCODER 0
-+#define CONFIG_JPEG2000_ENCODER 0
-+#define CONFIG_JPEGLS_ENCODER 0
-+#define CONFIG_LJPEG_ENCODER 0
-+#define CONFIG_MAGICYUV_ENCODER 0
-+#define CONFIG_MJPEG_ENCODER 0
-+#define CONFIG_MPEG1VIDEO_ENCODER 0
-+#define CONFIG_MPEG2VIDEO_ENCODER 0
-+#define CONFIG_MPEG4_ENCODER 0
-+#define CONFIG_MSMPEG4V2_ENCODER 0
-+#define CONFIG_MSMPEG4V3_ENCODER 0
-+#define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_PAM_ENCODER 0
-+#define CONFIG_PBM_ENCODER 0
-+#define CONFIG_PCX_ENCODER 0
-+#define CONFIG_PFM_ENCODER 0
-+#define CONFIG_PGM_ENCODER 0
-+#define CONFIG_PGMYUV_ENCODER 0
-+#define CONFIG_PNG_ENCODER 0
-+#define CONFIG_PPM_ENCODER 0
-+#define CONFIG_PRORES_ENCODER 0
-+#define CONFIG_PRORES_AW_ENCODER 0
-+#define CONFIG_PRORES_KS_ENCODER 0
-+#define CONFIG_QTRLE_ENCODER 0
-+#define CONFIG_R10K_ENCODER 0
-+#define CONFIG_R210_ENCODER 0
-+#define CONFIG_RAWVIDEO_ENCODER 0
-+#define CONFIG_ROQ_ENCODER 0
-+#define CONFIG_RPZA_ENCODER 0
-+#define CONFIG_RV10_ENCODER 0
-+#define CONFIG_RV20_ENCODER 0
-+#define CONFIG_S302M_ENCODER 0
-+#define CONFIG_SGI_ENCODER 0
-+#define CONFIG_SMC_ENCODER 0
-+#define CONFIG_SNOW_ENCODER 0
-+#define CONFIG_SPEEDHQ_ENCODER 0
-+#define CONFIG_SUNRAST_ENCODER 0
-+#define CONFIG_SVQ1_ENCODER 0
-+#define CONFIG_TARGA_ENCODER 0
-+#define CONFIG_TIFF_ENCODER 0
-+#define CONFIG_UTVIDEO_ENCODER 0
-+#define CONFIG_V210_ENCODER 0
-+#define CONFIG_V308_ENCODER 0
-+#define CONFIG_V408_ENCODER 0
-+#define CONFIG_V410_ENCODER 0
-+#define CONFIG_VC2_ENCODER 0
-+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
-+#define CONFIG_WMV1_ENCODER 0
-+#define CONFIG_WMV2_ENCODER 0
-+#define CONFIG_XBM_ENCODER 0
-+#define CONFIG_XFACE_ENCODER 0
-+#define CONFIG_XWD_ENCODER 0
-+#define CONFIG_Y41P_ENCODER 0
-+#define CONFIG_YUV4_ENCODER 0
-+#define CONFIG_ZLIB_ENCODER 0
-+#define CONFIG_ZMBV_ENCODER 0
-+#define CONFIG_AAC_ENCODER 0
-+#define CONFIG_AC3_ENCODER 0
-+#define CONFIG_AC3_FIXED_ENCODER 0
-+#define CONFIG_ALAC_ENCODER 0
-+#define CONFIG_APTX_ENCODER 0
-+#define CONFIG_APTX_HD_ENCODER 0
-+#define CONFIG_DCA_ENCODER 0
-+#define CONFIG_EAC3_ENCODER 0
-+#define CONFIG_FLAC_ENCODER 0
-+#define CONFIG_G723_1_ENCODER 0
-+#define CONFIG_MLP_ENCODER 0
-+#define CONFIG_MP2_ENCODER 0
-+#define CONFIG_MP2FIXED_ENCODER 0
-+#define CONFIG_NELLYMOSER_ENCODER 0
-+#define CONFIG_OPUS_ENCODER 0
-+#define CONFIG_RA_144_ENCODER 0
-+#define CONFIG_SBC_ENCODER 0
-+#define CONFIG_SONIC_ENCODER 0
-+#define CONFIG_SONIC_LS_ENCODER 0
-+#define CONFIG_TRUEHD_ENCODER 0
-+#define CONFIG_TTA_ENCODER 0
-+#define CONFIG_VORBIS_ENCODER 0
-+#define CONFIG_WAVPACK_ENCODER 0
-+#define CONFIG_WMAV1_ENCODER 0
-+#define CONFIG_WMAV2_ENCODER 0
-+#define CONFIG_PCM_ALAW_ENCODER 0
-+#define CONFIG_PCM_DVD_ENCODER 0
-+#define CONFIG_PCM_F32BE_ENCODER 0
-+#define CONFIG_PCM_F32LE_ENCODER 0
-+#define CONFIG_PCM_F64BE_ENCODER 0
-+#define CONFIG_PCM_F64LE_ENCODER 0
-+#define CONFIG_PCM_MULAW_ENCODER 0
-+#define CONFIG_PCM_S8_ENCODER 0
-+#define CONFIG_PCM_S8_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16BE_ENCODER 0
-+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16LE_ENCODER 0
-+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S24BE_ENCODER 0
-+#define CONFIG_PCM_S24DAUD_ENCODER 0
-+#define CONFIG_PCM_S24LE_ENCODER 0
-+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S32BE_ENCODER 0
-+#define CONFIG_PCM_S32LE_ENCODER 0
-+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S64BE_ENCODER 0
-+#define CONFIG_PCM_S64LE_ENCODER 0
-+#define CONFIG_PCM_U8_ENCODER 0
-+#define CONFIG_PCM_U16BE_ENCODER 0
-+#define CONFIG_PCM_U16LE_ENCODER 0
-+#define CONFIG_PCM_U24BE_ENCODER 0
-+#define CONFIG_PCM_U24LE_ENCODER 0
-+#define CONFIG_PCM_U32BE_ENCODER 0
-+#define CONFIG_PCM_U32LE_ENCODER 0
-+#define CONFIG_PCM_VIDC_ENCODER 0
-+#define CONFIG_ROQ_DPCM_ENCODER 0
-+#define CONFIG_ADPCM_ADX_ENCODER 0
-+#define CONFIG_ADPCM_ARGO_ENCODER 0
-+#define CONFIG_ADPCM_G722_ENCODER 0
-+#define CONFIG_ADPCM_G726_ENCODER 0
-+#define CONFIG_ADPCM_G726LE_ENCODER 0
-+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0
-+#define CONFIG_ADPCM_IMA_APM_ENCODER 0
-+#define CONFIG_ADPCM_IMA_QT_ENCODER 0
-+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WS_ENCODER 0
-+#define CONFIG_ADPCM_MS_ENCODER 0
-+#define CONFIG_ADPCM_SWF_ENCODER 0
-+#define CONFIG_ADPCM_YAMAHA_ENCODER 0
-+#define CONFIG_SSA_ENCODER 0
-+#define CONFIG_ASS_ENCODER 0
-+#define CONFIG_DVBSUB_ENCODER 0
-+#define CONFIG_DVDSUB_ENCODER 0
-+#define CONFIG_MOVTEXT_ENCODER 0
-+#define CONFIG_SRT_ENCODER 0
-+#define CONFIG_SUBRIP_ENCODER 0
-+#define CONFIG_TEXT_ENCODER 0
-+#define CONFIG_TTML_ENCODER 0
-+#define CONFIG_WEBVTT_ENCODER 0
-+#define CONFIG_XSUB_ENCODER 0
-+#define CONFIG_AAC_AT_ENCODER 0
-+#define CONFIG_ALAC_AT_ENCODER 0
-+#define CONFIG_ILBC_AT_ENCODER 0
-+#define CONFIG_PCM_ALAW_AT_ENCODER 0
-+#define CONFIG_PCM_MULAW_AT_ENCODER 0
-+#define CONFIG_LIBAOM_AV1_ENCODER 0
-+#define CONFIG_LIBCODEC2_ENCODER 0
-+#define CONFIG_LIBFDK_AAC_ENCODER 0
-+#define CONFIG_LIBGSM_ENCODER 0
-+#define CONFIG_LIBGSM_MS_ENCODER 0
-+#define CONFIG_LIBILBC_ENCODER 0
-+#define CONFIG_LIBMP3LAME_ENCODER 0
-+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+#define CONFIG_LIBOPENJPEG_ENCODER 0
-+#define CONFIG_LIBOPUS_ENCODER 0
-+#define CONFIG_LIBRAV1E_ENCODER 0
-+#define CONFIG_LIBSHINE_ENCODER 0
-+#define CONFIG_LIBSPEEX_ENCODER 0
-+#define CONFIG_LIBSVTAV1_ENCODER 0
-+#define CONFIG_LIBTHEORA_ENCODER 0
-+#define CONFIG_LIBTWOLAME_ENCODER 0
-+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
-+#define CONFIG_LIBVORBIS_ENCODER 0
-+#define CONFIG_LIBVPX_VP8_ENCODER 0
-+#define CONFIG_LIBVPX_VP9_ENCODER 0
-+#define CONFIG_LIBWEBP_ANIM_ENCODER 0
-+#define CONFIG_LIBWEBP_ENCODER 0
-+#define CONFIG_LIBX262_ENCODER 0
-+#define CONFIG_LIBX264_ENCODER 0
-+#define CONFIG_LIBX264RGB_ENCODER 0
-+#define CONFIG_LIBX265_ENCODER 0
-+#define CONFIG_LIBXAVS_ENCODER 0
-+#define CONFIG_LIBXAVS2_ENCODER 0
-+#define CONFIG_LIBXVID_ENCODER 0
-+#define CONFIG_AAC_MF_ENCODER 0
-+#define CONFIG_AC3_MF_ENCODER 0
-+#define CONFIG_H263_V4L2M2M_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
-+#define CONFIG_H264_AMF_ENCODER 0
-+#define CONFIG_H264_MF_ENCODER 0
-+#define CONFIG_H264_NVENC_ENCODER 0
-+#define CONFIG_H264_OMX_ENCODER 0
-+#define CONFIG_H264_QSV_ENCODER 0
-+#define CONFIG_H264_V4L2M2M_ENCODER 0
-+#define CONFIG_H264_VAAPI_ENCODER 0
-+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_HEVC_AMF_ENCODER 0
-+#define CONFIG_HEVC_MF_ENCODER 0
-+#define CONFIG_HEVC_NVENC_ENCODER 0
-+#define CONFIG_HEVC_QSV_ENCODER 0
-+#define CONFIG_HEVC_V4L2M2M_ENCODER 0
-+#define CONFIG_HEVC_VAAPI_ENCODER 0
-+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_LIBKVAZAAR_ENCODER 0
-+#define CONFIG_MJPEG_QSV_ENCODER 0
-+#define CONFIG_MJPEG_VAAPI_ENCODER 0
-+#define CONFIG_MP3_MF_ENCODER 0
-+#define CONFIG_MPEG2_QSV_ENCODER 0
-+#define CONFIG_MPEG2_VAAPI_ENCODER 0
-+#define CONFIG_MPEG4_OMX_ENCODER 0
-+#define CONFIG_MPEG4_V4L2M2M_ENCODER 0
-+#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_VP8_V4L2M2M_ENCODER 0
-+#define CONFIG_VP8_VAAPI_ENCODER 0
-+#define CONFIG_VP9_VAAPI_ENCODER 0
-+#define CONFIG_VP9_QSV_ENCODER 0
-+#define CONFIG_AV1_D3D11VA_HWACCEL 0
-+#define CONFIG_AV1_D3D11VA2_HWACCEL 0
-+#define CONFIG_AV1_DXVA2_HWACCEL 0
-+#define CONFIG_AV1_NVDEC_HWACCEL 0
-+#define CONFIG_AV1_VAAPI_HWACCEL 0
-+#define CONFIG_H263_VAAPI_HWACCEL 0
-+#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_H264_D3D11VA_HWACCEL 0
-+#define CONFIG_H264_D3D11VA2_HWACCEL 0
-+#define CONFIG_H264_DXVA2_HWACCEL 0
-+#define CONFIG_H264_NVDEC_HWACCEL 0
-+#define CONFIG_H264_VAAPI_HWACCEL 0
-+#define CONFIG_H264_VDPAU_HWACCEL 0
-+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_HEVC_D3D11VA_HWACCEL 0
-+#define CONFIG_HEVC_D3D11VA2_HWACCEL 0
-+#define CONFIG_HEVC_DXVA2_HWACCEL 0
-+#define CONFIG_HEVC_NVDEC_HWACCEL 0
-+#define CONFIG_HEVC_VAAPI_HWACCEL 0
-+#define CONFIG_HEVC_VDPAU_HWACCEL 0
-+#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_MJPEG_NVDEC_HWACCEL 0
-+#define CONFIG_MJPEG_VAAPI_HWACCEL 0
-+#define CONFIG_MPEG1_NVDEC_HWACCEL 0
-+#define CONFIG_MPEG1_VDPAU_HWACCEL 0
-+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_MPEG1_XVMC_HWACCEL 0
-+#define CONFIG_MPEG2_D3D11VA_HWACCEL 0
-+#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0
-+#define CONFIG_MPEG2_NVDEC_HWACCEL 0
-+#define CONFIG_MPEG2_DXVA2_HWACCEL 0
-+#define CONFIG_MPEG2_VAAPI_HWACCEL 0
-+#define CONFIG_MPEG2_VDPAU_HWACCEL 0
-+#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_MPEG2_XVMC_HWACCEL 0
-+#define CONFIG_MPEG4_NVDEC_HWACCEL 0
-+#define CONFIG_MPEG4_VAAPI_HWACCEL 0
-+#define CONFIG_MPEG4_VDPAU_HWACCEL 0
-+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_VC1_D3D11VA_HWACCEL 0
-+#define CONFIG_VC1_D3D11VA2_HWACCEL 0
-+#define CONFIG_VC1_DXVA2_HWACCEL 0
-+#define CONFIG_VC1_NVDEC_HWACCEL 0
-+#define CONFIG_VC1_VAAPI_HWACCEL 0
-+#define CONFIG_VC1_VDPAU_HWACCEL 0
-+#define CONFIG_VP8_NVDEC_HWACCEL 0
-+#define CONFIG_VP8_VAAPI_HWACCEL 0
-+#define CONFIG_VP9_D3D11VA_HWACCEL 0
-+#define CONFIG_VP9_D3D11VA2_HWACCEL 0
-+#define CONFIG_VP9_DXVA2_HWACCEL 0
-+#define CONFIG_VP9_NVDEC_HWACCEL 0
-+#define CONFIG_VP9_VAAPI_HWACCEL 0
-+#define CONFIG_VP9_VDPAU_HWACCEL 0
-+#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_WMV3_D3D11VA_HWACCEL 0
-+#define CONFIG_WMV3_D3D11VA2_HWACCEL 0
-+#define CONFIG_WMV3_DXVA2_HWACCEL 0
-+#define CONFIG_WMV3_NVDEC_HWACCEL 0
-+#define CONFIG_WMV3_VAAPI_HWACCEL 0
-+#define CONFIG_WMV3_VDPAU_HWACCEL 0
-+#define CONFIG_AAC_PARSER 1
-+#define CONFIG_AAC_LATM_PARSER 0
-+#define CONFIG_AC3_PARSER 0
-+#define CONFIG_ADX_PARSER 0
-+#define CONFIG_AMR_PARSER 0
-+#define CONFIG_AV1_PARSER 0
-+#define CONFIG_AVS2_PARSER 0
-+#define CONFIG_AVS3_PARSER 0
-+#define CONFIG_BMP_PARSER 0
-+#define CONFIG_CAVSVIDEO_PARSER 0
-+#define CONFIG_COOK_PARSER 0
-+#define CONFIG_CRI_PARSER 0
-+#define CONFIG_DCA_PARSER 0
-+#define CONFIG_DIRAC_PARSER 0
-+#define CONFIG_DNXHD_PARSER 0
-+#define CONFIG_DOLBY_E_PARSER 0
-+#define CONFIG_DPX_PARSER 0
-+#define CONFIG_DVAUDIO_PARSER 0
-+#define CONFIG_DVBSUB_PARSER 0
-+#define CONFIG_DVDSUB_PARSER 0
-+#define CONFIG_DVD_NAV_PARSER 0
-+#define CONFIG_FLAC_PARSER 1
-+#define CONFIG_G723_1_PARSER 0
-+#define CONFIG_G729_PARSER 0
-+#define CONFIG_GIF_PARSER 0
-+#define CONFIG_GSM_PARSER 0
-+#define CONFIG_H261_PARSER 0
-+#define CONFIG_H263_PARSER 0
-+#define CONFIG_H264_PARSER 1
-+#define CONFIG_HEVC_PARSER 0
-+#define CONFIG_IPU_PARSER 0
-+#define CONFIG_JPEG2000_PARSER 0
-+#define CONFIG_MJPEG_PARSER 0
-+#define CONFIG_MLP_PARSER 0
-+#define CONFIG_MPEG4VIDEO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
-+#define CONFIG_MPEGVIDEO_PARSER 0
-+#define CONFIG_OPUS_PARSER 1
-+#define CONFIG_PNG_PARSER 0
-+#define CONFIG_PNM_PARSER 0
-+#define CONFIG_RV30_PARSER 0
-+#define CONFIG_RV40_PARSER 0
-+#define CONFIG_SBC_PARSER 0
-+#define CONFIG_SIPR_PARSER 0
-+#define CONFIG_TAK_PARSER 0
-+#define CONFIG_VC1_PARSER 0
-+#define CONFIG_VORBIS_PARSER 1
-+#define CONFIG_VP3_PARSER 1
-+#define CONFIG_VP8_PARSER 1
-+#define CONFIG_VP9_PARSER 1
-+#define CONFIG_WEBP_PARSER 0
-+#define CONFIG_XBM_PARSER 0
-+#define CONFIG_XMA_PARSER 0
-+#define CONFIG_ALSA_INDEV 0
-+#define CONFIG_ANDROID_CAMERA_INDEV 0
-+#define CONFIG_AVFOUNDATION_INDEV 0
-+#define CONFIG_BKTR_INDEV 0
-+#define CONFIG_DECKLINK_INDEV 0
-+#define CONFIG_DSHOW_INDEV 0
-+#define CONFIG_FBDEV_INDEV 0
-+#define CONFIG_GDIGRAB_INDEV 0
-+#define CONFIG_IEC61883_INDEV 0
-+#define CONFIG_JACK_INDEV 0
-+#define CONFIG_KMSGRAB_INDEV 0
-+#define CONFIG_LAVFI_INDEV 0
-+#define CONFIG_OPENAL_INDEV 0
-+#define CONFIG_OSS_INDEV 0
-+#define CONFIG_PULSE_INDEV 0
-+#define CONFIG_SNDIO_INDEV 0
-+#define CONFIG_V4L2_INDEV 0
-+#define CONFIG_VFWCAP_INDEV 0
-+#define CONFIG_XCBGRAB_INDEV 0
-+#define CONFIG_LIBCDIO_INDEV 0
-+#define CONFIG_LIBDC1394_INDEV 0
-+#define CONFIG_ALSA_OUTDEV 0
-+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0
-+#define CONFIG_CACA_OUTDEV 0
-+#define CONFIG_DECKLINK_OUTDEV 0
-+#define CONFIG_FBDEV_OUTDEV 0
-+#define CONFIG_OPENGL_OUTDEV 0
-+#define CONFIG_OSS_OUTDEV 0
-+#define CONFIG_PULSE_OUTDEV 0
-+#define CONFIG_SDL2_OUTDEV 0
-+#define CONFIG_SNDIO_OUTDEV 0
-+#define CONFIG_V4L2_OUTDEV 0
-+#define CONFIG_XV_OUTDEV 0
-+#define CONFIG_ABENCH_FILTER 0
-+#define CONFIG_ACOMPRESSOR_FILTER 0
-+#define CONFIG_ACONTRAST_FILTER 0
-+#define CONFIG_ACOPY_FILTER 0
-+#define CONFIG_ACUE_FILTER 0
-+#define CONFIG_ACROSSFADE_FILTER 0
-+#define CONFIG_ACROSSOVER_FILTER 0
-+#define CONFIG_ACRUSHER_FILTER 0
-+#define CONFIG_ADECLICK_FILTER 0
-+#define CONFIG_ADECLIP_FILTER 0
-+#define CONFIG_ADECORRELATE_FILTER 0
-+#define CONFIG_ADELAY_FILTER 0
-+#define CONFIG_ADENORM_FILTER 0
-+#define CONFIG_ADERIVATIVE_FILTER 0
-+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
-+#define CONFIG_ADYNAMICSMOOTH_FILTER 0
-+#define CONFIG_AECHO_FILTER 0
-+#define CONFIG_AEMPHASIS_FILTER 0
-+#define CONFIG_AEVAL_FILTER 0
-+#define CONFIG_AEXCITER_FILTER 0
-+#define CONFIG_AFADE_FILTER 0
-+#define CONFIG_AFFTDN_FILTER 0
-+#define CONFIG_AFFTFILT_FILTER 0
-+#define CONFIG_AFIR_FILTER 0
-+#define CONFIG_AFORMAT_FILTER 0
-+#define CONFIG_AFREQSHIFT_FILTER 0
-+#define CONFIG_AFWTDN_FILTER 0
-+#define CONFIG_AGATE_FILTER 0
-+#define CONFIG_AIIR_FILTER 0
-+#define CONFIG_AINTEGRAL_FILTER 0
-+#define CONFIG_AINTERLEAVE_FILTER 0
-+#define CONFIG_ALATENCY_FILTER 0
-+#define CONFIG_ALIMITER_FILTER 0
-+#define CONFIG_ALLPASS_FILTER 0
-+#define CONFIG_ALOOP_FILTER 0
-+#define CONFIG_AMERGE_FILTER 0
-+#define CONFIG_AMETADATA_FILTER 0
-+#define CONFIG_AMIX_FILTER 0
-+#define CONFIG_AMULTIPLY_FILTER 0
-+#define CONFIG_ANEQUALIZER_FILTER 0
-+#define CONFIG_ANLMDN_FILTER 0
-+#define CONFIG_ANLMF_FILTER 0
-+#define CONFIG_ANLMS_FILTER 0
-+#define CONFIG_ANULL_FILTER 0
-+#define CONFIG_APAD_FILTER 0
-+#define CONFIG_APERMS_FILTER 0
-+#define CONFIG_APHASER_FILTER 0
-+#define CONFIG_APHASESHIFT_FILTER 0
-+#define CONFIG_APSYCLIP_FILTER 0
-+#define CONFIG_APULSATOR_FILTER 0
-+#define CONFIG_AREALTIME_FILTER 0
-+#define CONFIG_ARESAMPLE_FILTER 0
-+#define CONFIG_AREVERSE_FILTER 0
-+#define CONFIG_ARNNDN_FILTER 0
-+#define CONFIG_ASDR_FILTER 0
-+#define CONFIG_ASEGMENT_FILTER 0
-+#define CONFIG_ASELECT_FILTER 0
-+#define CONFIG_ASENDCMD_FILTER 0
-+#define CONFIG_ASETNSAMPLES_FILTER 0
-+#define CONFIG_ASETPTS_FILTER 0
-+#define CONFIG_ASETRATE_FILTER 0
-+#define CONFIG_ASETTB_FILTER 0
-+#define CONFIG_ASHOWINFO_FILTER 0
-+#define CONFIG_ASIDEDATA_FILTER 0
-+#define CONFIG_ASOFTCLIP_FILTER 0
-+#define CONFIG_ASPECTRALSTATS_FILTER 0
-+#define CONFIG_ASPLIT_FILTER 0
-+#define CONFIG_ASR_FILTER 0
-+#define CONFIG_ASTATS_FILTER 0
-+#define CONFIG_ASTREAMSELECT_FILTER 0
-+#define CONFIG_ASUBBOOST_FILTER 0
-+#define CONFIG_ASUBCUT_FILTER 0
-+#define CONFIG_ASUPERCUT_FILTER 0
-+#define CONFIG_ASUPERPASS_FILTER 0
-+#define CONFIG_ASUPERSTOP_FILTER 0
-+#define CONFIG_ATEMPO_FILTER 0
-+#define CONFIG_ATILT_FILTER 0
-+#define CONFIG_ATRIM_FILTER 0
-+#define CONFIG_AXCORRELATE_FILTER 0
-+#define CONFIG_AZMQ_FILTER 0
-+#define CONFIG_BANDPASS_FILTER 0
-+#define CONFIG_BANDREJECT_FILTER 0
-+#define CONFIG_BASS_FILTER 0
-+#define CONFIG_BIQUAD_FILTER 0
-+#define CONFIG_BS2B_FILTER 0
-+#define CONFIG_CHANNELMAP_FILTER 0
-+#define CONFIG_CHANNELSPLIT_FILTER 0
-+#define CONFIG_CHORUS_FILTER 0
-+#define CONFIG_COMPAND_FILTER 0
-+#define CONFIG_COMPENSATIONDELAY_FILTER 0
-+#define CONFIG_CROSSFEED_FILTER 0
-+#define CONFIG_CRYSTALIZER_FILTER 0
-+#define CONFIG_DCSHIFT_FILTER 0
-+#define CONFIG_DEESSER_FILTER 0
-+#define CONFIG_DRMETER_FILTER 0
-+#define CONFIG_DYNAUDNORM_FILTER 0
-+#define CONFIG_EARWAX_FILTER 0
-+#define CONFIG_EBUR128_FILTER 0
-+#define CONFIG_EQUALIZER_FILTER 0
-+#define CONFIG_EXTRASTEREO_FILTER 0
-+#define CONFIG_FIREQUALIZER_FILTER 0
-+#define CONFIG_FLANGER_FILTER 0
-+#define CONFIG_HAAS_FILTER 0
-+#define CONFIG_HDCD_FILTER 0
-+#define CONFIG_HEADPHONE_FILTER 0
-+#define CONFIG_HIGHPASS_FILTER 0
-+#define CONFIG_HIGHSHELF_FILTER 0
-+#define CONFIG_JOIN_FILTER 0
-+#define CONFIG_LADSPA_FILTER 0
-+#define CONFIG_LOUDNORM_FILTER 0
-+#define CONFIG_LOWPASS_FILTER 0
-+#define CONFIG_LOWSHELF_FILTER 0
-+#define CONFIG_LV2_FILTER 0
-+#define CONFIG_MCOMPAND_FILTER 0
-+#define CONFIG_PAN_FILTER 0
-+#define CONFIG_REPLAYGAIN_FILTER 0
-+#define CONFIG_RUBBERBAND_FILTER 0
-+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
-+#define CONFIG_SIDECHAINGATE_FILTER 0
-+#define CONFIG_SILENCEDETECT_FILTER 0
-+#define CONFIG_SILENCEREMOVE_FILTER 0
-+#define CONFIG_SOFALIZER_FILTER 0
-+#define CONFIG_SPEECHNORM_FILTER 0
-+#define CONFIG_STEREOTOOLS_FILTER 0
-+#define CONFIG_STEREOWIDEN_FILTER 0
-+#define CONFIG_SUPEREQUALIZER_FILTER 0
-+#define CONFIG_SURROUND_FILTER 0
-+#define CONFIG_TREBLE_FILTER 0
-+#define CONFIG_TREMOLO_FILTER 0
-+#define CONFIG_VIBRATO_FILTER 0
-+#define CONFIG_VOLUME_FILTER 0
-+#define CONFIG_VOLUMEDETECT_FILTER 0
-+#define CONFIG_AEVALSRC_FILTER 0
-+#define CONFIG_AFIRSRC_FILTER 0
-+#define CONFIG_ANOISESRC_FILTER 0
-+#define CONFIG_ANULLSRC_FILTER 0
-+#define CONFIG_FLITE_FILTER 0
-+#define CONFIG_HILBERT_FILTER 0
-+#define CONFIG_SINC_FILTER 0
-+#define CONFIG_SINE_FILTER 0
-+#define CONFIG_ANULLSINK_FILTER 0
-+#define CONFIG_ADDROI_FILTER 0
-+#define CONFIG_ALPHAEXTRACT_FILTER 0
-+#define CONFIG_ALPHAMERGE_FILTER 0
-+#define CONFIG_AMPLIFY_FILTER 0
-+#define CONFIG_ASS_FILTER 0
-+#define CONFIG_ATADENOISE_FILTER 0
-+#define CONFIG_AVGBLUR_FILTER 0
-+#define CONFIG_AVGBLUR_OPENCL_FILTER 0
-+#define CONFIG_AVGBLUR_VULKAN_FILTER 0
-+#define CONFIG_BBOX_FILTER 0
-+#define CONFIG_BENCH_FILTER 0
-+#define CONFIG_BILATERAL_FILTER 0
-+#define CONFIG_BITPLANENOISE_FILTER 0
-+#define CONFIG_BLACKDETECT_FILTER 0
-+#define CONFIG_BLACKFRAME_FILTER 0
-+#define CONFIG_BLEND_FILTER 0
-+#define CONFIG_BLEND_VULKAN_FILTER 0
-+#define CONFIG_BM3D_FILTER 0
-+#define CONFIG_BOXBLUR_FILTER 0
-+#define CONFIG_BOXBLUR_OPENCL_FILTER 0
-+#define CONFIG_BWDIF_FILTER 0
-+#define CONFIG_CAS_FILTER 0
-+#define CONFIG_CHROMABER_VULKAN_FILTER 0
-+#define CONFIG_CHROMAHOLD_FILTER 0
-+#define CONFIG_CHROMAKEY_FILTER 0
-+#define CONFIG_CHROMANR_FILTER 0
-+#define CONFIG_CHROMASHIFT_FILTER 0
-+#define CONFIG_CIESCOPE_FILTER 0
-+#define CONFIG_CODECVIEW_FILTER 0
-+#define CONFIG_COLORBALANCE_FILTER 0
-+#define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORCONTRAST_FILTER 0
-+#define CONFIG_COLORCORRECT_FILTER 0
-+#define CONFIG_COLORIZE_FILTER 0
-+#define CONFIG_COLORKEY_FILTER 0
-+#define CONFIG_COLORKEY_OPENCL_FILTER 0
-+#define CONFIG_COLORHOLD_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
-+#define CONFIG_COLORMATRIX_FILTER 0
-+#define CONFIG_COLORSPACE_FILTER 0
-+#define CONFIG_COLORTEMPERATURE_FILTER 0
-+#define CONFIG_CONVOLUTION_FILTER 0
-+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
-+#define CONFIG_CONVOLVE_FILTER 0
-+#define CONFIG_COPY_FILTER 0
-+#define CONFIG_COREIMAGE_FILTER 0
-+#define CONFIG_COVER_RECT_FILTER 0
-+#define CONFIG_CROP_FILTER 0
-+#define CONFIG_CROPDETECT_FILTER 0
-+#define CONFIG_CUE_FILTER 0
-+#define CONFIG_CURVES_FILTER 0
-+#define CONFIG_DATASCOPE_FILTER 0
-+#define CONFIG_DBLUR_FILTER 0
-+#define CONFIG_DCTDNOIZ_FILTER 0
-+#define CONFIG_DEBAND_FILTER 0
-+#define CONFIG_DEBLOCK_FILTER 0
-+#define CONFIG_DECIMATE_FILTER 0
-+#define CONFIG_DECONVOLVE_FILTER 0
-+#define CONFIG_DEDOT_FILTER 0
-+#define CONFIG_DEFLATE_FILTER 0
-+#define CONFIG_DEFLICKER_FILTER 0
-+#define CONFIG_DEINTERLACE_QSV_FILTER 0
-+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0
-+#define CONFIG_DEJUDDER_FILTER 0
-+#define CONFIG_DELOGO_FILTER 0
-+#define CONFIG_DENOISE_VAAPI_FILTER 0
-+#define CONFIG_DERAIN_FILTER 0
-+#define CONFIG_DESHAKE_FILTER 0
-+#define CONFIG_DESHAKE_OPENCL_FILTER 0
-+#define CONFIG_DESPILL_FILTER 0
-+#define CONFIG_DETELECINE_FILTER 0
-+#define CONFIG_DILATION_FILTER 0
-+#define CONFIG_DILATION_OPENCL_FILTER 0
-+#define CONFIG_DISPLACE_FILTER 0
-+#define CONFIG_DNN_CLASSIFY_FILTER 0
-+#define CONFIG_DNN_DETECT_FILTER 0
-+#define CONFIG_DNN_PROCESSING_FILTER 0
-+#define CONFIG_DOUBLEWEAVE_FILTER 0
-+#define CONFIG_DRAWBOX_FILTER 0
-+#define CONFIG_DRAWGRAPH_FILTER 0
-+#define CONFIG_DRAWGRID_FILTER 0
-+#define CONFIG_DRAWTEXT_FILTER 0
-+#define CONFIG_EDGEDETECT_FILTER 0
-+#define CONFIG_ELBG_FILTER 0
-+#define CONFIG_ENTROPY_FILTER 0
-+#define CONFIG_EPX_FILTER 0
-+#define CONFIG_EQ_FILTER 0
-+#define CONFIG_EROSION_FILTER 0
-+#define CONFIG_EROSION_OPENCL_FILTER 0
-+#define CONFIG_ESTDIF_FILTER 0
-+#define CONFIG_EXPOSURE_FILTER 0
-+#define CONFIG_EXTRACTPLANES_FILTER 0
-+#define CONFIG_FADE_FILTER 0
-+#define CONFIG_FFTDNOIZ_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
-+#define CONFIG_FIELD_FILTER 0
-+#define CONFIG_FIELDHINT_FILTER 0
-+#define CONFIG_FIELDMATCH_FILTER 0
-+#define CONFIG_FIELDORDER_FILTER 0
-+#define CONFIG_FILLBORDERS_FILTER 0
-+#define CONFIG_FIND_RECT_FILTER 0
-+#define CONFIG_FLIP_VULKAN_FILTER 0
-+#define CONFIG_FLOODFILL_FILTER 0
-+#define CONFIG_FORMAT_FILTER 0
-+#define CONFIG_FPS_FILTER 0
-+#define CONFIG_FRAMEPACK_FILTER 0
-+#define CONFIG_FRAMERATE_FILTER 0
-+#define CONFIG_FRAMESTEP_FILTER 0
-+#define CONFIG_FREEZEDETECT_FILTER 0
-+#define CONFIG_FREEZEFRAMES_FILTER 0
-+#define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
-+#define CONFIG_GBLUR_FILTER 0
-+#define CONFIG_GBLUR_VULKAN_FILTER 0
-+#define CONFIG_GEQ_FILTER 0
-+#define CONFIG_GRADFUN_FILTER 0
-+#define CONFIG_GRAPHMONITOR_FILTER 0
-+#define CONFIG_GRAYWORLD_FILTER 0
-+#define CONFIG_GREYEDGE_FILTER 0
-+#define CONFIG_GUIDED_FILTER 0
-+#define CONFIG_HALDCLUT_FILTER 0
-+#define CONFIG_HFLIP_FILTER 0
-+#define CONFIG_HFLIP_VULKAN_FILTER 0
-+#define CONFIG_HISTEQ_FILTER 0
-+#define CONFIG_HISTOGRAM_FILTER 0
-+#define CONFIG_HQDN3D_FILTER 0
-+#define CONFIG_HQX_FILTER 0
-+#define CONFIG_HSTACK_FILTER 0
-+#define CONFIG_HSVHOLD_FILTER 0
-+#define CONFIG_HSVKEY_FILTER 0
-+#define CONFIG_HUE_FILTER 0
-+#define CONFIG_HUESATURATION_FILTER 0
-+#define CONFIG_HWDOWNLOAD_FILTER 0
-+#define CONFIG_HWMAP_FILTER 0
-+#define CONFIG_HWUPLOAD_FILTER 0
-+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
-+#define CONFIG_HYSTERESIS_FILTER 0
-+#define CONFIG_IDENTITY_FILTER 0
-+#define CONFIG_IDET_FILTER 0
-+#define CONFIG_IL_FILTER 0
-+#define CONFIG_INFLATE_FILTER 0
-+#define CONFIG_INTERLACE_FILTER 0
-+#define CONFIG_INTERLEAVE_FILTER 0
-+#define CONFIG_KERNDEINT_FILTER 0
-+#define CONFIG_KIRSCH_FILTER 0
-+#define CONFIG_LAGFUN_FILTER 0
-+#define CONFIG_LATENCY_FILTER 0
-+#define CONFIG_LENSCORRECTION_FILTER 0
-+#define CONFIG_LENSFUN_FILTER 0
-+#define CONFIG_LIBPLACEBO_FILTER 0
-+#define CONFIG_LIBVMAF_FILTER 0
-+#define CONFIG_LIMITDIFF_FILTER 0
-+#define CONFIG_LIMITER_FILTER 0
-+#define CONFIG_LOOP_FILTER 0
-+#define CONFIG_LUMAKEY_FILTER 0
-+#define CONFIG_LUT_FILTER 0
-+#define CONFIG_LUT1D_FILTER 0
-+#define CONFIG_LUT2_FILTER 0
-+#define CONFIG_LUT3D_FILTER 0
-+#define CONFIG_LUTRGB_FILTER 0
-+#define CONFIG_LUTYUV_FILTER 0
-+#define CONFIG_MASKEDCLAMP_FILTER 0
-+#define CONFIG_MASKEDMAX_FILTER 0
-+#define CONFIG_MASKEDMERGE_FILTER 0
-+#define CONFIG_MASKEDMIN_FILTER 0
-+#define CONFIG_MASKEDTHRESHOLD_FILTER 0
-+#define CONFIG_MASKFUN_FILTER 0
-+#define CONFIG_MCDEINT_FILTER 0
-+#define CONFIG_MEDIAN_FILTER 0
-+#define CONFIG_MERGEPLANES_FILTER 0
-+#define CONFIG_MESTIMATE_FILTER 0
-+#define CONFIG_METADATA_FILTER 0
-+#define CONFIG_MIDEQUALIZER_FILTER 0
-+#define CONFIG_MINTERPOLATE_FILTER 0
-+#define CONFIG_MIX_FILTER 0
-+#define CONFIG_MONOCHROME_FILTER 0
-+#define CONFIG_MORPHO_FILTER 0
-+#define CONFIG_MPDECIMATE_FILTER 0
-+#define CONFIG_MSAD_FILTER 0
-+#define CONFIG_NEGATE_FILTER 0
-+#define CONFIG_NLMEANS_FILTER 0
-+#define CONFIG_NLMEANS_OPENCL_FILTER 0
-+#define CONFIG_NNEDI_FILTER 0
-+#define CONFIG_NOFORMAT_FILTER 0
-+#define CONFIG_NOISE_FILTER 0
-+#define CONFIG_NORMALIZE_FILTER 0
-+#define CONFIG_NULL_FILTER 0
-+#define CONFIG_OCR_FILTER 0
-+#define CONFIG_OCV_FILTER 0
-+#define CONFIG_OSCILLOSCOPE_FILTER 0
-+#define CONFIG_OVERLAY_FILTER 0
-+#define CONFIG_OVERLAY_OPENCL_FILTER 0
-+#define CONFIG_OVERLAY_QSV_FILTER 0
-+#define CONFIG_OVERLAY_VAAPI_FILTER 0
-+#define CONFIG_OVERLAY_VULKAN_FILTER 0
-+#define CONFIG_OVERLAY_CUDA_FILTER 0
-+#define CONFIG_OWDENOISE_FILTER 0
-+#define CONFIG_PAD_FILTER 0
-+#define CONFIG_PAD_OPENCL_FILTER 0
-+#define CONFIG_PALETTEGEN_FILTER 0
-+#define CONFIG_PALETTEUSE_FILTER 0
-+#define CONFIG_PERMS_FILTER 0
-+#define CONFIG_PERSPECTIVE_FILTER 0
-+#define CONFIG_PHASE_FILTER 0
-+#define CONFIG_PHOTOSENSITIVITY_FILTER 0
-+#define CONFIG_PIXDESCTEST_FILTER 0
-+#define CONFIG_PIXSCOPE_FILTER 0
-+#define CONFIG_PP_FILTER 0
-+#define CONFIG_PP7_FILTER 0
-+#define CONFIG_PREMULTIPLY_FILTER 0
-+#define CONFIG_PREWITT_FILTER 0
-+#define CONFIG_PREWITT_OPENCL_FILTER 0
-+#define CONFIG_PROCAMP_VAAPI_FILTER 0
-+#define CONFIG_PROGRAM_OPENCL_FILTER 0
-+#define CONFIG_PSEUDOCOLOR_FILTER 0
-+#define CONFIG_PSNR_FILTER 0
-+#define CONFIG_PULLUP_FILTER 0
-+#define CONFIG_QP_FILTER 0
-+#define CONFIG_RANDOM_FILTER 0
-+#define CONFIG_READEIA608_FILTER 0
-+#define CONFIG_READVITC_FILTER 0
-+#define CONFIG_REALTIME_FILTER 0
-+#define CONFIG_REMAP_FILTER 0
-+#define CONFIG_REMOVEGRAIN_FILTER 0
-+#define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
-+#define CONFIG_REVERSE_FILTER 0
-+#define CONFIG_RGBASHIFT_FILTER 0
-+#define CONFIG_ROBERTS_FILTER 0
-+#define CONFIG_ROBERTS_OPENCL_FILTER 0
-+#define CONFIG_ROTATE_FILTER 0
-+#define CONFIG_SAB_FILTER 0
-+#define CONFIG_SCALE_FILTER 0
-+#define CONFIG_SCALE_CUDA_FILTER 0
-+#define CONFIG_SCALE_NPP_FILTER 0
-+#define CONFIG_SCALE_QSV_FILTER 0
-+#define CONFIG_SCALE_VAAPI_FILTER 0
-+#define CONFIG_SCALE_VULKAN_FILTER 0
-+#define CONFIG_SCALE2REF_FILTER 0
-+#define CONFIG_SCALE2REF_NPP_FILTER 0
-+#define CONFIG_SCDET_FILTER 0
-+#define CONFIG_SCHARR_FILTER 0
-+#define CONFIG_SCROLL_FILTER 0
-+#define CONFIG_SEGMENT_FILTER 0
-+#define CONFIG_SELECT_FILTER 0
-+#define CONFIG_SELECTIVECOLOR_FILTER 0
-+#define CONFIG_SENDCMD_FILTER 0
-+#define CONFIG_SEPARATEFIELDS_FILTER 0
-+#define CONFIG_SETDAR_FILTER 0
-+#define CONFIG_SETFIELD_FILTER 0
-+#define CONFIG_SETPARAMS_FILTER 0
-+#define CONFIG_SETPTS_FILTER 0
-+#define CONFIG_SETRANGE_FILTER 0
-+#define CONFIG_SETSAR_FILTER 0
-+#define CONFIG_SETTB_FILTER 0
-+#define CONFIG_SHARPEN_NPP_FILTER 0
-+#define CONFIG_SHARPNESS_VAAPI_FILTER 0
-+#define CONFIG_SHEAR_FILTER 0
-+#define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
-+#define CONFIG_SHUFFLEFRAMES_FILTER 0
-+#define CONFIG_SHUFFLEPIXELS_FILTER 0
-+#define CONFIG_SHUFFLEPLANES_FILTER 0
-+#define CONFIG_SIDEDATA_FILTER 0
-+#define CONFIG_SIGNALSTATS_FILTER 0
-+#define CONFIG_SIGNATURE_FILTER 0
-+#define CONFIG_SMARTBLUR_FILTER 0
-+#define CONFIG_SOBEL_FILTER 0
-+#define CONFIG_SOBEL_OPENCL_FILTER 0
-+#define CONFIG_SPLIT_FILTER 0
-+#define CONFIG_SPP_FILTER 0
-+#define CONFIG_SR_FILTER 0
-+#define CONFIG_SSIM_FILTER 0
-+#define CONFIG_STEREO3D_FILTER 0
-+#define CONFIG_STREAMSELECT_FILTER 0
-+#define CONFIG_SUBTITLES_FILTER 0
-+#define CONFIG_SUPER2XSAI_FILTER 0
-+#define CONFIG_SWAPRECT_FILTER 0
-+#define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
-+#define CONFIG_TELECINE_FILTER 0
-+#define CONFIG_THISTOGRAM_FILTER 0
-+#define CONFIG_THRESHOLD_FILTER 0
-+#define CONFIG_THUMBNAIL_FILTER 0
-+#define CONFIG_THUMBNAIL_CUDA_FILTER 0
-+#define CONFIG_TILE_FILTER 0
-+#define CONFIG_TINTERLACE_FILTER 0
-+#define CONFIG_TLUT2_FILTER 0
-+#define CONFIG_TMEDIAN_FILTER 0
-+#define CONFIG_TMIDEQUALIZER_FILTER 0
-+#define CONFIG_TMIX_FILTER 0
-+#define CONFIG_TONEMAP_FILTER 0
-+#define CONFIG_TONEMAP_OPENCL_FILTER 0
-+#define CONFIG_TONEMAP_VAAPI_FILTER 0
-+#define CONFIG_TPAD_FILTER 0
-+#define CONFIG_TRANSPOSE_FILTER 0
-+#define CONFIG_TRANSPOSE_NPP_FILTER 0
-+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0
-+#define CONFIG_TRANSPOSE_VAAPI_FILTER 0
-+#define CONFIG_TRANSPOSE_VULKAN_FILTER 0
-+#define CONFIG_TRIM_FILTER 0
-+#define CONFIG_UNPREMULTIPLY_FILTER 0
-+#define CONFIG_UNSHARP_FILTER 0
-+#define CONFIG_UNSHARP_OPENCL_FILTER 0
-+#define CONFIG_UNTILE_FILTER 0
-+#define CONFIG_USPP_FILTER 0
-+#define CONFIG_V360_FILTER 0
-+#define CONFIG_VAGUEDENOISER_FILTER 0
-+#define CONFIG_VARBLUR_FILTER 0
-+#define CONFIG_VECTORSCOPE_FILTER 0
-+#define CONFIG_VFLIP_FILTER 0
-+#define CONFIG_VFLIP_VULKAN_FILTER 0
-+#define CONFIG_VFRDET_FILTER 0
-+#define CONFIG_VIBRANCE_FILTER 0
-+#define CONFIG_VIDSTABDETECT_FILTER 0
-+#define CONFIG_VIDSTABTRANSFORM_FILTER 0
-+#define CONFIG_VIF_FILTER 0
-+#define CONFIG_VIGNETTE_FILTER 0
-+#define CONFIG_VMAFMOTION_FILTER 0
-+#define CONFIG_VPP_QSV_FILTER 0
-+#define CONFIG_VSTACK_FILTER 0
-+#define CONFIG_W3FDIF_FILTER 0
-+#define CONFIG_WAVEFORM_FILTER 0
-+#define CONFIG_WEAVE_FILTER 0
-+#define CONFIG_XBR_FILTER 0
-+#define CONFIG_XCORRELATE_FILTER 0
-+#define CONFIG_XFADE_FILTER 0
-+#define CONFIG_XFADE_OPENCL_FILTER 0
-+#define CONFIG_XMEDIAN_FILTER 0
-+#define CONFIG_XSTACK_FILTER 0
-+#define CONFIG_YADIF_FILTER 0
-+#define CONFIG_YADIF_CUDA_FILTER 0
-+#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0
-+#define CONFIG_YAEPBLUR_FILTER 0
-+#define CONFIG_ZMQ_FILTER 0
-+#define CONFIG_ZOOMPAN_FILTER 0
-+#define CONFIG_ZSCALE_FILTER 0
-+#define CONFIG_ALLRGB_FILTER 0
-+#define CONFIG_ALLYUV_FILTER 0
-+#define CONFIG_CELLAUTO_FILTER 0
-+#define CONFIG_COLOR_FILTER 0
-+#define CONFIG_COLORSPECTRUM_FILTER 0
-+#define CONFIG_COREIMAGESRC_FILTER 0
-+#define CONFIG_FREI0R_SRC_FILTER 0
-+#define CONFIG_GRADIENTS_FILTER 0
-+#define CONFIG_HALDCLUTSRC_FILTER 0
-+#define CONFIG_LIFE_FILTER 0
-+#define CONFIG_MANDELBROT_FILTER 0
-+#define CONFIG_MPTESTSRC_FILTER 0
-+#define CONFIG_NULLSRC_FILTER 0
-+#define CONFIG_OPENCLSRC_FILTER 0
-+#define CONFIG_PAL75BARS_FILTER 0
-+#define CONFIG_PAL100BARS_FILTER 0
-+#define CONFIG_RGBTESTSRC_FILTER 0
-+#define CONFIG_SIERPINSKI_FILTER 0
-+#define CONFIG_SMPTEBARS_FILTER 0
-+#define CONFIG_SMPTEHDBARS_FILTER 0
-+#define CONFIG_TESTSRC_FILTER 0
-+#define CONFIG_TESTSRC2_FILTER 0
-+#define CONFIG_YUVTESTSRC_FILTER 0
-+#define CONFIG_NULLSINK_FILTER 0
-+#define CONFIG_ABITSCOPE_FILTER 0
-+#define CONFIG_ADRAWGRAPH_FILTER 0
-+#define CONFIG_AGRAPHMONITOR_FILTER 0
-+#define CONFIG_AHISTOGRAM_FILTER 0
-+#define CONFIG_APHASEMETER_FILTER 0
-+#define CONFIG_AVECTORSCOPE_FILTER 0
-+#define CONFIG_CONCAT_FILTER 0
-+#define CONFIG_SHOWCQT_FILTER 0
-+#define CONFIG_SHOWFREQS_FILTER 0
-+#define CONFIG_SHOWSPATIAL_FILTER 0
-+#define CONFIG_SHOWSPECTRUM_FILTER 0
-+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0
-+#define CONFIG_SHOWVOLUME_FILTER 0
-+#define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
-+#define CONFIG_SPECTRUMSYNTH_FILTER 0
-+#define CONFIG_AMOVIE_FILTER 0
-+#define CONFIG_MOVIE_FILTER 0
-+#define CONFIG_AFIFO_FILTER 0
-+#define CONFIG_FIFO_FILTER 0
-+#define CONFIG_AA_DEMUXER 0
-+#define CONFIG_AAC_DEMUXER 1
-+#define CONFIG_AAX_DEMUXER 0
-+#define CONFIG_AC3_DEMUXER 0
-+#define CONFIG_ACE_DEMUXER 0
-+#define CONFIG_ACM_DEMUXER 0
-+#define CONFIG_ACT_DEMUXER 0
-+#define CONFIG_ADF_DEMUXER 0
-+#define CONFIG_ADP_DEMUXER 0
-+#define CONFIG_ADS_DEMUXER 0
-+#define CONFIG_ADX_DEMUXER 0
-+#define CONFIG_AEA_DEMUXER 0
-+#define CONFIG_AFC_DEMUXER 0
-+#define CONFIG_AIFF_DEMUXER 0
-+#define CONFIG_AIX_DEMUXER 0
-+#define CONFIG_ALP_DEMUXER 0
-+#define CONFIG_AMR_DEMUXER 0
-+#define CONFIG_AMRNB_DEMUXER 0
-+#define CONFIG_AMRWB_DEMUXER 0
-+#define CONFIG_ANM_DEMUXER 0
-+#define CONFIG_APC_DEMUXER 0
-+#define CONFIG_APE_DEMUXER 0
-+#define CONFIG_APM_DEMUXER 0
-+#define CONFIG_APNG_DEMUXER 0
-+#define CONFIG_APTX_DEMUXER 0
-+#define CONFIG_APTX_HD_DEMUXER 0
-+#define CONFIG_AQTITLE_DEMUXER 0
-+#define CONFIG_ARGO_ASF_DEMUXER 0
-+#define CONFIG_ARGO_BRP_DEMUXER 0
-+#define CONFIG_ARGO_CVG_DEMUXER 0
-+#define CONFIG_ASF_DEMUXER 0
-+#define CONFIG_ASF_O_DEMUXER 0
-+#define CONFIG_ASS_DEMUXER 0
-+#define CONFIG_AST_DEMUXER 0
-+#define CONFIG_AU_DEMUXER 0
-+#define CONFIG_AV1_DEMUXER 0
-+#define CONFIG_AVI_DEMUXER 0
-+#define CONFIG_AVISYNTH_DEMUXER 0
-+#define CONFIG_AVR_DEMUXER 0
-+#define CONFIG_AVS_DEMUXER 0
-+#define CONFIG_AVS2_DEMUXER 0
-+#define CONFIG_AVS3_DEMUXER 0
-+#define CONFIG_BETHSOFTVID_DEMUXER 0
-+#define CONFIG_BFI_DEMUXER 0
-+#define CONFIG_BINTEXT_DEMUXER 0
-+#define CONFIG_BINK_DEMUXER 0
-+#define CONFIG_BINKA_DEMUXER 0
-+#define CONFIG_BIT_DEMUXER 0
-+#define CONFIG_BITPACKED_DEMUXER 0
-+#define CONFIG_BMV_DEMUXER 0
-+#define CONFIG_BFSTM_DEMUXER 0
-+#define CONFIG_BRSTM_DEMUXER 0
-+#define CONFIG_BOA_DEMUXER 0
-+#define CONFIG_C93_DEMUXER 0
-+#define CONFIG_CAF_DEMUXER 0
-+#define CONFIG_CAVSVIDEO_DEMUXER 0
-+#define CONFIG_CDG_DEMUXER 0
-+#define CONFIG_CDXL_DEMUXER 0
-+#define CONFIG_CINE_DEMUXER 0
-+#define CONFIG_CODEC2_DEMUXER 0
-+#define CONFIG_CODEC2RAW_DEMUXER 0
-+#define CONFIG_CONCAT_DEMUXER 0
-+#define CONFIG_DASH_DEMUXER 0
-+#define CONFIG_DATA_DEMUXER 0
-+#define CONFIG_DAUD_DEMUXER 0
-+#define CONFIG_DCSTR_DEMUXER 0
-+#define CONFIG_DERF_DEMUXER 0
-+#define CONFIG_DFA_DEMUXER 0
-+#define CONFIG_DHAV_DEMUXER 0
-+#define CONFIG_DIRAC_DEMUXER 0
-+#define CONFIG_DNXHD_DEMUXER 0
-+#define CONFIG_DSF_DEMUXER 0
-+#define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
-+#define CONFIG_DTS_DEMUXER 0
-+#define CONFIG_DTSHD_DEMUXER 0
-+#define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
-+#define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_DXA_DEMUXER 0
-+#define CONFIG_EA_DEMUXER 0
-+#define CONFIG_EA_CDATA_DEMUXER 0
-+#define CONFIG_EAC3_DEMUXER 0
-+#define CONFIG_EPAF_DEMUXER 0
-+#define CONFIG_FFMETADATA_DEMUXER 0
-+#define CONFIG_FILMSTRIP_DEMUXER 0
-+#define CONFIG_FITS_DEMUXER 0
-+#define CONFIG_FLAC_DEMUXER 1
-+#define CONFIG_FLIC_DEMUXER 0
-+#define CONFIG_FLV_DEMUXER 0
-+#define CONFIG_LIVE_FLV_DEMUXER 0
-+#define CONFIG_FOURXM_DEMUXER 0
-+#define CONFIG_FRM_DEMUXER 0
-+#define CONFIG_FSB_DEMUXER 0
-+#define CONFIG_FWSE_DEMUXER 0
-+#define CONFIG_G722_DEMUXER 0
-+#define CONFIG_G723_1_DEMUXER 0
-+#define CONFIG_G726_DEMUXER 0
-+#define CONFIG_G726LE_DEMUXER 0
-+#define CONFIG_G729_DEMUXER 0
-+#define CONFIG_GDV_DEMUXER 0
-+#define CONFIG_GENH_DEMUXER 0
-+#define CONFIG_GIF_DEMUXER 0
-+#define CONFIG_GSM_DEMUXER 0
-+#define CONFIG_GXF_DEMUXER 0
-+#define CONFIG_H261_DEMUXER 0
-+#define CONFIG_H263_DEMUXER 0
-+#define CONFIG_H264_DEMUXER 0
-+#define CONFIG_HCA_DEMUXER 0
-+#define CONFIG_HCOM_DEMUXER 0
-+#define CONFIG_HEVC_DEMUXER 0
-+#define CONFIG_HLS_DEMUXER 0
-+#define CONFIG_HNM_DEMUXER 0
-+#define CONFIG_ICO_DEMUXER 0
-+#define CONFIG_IDCIN_DEMUXER 0
-+#define CONFIG_IDF_DEMUXER 0
-+#define CONFIG_IFF_DEMUXER 0
-+#define CONFIG_IFV_DEMUXER 0
-+#define CONFIG_ILBC_DEMUXER 0
-+#define CONFIG_IMAGE2_DEMUXER 0
-+#define CONFIG_IMAGE2PIPE_DEMUXER 0
-+#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0
-+#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0
-+#define CONFIG_IMF_DEMUXER 0
-+#define CONFIG_INGENIENT_DEMUXER 0
-+#define CONFIG_IPMOVIE_DEMUXER 0
-+#define CONFIG_IPU_DEMUXER 0
-+#define CONFIG_IRCAM_DEMUXER 0
-+#define CONFIG_ISS_DEMUXER 0
-+#define CONFIG_IV8_DEMUXER 0
-+#define CONFIG_IVF_DEMUXER 0
-+#define CONFIG_IVR_DEMUXER 0
-+#define CONFIG_JACOSUB_DEMUXER 0
-+#define CONFIG_JV_DEMUXER 0
-+#define CONFIG_KUX_DEMUXER 0
-+#define CONFIG_KVAG_DEMUXER 0
-+#define CONFIG_LMLM4_DEMUXER 0
-+#define CONFIG_LOAS_DEMUXER 0
-+#define CONFIG_LUODAT_DEMUXER 0
-+#define CONFIG_LRC_DEMUXER 0
-+#define CONFIG_LVF_DEMUXER 0
-+#define CONFIG_LXF_DEMUXER 0
-+#define CONFIG_M4V_DEMUXER 0
-+#define CONFIG_MCA_DEMUXER 0
-+#define CONFIG_MCC_DEMUXER 0
-+#define CONFIG_MATROSKA_DEMUXER 1
-+#define CONFIG_MGSTS_DEMUXER 0
-+#define CONFIG_MICRODVD_DEMUXER 0
-+#define CONFIG_MJPEG_DEMUXER 0
-+#define CONFIG_MJPEG_2000_DEMUXER 0
-+#define CONFIG_MLP_DEMUXER 0
-+#define CONFIG_MLV_DEMUXER 0
-+#define CONFIG_MM_DEMUXER 0
-+#define CONFIG_MMF_DEMUXER 0
-+#define CONFIG_MODS_DEMUXER 0
-+#define CONFIG_MOFLEX_DEMUXER 0
-+#define CONFIG_MOV_DEMUXER 1
-+#define CONFIG_MP3_DEMUXER 1
-+#define CONFIG_MPC_DEMUXER 0
-+#define CONFIG_MPC8_DEMUXER 0
-+#define CONFIG_MPEGPS_DEMUXER 0
-+#define CONFIG_MPEGTS_DEMUXER 0
-+#define CONFIG_MPEGTSRAW_DEMUXER 0
-+#define CONFIG_MPEGVIDEO_DEMUXER 0
-+#define CONFIG_MPJPEG_DEMUXER 0
-+#define CONFIG_MPL2_DEMUXER 0
-+#define CONFIG_MPSUB_DEMUXER 0
-+#define CONFIG_MSF_DEMUXER 0
-+#define CONFIG_MSNWC_TCP_DEMUXER 0
-+#define CONFIG_MSP_DEMUXER 0
-+#define CONFIG_MTAF_DEMUXER 0
-+#define CONFIG_MTV_DEMUXER 0
-+#define CONFIG_MUSX_DEMUXER 0
-+#define CONFIG_MV_DEMUXER 0
-+#define CONFIG_MVI_DEMUXER 0
-+#define CONFIG_MXF_DEMUXER 0
-+#define CONFIG_MXG_DEMUXER 0
-+#define CONFIG_NC_DEMUXER 0
-+#define CONFIG_NISTSPHERE_DEMUXER 0
-+#define CONFIG_NSP_DEMUXER 0
-+#define CONFIG_NSV_DEMUXER 0
-+#define CONFIG_NUT_DEMUXER 0
-+#define CONFIG_NUV_DEMUXER 0
-+#define CONFIG_OBU_DEMUXER 0
-+#define CONFIG_OGG_DEMUXER 1
-+#define CONFIG_OMA_DEMUXER 0
-+#define CONFIG_PAF_DEMUXER 0
-+#define CONFIG_PCM_ALAW_DEMUXER 0
-+#define CONFIG_PCM_MULAW_DEMUXER 0
-+#define CONFIG_PCM_VIDC_DEMUXER 0
-+#define CONFIG_PCM_F64BE_DEMUXER 0
-+#define CONFIG_PCM_F64LE_DEMUXER 0
-+#define CONFIG_PCM_F32BE_DEMUXER 0
-+#define CONFIG_PCM_F32LE_DEMUXER 0
-+#define CONFIG_PCM_S32BE_DEMUXER 0
-+#define CONFIG_PCM_S32LE_DEMUXER 0
-+#define CONFIG_PCM_S24BE_DEMUXER 0
-+#define CONFIG_PCM_S24LE_DEMUXER 0
-+#define CONFIG_PCM_S16BE_DEMUXER 0
-+#define CONFIG_PCM_S16LE_DEMUXER 0
-+#define CONFIG_PCM_S8_DEMUXER 0
-+#define CONFIG_PCM_U32BE_DEMUXER 0
-+#define CONFIG_PCM_U32LE_DEMUXER 0
-+#define CONFIG_PCM_U24BE_DEMUXER 0
-+#define CONFIG_PCM_U24LE_DEMUXER 0
-+#define CONFIG_PCM_U16BE_DEMUXER 0
-+#define CONFIG_PCM_U16LE_DEMUXER 0
-+#define CONFIG_PCM_U8_DEMUXER 0
-+#define CONFIG_PJS_DEMUXER 0
-+#define CONFIG_PMP_DEMUXER 0
-+#define CONFIG_PP_BNK_DEMUXER 0
-+#define CONFIG_PVA_DEMUXER 0
-+#define CONFIG_PVF_DEMUXER 0
-+#define CONFIG_QCP_DEMUXER 0
-+#define CONFIG_R3D_DEMUXER 0
-+#define CONFIG_RAWVIDEO_DEMUXER 0
-+#define CONFIG_REALTEXT_DEMUXER 0
-+#define CONFIG_REDSPARK_DEMUXER 0
-+#define CONFIG_RL2_DEMUXER 0
-+#define CONFIG_RM_DEMUXER 0
-+#define CONFIG_ROQ_DEMUXER 0
-+#define CONFIG_RPL_DEMUXER 0
-+#define CONFIG_RSD_DEMUXER 0
-+#define CONFIG_RSO_DEMUXER 0
-+#define CONFIG_RTP_DEMUXER 0
-+#define CONFIG_RTSP_DEMUXER 0
-+#define CONFIG_S337M_DEMUXER 0
-+#define CONFIG_SAMI_DEMUXER 0
-+#define CONFIG_SAP_DEMUXER 0
-+#define CONFIG_SBC_DEMUXER 0
-+#define CONFIG_SBG_DEMUXER 0
-+#define CONFIG_SCC_DEMUXER 0
-+#define CONFIG_SCD_DEMUXER 0
-+#define CONFIG_SDP_DEMUXER 0
-+#define CONFIG_SDR2_DEMUXER 0
-+#define CONFIG_SDS_DEMUXER 0
-+#define CONFIG_SDX_DEMUXER 0
-+#define CONFIG_SEGAFILM_DEMUXER 0
-+#define CONFIG_SER_DEMUXER 0
-+#define CONFIG_SGA_DEMUXER 0
-+#define CONFIG_SHORTEN_DEMUXER 0
-+#define CONFIG_SIFF_DEMUXER 0
-+#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0
-+#define CONFIG_SLN_DEMUXER 0
-+#define CONFIG_SMACKER_DEMUXER 0
-+#define CONFIG_SMJPEG_DEMUXER 0
-+#define CONFIG_SMUSH_DEMUXER 0
-+#define CONFIG_SOL_DEMUXER 0
-+#define CONFIG_SOX_DEMUXER 0
-+#define CONFIG_SPDIF_DEMUXER 0
-+#define CONFIG_SRT_DEMUXER 0
-+#define CONFIG_STR_DEMUXER 0
-+#define CONFIG_STL_DEMUXER 0
-+#define CONFIG_SUBVIEWER1_DEMUXER 0
-+#define CONFIG_SUBVIEWER_DEMUXER 0
-+#define CONFIG_SUP_DEMUXER 0
-+#define CONFIG_SVAG_DEMUXER 0
-+#define CONFIG_SVS_DEMUXER 0
-+#define CONFIG_SWF_DEMUXER 0
-+#define CONFIG_TAK_DEMUXER 0
-+#define CONFIG_TEDCAPTIONS_DEMUXER 0
-+#define CONFIG_THP_DEMUXER 0
-+#define CONFIG_THREEDOSTR_DEMUXER 0
-+#define CONFIG_TIERTEXSEQ_DEMUXER 0
-+#define CONFIG_TMV_DEMUXER 0
-+#define CONFIG_TRUEHD_DEMUXER 0
-+#define CONFIG_TTA_DEMUXER 0
-+#define CONFIG_TXD_DEMUXER 0
-+#define CONFIG_TTY_DEMUXER 0
-+#define CONFIG_TY_DEMUXER 0
-+#define CONFIG_V210_DEMUXER 0
-+#define CONFIG_V210X_DEMUXER 0
-+#define CONFIG_VAG_DEMUXER 0
-+#define CONFIG_VC1_DEMUXER 0
-+#define CONFIG_VC1T_DEMUXER 0
-+#define CONFIG_VIVIDAS_DEMUXER 0
-+#define CONFIG_VIVO_DEMUXER 0
-+#define CONFIG_VMD_DEMUXER 0
-+#define CONFIG_VOBSUB_DEMUXER 0
-+#define CONFIG_VOC_DEMUXER 0
-+#define CONFIG_VPK_DEMUXER 0
-+#define CONFIG_VPLAYER_DEMUXER 0
-+#define CONFIG_VQF_DEMUXER 0
-+#define CONFIG_W64_DEMUXER 0
-+#define CONFIG_WAV_DEMUXER 1
-+#define CONFIG_WC3_DEMUXER 0
-+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
-+#define CONFIG_WEBVTT_DEMUXER 0
-+#define CONFIG_WSAUD_DEMUXER 0
-+#define CONFIG_WSD_DEMUXER 0
-+#define CONFIG_WSVQA_DEMUXER 0
-+#define CONFIG_WTV_DEMUXER 0
-+#define CONFIG_WVE_DEMUXER 0
-+#define CONFIG_WV_DEMUXER 0
-+#define CONFIG_XA_DEMUXER 0
-+#define CONFIG_XBIN_DEMUXER 0
-+#define CONFIG_XMV_DEMUXER 0
-+#define CONFIG_XVAG_DEMUXER 0
-+#define CONFIG_XWMA_DEMUXER 0
-+#define CONFIG_YOP_DEMUXER 0
-+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0
-+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
-+#define CONFIG_LIBGME_DEMUXER 0
-+#define CONFIG_LIBMODPLUG_DEMUXER 0
-+#define CONFIG_LIBOPENMPT_DEMUXER 0
-+#define CONFIG_VAPOURSYNTH_DEMUXER 0
-+#define CONFIG_A64_MUXER 0
-+#define CONFIG_AC3_MUXER 0
-+#define CONFIG_ADTS_MUXER 0
-+#define CONFIG_ADX_MUXER 0
-+#define CONFIG_AIFF_MUXER 0
-+#define CONFIG_ALP_MUXER 0
-+#define CONFIG_AMR_MUXER 0
-+#define CONFIG_AMV_MUXER 0
-+#define CONFIG_APM_MUXER 0
-+#define CONFIG_APNG_MUXER 0
-+#define CONFIG_APTX_MUXER 0
-+#define CONFIG_APTX_HD_MUXER 0
-+#define CONFIG_ARGO_ASF_MUXER 0
-+#define CONFIG_ARGO_CVG_MUXER 0
-+#define CONFIG_ASF_MUXER 0
-+#define CONFIG_ASS_MUXER 0
-+#define CONFIG_AST_MUXER 0
-+#define CONFIG_ASF_STREAM_MUXER 0
-+#define CONFIG_AU_MUXER 0
-+#define CONFIG_AVI_MUXER 0
-+#define CONFIG_AVM2_MUXER 0
-+#define CONFIG_AVS2_MUXER 0
-+#define CONFIG_AVS3_MUXER 0
-+#define CONFIG_BIT_MUXER 0
-+#define CONFIG_CAF_MUXER 0
-+#define CONFIG_CAVSVIDEO_MUXER 0
-+#define CONFIG_CODEC2_MUXER 0
-+#define CONFIG_CODEC2RAW_MUXER 0
-+#define CONFIG_CRC_MUXER 0
-+#define CONFIG_DASH_MUXER 0
-+#define CONFIG_DATA_MUXER 0
-+#define CONFIG_DAUD_MUXER 0
-+#define CONFIG_DIRAC_MUXER 0
-+#define CONFIG_DNXHD_MUXER 0
-+#define CONFIG_DTS_MUXER 0
-+#define CONFIG_DV_MUXER 0
-+#define CONFIG_EAC3_MUXER 0
-+#define CONFIG_F4V_MUXER 0
-+#define CONFIG_FFMETADATA_MUXER 0
-+#define CONFIG_FIFO_MUXER 0
-+#define CONFIG_FIFO_TEST_MUXER 0
-+#define CONFIG_FILMSTRIP_MUXER 0
-+#define CONFIG_FITS_MUXER 0
-+#define CONFIG_FLAC_MUXER 0
-+#define CONFIG_FLV_MUXER 0
-+#define CONFIG_FRAMECRC_MUXER 0
-+#define CONFIG_FRAMEHASH_MUXER 0
-+#define CONFIG_FRAMEMD5_MUXER 0
-+#define CONFIG_G722_MUXER 0
-+#define CONFIG_G723_1_MUXER 0
-+#define CONFIG_G726_MUXER 0
-+#define CONFIG_G726LE_MUXER 0
-+#define CONFIG_GIF_MUXER 0
-+#define CONFIG_GSM_MUXER 0
-+#define CONFIG_GXF_MUXER 0
-+#define CONFIG_H261_MUXER 0
-+#define CONFIG_H263_MUXER 0
-+#define CONFIG_H264_MUXER 0
-+#define CONFIG_HASH_MUXER 0
-+#define CONFIG_HDS_MUXER 0
-+#define CONFIG_HEVC_MUXER 0
-+#define CONFIG_HLS_MUXER 0
-+#define CONFIG_ICO_MUXER 0
-+#define CONFIG_ILBC_MUXER 0
-+#define CONFIG_IMAGE2_MUXER 0
-+#define CONFIG_IMAGE2PIPE_MUXER 0
-+#define CONFIG_IPOD_MUXER 0
-+#define CONFIG_IRCAM_MUXER 0
-+#define CONFIG_ISMV_MUXER 0
-+#define CONFIG_IVF_MUXER 0
-+#define CONFIG_JACOSUB_MUXER 0
-+#define CONFIG_KVAG_MUXER 0
-+#define CONFIG_LATM_MUXER 0
-+#define CONFIG_LRC_MUXER 0
-+#define CONFIG_M4V_MUXER 0
-+#define CONFIG_MD5_MUXER 0
-+#define CONFIG_MATROSKA_MUXER 0
-+#define CONFIG_MATROSKA_AUDIO_MUXER 0
-+#define CONFIG_MICRODVD_MUXER 0
-+#define CONFIG_MJPEG_MUXER 0
-+#define CONFIG_MLP_MUXER 0
-+#define CONFIG_MMF_MUXER 0
-+#define CONFIG_MOV_MUXER 0
-+#define CONFIG_MP2_MUXER 0
-+#define CONFIG_MP3_MUXER 0
-+#define CONFIG_MP4_MUXER 0
-+#define CONFIG_MPEG1SYSTEM_MUXER 0
-+#define CONFIG_MPEG1VCD_MUXER 0
-+#define CONFIG_MPEG1VIDEO_MUXER 0
-+#define CONFIG_MPEG2DVD_MUXER 0
-+#define CONFIG_MPEG2SVCD_MUXER 0
-+#define CONFIG_MPEG2VIDEO_MUXER 0
-+#define CONFIG_MPEG2VOB_MUXER 0
-+#define CONFIG_MPEGTS_MUXER 0
-+#define CONFIG_MPJPEG_MUXER 0
-+#define CONFIG_MXF_MUXER 0
-+#define CONFIG_MXF_D10_MUXER 0
-+#define CONFIG_MXF_OPATOM_MUXER 0
-+#define CONFIG_NULL_MUXER 0
-+#define CONFIG_NUT_MUXER 0
-+#define CONFIG_OBU_MUXER 0
-+#define CONFIG_OGA_MUXER 0
-+#define CONFIG_OGG_MUXER 0
-+#define CONFIG_OGV_MUXER 0
-+#define CONFIG_OMA_MUXER 0
-+#define CONFIG_OPUS_MUXER 0
-+#define CONFIG_PCM_ALAW_MUXER 0
-+#define CONFIG_PCM_MULAW_MUXER 0
-+#define CONFIG_PCM_VIDC_MUXER 0
-+#define CONFIG_PCM_F64BE_MUXER 0
-+#define CONFIG_PCM_F64LE_MUXER 0
-+#define CONFIG_PCM_F32BE_MUXER 0
-+#define CONFIG_PCM_F32LE_MUXER 0
-+#define CONFIG_PCM_S32BE_MUXER 0
-+#define CONFIG_PCM_S32LE_MUXER 0
-+#define CONFIG_PCM_S24BE_MUXER 0
-+#define CONFIG_PCM_S24LE_MUXER 0
-+#define CONFIG_PCM_S16BE_MUXER 0
-+#define CONFIG_PCM_S16LE_MUXER 0
-+#define CONFIG_PCM_S8_MUXER 0
-+#define CONFIG_PCM_U32BE_MUXER 0
-+#define CONFIG_PCM_U32LE_MUXER 0
-+#define CONFIG_PCM_U24BE_MUXER 0
-+#define CONFIG_PCM_U24LE_MUXER 0
-+#define CONFIG_PCM_U16BE_MUXER 0
-+#define CONFIG_PCM_U16LE_MUXER 0
-+#define CONFIG_PCM_U8_MUXER 0
-+#define CONFIG_PSP_MUXER 0
-+#define CONFIG_RAWVIDEO_MUXER 0
-+#define CONFIG_RM_MUXER 0
-+#define CONFIG_ROQ_MUXER 0
-+#define CONFIG_RSO_MUXER 0
-+#define CONFIG_RTP_MUXER 0
-+#define CONFIG_RTP_MPEGTS_MUXER 0
-+#define CONFIG_RTSP_MUXER 0
-+#define CONFIG_SAP_MUXER 0
-+#define CONFIG_SBC_MUXER 0
-+#define CONFIG_SCC_MUXER 0
-+#define CONFIG_SEGAFILM_MUXER 0
-+#define CONFIG_SEGMENT_MUXER 0
-+#define CONFIG_STREAM_SEGMENT_MUXER 0
-+#define CONFIG_SMJPEG_MUXER 0
-+#define CONFIG_SMOOTHSTREAMING_MUXER 0
-+#define CONFIG_SOX_MUXER 0
-+#define CONFIG_SPX_MUXER 0
-+#define CONFIG_SPDIF_MUXER 0
-+#define CONFIG_SRT_MUXER 0
-+#define CONFIG_STREAMHASH_MUXER 0
-+#define CONFIG_SUP_MUXER 0
-+#define CONFIG_SWF_MUXER 0
-+#define CONFIG_TEE_MUXER 0
-+#define CONFIG_TG2_MUXER 0
-+#define CONFIG_TGP_MUXER 0
-+#define CONFIG_MKVTIMESTAMP_V2_MUXER 0
-+#define CONFIG_TRUEHD_MUXER 0
-+#define CONFIG_TTA_MUXER 0
-+#define CONFIG_TTML_MUXER 0
-+#define CONFIG_UNCODEDFRAMECRC_MUXER 0
-+#define CONFIG_VC1_MUXER 0
-+#define CONFIG_VC1T_MUXER 0
-+#define CONFIG_VOC_MUXER 0
-+#define CONFIG_W64_MUXER 0
-+#define CONFIG_WAV_MUXER 0
-+#define CONFIG_WEBM_MUXER 0
-+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
-+#define CONFIG_WEBM_CHUNK_MUXER 0
-+#define CONFIG_WEBP_MUXER 0
-+#define CONFIG_WEBVTT_MUXER 0
-+#define CONFIG_WSAUD_MUXER 0
-+#define CONFIG_WTV_MUXER 0
-+#define CONFIG_WV_MUXER 0
-+#define CONFIG_YUV4MPEGPIPE_MUXER 0
-+#define CONFIG_CHROMAPRINT_MUXER 0
-+#define CONFIG_ASYNC_PROTOCOL 0
-+#define CONFIG_BLURAY_PROTOCOL 0
-+#define CONFIG_CACHE_PROTOCOL 0
-+#define CONFIG_CONCAT_PROTOCOL 0
-+#define CONFIG_CONCATF_PROTOCOL 0
-+#define CONFIG_CRYPTO_PROTOCOL 0
-+#define CONFIG_DATA_PROTOCOL 0
-+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
-+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
-+#define CONFIG_FILE_PROTOCOL 0
-+#define CONFIG_FTP_PROTOCOL 0
-+#define CONFIG_GOPHER_PROTOCOL 0
-+#define CONFIG_GOPHERS_PROTOCOL 0
-+#define CONFIG_HLS_PROTOCOL 0
-+#define CONFIG_HTTP_PROTOCOL 0
-+#define CONFIG_HTTPPROXY_PROTOCOL 0
-+#define CONFIG_HTTPS_PROTOCOL 0
-+#define CONFIG_ICECAST_PROTOCOL 0
-+#define CONFIG_MMSH_PROTOCOL 0
-+#define CONFIG_MMST_PROTOCOL 0
-+#define CONFIG_MD5_PROTOCOL 0
-+#define CONFIG_PIPE_PROTOCOL 0
-+#define CONFIG_PROMPEG_PROTOCOL 0
-+#define CONFIG_RTMP_PROTOCOL 0
-+#define CONFIG_RTMPE_PROTOCOL 0
-+#define CONFIG_RTMPS_PROTOCOL 0
-+#define CONFIG_RTMPT_PROTOCOL 0
-+#define CONFIG_RTMPTE_PROTOCOL 0
-+#define CONFIG_RTMPTS_PROTOCOL 0
-+#define CONFIG_RTP_PROTOCOL 0
-+#define CONFIG_SCTP_PROTOCOL 0
-+#define CONFIG_SRTP_PROTOCOL 0
-+#define CONFIG_SUBFILE_PROTOCOL 0
-+#define CONFIG_TEE_PROTOCOL 0
-+#define CONFIG_TCP_PROTOCOL 0
-+#define CONFIG_TLS_PROTOCOL 0
-+#define CONFIG_UDP_PROTOCOL 0
-+#define CONFIG_UDPLITE_PROTOCOL 0
-+#define CONFIG_UNIX_PROTOCOL 0
-+#define CONFIG_LIBAMQP_PROTOCOL 0
-+#define CONFIG_LIBRIST_PROTOCOL 0
-+#define CONFIG_LIBRTMP_PROTOCOL 0
-+#define CONFIG_LIBRTMPE_PROTOCOL 0
-+#define CONFIG_LIBRTMPS_PROTOCOL 0
-+#define CONFIG_LIBRTMPT_PROTOCOL 0
-+#define CONFIG_LIBRTMPTE_PROTOCOL 0
-+#define CONFIG_LIBSRT_PROTOCOL 0
-+#define CONFIG_LIBSSH_PROTOCOL 0
-+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
-+#define CONFIG_LIBZMQ_PROTOCOL 0
+#endif /* FFMPEG_CONFIG_H */
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h
new file mode 100644
index 000000000000..be34e11ef073
--- /dev/null
+++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h
@@ -0,0 +1,2066 @@
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h.orig 2022-05-19 14:06:27 UTC
++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h
+@@ -0,0 +1,2063 @@
++/* Automatically generated by configure - do not modify! */
++#ifndef FFMPEG_CONFIG_COMPONENTS_H
++#define FFMPEG_CONFIG_COMPONENTS_H
++#define CONFIG_AAC_ADTSTOASC_BSF 0
++#define CONFIG_AV1_FRAME_MERGE_BSF 0
++#define CONFIG_AV1_FRAME_SPLIT_BSF 0
++#define CONFIG_AV1_METADATA_BSF 0
++#define CONFIG_CHOMP_BSF 0
++#define CONFIG_DUMP_EXTRADATA_BSF 0
++#define CONFIG_DCA_CORE_BSF 0
++#define CONFIG_DV_ERROR_MARKER_BSF 0
++#define CONFIG_EAC3_CORE_BSF 0
++#define CONFIG_EXTRACT_EXTRADATA_BSF 0
++#define CONFIG_FILTER_UNITS_BSF 0
++#define CONFIG_H264_METADATA_BSF 0
++#define CONFIG_H264_MP4TOANNEXB_BSF 0
++#define CONFIG_H264_REDUNDANT_PPS_BSF 0
++#define CONFIG_HAPQA_EXTRACT_BSF 0
++#define CONFIG_HEVC_METADATA_BSF 0
++#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
++#define CONFIG_IMX_DUMP_HEADER_BSF 0
++#define CONFIG_MJPEG2JPEG_BSF 0
++#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
++#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
++#define CONFIG_MPEG2_METADATA_BSF 0
++#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
++#define CONFIG_MOV2TEXTSUB_BSF 0
++#define CONFIG_NOISE_BSF 0
++#define CONFIG_NULL_BSF 0
++#define CONFIG_OPUS_METADATA_BSF 0
++#define CONFIG_PCM_RECHUNK_BSF 0
++#define CONFIG_PRORES_METADATA_BSF 0
++#define CONFIG_REMOVE_EXTRADATA_BSF 0
++#define CONFIG_SETTS_BSF 0
++#define CONFIG_TEXT2MOVSUB_BSF 0
++#define CONFIG_TRACE_HEADERS_BSF 0
++#define CONFIG_TRUEHD_CORE_BSF 0
++#define CONFIG_VP9_METADATA_BSF 0
++#define CONFIG_VP9_RAW_REORDER_BSF 0
++#define CONFIG_VP9_SUPERFRAME_BSF 0
++#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
++#define CONFIG_AASC_DECODER 0
++#define CONFIG_AIC_DECODER 0
++#define CONFIG_ALIAS_PIX_DECODER 0
++#define CONFIG_AGM_DECODER 0
++#define CONFIG_AMV_DECODER 0
++#define CONFIG_ANM_DECODER 0
++#define CONFIG_ANSI_DECODER 0
++#define CONFIG_APNG_DECODER 0
++#define CONFIG_ARBC_DECODER 0
++#define CONFIG_ARGO_DECODER 0
++#define CONFIG_ASV1_DECODER 0
++#define CONFIG_ASV2_DECODER 0
++#define CONFIG_AURA_DECODER 0
++#define CONFIG_AURA2_DECODER 0
++#define CONFIG_AVRP_DECODER 0
++#define CONFIG_AVRN_DECODER 0
++#define CONFIG_AVS_DECODER 0
++#define CONFIG_AVUI_DECODER 0
++#define CONFIG_AYUV_DECODER 0
++#define CONFIG_BETHSOFTVID_DECODER 0
++#define CONFIG_BFI_DECODER 0
++#define CONFIG_BINK_DECODER 0
++#define CONFIG_BITPACKED_DECODER 0
++#define CONFIG_BMP_DECODER 0
++#define CONFIG_BMV_VIDEO_DECODER 0
++#define CONFIG_BRENDER_PIX_DECODER 0
++#define CONFIG_C93_DECODER 0
++#define CONFIG_CAVS_DECODER 0
++#define CONFIG_CDGRAPHICS_DECODER 0
++#define CONFIG_CDTOONS_DECODER 0